Merge branch 'python2' of https://github.com/bcgov/dbc-pylib into python2

Author: franTarkenton

DB/DB/DbLib.py

@@ -30,7 +30,6 @@
 import os
 
 import cx_Oracle
-import Misc.AppConfigs
 
 
 class DbMethods(object):
@@ -44,7 +43,7 @@ class DbMethods(object):
     :ivar dbParams: Contains the database connection parameters.
     '''
 
-    def __init__(self, configFile=''):
+    def __init__(self):
         self.logger = logging.getLogger(__name__)
         self.logger.debug("Logging set up in the module: %s" , os.path.basename(__file__))
         self.logger.debug("using this version of dblib")
@@ -53,8 +52,6 @@ def __init__(self, configFile=''):
         # parameters by the method __getDbParams
         self.dbParams = {}
 
-        if configFile:
-            self.connect(configFile)
 
     def connectParams(self, user=None, pswd=None, instance=None):
         '''
@@ -88,20 +85,20 @@ def connectParams(self, user=None, pswd=None, instance=None):
             self.logger.info(msg)
             raise ConnectionError(self.dbParams['username'], self.dbParams['instance'])
 
-    def connectNoDSN(self, user, pswd, instance, server, port=1521):
+    def connectNoDSN(self, user, pswd, serviceName, host, port=1521):
         '''
         Allows for the creation of a database connection when the
         client does not have a valid TNS file.  Allows you to connect
-        using port and server name.
+        using port and host name.
 
         :param  user: schema that you are using to connnect to the database
         :type user: str
         :param  pswd: password that goes with the schema
         :type pswd: str
-        :param  instance: The database instance (service_name) that is being connected to.
-        :type instance: str
-        :param  server: The server that the instance resides on
-        :type server: str
+        :param  serviceName: The database serviceName (service_name) that is being connected to.
+        :type serviceName: str
+        :param  host: The host that the serviceName resides on
+        :type host: str
         :param  port: the port that the database listener is attached to.
         :type port: int
         '''
@@ -112,56 +109,20 @@ def connectNoDSN(self, user, pswd, instance, server, port=1521):
             cxOraPath = os.path.abspath(cx_Oracle.__file__)
             self.logger.debug("cx_oracle path is: %s", cxOraPath)
 
-            # dsn = cx_Oracle.makedsn(server, port, service_name=instance)
-            dsn = cx_Oracle.makedsn(server, port, service_name=instance)  # pylint: disable=no-member
-            self.logger.info("successfully connected to host/sn %s/%s", server, instance)
+            # dsn = cx_Oracle.makedsn(host, port, service_name=serviceName)
+            dsn = cx_Oracle.makedsn(host, port, service_name=serviceName)  # pylint: disable=no-member
+            self.logger.info("successfully connected to host/sn %s/%s", host, serviceName)
         except Exception, e:  # pylint: disable=broad-except
             msg = u'Got an error trying to create the dsn using the ' + \
                   u'service_name keyword.  Trying with no keywords'
             self.logger.debug(msg)
             self.logger.debug(repr(e))
-            msg = u'input params are, server: {0}, port: {1}, inst {2}'
-            msg = msg.format(server, port, instance)
-            dsn = cx_Oracle.makedsn(server, port, instance).replace(u'SID', u'SERVICE_NAME')  # pylint: disable=no-member
+            msg = u'input params are, host: {0}, port: {1}, inst {2}'
+            msg = msg.format(host, port, serviceName)
+            dsn = cx_Oracle.makedsn(host, port, serviceName).replace(u'SID', u'SERVICE_NAME')  # pylint: disable=no-member
             self.logger.debug(u'dsn returned is: %s', dsn)
         self.connectParams(user, pswd, dsn)
 
