Merge pull request #7 from scanlonp/mikewrighton-fix-admin-role

remove admin permissions from integ test
scanlonp · Jan 11, 2024 · 665943e · 665943e
2 parents d9c5de7 + 0fc8846
commit 665943e
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 123 deletions.
diff --git a/...1a7e85dfae971822fff6.assets/web-server.py → ...8e9aa3b169938de90d6b.assets/web-server.py b/...1a7e85dfae971822fff6.assets/web-server.py → ...8e9aa3b169938de90d6b.assets/web-server.py
diff --git a/...ting/framework-integ/test/aws-ec2/test/integ.vpc-dual-stack-ec2.js.snapshot/manifest.json b/...ting/framework-integ/test/aws-ec2/test/integ.vpc-dual-stack-ec2.js.snapshot/manifest.json
diff --git a/...-testing/framework-integ/test/aws-ec2/test/integ.vpc-dual-stack-ec2.js.snapshot/tree.json b/...-testing/framework-integ/test/aws-ec2/test/integ.vpc-dual-stack-ec2.js.snapshot/tree.json
diff --git a/...teg/test/aws-ec2/test/integ.vpc-dual-stack-ec2.js.snapshot/vpc-dual-stack-ec2.assets.json b/...teg/test/aws-ec2/test/integ.vpc-dual-stack-ec2.js.snapshot/vpc-dual-stack-ec2.assets.json
diff --git a/...g/test/aws-ec2/test/integ.vpc-dual-stack-ec2.js.snapshot/vpc-dual-stack-ec2.template.json b/...g/test/aws-ec2/test/integ.vpc-dual-stack-ec2.js.snapshot/vpc-dual-stack-ec2.template.json
@@ -659,37 +659,6 @@
     "CustomVpcRestrictDefaultSGCustomResourceProviderRole26592FE0"
    ]
   },
-  "MyInstanceRoleBF418E71": {
-   "Type": "AWS::IAM::Role",
-   "Properties": {
-    "AssumeRolePolicyDocument": {
-     "Statement": [
-      {
-       "Action": "sts:AssumeRole",
-       "Effect": "Allow",
-       "Principal": {
-        "Service": "ec2.amazonaws.com"
-       }
-      }
-     ],
-     "Version": "2012-10-17"
-    },
-    "ManagedPolicyArns": [
-     {
-      "Fn::Join": [
-       "",
-       [
-        "arn:",
-        {
-         "Ref": "AWS::Partition"
-        },
-        ":iam::aws:policy/AdministratorAccess"
-       ]
-      ]
-     }
-    ]
-   }
-  },
   "MyInstanceInstanceSecurityGroup3E7A7DD1": {
    "Type": "AWS::EC2::SecurityGroup",
    "Properties": {
@@ -887,7 +856,7 @@
       "Fn::Join": [
        "",
        [
-        "#!/bin/bash\n# fingerprint: 388389b8cd4e43e8\n(\n  set +e\n  /opt/aws/bin/cfn-init -v --region ",
+        "#!/bin/bash\n# fingerprint: 90213bdafd76f34c\n(\n  set +e\n  /opt/aws/bin/cfn-init -v --region ",
         {
          "Ref": "AWS::Region"
         },
@@ -930,7 +899,7 @@
       "files": {
        "/app/webserver.zip": {
         "source": {
-         "Fn::Sub": "https://s3.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/d756ca1d341346dcb403e73b61ec7041400c5ebc122e1a7e85dfae971822fff6.zip"
+         "Fn::Sub": "https://s3.${AWS::Region}.${AWS::URLSuffix}/cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/5ebd9f9364eb30f85504de10c76efc8130bce55a23bc8e9aa3b169938de90d6b.zip"
         },
         "mode": "000644",
         "owner": "root",

diff --git a/...dual-stack-ec2.js.snapshot/vpcdualstackec2testDefaultTestDeployAssertB4C8CEE8.assets.json b/...dual-stack-ec2.js.snapshot/vpcdualstackec2testDefaultTestDeployAssertB4C8CEE8.assets.json
diff --git a/...al-stack-ec2.js.snapshot/vpcdualstackec2testDefaultTestDeployAssertB4C8CEE8.template.json b/...al-stack-ec2.js.snapshot/vpcdualstackec2testDefaultTestDeployAssertB4C8CEE8.template.json
diff --git a/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-dual-stack-ec2.ts b/packages/@aws-cdk-testing/framework-integ/test/aws-ec2/test/integ.vpc-dual-stack-ec2.ts
@@ -1,5 +1,4 @@
 /* eslint-disable no-console */
-import * as iam from 'aws-cdk-lib/aws-iam';
 import * as cdk from 'aws-cdk-lib';
 import { ExpectedResult, IntegTest } from '@aws-cdk/integ-tests-alpha';
 import * as ec2 from 'aws-cdk-lib/aws-ec2';
@@ -35,12 +34,6 @@ class EC2DualStack extends cdk.Stack {
       },
     });
 
-    const role = new iam.Role(this, 'MyInstanceRole', {
-      assumedBy: new iam.ServicePrincipal('ec2.amazonaws.com'),
-    });
-
-    role.addManagedPolicy(iam.ManagedPolicy.fromAwsManagedPolicyName('AdministratorAccess'));
-
     const instance = new ec2.Instance(this, 'MyInstance', {
       instanceType: ec2.InstanceType.of(ec2.InstanceClass.T2, ec2.InstanceSize.MICRO),
       machineImage: ec2.MachineImage.latestAmazonLinux2(),