user profile and data zone fixes

Author: awsandy

aws2tf.py

@@ -280,14 +280,22 @@ def main():
     #os.environ["AWS"] = "aws --region "+region+" "
 
     # get the current env and set directory
+   
     if globals.debug: print("setting session region="+region)
+    
     try:
-        my_session = boto3.setup_default_session(region_name=region,profile_name=globals.profile)
+        if args.profile is None:
+            my_session = boto3.setup_default_session(region_name=region)
+        else:
+            my_session = boto3.setup_default_session(region_name=region,profile_name=globals.profile)
+        
     except Exception as e: 
         print("AWS Authorization Error: "+str(e))
+      
     if globals.debug: print("getting account")
     try:
         globals.acc = boto3.client('sts').get_caller_identity().get('Account')
+        print("account="+globals.acc)
     except Exception as e:
         exc_type, exc_obj, exc_tb = sys.exc_info()
         exn=str(exc_type.__name__)
@@ -306,6 +314,7 @@ def main():
     print('Using region: '+region + ' account: ' + globals.acc+ " profile: "+globals.profile+"\n")
 ####  restore form S3 if merging & serverless
 
+####    
 
     globals.region = region
     globals.regionl = len(region)
@@ -334,7 +343,7 @@ def main():
     globals.cwd=os.getcwd()
     os.chdir(globals.path1) 
     globals.tracking_message="Stage 1 of 10, Terraform Initialise ..."
-    common.aws_tf(region)
+    common.aws_tf(region,args)
 
     # check we have it
     foundtf=False

code/common.py

@@ -791,7 +791,7 @@ def check_python_version():
          sys.exit(1)
 
 
-def aws_tf(region):
+def aws_tf(region,args):
    # os.chdir(globals.path1)
    #if not os.path.isfile("aws.tf"):
 
@@ -808,7 +808,8 @@ def aws_tf(region):
       f3.write('}\n')
       f3.write('provider "aws" {\n')
       f3.write('  region                   = "' + region + '"\n')
-      f3.write('  profile                  = "' + globals.profile + '"\n')
+      if args.profile is not None:
+         f3.write('  profile                  = "' + globals.profile + '"\n')
       if not globals.serverless: f3.write('  shared_credentials_files = ["~/.aws/credentials"]\n')
       f3.write('}\n')
 

code/get_aws_resources/aws_datazone.py

@@ -139,28 +139,47 @@ def get_aws_datazone_domain(type, id, clfn, descfn, topkey, key, filterid):
                 response = response + page[topkey]
             if response == []: print("Empty response for "+type+ " id="+str(id)+" returning"); return True
             for j in response:
-                common.write_import(type,j[key],None) 
+                dzid=j[key]
+                dv=j['domainVersion']
+                if dv=="V1":
+                    #print(str(j))
+                    resp2=client.get_domain(identifier=j[key])
+                    sso=resp2['singleSignOn']['type']
+                    dst=resp2['status']
+                    #print("sso="+str(sso)+" dst="+str(dst)," dzid=",dzid)
+                    common.write_import(type,j[key],None)
+                    common.add_dependancy("aws_datazone_project", j[key])
+                    common.add_dependancy("aws_datazone_glossary", j[key])
+                    common.add_dependancy("aws_datazone_environment_profile", j[key])
+                    common.add_dependancy("aws_datazone_environment_blueprint_configuration", j[key])
+                    
+                    if sso!="DISABLED":
+                        common.add_dependancy("aws_datazone_user_profile", j[key])
+                    else:
+                        print("skipping sso="+str(sso)+" dst="+str(dst)+" dzid="+dzid)
+                        return True
+                    
+        else:      
+            response = client.get_domain(identifier=id)
+            if response == []: print("Empty response for "+type+ " id="+str(id)+" returning"); return True
+            j=response
+            dv=j['domainVersion']
+            if dv=="V1":
+                resp2=client.get_domain(identifier=j[key])
+                sso=resp2['singleSignOn']['type']
+                dst=resp2['status']
+                #print("sso="+str(sso)+" dst="+str(dst)," dzid=",dzid)
+                common.write_import(type,j[key],None)
                 # provider crashes on import
                 common.add_dependancy("aws_datazone_project", j[key])
                 common.add_dependancy("aws_datazone_glossary", j[key])
-            
                 common.add_dependancy("aws_datazone_environment_profile", j[key])
                 common.add_dependancy("aws_datazone_environment_blueprint_configuration", j[key])
-                common.add_dependancy("aws_datazone_user_profile", j[key])
-
-
-        else:      
-            response = client.get_domain(identifier=id)
-            if response == []: print("Empty response for "+type+ " id="+str(id)+" returning"); return True
-            j=response
-            common.write_import(type,j[key],None)
-            # provider crashes on import
-            common.add_dependancy("aws_datazone_project", j[key])
-            common.add_dependancy("aws_datazone_glossary", j[key])
-            
-            common.add_dependancy("aws_datazone_environment_profile", j[key])
-            common.add_dependancy("aws_datazone_environment_blueprint_configuration", j[key])
-            common.add_dependancy("aws_datazone_user_profile", j[key])
+                if sso!="DISABLED":
+                    common.add_dependancy("aws_datazone_user_profile", j[key])
+                else:
+                    print("skipping sso="+str(sso)+" dst="+str(dst)+" dzid="+dzid)
+                    return True
 
     except Exception as e:
         common.handle_error(e,str(inspect.currentframe().f_code.co_name),clfn,descfn,topkey,id)
@@ -363,8 +382,15 @@ def get_aws_datazone_environment_profile(type, id, clfn, descfn, topkey, key, fi
             print("WARNING must pass domain id to get_aws_datazone_environment_profile")
             return True
         else:
-            for page in paginator.paginate(domainIdentifier=id):
-                response = response + page[topkey]
+            try:
+                for page in paginator.paginate(domainIdentifier=id):
+                    response = response + page[topkey]
+            except Exception as e:
+                print(str(e))
+                print("WARNING: no environment profiles found for domain id "+id)
+                globals.rproc[type+"."+id]=True
+                return True
+
         pkey=type+"."+id
         if response == []: 
             if globals.debug: print("Empty response for "+type+ " id="+str(id)+" returning")