-    def connect(self, configFile):
-        '''
-        :param configFile: a config file containing the connection parameters.
-        :type configFile: string (filepath)
-
-        This is kind of a legacy method.  Originally when this module was
-        created the idea is that connection parameters would be stored in a file.
-        Have now abandoned that idea, and now connection info is generally handled
-        by the secrets api.  Secrets retrieves the parameters.  This module then
-        receives them and uses them.
-
-        This function will extract the parameters from the db config file and
-        create a connection using the parameters found in that file.
-        '''
-        self.confObj = Misc.AppConfigs.Config(configFile)
-        self.__getDbParams()
-        self.connectParams()
-
-    def __getDbParams(self):
-        '''
-        Retrieves the database parameters from the database config file.
-        '''
-        # get directory that this module is in, backup one, then go
-        # into config
-
-        dbParamFileWithPath = self.confObj.getFullPathToDbParamsFile()
-        print 'dbParamFileWithPath', dbParamFileWithPath
-        fh = open(dbParamFileWithPath, 'r')
-        self.dbParams['username'] = fh.readline().replace("\n", "")
-        self.dbParams['password'] = fh.readline().replace("\n", "")
-        self.dbParams['instance'] = fh.readline().replace("\n", "")
-        msg = "using the db accoung: " + str(self.dbParams['username']) + \
-              " and the instance: " + str(self.dbParams['instance'])
-        self.logger.debug(msg)
-        fh.close()
-
     def commit(self):
         '''
         commits the current connection

DB/setup.py

@@ -7,7 +7,7 @@
 from setuptools import setup
 
 setup(name='DB',
-      version='0.4',
+      version='1.0',
       description='wrapper for database communication',
       url='httpshttps://github.com/bcgov/dbc-pylib/tree/master/DB',
       author='Kevin Netherton',

DBCSecrets/DBCSecrets/GetSecrets.py

@@ -856,6 +856,7 @@ def loadSecrets(self):
                       'in the secrets file {1}'
                 raise ValueError(msg.format(
                     self.const.secrets_env_var, secretsFileFullPath))
+        self.logger.debug("secretString: %s", secretString)
         struct = json.loads(secretString)
         self.secretsStruct = struct
 

FMEUtil/FMEUtil/FMEConstants.py

@@ -6,7 +6,6 @@
 used to keep track of property names used by fme rest api.
 '''
 from enum import Enum
-from lxml.html.builder import ACRONYM
 
 
 class Schedule(Enum):
@@ -32,4 +31,98 @@ class FMEFrameworkPublishedParameters(Enum):
     KIRK_JOBLABEL = 4
 
 
-    
+class Workspace(Enum):
+    lastSaveDate = 1
+    lastPublishDate = 2
+    name = 3
+    description = 4
+    repositoryName = 5
+    title = 6
+    type = 7
+    userName = 8
+    
+class WorkspaceInfo(Enum):
+    '''
+    sample data 
+    u'buildNumber': 17539,
+    u'category': u'DataBC Warehouse Replication',
+    u'name': u'OBJECTID',
+    u'datasets': {   u'destination': [   {   u'featuretypes': [   {   u'attributes': [   {   u'decimals': 0,
+
+    '''
+    buildNumber = 1
+    category = 2
+    datasets = 3
+    description = 4
+    enabled = 5
+    fileSize = 6
+    history = 7
+    isVersioned = 8
+    lastPublishDate = 9
+    lastSaveBuild = 10
+    lastSaveDate = 11
+    legalTermsConditions = 12
+    name = 13
+    parameters = 14
+    properties = 15
+    requirements = 16
+    requirementsKeyword = 17
+    resources = 18
+    services = 19
+    title = 20
+    type = 21
+    usage = 22
+    userName = 23
+    
+class Properties(Enum):
+    attributes = 1
+    category = 2
+    name = 3
+    value = 4
+   
+class Parameters(Enum):
+    '''
+    example data:
+{   u'defaultValue': u'PROXY_FADM_WHSE',
+                           u'description': u'Source schema used to login to the database (upper case only please)',
+                           u'model': u'string',
+                           u'name': u'SRC_ORA_PROXY_SCHEMA',
+                           u'type': u'TEXT'},
+                       {   u'defaultValue': u'DLV',
+                           u'description': u'Destination Database Keyword (DLV|TST|PRD)',
+                           u'listOptions': [   {   u'caption': u'DLV',
+                                                   u'value': u'DLV'},
+                                               {   u'caption': u'TST',
+                                                   u'value': u'TST'},
+                                               {   u'caption': u'PRD',
+                                                   u'value': u'PRD'},
+                                               {   u'caption': u'DEV',
+                                                   u'value': u'DEV'}],
+    '''
+    defaultValue = 1
+    description = 2
+    model = 3
+    name = 4
+    type = 5
+    listOptions = 6
+    
+class DataSets(Enum):
+    # both of these properties are tied to lists
+    destination = 1
+    source = 2
+    
+class DataSet(Enum):
+    '''
+    example of data:
+    u'format': u'SDE30',
+    u'location': u'random.bcgov',
+    u'name': u'SDE30_1',
+    u'properties': [   {   u'attributes': {   }, ...
+    u'source': True}
+
+    '''
+    featuretypes = 1
+    format = 2
+    location = 3
+    properties = 4
+    source = 5