Upgrade to aws v7.0.0 (#1640)

fixes #1612

Author: corymhall

.ci-mgmt.yaml

@@ -1,6 +1,6 @@
 provider: awsx
 aws: true
-major-version: 2
+major-version: 3
 template: generic
 
 buildProviderCmd: "OS=$(1) ARCH=$(2) OUT=$(3) yarn --cwd awsx build"

.github/workflows/prerequisites.yml

@@ -58,7 +58,7 @@ jobs:
     - uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0
       id: provider-version
       with:
-        major-version: 2
+        major-version: 3
         set-env: 'PROVIDER_VERSION'
     - name: Cache examples generation
       uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4

Makefile

@@ -3,7 +3,7 @@
 PACK := awsx
 ORG := pulumi
 PROJECT := github.com/$(ORG)/pulumi-$(PACK)
-PROVIDER_PATH := provider/v2
+PROVIDER_PATH := provider/v3
 VERSION_PATH := $(PROVIDER_PATH)/pkg/version.Version
 CODEGEN := pulumi-gen-$(PACK)
 PROVIDER := pulumi-resource-$(PACK)
@@ -17,7 +17,7 @@ PULUMI_MISSING_DOCS_ERROR := false
 
 # Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
 # Local & branch builds will just used this fixed default version unless specified
-PROVIDER_VERSION ?= 2.0.0-alpha.0+dev
+PROVIDER_VERSION ?= 3.0.0-alpha.0+dev
 
 # Check version doesn't start with a "v" - this is a common mistake
 ifeq ($(shell echo $(PROVIDER_VERSION) | cut -c1),v)

awsx-classic/apigateway/api.ts

@@ -631,8 +631,6 @@ export function createAPI(parent: pulumi.Resource, name: string, args: APIArgs,
     const deployment = new aws.apigateway.Deployment(name, {
         ...args.deploymentArgs,
         restApi: restAPI,
-        // Note: Set to empty to avoid creating an implicit stage, we'll create it explicitly below instead.
-        stageName: "",
         // Note: We set `variables` here because it forces recreation of the Deployment object
         // whenever the body hash changes.  Because we use a blank stage name above, there will
         // not actually be any stage created in AWS, and thus these variables will not actually
@@ -645,10 +643,7 @@ export function createAPI(parent: pulumi.Resource, name: string, args: APIArgs,
         dependsOn: apiPolicy ? [apiPolicy] : [],
     });
 
-    const permissions = createLambdaPermissions(parent, deployment, name, swaggerLambdas);
-
-    // Expose the URL that the API is served at.
-    const url = pulumi.interpolate`${deployment.invokeUrl}${stageName}/`;
+    const permissions = createLambdaPermissions(parent, restAPI, name, swaggerLambdas);
 
     // Create a stage, which is an addressable instance of the Rest API. Set it to point at the latest deployment.
     const stage = new aws.apigateway.Stage(name, {
@@ -658,6 +653,9 @@ export function createAPI(parent: pulumi.Resource, name: string, args: APIArgs,
         stageName: stageName,
     }, { parent, dependsOn: permissions });
 
+    // Expose the URL that the API is served at.
+    const url = pulumi.interpolate`${stage.invokeUrl}/`;
+
     return {
         restAPI,
         deployment,
@@ -669,7 +667,12 @@ export function createAPI(parent: pulumi.Resource, name: string, args: APIArgs,
     };
 }
 
-function createLambdaPermissions(parent: pulumi.Resource, deployment: aws.apigateway.Deployment, name: string, swaggerLambdas: SwaggerLambdas) {
+function createLambdaPermissions(
+  parent: pulumi.Resource,
+  restAPI: aws.apigateway.RestApi,
+  name: string,
+  swaggerLambdas: SwaggerLambdas
+) {
     const permissions: aws.lambda.Permission[] = [];
     for (const [path, lambdas] of swaggerLambdas) {
         for (const [method, lambda] of lambdas) {
@@ -683,7 +686,7 @@ function createLambdaPermissions(parent: pulumi.Resource, deployment: aws.apigat
                 // path on the API. We allow any stage instead of encoding the one known stage that will be
                 // deployed by Pulumi because the API Gateway console "Test" feature invokes the route
                 // handler with the fake stage `test-invoke-stage`.
-                sourceArn: pulumi.interpolate`${deployment.executionArn}*/${methodAndPath}`,
+                sourceArn: pulumi.interpolate`${restAPI.executionArn}*/${methodAndPath}`,
             }, { parent }));
         }
     }
@@ -1084,7 +1087,7 @@ function addStaticRouteToSwaggerSpec(
         }, { parent });
         const attachment = new aws.iam.RolePolicyAttachment(key, {
             role: role,
-            policyArn: aws.iam.ManagedPolicies.AmazonS3FullAccess,
+            policyArn: aws.iam.ManagedPolicy.AmazonS3FullAccess,
         }, { parent });
 
         return role;

awsx-classic/autoscaling/launchConfiguration.ts

@@ -82,7 +82,7 @@ export class AutoScalingLaunchConfiguration extends pulumi.ComponentResource {
     }
 
     public static defaultInstanceProfilePolicyARNs() {
-        return [aws.iam.ManagedPolicies.AmazonEC2ContainerServiceforEC2Role, aws.iam.ManagedPolicies.AmazonEC2ReadOnlyAccess];
+        return [aws.iam.ManagedPolicy.AmazonEC2ContainerServiceforEC2Role, aws.iam.ManagedPolicy.AmazonEC2ReadOnlyAccess];
     }
 
     /**

awsx-classic/ecs/image.ts

@@ -194,16 +194,11 @@ export function computeImageFromAsset(
             throw new Error("Expected registry ID to be defined during push");
         }
 
-        const credentials = await aws.ecr.getCredentials({ registryId: registryId }, { parent, async: true });
-        const decodedCredentials = Buffer.from(credentials.authorizationToken, "base64").toString();
-        const [username, password] = decodedCredentials.split(":");
-        if (!password || !username) {
-            throw new Error("Invalid credentials");
-        }
+        const credentials = await aws.ecr.getAuthorizationToken({ registryId: registryId }, { parent, async: true });
         return {
             registry: credentials.proxyEndpoint,
-            username: username,
-            password: password,
+            username: credentials.userName,
+            password: credentials.password,
         };
     });
 

awsx-classic/ecs/taskDefinition.ts

@@ -158,7 +158,7 @@ export abstract class TaskDefinition extends pulumi.ComponentResource {
     public static defaultExecutionRolePolicyARNs() {
         return [
             "arn:aws:iam::aws:policy/service-role/AmazonECSTaskExecutionRolePolicy",
-            aws.iam.ManagedPolicies.AWSLambdaBasicExecutionRole,
+            aws.iam.ManagedPolicy.AWSLambdaBasicExecutionRole,
         ];
     }
 }
@@ -337,11 +337,6 @@ export interface TaskDefinitionArgs {
      */
     family?: pulumi.Input<string>;
 
-    /**
-     * Configuration block(s) with Inference Accelerators settings. Detailed below.
-     */
-    inferenceAccelerators?: pulumi.Input<pulumi.Input<aws.types.input.ecs.TaskDefinitionInferenceAccelerator>[]>;
-
     /**
      * The IPC resource namespace to be used for the containers in the task The valid values are `host`, `task`, and `none`.
      */

awsx-classic/package.json

@@ -14,7 +14,7 @@
     },
     "dependencies": {
         "@aws-sdk/client-ecs": "^3.405.0",
-        "@pulumi/aws": "^6.0.2",
+        "@pulumi/aws": "^7.0.0",
         "@pulumi/docker": "4.5.8",
         "@pulumi/pulumi": "^3.34.0",
         "aws-lambda": "^1.0.7",

awsx/cloudtrail/trail.ts

@@ -72,7 +72,7 @@ function createBucketCloudtrailPolicy(
   );
 }
 
-function defaultCloudTrailPolicy(bucketArn: string): aws.iam.PolicyDocument {
+function defaultCloudTrailPolicy(bucketArn: string): aws.types.input.iam.PolicyDocument {
   return {
     Version: "2012-10-17",
     Statement: [

awsx/ec2/vpc.test.ts

@@ -379,9 +379,10 @@ describe("child resource api", () => {
           case "aws:index/getAvailabilityZones:getAvailabilityZones":
             const result: pulumiAws.GetAvailabilityZonesResult = {
               id: "mocked-az-result",
-              zoneIds: [1, 2, 3].map((i) => `${pulumiAws.USEast1Region}${i}`),
-              names: [1, 2, 3].map((i) => `${pulumiAws.USEast1Region}${i}`),
-              groupNames: [1, 2, 3].map((i) => `${pulumiAws.USEast1Region}${i}`),
+              zoneIds: [1, 2, 3].map((i) => `${pulumiAws.Region.USEast1}${i}`),
+              names: [1, 2, 3].map((i) => `${pulumiAws.Region.USEast1}${i}`),
+              groupNames: [1, 2, 3].map((i) => `${pulumiAws.Region.USEast1}${i}`),
+              region: pulumiAws.Region.USEast1,
             };
             return result;
           default: