Upstream 5.65.0 (#4425)

Upgrade upstream to v5.65.0 Fixes #4422 New Data Source: aws_shield_protection New Resource: aws_glue_catalog_table_optimizer Upgrade to Go 1.23.0 following upstream.
pulumi · Sep 5, 2024 · d5c2cda · d5c2cda
1 parent 3ff4fa4
commit d5c2cda
Show file tree

Hide file tree

Showing 154 changed files with 6,295 additions and 330 deletions.
diff --git a/.ci-mgmt.yaml b/.ci-mgmt.yaml
@@ -5,6 +5,14 @@ parallel: 1
 timeout: 150
 generate-nightly-test-workflow: true
 providerVersion: github.com/hashicorp/terraform-provider-aws/version.ProviderVersion
+toolVersions:
+  dotnet: "6.0.x"
+  go: "1.23.x"
+  java: "11"
+  gradle: "7.6"
+  node: "20.x"
+  pulumi: "dev"
+  python: "3.11.8"
 env:
   PULUMI_MISSING_DOCS_ERROR: true
   AWS_REGION: "us-west-2"

diff --git a/.github/actions/setup-tools/action.yml b/.github/actions/setup-tools/action.yml
@@ -22,7 +22,7 @@ runs:
       if: inputs.tools == 'all' || contains(inputs.tools, 'go')
       uses: actions/setup-go@v5
       with:
-        go-version: "1.21.x"
+        go-version: "1.23.x"
         cache-dependency-path: |
           provider/*.sum
           upstream/*.sum

diff --git a/devbox.json b/devbox.json
@@ -2,7 +2,7 @@
   "packages": [
     "yarn@latest",
     "pulumictl@latest",
-    "go@1.21.",
+    "go@1.23.",
     "nodejs@20.",
     "[email protected]",
     "[email protected].",

diff --git a/examples/go.mod b/examples/go.mod
@@ -1,6 +1,6 @@
 module github.com/pulumi/pulumi-aws/examples/v6
 
-go 1.22.6
+go 1.23.0
 
 require (
 	github.com/aws/aws-sdk-go v1.55.5
@@ -155,6 +155,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/elasticbeanstalk v1.26.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.26.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.34.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.30.5 // indirect
 	github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.25.4 // indirect
 	github.com/aws/aws-sdk-go-v2/service/emr v1.42.3 // indirect
 	github.com/aws/aws-sdk-go-v2/service/emrcontainers v1.30.5 // indirect

diff --git a/examples/go.sum b/examples/go.sum
@@ -1441,6 +1441,8 @@ github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.26.4 h1:m+rMj7WOFCf
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.26.4/go.mod h1:LmgiPApGNIhqMYvqutZx8OZp/ia8Dzp89BaqH8TaQQ8=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.34.1 h1:kGMwyO/8QEbcE5s9hnprQg82Bo0U5iHkcqFtQm5FODg=
 github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.34.1/go.mod h1:rdgCuor2mAOU7LhpD7tO3TPl7BACCY4PzM9N0jnnHyo=
+github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.30.5 h1:doJDRX17qdP/W93+FmW5zPj2vB9yWIojvqtOcK5CNnE=
+github.com/aws/aws-sdk-go-v2/service/elasticsearchservice v1.30.5/go.mod h1:YqwsImPCrZ8Ay4V/YIqASX80JIfpaRp8zye3e8JU8UU=
 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.25.4 h1:oqcQPG5DC3KSHYtvU9IAGcx8m0bv/E1/N+axNTU8XBQ=
 github.com/aws/aws-sdk-go-v2/service/elastictranscoder v1.25.4/go.mod h1:vrCOclUVPrk9dUIy1jPS4EE3oTIMy41essKbVgDIOJc=
 github.com/aws/aws-sdk-go-v2/service/emr v1.42.3 h1:ndpZbpeHezH1PvwyZPMfsQFwNsdOm1smePijmDHEYiQ=

diff --git a/patches/0002-Add-S3-legacy-bucket-to-resources.patch b/patches/0002-Add-S3-legacy-bucket-to-resources.patch
@@ -14,7 +14,7 @@ scheme for registration: see
 https://github.com/hashicorp/terraform-provider-aws/pull/29717.
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index cc2fcc4ed2..7c901f1efa 100644
+index 7f0b2027f7..c242026283 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -13,6 +13,8 @@ import (

diff --git a/patches/0005-Remove-lakeformation-catalog_resource-default.patch b/patches/0005-Remove-lakeformation-catalog_resource-default.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Remove lakeformation catalog_resource default
 
 
 diff --git a/internal/service/lakeformation/permissions.go b/internal/service/lakeformation/permissions.go
-index cb641c005b..c7a4d8aeb2 100644
+index add4416c3c..628fde7fc9 100644
 --- a/internal/service/lakeformation/permissions.go
 +++ b/internal/service/lakeformation/permissions.go
 @@ -43,8 +43,8 @@ func ResourcePermissions() *schema.Resource {

diff --git a/patches/0006-Workaround-SSM-Parameter-tier-bug.patch b/patches/0006-Workaround-SSM-Parameter-tier-bug.patch
@@ -7,7 +7,7 @@ Subject: [PATCH] Workaround SSM Parameter tier bug
 - Disable diff suppression & counteractions
 
 diff --git a/internal/service/ssm/parameter.go b/internal/service/ssm/parameter.go
-index 082353da5e..8ef6a77013 100644
+index a5fe04fa27..f8d9fca060 100644
 --- a/internal/service/ssm/parameter.go
 +++ b/internal/service/ssm/parameter.go
 @@ -93,15 +93,17 @@ func resourceParameter() *schema.Resource {

diff --git a/patches/0009-Add-ECR-credentials_data_source.patch b/patches/0009-Add-ECR-credentials_data_source.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add ECR credentials_data_source
 
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index 7c901f1efa..5cfbc29f36 100644
+index c242026283..7578b0e6e8 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -13,6 +13,8 @@ import (

diff --git a/patches/0014-add-matchmaking-configuration-72.patch b/patches/0014-add-matchmaking-configuration-72.patch
@@ -10,7 +10,7 @@ Subject: [PATCH] add matchmaking configuration (#72)
 * add resource docs
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index 5cfbc29f36..f64c912033 100644
+index 7578b0e6e8..5557727b6f 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
 @@ -15,6 +15,7 @@ import (

diff --git a/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch b/patches/0018-Change-default-descriptions-to-Managed-by-Pulumi.patch
@@ -70,7 +70,7 @@ index 70a69db303..5f1045af17 100644
  			names.AttrName: {
  				Type:          schema.TypeString,
 diff --git a/internal/service/ec2/vpc_security_group.go b/internal/service/ec2/vpc_security_group.go
-index 6730abbc03..1ed388d36b 100644
+index 044afe933a..aeb16673fc 100644
 --- a/internal/service/ec2/vpc_security_group.go
 +++ b/internal/service/ec2/vpc_security_group.go
 @@ -69,7 +69,7 @@ func resourceSecurityGroup() *schema.Resource {

diff --git a/patches/0027-Do-not-compute-tags_all-at-TF-level.patch b/patches/0027-Do-not-compute-tags_all-at-TF-level.patch
@@ -21,10 +21,10 @@ index 7c33a2aae0..3c17d64604 100644
  	if request.Plan.Raw.IsNull() {
  		return
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index 5435b50317..1e888e3ae9 100644
+index 702305fc56..e566d84a9b 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
-@@ -435,8 +435,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
+@@ -433,8 +433,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
  					continue
  				}
  				if v, ok := schemaResponse.Schema.Attributes[names.AttrTagsAll]; ok {

diff --git a/patches/0030-Optimize-startup-performance.patch b/patches/0030-Optimize-startup-performance.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Optimize startup performance
 
 
 diff --git a/internal/provider/provider.go b/internal/provider/provider.go
-index f64c912033..ee14629100 100644
+index 5557727b6f..7d8a8552fa 100644
 --- a/internal/provider/provider.go
 +++ b/internal/provider/provider.go
-@@ -315,7 +315,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
+@@ -314,7 +314,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
  			interceptors := interceptorItems{}
 
  			if v.Tags != nil {
@@ -17,7 +17,7 @@ index f64c912033..ee14629100 100644
 
  				// The data source has opted in to transparent tagging.
  				// Ensure that the schema look OK.
-@@ -392,7 +392,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
+@@ -390,7 +390,7 @@ func New(ctx context.Context) (*schema.Provider, error) {
  			interceptors := interceptorItems{}
 
  			if v.Tags != nil {

diff --git a/patches/0031-DisableTagSchemaCheck-for-PF-provider.patch b/patches/0031-DisableTagSchemaCheck-for-PF-provider.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] DisableTagSchemaCheck for PF provider
 
 
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index 1e888e3ae9..04d38c2adc 100644
+index e566d84a9b..b41792fb28 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
-@@ -422,8 +422,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
+@@ -420,8 +420,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
  			if v.Tags != nil {
  				// The resource has opted in to transparent tagging.
  				// Ensure that the schema look OK.

diff --git a/patches/0033-Fail-fast-when-PF-resources-are-dropped.patch b/patches/0033-Fail-fast-when-PF-resources-are-dropped.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fail fast when PF resources are dropped
 
 
 diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
-index 04d38c2adc..662368d229 100644
+index b41792fb28..0c09223edd 100644
 --- a/internal/provider/fwprovider/provider.go
 +++ b/internal/provider/fwprovider/provider.go
-@@ -453,9 +453,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
+@@ -451,9 +451,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
  	}
 
  	if err := errors.Join(errs...); err != nil {

diff --git a/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch b/patches/0034-Fix-tags_all-Computed-for-PF-resources.patch
@@ -83,7 +83,7 @@ index 69d6b912ac..6323d7c399 100644
  		Blocks: map[string]schema.Block{
  			names.AttrActions: schema.SetNestedBlock{
 diff --git a/internal/service/securitylake/data_lake.go b/internal/service/securitylake/data_lake.go
-index 9ff71fe5d7..faba601773 100644
+index 1850f8d71f..4183d3da8d 100644
 --- a/internal/service/securitylake/data_lake.go
 +++ b/internal/service/securitylake/data_lake.go
 @@ -75,7 +75,7 @@ func (r *dataLakeResource) Schema(ctx context.Context, request resource.SchemaRe