Merge pull request salesforce-marketingcloud#27 from CommandIQ/master

Specify specific local file location for wsdl file

Author: cmoad

.gitignore

@@ -1,5 +1,5 @@
 *.py[cod]
-
+*.swp
 # C extensions
 *.so
 

FuelSDK/client.py

@@ -41,6 +41,8 @@ def __init__(self, get_server_wsdl = False, debug = False, params = None):
             logging.getLogger('suds.transport').setLevel(logging.DEBUG)
             logging.getLogger('suds.xsd.schema').setLevel(logging.DEBUG)
             logging.getLogger('suds.wsdl').setLevel(logging.DEBUG)
+        else:
+            logging.getLogger('suds').setLevel(logging.INFO)
 
         ## Read the config information out of config.python
         config = ConfigParser.RawConfigParser()
@@ -81,15 +83,24 @@ def __init__(self, get_server_wsdl = False, debug = False, params = None):
 
         if params is not None and 'authenticationurl' in params:
             self.auth_url = params['authenticationurl']
-        if config.has_option('Web Services', 'authenticationurl'):
+        elif config.has_option('Web Services', 'authenticationurl'):
             self.auth_url = config.get('Web Services', 'authenticationurl')
         elif 'FUELSDK_AUTH_URL' in os.environ:
             self.auth_url = os.environ['FUELSDK_AUTH_URL']
         else:
             self.auth_url = 'https://auth.exacttargetapis.com/v1/requestToken?legacy=1'
 
-        self.wsdl_file_url = self.load_wsdl(wsdl_server_url, get_server_wsdl)
-        
+        if params is not None and "wsdl_file_local_loc" in params:
+            wsdl_file_local_location = params["wsdl_file_local_loc"]
+        elif config.has_option("Web Services", "wsdl_file_local_loc"):
+            wsdl_file_local_location = config.get("Web Services", "wsdl_file_local_loc")
+        elif "FUELSDK_WSDL_FILE_LOCAL_LOC" in os.environ:
+            wsdl_file_local_location = os.environ["FUELSDK_WSDL_FILE_LOCAL_LOC"]
+        else:
+            wsdl_file_local_location = None
+
+        self.wsdl_file_url = self.load_wsdl(wsdl_server_url, wsdl_file_local_location, get_server_wsdl)
+
         ## get the JWT from the params if passed in...or go to the server to get it             
         if(params is not None and 'jwt' in params):
             decodedJWT = jwt.decode(params['jwt'], self.appsignature)
@@ -104,17 +115,20 @@ def __init__(self, get_server_wsdl = False, debug = False, params = None):
             self.refresh_token()
 
 
-    def load_wsdl(self, wsdl_url, get_server_wsdl = False):
+    def load_wsdl(self, wsdl_url, wsdl_file_local_location, get_server_wsdl = False):
         """
         retrieve the url of the ExactTarget wsdl...either file: or http:
         depending on if it already exists locally or server flag is set and
         server has a newer copy
         """
-        path = os.path.dirname(os.path.abspath(__file__))
-        file_location = os.path.join(path, 'ExactTargetWSDL.xml')
+        if wsdl_file_local_location is not None:
+           file_location = wsdl_file_local_location
+        else:
+           path = os.path.dirname(os.path.abspath(__file__))
+           file_location = os.path.join(path, 'ExactTargetWSDL.xml')
         file_url = 'file:///' + file_location 
 
-        if not os.path.exists(file_location):   #if there is no local copy then go get it...
+        if not os.path.exists(file_location) or os.path.getsize(file_location) == 0:   #if there is no local copy or local copy is empty then go get it...
             self.retrieve_server_wsdl(wsdl_url, file_location)
         elif get_server_wsdl:
             r = requests.head(wsdl_url)

FuelSDK/objects.py

@@ -28,9 +28,10 @@ def __init__(self):
 class ET_ProfileAttribute():    
     def __init__(self):
         self.obj_type = 'PropertyDefinition'
+        self.update = False
 
     def post(self):       
-        obj = ET_Configure(self.auth_stub, self.obj_type, self.props)
+        obj = ET_Configure(self.auth_stub, self.obj_type, self.props, self.update)
         if obj is not None:
             self.last_request_id = obj.request_id
         return obj
@@ -123,7 +124,7 @@ def __init__(self):
         self.obj_type = 'TriggeredSendDefinition'
 
     def send(self):
-        tscall = {"TriggeredSendDefinition" : self.props, "Subscribers" : self.subscribers}
+        tscall = {"TriggeredSendDefinition" : self.props, "Subscribers" : self.subscribers, "Attributes": self.attributes }
         self.obj = ET_Post(self.auth_stub, "TriggeredSend", tscall)
         return self.obj
 

FuelSDK/rest.py

@@ -119,11 +119,11 @@ def __init__(self, auth_stub, obj_type):
 ##
 ########
 class ET_Configure(ET_Constructor):
-    def __init__(self, auth_stub, obj_type, props = None):        
+    def __init__(self, auth_stub, obj_type, props = None, update = False):        
         auth_stub.refresh_token()
 
         ws_configureRequest = auth_stub.soap_client.factory.create('ConfigureRequestMsg')
-        ws_configureRequest.Action = 'create'        
+        ws_configureRequest.Action = 'create' if update is False else 'update'
         ws_configureRequest.Configurations = {'Configuration': self.parse_props_into_ws_object(auth_stub, obj_type, props)}
 
         response = auth_stub.soap_client.service.Configure(None, ws_configureRequest)        

README.md

@@ -27,10 +27,12 @@ You must configure your access tokens and details for the Fuel SDK in one of the
     * `FUELSDK_APP_SIGNATURE`
     * `FUELSDK_DEFAULT_WSDL`
     * `FUELSDK_AUTH_URL`
+    * `FUELSDK_WSDL_FILE_LOCAL_LOC`
 
 Edit `config.python` or declare environment variables so you can input the ClientID and Client Secret values provided when you registered your application. If you are building a HubExchange application for the Interactive Marketing Hub then, you must also provide the Application Signature (`appsignature` / `FUELSDK_APP_SIGNATURE`).
 The `defaultwsdl` / `FUELSDK_DEFAULT_WSDL` configuration must be [changed depending on the ExactTarget service](https://code.exacttarget.com/question/there-any-cetificrate-install-our-server-access-et-api "ExactTarget Forum").
 The `authenticationurl` / `FUELSDK_AUTH_URL` must also be [changed depending on service](https://code.exacttarget.com/question/not-able-create-accesstoken-when-clientidsecret-associated-preproduction-account "ExactTarget Forum").
+The `wsdl_file_local_loc` / `FUELSDK_WSDL_FILE_LOCAL_LOC` allows you to specify the full path/filename where the WSDL file will be located on disk, if for instance you are connecting to different endpoints from the same server.
 
 If you have not registered your application or you need to lookup your Application Key or Application Signature values, please go to App Center at [Code@: ExactTarget's Developer Community](http://code.exacttarget.com/appcenter "Code@ App Center").
 

config.python.template

@@ -3,4 +3,5 @@ appsignature: none
 clientid: XXXXXXXXXXXXXXXXXXXXXXXX
 clientsecret: XXXXXXXXXXXXXXXXXXXXXXXX
 defaultwsdl: https://webservice.exacttarget.com/etframework.wsdl
-authenticationurl: https://auth.exacttargetapis.com/v1/requestToken?legacy=1
+authenticationurl: https://auth.exacttargetapis.com/v1/requestToken?legacy=1
+wsdl_file_local_loc: /tmp/ExactTargetWSDL.s6.xml