Merge branch 'main' into bedrock-ai21-jamba-instruct

aws · Jun 26, 2024 · c708385 · c708385
2 parents 6ff387b + b880067
commit c708385
Show file tree

Hide file tree

Showing 73 changed files with 38,208 additions and 2,699 deletions.
diff --git a/.github/workflows/issue-label-assign.yml b/.github/workflows/issue-label-assign.yml
@@ -58,7 +58,7 @@ jobs:
 env:
  OSDS_DEVS: >
            {
-             "assignees":["indrora","khushail","hunhsieh"]
+             "assignees":["ashishdhingra","khushail","hunhsieh"]
            }
 
  AREA_AFFIXES: >
@@ -283,5 +283,6 @@ env:
             {"area":"@aws-cdk/triggers","keywords":["trigger","triggers"],"labels":["@aws-cdk/triggers"]},
             {"area":"@aws-cdk/integ-tests","keywords":["integ-tests", "integ"],"labels":["@aws-cdk/integ-tests"]},
             {"area":"@aws-cdk/integ-runner","keywords":["integ-runner"],"labels":["@aws-cdk/integ-runner"]},
-            {"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]}
+            {"area":"@aws-cdk/app-staging-synthesizer-alpha", "keywords":["app-staging-synthesizer", "app-staging-synthesizer-alpha"],"labels":["@aws-cdk/app-staging-synthesizer-alpha"]},
+            {"area":"@aws-cdk/aws-location-alpha", "keywords":["aws-location", "aws-location-alpha"],"labels":["@aws-cdk/aws-location-alpha"]}
           ]
diff --git a/...y/test/server/integ.deployment-group.js.snapshot/aws-cdk-codedeploy-server-dg.assets.json b/...y/test/server/integ.deployment-group.js.snapshot/aws-cdk-codedeploy-server-dg.assets.json
diff --git a/...test/server/integ.deployment-group.js.snapshot/aws-cdk-codedeploy-server-dg.template.json b/...test/server/integ.deployment-group.js.snapshot/aws-cdk-codedeploy-server-dg.template.json
@@ -773,7 +773,8 @@
       "CodeDeployGroupRole1D304F7A",
       "Arn"
      ]
-    }
+    },
+    "TerminationHookEnabled": true
    }
   }
  },

diff --git a/...ramework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/cdk.out b/...ramework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/cdk.out
diff --git a/...ework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/integ.json b/...ework-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/integ.json
diff --git a/...loyment-group.js.snapshot/integdeploymentgroupDefaultTestDeployAssert282ECB20.assets.json b/...loyment-group.js.snapshot/integdeploymentgroupDefaultTestDeployAssert282ECB20.assets.json
diff --git a/...yment-group.js.snapshot/integdeploymentgroupDefaultTestDeployAssert282ECB20.template.json b/...yment-group.js.snapshot/integdeploymentgroupDefaultTestDeployAssert282ECB20.template.json
diff --git a/...rk-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/manifest.json b/...rk-integ/test/aws-codedeploy/test/server/integ.deployment-group.js.snapshot/manifest.json
-Original file line number
+Diff line change
@@ Expand Up / @@ -773,7 +773,8 @@ @@
           "CodeDeployGroupRole1D304F7A",
           "Arn"
          ]
-        }
+        },
+        "TerminationHookEnabled": true
        }
       }
      },
@@ Expand Down @@