Merge pull request #335 from 4dn-dcic/access_block

Access block

tibanna/_version.py

@@ -1,4 +1,4 @@
 """Version information."""
 
 # The following line *must* be the last in the module, exactly as formatted:
-__version__ = "1.2.5"
+__version__ = "1.2.6"

tibanna/core.py

@@ -803,7 +803,10 @@ def setup_tibanna_env(self, buckets='', usergroup_tag='default', no_randomize=Fa
             client = boto3.client('s3')
             for b in bucket_names:
                 logger.info("Deleting public access block for bucket %s" % b)
-                response = client.delete_public_access_block(Bucket=b)
+                try:
+                    response = client.delete_public_access_block(Bucket=b)
+                except Exception as e:
+                    logger.warning("public access block could not be deleted on bucket %s - skipping.." % b)
         tibanna_iam = self.IAM(usergroup_tag, bucket_names, no_randomize=no_randomize)
         tibanna_iam.create_tibanna_iam(verbose=verbose)
         logger.info("Tibanna usergroup %s has been created on AWS." % tibanna_iam.user_group_name)