Merge branch 'master' into huijbers/pipelines-tags

aws · Sep 28, 2020 · 4106f9d · 4106f9d
2 parents 527c94e + 350105a
commit 4106f9d
Show file tree

Hide file tree

Showing 43 changed files with 3,483 additions and 88 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [1.64.1](https://github.com/aws/aws-cdk/compare/v1.64.0...v1.64.1) (2020-09-25)
+
+
+### Bug Fixes
+
+* **eks:** `KubernetesPatch` and `FargateCluster` creates a circular dependency and breaks deployment ([#10536](https://github.com/aws/aws-cdk/issues/10536)) ([f0f8a63](https://github.com/aws/aws-cdk/commit/f0f8a63c98e8a7ff5bedcf271a78fcb417988378)), closes [#10528](https://github.com/aws/aws-cdk/issues/10528)
+
 ## [1.64.0](https://github.com/aws/aws-cdk/compare/v1.63.0...v1.64.0) (2020-09-22)
 
 

diff --git a/lerna.json b/lerna.json
@@ -10,5 +10,5 @@
     "tools/*"
   ],
   "rejectCycles": "true",
-  "version": "1.64.0"
+  "version": "1.64.1"
 }
diff --git a/packages/@aws-cdk/aws-codebuild/lib/project.ts b/packages/@aws-cdk/aws-codebuild/lib/project.ts
@@ -753,7 +753,9 @@ export class Project extends ProjectBase {
       environment: this.renderEnvironment(props.environment, environmentVariables),
       fileSystemLocations: Lazy.anyValue({ produce: () => this.renderFileSystemLocations() }),
       // lazy, because we have a setter for it in setEncryptionKey
-      encryptionKey: Lazy.stringValue({ produce: () => this._encryptionKey && this._encryptionKey.keyArn }),
+      // The 'alias/aws/s3' default is necessary because leaving the `encryptionKey` field
+      // empty will not remove existing encryptionKeys during an update (ref. t/D17810523)
+      encryptionKey: Lazy.stringValue({ produce: () => this._encryptionKey ? this._encryptionKey.keyArn : 'alias/aws/s3' }),
       badgeEnabled: props.badge,
       cache: cache._toCloudFormation(),
       name: this.physicalName,

diff --git a/...s/@aws-cdk/aws-codebuild/test/integ.aws-deep-learning-container-build-image.expected.json b/...s/@aws-cdk/aws-codebuild/test/integ.aws-deep-learning-container-build-image.expected.json
@@ -208,7 +208,8 @@
         "Source": {
           "BuildSpec": "{\n  \"version\": \"0.2\",\n  \"phases\": {\n    \"build\": {\n      \"commands\": [\n        \"ls\"\n      ]\n    }\n  }\n}",
           "Type": "NO_SOURCE"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     }
   },

diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.caching.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.caching.expected.json
@@ -165,7 +165,8 @@
             ]
           },
           "Type": "S3"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     }
   }

diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.defaults.lit.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.defaults.lit.expected.json
@@ -144,8 +144,9 @@
         "Source": {
           "BuildSpec": "{\n  \"version\": \"0.2\",\n  \"phases\": {\n    \"build\": {\n      \"commands\": [\n        \"echo \\\"Hello, CodeBuild!\\\"\"\n      ]\n    }\n  }\n}",
           "Type": "NO_SOURCE"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.docker-asset.lit.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.docker-asset.lit.expected.json
@@ -163,7 +163,8 @@
         "Source": {
           "BuildSpec": "{\n  \"version\": \"0.2\",\n  \"phases\": {\n    \"build\": {\n      \"commands\": [\n        \"ls\"\n      ]\n    }\n  }\n}",
           "Type": "NO_SOURCE"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     }
   }

diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.docker-registry.lit.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.docker-registry.lit.expected.json
@@ -154,8 +154,9 @@
         "Source": {
           "BuildSpec": "{\n  \"version\": \"0.2\",\n  \"phases\": {\n    \"build\": {\n      \"commands\": [\n        \"ls\"\n      ]\n    }\n  }\n}",
           "Type": "NO_SOURCE"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.ecr.lit.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.ecr.lit.expected.json
@@ -184,7 +184,8 @@
         "Source": {
           "BuildSpec": "{\n  \"version\": \"0.2\",\n  \"phases\": {\n    \"build\": {\n      \"commands\": [\n        \"ls\"\n      ]\n    }\n  }\n}",
           "Type": "NO_SOURCE"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     }
   }

diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.github.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.github.expected.json
@@ -112,7 +112,8 @@
           "Location": "https://github.com/aws/aws-cdk.git",
           "ReportBuildStatus": false,
           "Type": "GITHUB"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     }
   }

diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-bucket.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.project-bucket.expected.json
@@ -156,7 +156,8 @@
             ]
           },
           "Type": "S3"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     }
   }

diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-buildspec-artifacts.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.project-buildspec-artifacts.expected.json
@@ -1,9 +1,9 @@
 {
   "Resources": {
     "MyBucketF68F3FF0": {
-      "DeletionPolicy": "Delete",
+      "Type": "AWS::S3::Bucket",
       "UpdateReplacePolicy": "Delete",
-      "Type": "AWS::S3::Bucket"
+      "DeletionPolicy": "Delete"
     },
     "MyProjectRole9BBE5233": {
       "Type": "AWS::IAM::Role",
@@ -133,7 +133,9 @@
       "Properties": {
         "Artifacts": {
           "ArtifactIdentifier": "AddArtifact1",
-          "Location": { "Ref": "MyBucketF68F3FF0" },
+          "Location": {
+            "Ref": "MyBucketF68F3FF0"
+          },
           "NamespaceType": "NONE",
           "OverrideArtifactName": true,
           "Packaging": "ZIP",
@@ -155,9 +157,9 @@
         "Source": {
           "BuildSpec": "{\n  \"version\": \"0.2\"\n}",
           "Type": "NO_SOURCE"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     }
   }
-}
-
+}
diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-file-system-location.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.project-file-system-location.expected.json
@@ -371,6 +371,7 @@
           "BuildSpec": "{\n  \"version\": \"0.2\"\n}",
           "Type": "NO_SOURCE"
         },
+        "EncryptionKey": "alias/aws/s3",
         "FileSystemLocations": [
           {
             "Identifier": "myidentifier",

diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-secondary-sources-artifacts.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.project-secondary-sources-artifacts.expected.json
@@ -180,6 +180,7 @@
           "BuildSpec": "{\n  \"version\": \"0.2\"\n}",
           "Type": "NO_SOURCE"
         },
+        "EncryptionKey": "alias/aws/s3",
         "SecondaryArtifacts": [
           {
             "ArtifactIdentifier": "AddArtifact1",

diff --git a/packages/@aws-cdk/aws-codebuild/test/integ.project-vpc.expected.json b/packages/@aws-cdk/aws-codebuild/test/integ.project-vpc.expected.json
@@ -371,6 +371,7 @@
           "BuildSpec": "{\n  \"version\": \"0.2\",\n  \"phases\": {\n    \"build\": {\n      \"commands\": [\n        \"echo \\\"Nothing to do!\\\"\"\n      ]\n    }\n  }\n}",
           "Type": "NO_SOURCE"
         },
+        "EncryptionKey": "alias/aws/s3",
         "VpcConfig": {
           "SecurityGroupIds": [
             {

diff --git a/packages/@aws-cdk/aws-codebuild/test/test.codebuild.ts b/packages/@aws-cdk/aws-codebuild/test/test.codebuild.ts
@@ -153,6 +153,7 @@ export = {
                 'Image': 'aws/codebuild/standard:1.0',
                 'ComputeType': 'BUILD_GENERAL1_SMALL',
               },
+              'EncryptionKey': 'alias/aws/s3',
             },
           },
         },
@@ -331,6 +332,7 @@ export = {
                 'GitCloneDepth': 2,
                 'Type': 'CODECOMMIT',
               },
+              'EncryptionKey': 'alias/aws/s3',
             },
           },
         },
@@ -532,6 +534,7 @@ export = {
                 },
                 'Type': 'S3',
               },
+              'EncryptionKey': 'alias/aws/s3',
             },
           },
         },
@@ -800,6 +803,21 @@ export = {
       test.done();
     },
 
+    'no KMS Key defaults to default S3 managed key'(test: Test) {
+      // GIVEN
+      const stack = new cdk.Stack();
+
+      // WHEN
+      new codebuild.PipelineProject(stack, 'MyProject');
+
+      // THEN
+      expect(stack).to(haveResourceLike('AWS::CodeBuild::Project', {
+        EncryptionKey: 'alias/aws/s3',
+      }));
+
+      test.done();
+    },
+
     'with a KMS Key adds decrypt permissions to the CodeBuild Role'(test: Test) {
       const stack = new cdk.Stack();
 

diff --git a/...codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.expected.json b/...codepipeline-actions/test/integ.pipeline-code-build-multiple-inputs-outputs.expected.json
@@ -614,8 +614,9 @@
         },
         "Source": {
           "Type": "CODEPIPELINE"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.expected.json b/packages/@aws-cdk/aws-codepipeline-actions/test/integ.pipeline-ecs-deploy.expected.json
@@ -540,7 +540,8 @@
         "Source": {
           "BuildSpec": "{\n  \"version\": \"0.2\",\n  \"phases\": {\n    \"pre_build\": {\n      \"commands\": \"$(aws ecr get-login --region $AWS_DEFAULT_REGION --no-include-email)\"\n    },\n    \"build\": {\n      \"commands\": \"docker build -t $REPOSITORY_URI:latest .\"\n    },\n    \"post_build\": {\n      \"commands\": [\n        \"docker push $REPOSITORY_URI:latest\",\n        \"printf '[{ \\\"name\\\": \\\"Container\\\", \\\"imageUri\\\": \\\"%s\\\" }]' $REPOSITORY_URI:latest > imagedefinitions.json\"\n      ]\n    }\n  },\n  \"artifacts\": {\n    \"files\": \"imagedefinitions.json\"\n  }\n}",
           "Type": "CODEPIPELINE"
-        }
+        },
+        "EncryptionKey": "alias/aws/s3"
       }
     },
     "MyPipelineRoleC0D47CA4": {
@@ -1041,4 +1042,4 @@
       }
     }
   }
-}
+}
diff --git a/packages/@aws-cdk/aws-eks/lib/k8s-patch.ts b/packages/@aws-cdk/aws-eks/lib/k8s-patch.ts
@@ -71,7 +71,7 @@ export class KubernetesPatch extends Construct {
     super(scope, id);
 
     const stack = Stack.of(this);
-    const provider = KubectlProvider.getOrCreate(scope, props.cluster);
+    const provider = KubectlProvider.getOrCreate(this, props.cluster);
 
     new CustomResource(this, 'Resource', {
       serviceToken: provider.serviceToken,
-Original file line number
+Diff line change
@@ Expand Up / @@ -165,7 +165,8 @@ @@
                 ]
               },
               "Type": "S3"
-            }
+            },
+            "EncryptionKey": "alias/aws/s3"
           }
         }
       }
@@ Expand Down @@