Skip to content

Commit ca9aaf3

Browse files
corymhallcorymhall
authored
[7.0.0-alpha]: upgrade upstream to 6.0.0-beta (#5479)
This PR performs a major version upgrade while upgrading upstream to the `release/6.0.0-beta` branch. Some things that occur as part of this major version upgrade are: - Resources/properties that were deprecated in v6 are removed - Changes to `MaxItemsOne` that were held off in v6 occur now In additional the following groups of patches were removed. This was included in this PR rather than in a follow up because as part of the `6.0.0-beta` upstream completely removed aws sdkv1. In order to keep these patches around we would have had to either include it back or update the patches to use aws sdkv2. - [Remove sdkv1 related patches](#5466) closes #5461, closes #5460, closes #5465, closes #5463, closes #5470, closes #5472 - [Legacy S3 Bucket Patches](#5473) closes #3720, closes #3726, closes #2727, closes #2728, closes #5474, closes #2752, closes #2729 - [Remove deprecated Gamelift MatchMaking resources](#4375) closes #5409, closes #2745, closes #2742, closes #2740, closes #5467, closes #5468, closes #5469 There are a lot of changes in this PR that I won't be able to enumerate in this description so I have created a follow up PR that includes a doc with all the details. #5498 closes #2732
1 parent db40d48 commit ca9aaf3

File tree

8,376 files changed

+200293
-458896
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

8,376 files changed

+200293
-458896
lines changed

‎.ci-mgmt.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
provider: aws
22
lint: false
3-
major-version: 6
3+
major-version: 7
44
parallel: 1
55
timeout: 150
66
generate-nightly-test-workflow: true

‎.github/workflows/prerequisites.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
- uses: pulumi/provider-version-action@f96d032a2758fdda7939e5728eff6c0d980ae894 # v1.6.0
6363
id: provider-version
6464
with:
65-
major-version: 6
65+
major-version: 7
6666
set-env: 'PROVIDER_VERSION'
6767
- name: Cache examples generation
6868
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4

‎Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
PACK := aws
44
ORG := pulumi
55
PROJECT := github.com/$(ORG)/pulumi-$(PACK)
6-
PROVIDER_PATH := provider/v6
6+
PROVIDER_PATH := provider/v7
77
VERSION_PATH := $(PROVIDER_PATH)/pkg/version.Version
88
CODEGEN := pulumi-tfgen-$(PACK)
99
PROVIDER := pulumi-resource-$(PACK)
@@ -17,7 +17,7 @@ PULUMI_MISSING_DOCS_ERROR := true
1717

1818
# Override during CI using `make [TARGET] PROVIDER_VERSION=""` or by setting a PROVIDER_VERSION environment variable
1919
# Local & branch builds will just used this fixed default version unless specified
20-
PROVIDER_VERSION ?= 6.0.0-alpha.0+dev
20+
PROVIDER_VERSION ?= 7.0.0-alpha.0+dev
2121

2222
# Check version doesn't start with a "v" - this is a common mistake
2323
ifeq ($(shell echo $(PROVIDER_VERSION) | cut -c1),v)

‎docs/v7-upgrade.md

Lines changed: 455 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ resources:
66
aws-provider:
77
type: pulumi:providers:aws
88
res:
9-
type: aws:s3:BucketV2
9+
type: aws:s3:Bucket
1010
options:
1111
provider: ${aws-provider}
1212
outputs:
13-
actual: ${res.tags}
13+
actual: ${res.tagsAll}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ resources:
1010
tags:
1111
foo: bar
1212
res:
13-
type: aws:s3:BucketV2
13+
type: aws:s3:Bucket
1414
options:
1515
provider: ${aws-provider}
1616
outputs:
17-
actual: ${res.tags}
17+
actual: ${res.tagsAll}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ resources:
1010
tags:
1111
foo: quux
1212
res:
13-
type: aws:s3:BucketV2
13+
type: aws:s3:Bucket
1414
options:
1515
provider: ${aws-provider}
1616
outputs:
17-
actual: ${res.tags}
17+
actual: ${res.tagsAll}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ resources:
1010
tags:
1111
foo: quux
1212
res:
13-
type: aws:s3:BucketV2
13+
type: aws:s3:Bucket
1414
properties:
1515
tags:
1616
fizz: buzz
1717
options:
1818
provider: ${aws-provider}
1919
outputs:
20-
actual: ${res.tags}
20+
actual: ${res.tagsAll}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ resources:
1010
tags:
1111
foo: quux
1212
res:
13-
type: aws:s3:BucketV2
13+
type: aws:s3:Bucket
1414
properties:
1515
tags:
1616
fizz: buzz
1717
foo: bar
1818
options:
1919
provider: ${aws-provider}
2020
outputs:
21-
actual: ${res.tags}
21+
actual: ${res.tagsAll}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ resources:
1010
tags:
1111
foo: quux
1212
res:
13-
type: aws:s3:BucketV2
13+
type: aws:s3:Bucket
1414
options:
1515
provider: ${aws-provider}
1616
outputs:
17-
actual: ${res.tags}
17+
actual: ${res.tagsAll}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ resources:
1111
foo: quux
1212
thwomp: pow
1313
res:
14-
type: aws:s3:BucketV2
14+
type: aws:s3:Bucket
1515
options:
1616
provider: ${aws-provider}
1717
outputs:
18-
actual: ${res.tags}
18+
actual: ${res.tagsAll}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ resources:
1010
tags:
1111
thwomp: pow
1212
res:
13-
type: aws:s3:BucketV2
13+
type: aws:s3:Bucket
1414
options:
1515
provider: ${aws-provider}
1616
outputs:
17-
actual: ${res.tags}
17+
actual: ${res.tagsAll}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ resources:
66
aws-provider:
77
type: pulumi:providers:aws
88
res:
9-
type: aws:s3:BucketV2
9+
type: aws:s3:Bucket
1010
options:
1111
provider: ${aws-provider}
1212
outputs:
13-
actual: ${res.tags}
13+
actual: ${res.tagsAll}

‎examples/bucket-py/__main__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
from pulumi_aws import s3
44

5-
web_bucket = s3.Bucket('s3-py-bucket')
5+
web_bucket = s3.Bucket("s3-py-bucket")

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ runtime: yaml
33
resources:
44

55
res:
6-
type: aws:s3:BucketV2
6+
type: aws:s3:Bucket
77
properties:
88
tags:
99
that:

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

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
name: test-aws-bucket-migration
2+
runtime: yaml
3+
resources:
4+
loggingBucket:
5+
type: aws:s3:BucketV2
6+
properties:
7+
forceDestroy: true
8+
exampleBucketOwnershipControls:
9+
type: aws:s3:BucketOwnershipControls
10+
properties:
11+
bucket: ${loggingBucket.id}
12+
rule:
13+
objectOwnership: BucketOwnerPreferred
14+
bucketAcl:
15+
type: aws:s3:BucketAclV2
16+
properties:
17+
bucket: ${loggingBucket.id}
18+
acl: log-delivery-write
19+
options:
20+
dependsOn:
21+
- ${exampleBucketOwnershipControls}
22+
bucketSse:
23+
type: aws:s3:BucketServerSideEncryptionConfigurationV2
24+
properties:
25+
bucket: ${migrationBucket.bucket}
26+
rules:
27+
- applyServerSideEncryptionByDefault:
28+
sseAlgorithm: "AES256"
29+
bucketVersioning:
30+
type: aws:s3:BucketVersioningV2
31+
properties:
32+
bucket: ${migrationBucket.bucket}
33+
versioningConfiguration:
34+
status: Enabled
35+
bucketWebsiteConfig:
36+
type: aws:s3:BucketWebsiteConfigurationV2
37+
properties:
38+
bucket: ${migrationBucket.bucket}
39+
indexDocument:
40+
suffix: index.html
41+
errorDocument:
42+
key: error.html
43+
routingRules:
44+
- condition:
45+
keyPrefixEquals: docs/
46+
redirect:
47+
replaceKeyPrefixWith: documents/
48+
bucketLifecycleConfig:
49+
type: aws:s3:BucketLifecycleConfigurationV2
50+
properties:
51+
bucket: ${migrationBucket.bucket}
52+
rules:
53+
- id: noncurrent
54+
status: Enabled
55+
# different between v1 & v2
56+
expiration:
57+
days: 30
58+
noncurrentVersionExpiration:
59+
noncurrentDays: 30
60+
- id: log
61+
status: Enabled
62+
filter:
63+
and:
64+
prefix: log/
65+
tags:
66+
rule: log
67+
autoclean: 'true'
68+
transitions:
69+
- days: 30
70+
storageClass: STANDARD_IA
71+
bucketCorsConfig:
72+
type: aws:s3:BucketCorsConfigurationV2
73+
properties:
74+
bucket: ${migrationBucket.bucket}
75+
corsRules:
76+
- allowedHeaders:
77+
- '*'
78+
allowedMethods:
79+
- PUT
80+
- POST
81+
allowedOrigins:
82+
- https://s3-website-test.mydomain.com
83+
exposeHeaders:
84+
- ETag
85+
maxAgeSeconds: 3000
86+
87+
bucketLogging:
88+
type: aws:s3:BucketLoggingV2
89+
properties:
90+
bucket: ${migrationBucket.bucket}
91+
targetBucket: ${loggingBucket.bucket}
92+
targetPrefix: /log
93+
94+
migrationBucket:
95+
type: aws:s3:BucketV2
96+
properties:
97+
forceDestroy: true
98+

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

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
name: test-aws-bucket-migration
2+
runtime: yaml
3+
resources:
4+
loggingBucket:
5+
type: aws:s3:Bucket
6+
properties:
7+
forceDestroy: true
8+
exampleBucketOwnershipControls:
9+
type: aws:s3:BucketOwnershipControls
10+
properties:
11+
bucket: ${loggingBucket.id}
12+
rule:
13+
objectOwnership: BucketOwnerPreferred
14+
bucketAcl:
15+
type: aws:s3:BucketAcl
16+
properties:
17+
bucket: ${loggingBucket.id}
18+
acl: log-delivery-write
19+
options:
20+
dependsOn:
21+
- ${exampleBucketOwnershipControls}
22+
bucketSse:
23+
type: aws:s3:BucketServerSideEncryptionConfiguration
24+
properties:
25+
bucket: ${migrationBucket.bucket}
26+
rules:
27+
- applyServerSideEncryptionByDefault:
28+
sseAlgorithm: "AES256"
29+
bucketVersioning:
30+
type: aws:s3:BucketVersioning
31+
properties:
32+
bucket: ${migrationBucket.bucket}
33+
versioningConfiguration:
34+
status: Enabled
35+
bucketWebsiteConfig:
36+
type: aws:s3:BucketWebsiteConfiguration
37+
properties:
38+
bucket: ${migrationBucket.bucket}
39+
indexDocument:
40+
suffix: index.html
41+
errorDocument:
42+
key: error.html
43+
routingRules:
44+
- condition:
45+
keyPrefixEquals: docs/
46+
redirect:
47+
replaceKeyPrefixWith: documents/
48+
bucketLifecycleConfig:
49+
type: aws:s3:BucketLifecycleConfiguration
50+
properties:
51+
bucket: ${migrationBucket.bucket}
52+
rules:
53+
- id: noncurrent
54+
status: Enabled
55+
# different between v1 & v2
56+
expiration:
57+
days: 30
58+
noncurrentVersionExpiration:
59+
noncurrentDays: 30
60+
- id: log
61+
status: Enabled
62+
filter:
63+
and:
64+
prefix: log/
65+
tags:
66+
rule: log
67+
autoclean: 'true'
68+
transitions:
69+
- days: 30
70+
storageClass: STANDARD_IA
71+
bucketCorsConfig:
72+
type: aws:s3:BucketCorsConfiguration
73+
properties:
74+
bucket: ${migrationBucket.bucket}
75+
corsRules:
76+
- allowedHeaders:
77+
- '*'
78+
allowedMethods:
79+
- PUT
80+
- POST
81+
allowedOrigins:
82+
- https://s3-website-test.mydomain.com
83+
exposeHeaders:
84+
- ETag
85+
maxAgeSeconds: 3000
86+
87+
bucketLogging:
88+
type: aws:s3:BucketLogging
89+
properties:
90+
bucket: ${migrationBucket.bucket}
91+
targetBucket: ${loggingBucket.bucket}
92+
targetPrefix: /log
93+
94+
migrationBucket:
95+
type: aws:s3:Bucket
96+
properties:
97+
forceDestroy: true
98+

0 commit comments

Comments
 (0)