Merge branch 'master' into v7-resolve-conflicts

Author: corymhall

CONTRIBUTING.md

@@ -62,7 +62,7 @@ git branch upstream-v5.60.0 && git checkout upstream-v5.60.0
 # in ./rebase finish the Git rebase and resolve conflicts
 (cd ./upstream && go build ./...) # verify everything builds
 # add commits as needed to make it build
-./scripts/upstream.sh format_patches
+./scripts/upstream.sh check_in
 git add ./patches && git commit -m "Update patches for v5.60.0"
 (cd upstream && git reset --hard v5.60.0)
 git add ./upstream && git commit -m "Move upstream to v5.60.0"

examples/go.mod

@@ -3,7 +3,7 @@ module github.com/pulumi/pulumi-aws/examples/v7
 go 1.24.4
 
 require (
-	github.com/aws/aws-sdk-go v1.55.6
+	github.com/aws/aws-sdk-go v1.55.7
 	github.com/aws/aws-sdk-go-v2 v1.36.5
 	github.com/aws/aws-sdk-go-v2/config v1.29.17
 	github.com/aws/aws-sdk-go-v2/credentials v1.17.70

examples/minimal_schema_test.go

@@ -0,0 +1,45 @@
+// Copyright 2016-2024, Pulumi Corporation.  All rights reserved.
+//go:build nodejs || all
+// +build nodejs all
+
+package examples
+
+import (
+	"bytes"
+	"encoding/json"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"testing"
+
+	"github.com/pulumi/pulumi/pkg/v3/codegen/schema"
+	"github.com/pulumi/pulumi/pkg/v3/codegen/testing/utils"
+	"github.com/stretchr/testify/require"
+)
+
+func TestMinimalSchema(t *testing.T) {
+	var buf bytes.Buffer
+	schemaSource := filepath.Join("..", "bin", "pulumi-resource-aws")
+	t.Logf("pulumi package get-schema %s", schemaSource)
+	cmd := exec.Command("pulumi", "package", "get-schema", schemaSource)
+	cmd.Env = append(os.Environ(), "PULUMI_AWS_MINIMAL_SCHEMA=true")
+	cmd.Stdout = &buf
+	err := cmd.Run()
+	cmd.Stderr = os.Stderr
+	if err != nil {
+		t.Logf("%s", buf.String())
+		require.NoError(t, err)
+	}
+	var packageSpec schema.PackageSpec
+	err = json.Unmarshal(buf.Bytes(), &packageSpec)
+	require.NoError(t, err)
+	t.Logf("Parsed minimal schema")
+	loader := schema.NewPluginLoader(utils.NewHostWithProviders(t.TempDir()))
+	_, diags, err := schema.BindSpec(packageSpec, loader, schema.ValidationOptions{AllowDanglingReferences: true})
+	require.NoError(t, err)
+	for _, d := range diags {
+		t.Logf("sev=%v summary: %s\n    detail: %s", d.Severity, d.Summary, d.Detail)
+	}
+	require.False(t, diags.HasErrors())
+	t.Logf("Validated minimal schema")
+}

patches/0047-Adapt-gamelift-matchmaking-resources.patch

@@ -56340,8 +56340,7 @@
                 },
                 "description": {
                     "type": "string",
-                    "description": "Description of this egress rule.\n",
-                    "default": ""
+                    "description": "Description of this egress rule.\n"
                 },
                 "fromPort": {
                     "type": "integer",
@@ -56386,17 +56385,7 @@
                 "fromPort",
                 "protocol",
                 "toPort"
-            ],
-            "language": {
-                "nodejs": {
-                    "requiredOutputs": [
-                        "description",
-                        "fromPort",
-                        "protocol",
-                        "toPort"
-                    ]
-                }
-            }
+            ]
         },
         "aws:ec2/SecurityGroupIngress:SecurityGroupIngress": {
             "properties": {
@@ -56409,8 +56398,7 @@
                 },
                 "description": {
                     "type": "string",
-                    "description": "Description of this ingress rule.\n",
-                    "default": ""
+                    "description": "Description of this ingress rule.\n"
                 },
                 "fromPort": {
                     "type": "integer",
@@ -56455,17 +56443,7 @@
                 "fromPort",
                 "protocol",
                 "toPort"
-            ],
-            "language": {
-                "nodejs": {
-                    "requiredOutputs": [
-                        "description",
-                        "fromPort",
-                        "protocol",
-                        "toPort"
-                    ]
-                }
-            }
+            ]
         },
         "aws:ec2/SpotFleetRequestLaunchSpecification:SpotFleetRequestLaunchSpecification": {
             "properties": {
@@ -87758,6 +87736,10 @@
                     "name": "MESouth1",
                     "value": "me-south-1"
                 },
+                {
+                    "name": "MXCentral1",
+                    "value": "mx-central-1"
+                },
                 {
                     "name": "SAEast1",
                     "value": "sa-east-1"

patches/0052-Restore-AWS-Go-SDK-v1-session.patch

@@ -32,7 +32,7 @@ replace github.com/hashicorp/terraform-plugin-log => github.com/gdavison/terrafo
 replace (
 	github.com/hashicorp/terraform-plugin-sdk/v2 => github.com/pulumi/terraform-plugin-sdk/v2 v2.0.0-20250530111747-935112552988
 	github.com/hashicorp/terraform-provider-aws => ../upstream
-	github.com/hashicorp/vault => github.com/hashicorp/vault v1.18.1
+	github.com/hashicorp/vault => github.com/hashicorp/vault v1.19.3
 )
 
 require (

patches/0056-restore-conns-to-awsclient.patch

@@ -1352,6 +1352,12 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
 					},
 				},
 			},
+			"aws_backup_restore_testing_plan": {
+				Tok: awsResource(backupMod, "RestoreTestingPlan"),
+				Fields: map[string]*tfbridge.SchemaInfo{
+					"name": tfbridge.AutoName("name", 255, "_"),
+				},
+			},
 			// Batch
 			"aws_batch_compute_environment": batch.ComputeEnvironment(awsResource(batchMod, "ComputeEnvironment"), tfbridge.GetLogger),
 			"aws_batch_job_definition":      {Tok: awsResource(batchMod, "JobDefinition")},
@@ -2002,19 +2008,9 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
 					// Use "ingress" instead of "ingresses" to match AWS APIs
 					"ingress": {
 						Name: "ingress",
-						Elem: &tfbridge.SchemaInfo{
-							Fields: map[string]*tfbridge.SchemaInfo{
-								"description": {Default: &info.Default{Value: ""}},
-							},
-						},
 					},
 					"egress": {
 						Name: "egress",
-						Elem: &tfbridge.SchemaInfo{
-							Fields: map[string]*tfbridge.SchemaInfo{
-								"description": {Default: &info.Default{Value: ""}},
-							},
-						},
 					},
 				},
 			},
@@ -2071,7 +2067,7 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
 				},
 			},
 			"aws_default_vpc":  {Tok: awsResource(ec2Mod, "DefaultVpc")},
-			"aws_vpc":          {Tok: awsResource(ec2Mod, "Vpc")},
+			"aws_vpc":          {Tok: awsResource(ec2Mod, vpcMod)},
 			"aws_vpc_endpoint": {Tok: awsResource(ec2Mod, "VpcEndpoint")},
 			"aws_vpc_endpoint_connection_notification":        {Tok: awsResource(ec2Mod, "VpcEndpointConnectionNotification")},
 			"aws_vpc_endpoint_route_table_association":        {Tok: awsResource(ec2Mod, "VpcEndpointRouteTableAssociation")},
@@ -3934,20 +3930,20 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
 			"aws_waf_xss_match_set":           {Tok: awsResource(wafMod, "XssMatchSet")},
 			"aws_waf_sql_injection_match_set": {Tok: awsResource(wafMod, "SqlInjectionMatchSet")},
 			// Web Application Firewall V2 (WAFv2)
-			"aws_wafv2_ip_set":                        {Tok: awsResource(wafV2Mod, "IpSet")},
-			"aws_wafv2_regex_pattern_set":             {Tok: awsResource(wafV2Mod, "RegexPatternSet")},
-			"aws_wafv2_web_acl_association":           {Tok: awsResource(wafV2Mod, "WebAclAssociation")},
-			"aws_wafv2_rule_group":                    {Tok: awsResource(wafV2Mod, "RuleGroup")},
-			"aws_wafv2_web_acl":                       {Tok: awsResource(wafV2Mod, "WebAcl")},
-			"aws_wafv2_web_acl_logging_configuration": {Tok: awsResource(wafV2Mod, "WebAclLoggingConfiguration")},
 			"aws_wafv2_api_key": {
 				Tok: awsResource(wafV2Mod, "ApiKey"),
-				Fields: map[string]*info.Schema{
+				Fields: map[string]*tfbridge.SchemaInfo{
 					"api_key": {
 						CSharpName: "Key",
 					},
 				},
 			},
+			"aws_wafv2_ip_set":                        {Tok: awsResource(wafV2Mod, "IpSet")},
+			"aws_wafv2_regex_pattern_set":             {Tok: awsResource(wafV2Mod, "RegexPatternSet")},
+			"aws_wafv2_web_acl_association":           {Tok: awsResource(wafV2Mod, "WebAclAssociation")},
+			"aws_wafv2_rule_group":                    {Tok: awsResource(wafV2Mod, "RuleGroup")},
+			"aws_wafv2_web_acl":                       {Tok: awsResource(wafV2Mod, "WebAcl")},
+			"aws_wafv2_web_acl_logging_configuration": {Tok: awsResource(wafV2Mod, "WebAclLoggingConfiguration")},
 			// Web Application Firewall (WAF) Regional
 			"aws_wafregional_byte_match_set": {
 				Tok: awsResource(wafregionalMod, "ByteMatchSet"),
@@ -4302,22 +4298,22 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
 		ExtraResources: resourceOverlays,
 		ExtraTypes:     extraTypes,
 		DataSources: map[string]*tfbridge.DataSourceInfo{
+			// Vpc
 			"aws_auditmanager_control": {
 				Tok: awsDataSource(auditmanagerMod, "getControl"),
 			},
 			"aws_auditmanager_framework": {
 				Tok: awsDataSource(auditmanagerMod, "getFramework"),
 			},
 			"aws_vpc_security_group_rule": {
-				Tok: awsDataSource("Vpc", "getSecurityGroupRule"),
+				Tok: awsDataSource(vpcMod, "getSecurityGroupRule"),
 			},
 			"aws_vpc_security_group_rules": {
-				Tok: awsDataSource("Vpc", "getSecurityGroupRules"),
+				Tok: awsDataSource(vpcMod, "getSecurityGroupRules"),
 			},
 			"aws_vpc_endpoint_associations": {
-				Tok: awsDataSource("Vpc", "getEndpointAssociations"),
+				Tok: awsDataSource(vpcMod, "getEndpointAssociations"),
 			},
-
 			// AWS
 			"aws_arn":                     {Tok: awsDataSource(awsMod, "getArn")},
 			"aws_availability_zone":       {Tok: awsDataSource(awsMod, "getAvailabilityZone")},
@@ -5417,19 +5413,19 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
 			Tok: awsResource(route53Mod, "CidrLocation"),
 		},
 		"aws_vpc_security_group_egress_rule": {
-			Tok: awsResource("Vpc", "SecurityGroupEgressRule"),
+			Tok: awsResource(vpcMod, "SecurityGroupEgressRule"),
 		},
 		"aws_vpc_security_group_ingress_rule": {
-			Tok: awsResource("Vpc", "SecurityGroupIngressRule"),
+			Tok: awsResource(vpcMod, "SecurityGroupIngressRule"),
 		},
 		"aws_vpc_security_group_vpc_association": {
-			Tok: awsResource("Vpc", "SecurityGroupVpcAssociation"),
+			Tok: awsResource(vpcMod, "SecurityGroupVpcAssociation"),
 		},
 		"aws_vpc_endpoint_private_dns": {
-			Tok: awsResource("Vpc", "EndpointPrivateDns"),
+			Tok: awsResource(vpcMod, "EndpointPrivateDns"),
 		},
 		"aws_vpc_endpoint_service_private_dns_verification": {
-			Tok: awsResource("Vpc", "EndpointServicePrivateDnsVerification"),
+			Tok: awsResource(vpcMod, "EndpointServicePrivateDnsVerification"),
 		},
 		"aws_quicksight_iam_policy_assignment": {
 			Tok: awsResource("QuickSight", "IamPolicyAssignment"),