revert

aws · Jun 6, 2024 · 75a5e0e · 75a5e0e
1 parent a0b5557
commit 75a5e0e
Show file tree

Hide file tree

Showing 9 changed files with 146 additions and 166 deletions.
diff --git a/...7cb775e24d61c895ad89e4ca6e9a7fc90b0f0.zip → ...6f0101715a162780d01a55845367e014fbcda.zip b/...7cb775e24d61c895ad89e4ca6e9a7fc90b0f0.zip → ...6f0101715a162780d01a55845367e014fbcda.zip
diff --git a/...d833d67973da5291085b4dc7be1a568a/index.js → ...61011e4d042244927d1208c4db523c76/index.js b/...d833d67973da5291085b4dc7be1a568a/index.js → ...61011e4d042244927d1208c4db523c76/index.js
diff --git a/...tart-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run.assets.json b/...tart-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run.assets.json
diff --git a/...rt-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run.template.json b/...rt-job-run.js.snapshot/aws-stepfunctions-tasks-emr-containers-start-job-run.template.json
@@ -1,18 +1,5 @@
 {
  "Resources": {
-  "KubectlLayer600207B5": {
-   "Type": "AWS::Lambda::LayerVersion",
-   "Properties": {
-    "Content": {
-     "S3Bucket": {
-      "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
-     },
-     "S3Key": "bfbdea4d45250c8162c204fe0687cb775e24d61c895ad89e4ca6e9a7fc90b0f0.zip"
-    },
-    "Description": "/opt/kubectl/kubectl 1.30; /opt/helm/helm 3.15",
-    "LicenseInfo": "Apache-2.0"
-   }
-  },
   "integrationtesteksclusterDefaultVpc395E1A86": {
    "Type": "AWS::EC2::VPC",
    "Properties": {
@@ -771,7 +758,7 @@
      ]
     },
     "Config": {
-     "version": "1.30",
+     "version": "1.29",
      "roleArn": {
       "Fn::GetAtt": [
        "integrationtesteksclusterRole03F70AF0",
@@ -1065,7 +1052,7 @@
        {
         "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
        },
-       "/3617382b4c6ae32ded66a307deb8be9a9feb9e3749d00e0d85105e27d5f30bd8.json"
+       "/2b794d10c1b557be68afbeb76dea8537d2e3182b48594e6feb53a93220bd820d.json"
       ]
      ]
     }
@@ -1077,9 +1064,6 @@
    "Type": "AWS::CloudFormation::Stack",
    "Properties": {
     "Parameters": {
-     "referencetoawsstepfunctionstasksemrcontainersstartjobrunKubectlLayer88E56740Ref": {
-      "Ref": "KubectlLayer600207B5"
-     },
      "referencetoawsstepfunctionstasksemrcontainersstartjobrunintegrationtesteksclusterKubectlHandlerRole965AEA8DArn": {
       "Fn::GetAtt": [
        "integrationtesteksclusterKubectlHandlerRole9A4C37D2",
@@ -1115,7 +1099,7 @@
        {
         "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
        },
-       "/05c45716ec4e255f02ab2f6270ef54cebee08e07c2dbdb1eda253cf38cca9ed6.json"
+       "/b62155c236c3047e54d8c09d000f5d74a31e21ce4862d71a0a05949bb6188073.json"
       ]
      ]
     }
@@ -1232,7 +1216,7 @@
          "Id"
         ]
        },
-       "\"},\"outputPaths\":[\"virtualCluster.containerProvider.info.eksInfo.namespace\",\"virtualCluster.containerProvider.id\"],\"physicalResourceId\":{\"id\":\"id\"},\"logApiResponseData\":true}"
+       "\"},\"outputPaths\":[\"virtualCluster.containerProvider.info.eksInfo.namespace\",\"virtualCluster.containerProvider.id\"],\"physicalResourceId\":{\"id\":\"id\"}}"
       ]
      ]
     },

diff --git a/...semrcontainersstartjobrunawscdkawseksClusterResourceProviderD9D7D7CE.nested.template.json b/...semrcontainersstartjobrunawscdkawseksClusterResourceProviderD9D7D7CE.nested.template.json
@@ -50,7 +50,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "98b432f1b1df9de4026df7e718c23783d833d67973da5291085b4dc7be1a568a.zip"
+     "S3Key": "96e08078ff1c0c6f320ab729994f87b461011e4d042244927d1208c4db523c76.zip"
     },
     "Description": "onEvent handler for EKS cluster resource provider",
     "Environment": {
@@ -115,7 +115,7 @@
      "S3Bucket": {
       "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
      },
-     "S3Key": "98b432f1b1df9de4026df7e718c23783d833d67973da5291085b4dc7be1a568a.zip"
+     "S3Key": "96e08078ff1c0c6f320ab729994f87b461011e4d042244927d1208c4db523c76.zip"
     },
     "Description": "isComplete handler for EKS cluster resource provider",
     "Environment": {

diff --git a/...ionstasksemrcontainersstartjobrunawscdkawseksKubectlProvider1BB62B22.nested.template.json b/...ionstasksemrcontainersstartjobrunawscdkawseksKubectlProvider1BB62B22.nested.template.json
@@ -16,7 +16,7 @@
       "Ref": "AwsCliLayerF44AAF94"
      },
      {
-      "Ref": "referencetoawsstepfunctionstasksemrcontainersstartjobrunKubectlLayer88E56740Ref"
+      "Ref": "KubectlLayer600207B5"
      }
     ],
     "MemorySize": 1024,
@@ -54,6 +54,18 @@
     "Description": "/opt/awscli/aws"
    }
   },
+  "KubectlLayer600207B5": {
+   "Type": "AWS::Lambda::LayerVersion",
+   "Properties": {
+    "Content": {
+     "S3Bucket": {
+      "Fn::Sub": "cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}"
+     },
+     "S3Key": "7e5f48d1e79c915595d938c932b6f0101715a162780d01a55845367e014fbcda.zip"
+    },
+    "Description": "/opt/kubectl/kubectl and /opt/helm/helm"
+   }
+  },
   "ProviderframeworkonEventServiceRole9FF04296": {
    "Type": "AWS::IAM::Role",
    "Properties": {
@@ -201,9 +213,6 @@
   }
  },
  "Parameters": {
-  "referencetoawsstepfunctionstasksemrcontainersstartjobrunKubectlLayer88E56740Ref": {
-   "Type": "String"
-  },
   "referencetoawsstepfunctionstasksemrcontainersstartjobrunintegrationtesteksclusterKubectlHandlerRole965AEA8DArn": {
    "Type": "String"
   },

diff --git a/.../aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/manifest.json b/.../aws-stepfunctions-tasks/test/emrcontainers/integ.start-job-run.js.snapshot/manifest.json