Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream v5.77.0 #4828

Merged
merged 9 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
551 changes: 275 additions & 276 deletions examples/go.mod

Large diffs are not rendered by default.

1,099 changes: 550 additions & 549 deletions examples/go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions patches/0027-Do-not-compute-tags_all-at-TF-level.patch
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ index 6ece15b4f4..89844a1233 100644
if request.Plan.Raw.IsNull() {
return
diff --git a/internal/provider/fwprovider/provider.go b/internal/provider/fwprovider/provider.go
index 5a04dc37de..13d23e89f7 100644
index c6408919dd..e57aa07e8f 100644
--- a/internal/provider/fwprovider/provider.go
+++ b/internal/provider/fwprovider/provider.go
@@ -434,8 +434,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
@@ -435,8 +435,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
continue
}
if v, ok := schemaResponse.Schema.Attributes[names.AttrTagsAll]; ok {
Expand Down
4 changes: 2 additions & 2 deletions patches/0031-DisableTagSchemaCheck-for-PF-provider.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 13d23e89f7..9735b9e20a 100644
index e57aa07e8f..a64bcd031d 100644
--- a/internal/provider/fwprovider/provider.go
+++ b/internal/provider/fwprovider/provider.go
@@ -421,8 +421,7 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
@@ -422,8 +422,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.
Expand Down
4 changes: 2 additions & 2 deletions patches/0033-Fail-fast-when-PF-resources-are-dropped.patch
Original file line number Diff line number Diff line change
Expand Up @@ -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 9735b9e20a..c8d0d9ed03 100644
index a64bcd031d..0d730c8ea4 100644
--- a/internal/provider/fwprovider/provider.go
+++ b/internal/provider/fwprovider/provider.go
@@ -452,9 +452,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
@@ -453,9 +453,8 @@ func (p *fwprovider) Resources(ctx context.Context) []func() resource.Resource {
}

if err := errors.Join(errs...); err != nil {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@ index 0000000000..79867519db
+ }
+}
diff --git a/internal/service/lambda/service_package_gen.go b/internal/service/lambda/service_package_gen.go
index b787967d5a..c9a8c815a7 100644
index 08cd796328..178d5ba23e 100644
--- a/internal/service/lambda/service_package_gen.go
+++ b/internal/service/lambda/service_package_gen.go
@@ -151,6 +151,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
@@ -160,6 +160,7 @@ func (p *servicePackage) NewClient(ctx context.Context, config map[string]any) (
return lambda.NewFromConfig(cfg,
lambda.WithEndpointResolverV2(newEndpointResolverV2()),
withBaseEndpoint(config[names.AttrEndpoint].(string)),
Expand Down
8 changes: 8 additions & 0 deletions provider/cmd/pulumi-resource-aws/bridge-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -11085,6 +11085,9 @@
}
}
}
},
"vpc_lattice_configurations": {
"maxItemsOne": false
}
}
},
Expand Down Expand Up @@ -155060,6 +155063,10 @@
}
}
},
"aws_rds_instance_state": {
"current": "aws:rds/instanceDesiredState:InstanceDesiredState",
"majorVersion": 6
},
"aws_rds_integration": {
"current": "aws:rds/integration:Integration",
"majorVersion": 6
Expand Down Expand Up @@ -276859,6 +276866,7 @@
"aws:rds/globalCluster:GlobalCluster": 0,
"aws:rds/instance:Instance": 0,
"aws:rds/instanceAutomatedBackupsReplication:InstanceAutomatedBackupsReplication": 0,
"aws:rds/instanceDesiredState:InstanceDesiredState": 1,
"aws:rds/integration:Integration": 1,
"aws:rds/optionGroup:OptionGroup": 0,
"aws:rds/parameterGroup:ParameterGroup": 0,
Expand Down

Large diffs are not rendered by default.

239 changes: 187 additions & 52 deletions provider/cmd/pulumi-resource-aws/schema-minimal.json

Large diffs are not rendered by default.

239 changes: 187 additions & 52 deletions provider/cmd/pulumi-resource-aws/schema.json

Large diffs are not rendered by default.

551 changes: 275 additions & 276 deletions provider/go.mod

Large diffs are not rendered by default.

1,099 changes: 550 additions & 549 deletions provider/go.sum

Large diffs are not rendered by default.

10 changes: 10 additions & 0 deletions provider/resources.go
Original file line number Diff line number Diff line change
Expand Up @@ -3130,6 +3130,11 @@ compatibility shim in favor of the new "name" field.`)
},
},
},
"aws_rds_instance_state": {
// Pulumi cannot call this resource InstanceState because SDKs such as the Node SDK
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Calling this out.

// reserve the name to an auxillary structure for the Instance resource.
Tok: awsResource(rdsMod, "InstanceDesiredState"),
},
"aws_rds_cluster_endpoint": {Tok: awsResource(rdsMod, "ClusterEndpoint")},
"aws_rds_cluster_instance": {
Tok: awsResource(rdsMod, "ClusterInstance"),
Expand Down Expand Up @@ -5916,4 +5921,9 @@ func setupComputedIDs(prov *tfbridge.ProviderInfo) {
) (resource.ID, error) {
return attrWithSeparator(state, "id"), nil
}
prov.Resources["aws_rds_instance_state"].ComputeID = func(
ctx context.Context, state resource.PropertyMap,
) (resource.ID, error) {
return attrWithSeparator(state, "identifier"), nil
}
}
77 changes: 0 additions & 77 deletions pulumi-aws.sln

This file was deleted.

6 changes: 3 additions & 3 deletions sdk/dotnet/DataExchange/DataSet.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions sdk/dotnet/Ec2/Instance.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading