[7.0.0-alpha]: upgrade upstream to 6.0.0-beta

.ci-mgmt.yaml

@@ -1,6 +1,6 @@
 provider: aws
 lint: false
-major-version: 6
+major-version: 7
 parallel: 1
 timeout: 150
 generate-nightly-test-workflow: true

.github/workflows/prerequisites.yml

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

Makefile

@@ -3,7 +3,7 @@
 PACK := aws
 ORG := pulumi
 PROJECT := github.com/$(ORG)/pulumi-$(PACK)
-PROVIDER_PATH := provider/v6
+PROVIDER_PATH := provider/v7
 VERSION_PATH := $(PROVIDER_PATH)/pkg/version.Version
 CODEGEN := pulumi-tfgen-$(PACK)
 PROVIDER := pulumi-resource-$(PACK)
@@ -17,7 +17,7 @@ PULUMI_MISSING_DOCS_ERROR := true
 
 # 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 ?= 6.0.0-alpha.0+dev
+PROVIDER_VERSION ?= 7.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)

examples/bucket-default-tags-yaml/Pulumi.yaml

@@ -6,8 +6,8 @@ resources:
   aws-provider:
     type: pulumi:providers:aws
   res:
-    type: aws:s3:BucketV2
+    type: aws:s3:Bucket
     options:
       provider: ${aws-provider}
 outputs:
-  actual: ${res.tags}
+  actual: ${res.tagsAll}

examples/bucket-default-tags-yaml/step1/Pulumi.yaml

@@ -10,8 +10,8 @@ resources:
         tags: 
           foo: bar
   res:
-    type: aws:s3:BucketV2
+    type: aws:s3:Bucket
     options:
       provider: ${aws-provider}
 outputs:
-  actual: ${res.tags}
+  actual: ${res.tagsAll}

examples/bucket-default-tags-yaml/step2/Pulumi.yaml

@@ -10,8 +10,8 @@ resources:
         tags: 
           foo: quux
   res:
-    type: aws:s3:BucketV2
+    type: aws:s3:Bucket
     options:
       provider: ${aws-provider}
 outputs:
-  actual: ${res.tags}
+  actual: ${res.tagsAll}

examples/bucket-default-tags-yaml/step3/Pulumi.yaml

@@ -10,11 +10,11 @@ resources:
         tags: 
           foo: quux
   res:
-    type: aws:s3:BucketV2
+    type: aws:s3:Bucket
     properties: 
       tags: 
         fizz: buzz
     options:
       provider: ${aws-provider}
 outputs:
-  actual: ${res.tags}
+  actual: ${res.tagsAll}

examples/bucket-default-tags-yaml/step4/Pulumi.yaml

@@ -10,12 +10,12 @@ resources:
         tags: 
           foo: quux
   res:
-    type: aws:s3:BucketV2
+    type: aws:s3:Bucket
     properties: 
       tags: 
         fizz: buzz
         foo: bar
     options:
       provider: ${aws-provider}
 outputs:
-  actual: ${res.tags}
+  actual: ${res.tagsAll}

examples/bucket-default-tags-yaml/step5/Pulumi.yaml

@@ -10,8 +10,8 @@ resources:
         tags: 
           foo: quux
   res:
-    type: aws:s3:BucketV2
+    type: aws:s3:Bucket
     options:
       provider: ${aws-provider}
 outputs:
-  actual: ${res.tags}
+  actual: ${res.tagsAll}

examples/bucket-default-tags-yaml/step6/Pulumi.yaml

@@ -11,8 +11,8 @@ resources:
           foo: quux
           thwomp: pow
   res:
-    type: aws:s3:BucketV2
+    type: aws:s3:Bucket
     options:
       provider: ${aws-provider}
 outputs:
-  actual: ${res.tags}
+  actual: ${res.tagsAll}

examples/bucket-default-tags-yaml/step7/Pulumi.yaml

@@ -10,8 +10,8 @@ resources:
         tags: 
           thwomp: pow
   res:
-    type: aws:s3:BucketV2
+    type: aws:s3:Bucket
     options:
       provider: ${aws-provider}
 outputs:
-  actual: ${res.tags}
+  actual: ${res.tagsAll}

examples/bucket-default-tags-yaml/step8/Pulumi.yaml

@@ -6,8 +6,8 @@ resources:
   aws-provider:
     type: pulumi:providers:aws
   res:
-    type: aws:s3:BucketV2
+    type: aws:s3:Bucket
     options:
       provider: ${aws-provider}
 outputs:
-  actual: ${res.tags}
+  actual: ${res.tagsAll}

examples/bucket-py/__main__.py

@@ -2,4 +2,4 @@
 
 from pulumi_aws import s3
 
-web_bucket = s3.Bucket('s3-py-bucket')
+web_bucket = s3.Bucket("s3-py-bucket")

examples/bucket-secret-tags-yaml/Pulumi.yaml

@@ -3,7 +3,7 @@ runtime: yaml
 resources:
 
   res:
-    type: aws:s3:BucketV2
+    type: aws:s3:Bucket
     properties:
       tags:
         that:

examples/bucket-sidecar-renames/Pulumi.yaml

