Rolling back VPC changes to S3Cleanup as it was causing errors

Author: Austin Johnson

templates/codebuild-deploy.yaml

@@ -1237,29 +1237,17 @@ Resources:
     # custom resource to cleanup S3 buckets
     S3Cleanup:
         Type: Custom::S3Cleanup
-        DeletionPolicy: Retain
-        UpdateReplacePolicy: Retain
         Condition: ShouldCleanupBuckets
         Properties:
             ServiceToken: !GetAtt S3CleanupLambda.Arn
-            ServiceTimeout: 60
             Buckets:
                 - !Ref WebAppBucket
 
   # Lambda function for custom resource
     S3CleanupLambda:
         Type: AWS::Lambda::Function
-        Condition: ShouldCleanupBuckets        
+        Condition: ShouldCleanupBuckets
         Properties:
-            VpcConfig:
-              !If
-              - NeedsVpc
-              - 
-                  SecurityGroupIds:
-                      - !Ref VpcSecurityGroupId
-                  SubnetIds:
-                      - !Ref VpcSubnetId
-              - !Ref "AWS::NoValue"
             Code:
                 S3Bucket: !Ref SourceBucket
                 S3Key: !Ref CustomResourceCodeObject