debug bucket replication

Author: awsandy

code/fixtf.py

@@ -279,15 +279,15 @@ def fixtf(ttft,tf):
     if ttft=="aws_s3_bucket_replication_configuration":
         for t1 in Lines:
             t1=t1.strip()
-            if globals.debug5: print("DEBUG5: pre scan block: t1=", t1)
+            if globals.debug5: print("DEBUG5: pre scan block1 : t1=", t1)
             skip=0
             tt1=t1.split("=")[0].strip()
             if tt1=="bucket":
                 try:
                     tt2=t1.split("=")[1].strip().strip('\"')
                     if "arn:aws:s3" in tt2:
                         tt2=tt2.split(":")[-1]
-                        if globals.debug5: print("DEBUG5: pre scan block: common.add_dep bucket_name=", tt2)
+                        if globals.debug5: print("DEBUG5: pre scan block 2: common.add_dep bucket_name=", tt2)
                         common.add_dependancy("aws_s3_bucket", tt2)
                 except:
                     tt2=""

code/fixtf_aws_resources/aws_common.py

@@ -40,26 +40,39 @@ def aws_common(type,t1,tt1,tt2,flag1,flag2):
             common.add_dependancy("aws_apigatewayv2_api", tt2)
         #if tt1=="bucket" or tt1=="s3_bucket_name" or tt1=="bucket_name":
         if tt1=="bucket" or tt1=="s3_bucket_name":
-            #if globals.debug5: print("DEBUG5: aws_common: type=", type, "tt1=", tt1, "tt2=", tt2)
+            if globals.debug5: print("DEBUG5: aws_common: type=", type, "tt1=", tt1, "tt2=", tt2)
             if type != "aws_s3_bucket":
                 if "." not in tt2:
                     if tt2 != "" and tt2 !="null":
-                        if tt2.startswith("arn:aws:s3"):  tt2=tt2.split(":")[-1]
                         if globals.debug5: 
                             print("DEBUG5: aws_common: bucket_name=", tt2)
                             for k, v in globals.bucketlist.items():
                                 print("DEBUG5: aws_common: bucketlist k,v=",k,v)
-                        if tt2 == "":
-                            print("WARNING: bucket name from arn " +tt2 +" is empty")
-                            return skip,t1,flag1,flag2
-                        
-                        try:
-                            if globals.bucketlist[tt2]:
-                                t1=tt1 + " = aws_s3_bucket.b-" + tt2 + ".bucket\n"
-                                #common.add_dependancy("aws_s3_bucket", tt2)
+
+                        if tt2.startswith("arn:aws:s3"):  
+                            tt2=tt2.split(":")[-1]
+                            try:
+                                if globals.bucketlist[tt2]:
+                                    t1=tt1 + " = aws_s3_bucket.b-" + tt2 + ".arn\n"
+                                    #common.add_dependancy("aws_s3_bucket", tt2)
+                                    return skip,t1,flag1,flag2
+                            except KeyError as e:
                                 return skip,t1,flag1,flag2
-                        except KeyError as e:
-                            return skip,t1,flag1,flag2
+
+                        else:                        
+                            try:
+                                if globals.bucketlist[tt2]:
+                                    t1=tt1 + " = aws_s3_bucket.b-" + tt2 + ".bucket\n"
+                                    #common.add_dependancy("aws_s3_bucket", tt2)
+                                    return skip,t1,flag1,flag2
+                            except KeyError as e:
+                                return skip,t1,flag1,flag2
+                        
+                    else:
+                        print("WARNING: bucket name from arn " +tt2 +" is empty or null")
+                        return skip,t1,flag1,flag2
+
+                    
 
         if tt1.endswith("bucket_arn"):
             if globals.debug5: print("DEBUG5: aws_common: bucket_name=", tt2, "lhs=",tt1)

code/fixtf_aws_resources/fixtf_s3.py

@@ -126,8 +126,8 @@ def aws_s3_bucket_replication_configuration(t1,tt1,tt2,flag1,flag2):
     if tt1 == "bucket" and "arn:aws:s3" in tt2:
         bn=tt2.split(":")[-1]
         if globals.debug5: 
-             print("-- aws_s3_bucket_replication_configuration: "+bn)
-             print("-- " + str(globals.bucketlist))
+             print("DEBUG5: fix aws_s3_bucket_replication_configuration: "+bn)
+             print("DEBUG5: " + str(globals.bucketlist))
         try:
             if globals.bucketlist[bn]:
                 t1=tt1 + " = aws_s3_bucket.b-" + bn + ".arn\n"

code/get_aws_resources/aws_s3.py

@@ -247,7 +247,7 @@ def get_s3(s3_fields,type,bucket_name):
          try:
             #print("HERE ....")
             barn=str(response['ReplicationConfiguration']['Rules'][0]['Destination']['Bucket'])
-            if globals.debug5: print("get_s3: replication bucket="+barn)
+            #print("replication bucket="+barn)
             repbuck=barn.split(":")[-1]
             #print("replication bucket="+repbuck)
             common.add_known_dependancy("aws_s3_bucket",repbuck)

code/globals.py

@@ -1,6 +1,6 @@
 import sys,os
 
-aws2tfver="v1011"
+aws2tfver="v1012"
 tfver="5.100.0"
 esttime=120.0
 profile="default"