@@ -0,0 +1,98 @@
+name: test-aws-bucket-migration
+runtime: yaml
+resources:
+  loggingBucket:
+    type: aws:s3:BucketV2
+    properties:
+      forceDestroy: true
+  exampleBucketOwnershipControls:
+    type: aws:s3:BucketOwnershipControls
+    properties:
+      bucket: ${loggingBucket.id}
+      rule:
+        objectOwnership: BucketOwnerPreferred
+  bucketAcl:
+    type: aws:s3:BucketAclV2
+    properties:
+      bucket: ${loggingBucket.id}
+      acl: log-delivery-write
+    options:
+      dependsOn:
+        - ${exampleBucketOwnershipControls}
+  bucketSse:
+    type: aws:s3:BucketServerSideEncryptionConfigurationV2
+    properties:
+      bucket: ${migrationBucket.bucket}
+      rules:
+        - applyServerSideEncryptionByDefault:
+            sseAlgorithm: "AES256"
+  bucketVersioning:
+    type: aws:s3:BucketVersioningV2
+    properties:
+      bucket: ${migrationBucket.bucket}
+      versioningConfiguration:
+        status: Enabled
+  bucketWebsiteConfig:
+    type: aws:s3:BucketWebsiteConfigurationV2
+    properties:
+      bucket: ${migrationBucket.bucket}
+      indexDocument:
+        suffix: index.html
+      errorDocument:
+        key: error.html
+      routingRules:
+        - condition:
+            keyPrefixEquals: docs/
+          redirect:
+            replaceKeyPrefixWith: documents/
+  bucketLifecycleConfig:
+    type: aws:s3:BucketLifecycleConfigurationV2
+    properties:
+      bucket: ${migrationBucket.bucket}
+      rules:
+        - id: noncurrent
+          status: Enabled
+          # different between v1 & v2
+          expiration:
+            days: 30
+          noncurrentVersionExpiration:
+            noncurrentDays: 30
+        - id: log
+          status: Enabled
+          filter:
+            and:
+              prefix: log/
+              tags:
+                rule: log
+                autoclean: 'true'
+          transitions:
+            - days: 30
+              storageClass: STANDARD_IA
+  bucketCorsConfig:
+    type: aws:s3:BucketCorsConfigurationV2
+    properties:
+      bucket: ${migrationBucket.bucket}
+      corsRules:
+        - allowedHeaders:
+            - '*'
+          allowedMethods:
+            - PUT
+            - POST
+          allowedOrigins:
+            - https://s3-website-test.mydomain.com
+          exposeHeaders:
+            - ETag
+          maxAgeSeconds: 3000
+
+  bucketLogging:
+    type: aws:s3:BucketLoggingV2
+    properties:
+      bucket: ${migrationBucket.bucket}
+      targetBucket: ${loggingBucket.bucket}
+      targetPrefix: /log
+
+  migrationBucket:
+    type: aws:s3:BucketV2
+    properties:
+      forceDestroy: true
+

examples/bucket-sidecar-renames/step1/Pulumi.yaml

@@ -0,0 +1,98 @@
+name: test-aws-bucket-migration
+runtime: yaml
+resources:
+  loggingBucket:
+    type: aws:s3:Bucket
+    properties:
+      forceDestroy: true
+  exampleBucketOwnershipControls:
+    type: aws:s3:BucketOwnershipControls
+    properties:
+      bucket: ${loggingBucket.id}
+      rule:
+        objectOwnership: BucketOwnerPreferred
+  bucketAcl:
+    type: aws:s3:BucketAcl
+    properties:
+      bucket: ${loggingBucket.id}
+      acl: log-delivery-write
+    options:
+      dependsOn:
+        - ${exampleBucketOwnershipControls}
+  bucketSse:
+    type: aws:s3:BucketServerSideEncryptionConfiguration
+    properties:
+      bucket: ${migrationBucket.bucket}
+      rules:
+        - applyServerSideEncryptionByDefault:
+            sseAlgorithm: "AES256"
+  bucketVersioning:
+    type: aws:s3:BucketVersioning
+    properties:
+      bucket: ${migrationBucket.bucket}
+      versioningConfiguration:
+        status: Enabled
+  bucketWebsiteConfig:
+    type: aws:s3:BucketWebsiteConfiguration
+    properties:
+      bucket: ${migrationBucket.bucket}
+      indexDocument:
+        suffix: index.html
+      errorDocument:
+        key: error.html
+      routingRules:
+        - condition:
+            keyPrefixEquals: docs/
+          redirect:
+            replaceKeyPrefixWith: documents/
+  bucketLifecycleConfig:
+    type: aws:s3:BucketLifecycleConfiguration
+    properties:
+      bucket: ${migrationBucket.bucket}
+      rules:
+        - id: noncurrent
+          status: Enabled
+          # different between v1 & v2
+          expiration:
+            days: 30
+          noncurrentVersionExpiration:
+            noncurrentDays: 30
+        - id: log
+          status: Enabled
+          filter:
+            and:
+              prefix: log/
+              tags:
+                rule: log
+                autoclean: 'true'
+          transitions:
+            - days: 30
+              storageClass: STANDARD_IA
+  bucketCorsConfig:
+    type: aws:s3:BucketCorsConfiguration
+    properties:
+      bucket: ${migrationBucket.bucket}
+      corsRules:
+        - allowedHeaders:
+            - '*'
+          allowedMethods:
+            - PUT
+            - POST
+          allowedOrigins:
+            - https://s3-website-test.mydomain.com
+          exposeHeaders:
+            - ETag
+          maxAgeSeconds: 3000
+
+  bucketLogging:
+    type: aws:s3:BucketLogging
+    properties:
+      bucket: ${migrationBucket.bucket}
+      targetBucket: ${loggingBucket.bucket}
+      targetPrefix: /log
+
+  migrationBucket:
+    type: aws:s3:Bucket
+    properties:
+      forceDestroy: true
+