Revert "Cascade-replace resources when provider region changes" (#3825)

Reverts #3497 Accidentally auto-merged this, but in fact the information discovered by the failing upgrade tests indicates non-trivial risk and I think we should discuss before going forward.
pulumi · Apr 16, 2024 · 1a2dbae · 1a2dbae
1 parent d12eda4
commit 1a2dbae
Show file tree

Hide file tree

Showing 53 changed files with 3,531 additions and 2,046 deletions.
diff --git a/provider/resources.go b/provider/resources.go
@@ -840,7 +840,6 @@ func ProviderFromMeta(metaInfo *tfbridge.MetadataInfo) *tfbridge.ProviderInfo {
 				Default: &tfbridge.DefaultInfo{
 					EnvVars: []string{"AWS_REGION", "AWS_DEFAULT_REGION"},
 				},
-				ForcesProviderReplace: tfbridge.True(),
 			},
 			"skip_region_validation": {
 				Default: &tfbridge.DefaultInfo{

diff --git a/provider/test-programs/bucket/Pulumi.yaml b/provider/test-programs/bucket/Pulumi.yaml
@@ -13,6 +13,6 @@ resources:
   tested-resource:
     type: aws:s3/bucket:Bucket
     properties:
-      bucket: pulumiawstestbucket-${pulumi.stack}
+      bucket: testbucket-${pulumi.stack}
     options:
       provider: ${provider}
diff --git a/provider/test-programs/iam-instanceprofile/Pulumi.yaml b/provider/test-programs/iam-instanceprofile/Pulumi.yaml
@@ -1,7 +1,7 @@
 
 name: "aws_iam_instanceProfile_InstanceProfile_1"
 runtime: yaml
-
+    
 resources:
   test_profile:
     type: aws:iam:InstanceProfile
@@ -11,14 +11,14 @@ resources:
   role:
     type: aws:iam:Role
     properties:
-      name: pulumi_aws_test_role_${pulumi.stack}
+      name: test_role
       path: /
       assumeRolePolicy: ${assumeRole.json}
 variables:
   assumeRole:
     fn::invoke:
-      function: aws:iam:getPolicyDocument
-      arguments:
+      Function: aws:iam:getPolicyDocument
+      Arguments:
         statements:
           - effect: Allow
             principals:

diff --git a/...der/testdata/recorded/TestProviderUpgrade/apigateway-integrationresponse/5.42.0/grpc.json b/...der/testdata/recorded/TestProviderUpgrade/apigateway-integrationresponse/5.42.0/grpc.json
diff --git a/...er/testdata/recorded/TestProviderUpgrade/apigateway-integrationresponse/5.42.0/stack.json b/...er/testdata/recorded/TestProviderUpgrade/apigateway-integrationresponse/5.42.0/stack.json
diff --git a/provider/testdata/recorded/TestProviderUpgrade/apigateway-methodreponse/5.42.0/grpc.json b/provider/testdata/recorded/TestProviderUpgrade/apigateway-methodreponse/5.42.0/grpc.json
diff --git a/provider/testdata/recorded/TestProviderUpgrade/apigateway-methodreponse/5.42.0/stack.json b/provider/testdata/recorded/TestProviderUpgrade/apigateway-methodreponse/5.42.0/stack.json
@@ -2,125 +2,115 @@
   "version": 3,
   "deployment": {
     "manifest": {
-      "time": "2024-04-15T15:43:44.920028-04:00",
-      "magic": "0e109972342b6ebd571fa6d2cffefcb95394f9c4f7bdd855463082d16126072c",
-      "version": "v3.111.1"
+      "time": "2023-11-10T17:23:05.006273-05:00",
+      "magic": "7a709c148c841bd111f454593cb3e2e763c9bdd1e384d02234b29bc070e10e78",
+      "version": "v3.92.0"
     },
     "secrets_providers": {
       "type": "passphrase",
       "state": {
-        "salt": "v1:5UM/bBIth18=:v1:kgisfsCU5rUOTefT:8ikmBnkaWU3d486FcQmekWZEesHvKQ=="
+        "salt": "v1:6d1Qq1wIc9c=:v1:MzIicgMpnxidEKdL:J7DiXS+xanaSAys5vVuyUOqpYM8ZvQ=="
       }
     },
     "resources": [
       {
         "urn": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:pulumi:Stack::aws_apigateway_methodResponse_MethodResponse_1-test",
         "custom": false,
         "type": "pulumi:pulumi:Stack",
-        "created": "2024-04-15T19:43:38.845453Z",
-        "modified": "2024-04-15T19:43:38.845453Z"
+        "created": "2023-11-10T22:23:00.499782Z",
+        "modified": "2023-11-10T22:23:00.499782Z"
       },
       {
         "urn": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default",
         "custom": true,
-        "id": "a1f4c496-0c1f-43dd-9732-b9cb5aa1f4f4",
+        "id": "19f04ff8-cf1c-4d97-be78-14613ed05740",
         "type": "pulumi:providers:aws",
-        "inputs": {
-          "region": "us-west-2",
-          "skipCredentialsValidation": "false",
-          "skipMetadataApiCheck": "true",
-          "skipRegionValidation": "true"
-        },
-        "outputs": {
-          "region": "us-west-2",
-          "skipCredentialsValidation": "false",
-          "skipMetadataApiCheck": "true",
-          "skipRegionValidation": "true"
-        },
-        "created": "2024-04-15T19:43:42.157126Z",
-        "modified": "2024-04-15T19:43:42.157126Z"
+        "created": "2023-11-10T22:23:02.025248Z",
+        "modified": "2023-11-10T22:23:02.025248Z"
       },
       {
         "urn": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/restApi:RestApi::MyDemoAPI",
         "custom": true,
-        "id": "vs00x5mu1h",
+        "id": "v1ve06ocl6",
         "type": "aws:apigateway/restApi:RestApi",
         "inputs": {
           "__defaults": [
+            "minimumCompressionSize",
             "putRestApiMode"
           ],
           "description": "This is my API for demonstration purposes",
+          "minimumCompressionSize": -1,
           "name": "MyDemoAPI",
           "putRestApiMode": "overwrite"
         },
         "outputs": {
           "apiKeySource": "HEADER",
-          "arn": "arn:aws:apigateway:us-west-2::/restapis/vs00x5mu1h",
+          "arn": "arn:aws:apigateway:us-west-2::/restapis/v1ve06ocl6",
           "binaryMediaTypes": [],
-          "createdDate": "2024-04-15T19:43:43Z",
+          "createdDate": "2023-11-10T22:23:03Z",
           "description": "This is my API for demonstration purposes",
           "disableExecuteApiEndpoint": false,
           "endpointConfiguration": {
             "types": "EDGE",
             "vpcEndpointIds": []
           },
-          "executionArn": "arn:aws:execute-api:us-west-2:616138583583:vs00x5mu1h",
-          "id": "vs00x5mu1h",
-          "minimumCompressionSize": "",
+          "executionArn": "arn:aws:execute-api:us-west-2:616138583583:v1ve06ocl6",
+          "id": "v1ve06ocl6",
+          "minimumCompressionSize": -1,
           "name": "MyDemoAPI",
           "policy": "",
-          "rootResourceId": "bvcaesigfj",
+          "rootResourceId": "6l6ql3hnui",
           "tags": {},
           "tagsAll": {}
         },
         "parent": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:pulumi:Stack::aws_apigateway_methodResponse_MethodResponse_1-test",
-        "provider": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default::a1f4c496-0c1f-43dd-9732-b9cb5aa1f4f4",
+        "provider": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default::19f04ff8-cf1c-4d97-be78-14613ed05740",
         "propertyDependencies": {
-          "description": [],
-          "name": []
+          "description": null,
+          "name": null
         },
-        "created": "2024-04-15T19:43:44.195383Z",
-        "modified": "2024-04-15T19:43:44.195383Z"
+        "created": "2023-11-10T22:23:04.256536Z",
+        "modified": "2023-11-10T22:23:04.256536Z"
       },
       {
         "urn": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/resource:Resource::MyDemoResource",
         "custom": true,
-        "id": "xc671u",
+        "id": "owzlrx",
         "type": "aws:apigateway/resource:Resource",
         "inputs": {
           "__defaults": [],
-          "parentId": "bvcaesigfj",
+          "parentId": "6l6ql3hnui",
           "pathPart": "mydemoresource",
-          "restApi": "vs00x5mu1h"
+          "restApi": "v1ve06ocl6"
         },
         "outputs": {
-          "id": "xc671u",
-          "parentId": "bvcaesigfj",
+          "id": "owzlrx",
+          "parentId": "6l6ql3hnui",
           "path": "/mydemoresource",
           "pathPart": "mydemoresource",
-          "restApi": "vs00x5mu1h"
+          "restApi": "v1ve06ocl6"
         },
         "parent": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:pulumi:Stack::aws_apigateway_methodResponse_MethodResponse_1-test",
         "dependencies": [
           "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/restApi:RestApi::MyDemoAPI"
         ],
-        "provider": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default::a1f4c496-0c1f-43dd-9732-b9cb5aa1f4f4",
+        "provider": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default::19f04ff8-cf1c-4d97-be78-14613ed05740",
         "propertyDependencies": {
           "parentId": [
             "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/restApi:RestApi::MyDemoAPI"
           ],
-          "pathPart": [],
+          "pathPart": null,
           "restApi": [
             "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/restApi:RestApi::MyDemoAPI"
           ]
         },
-        "created": "2024-04-15T19:43:44.482578Z",
-        "modified": "2024-04-15T19:43:44.482578Z"
+        "created": "2023-11-10T22:23:04.552754Z",
+        "modified": "2023-11-10T22:23:04.552754Z"
       },
       {
         "urn": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/method:Method::MyDemoMethod",
         "custom": true,
-        "id": "agm-vs00x5mu1h-xc671u-GET",
+        "id": "agm-v1ve06ocl6-owzlrx-GET",
         "type": "aws:apigateway/method:Method",
         "inputs": {
           "__defaults": [
@@ -129,53 +119,53 @@
           "apiKeyRequired": false,
           "authorization": "NONE",
           "httpMethod": "GET",
-          "resourceId": "xc671u",
-          "restApi": "vs00x5mu1h"
+          "resourceId": "owzlrx",
+          "restApi": "v1ve06ocl6"
         },
         "outputs": {
           "apiKeyRequired": false,
           "authorization": "NONE",
           "httpMethod": "GET",
-          "id": "agm-vs00x5mu1h-xc671u-GET",
-          "resourceId": "xc671u",
-          "restApi": "vs00x5mu1h"
+          "id": "agm-v1ve06ocl6-owzlrx-GET",
+          "resourceId": "owzlrx",
+          "restApi": "v1ve06ocl6"
         },
         "parent": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:pulumi:Stack::aws_apigateway_methodResponse_MethodResponse_1-test",
         "dependencies": [
           "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/resource:Resource::MyDemoResource",
           "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/restApi:RestApi::MyDemoAPI"
         ],
-        "provider": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default::a1f4c496-0c1f-43dd-9732-b9cb5aa1f4f4",
+        "provider": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default::19f04ff8-cf1c-4d97-be78-14613ed05740",
         "propertyDependencies": {
-          "authorization": [],
-          "httpMethod": [],
+          "authorization": null,
+          "httpMethod": null,
           "resourceId": [
             "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/resource:Resource::MyDemoResource"
           ],
           "restApi": [
             "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/restApi:RestApi::MyDemoAPI"
           ]
         },
-        "created": "2024-04-15T19:43:44.634843Z",
-        "modified": "2024-04-15T19:43:44.634843Z"
+        "created": "2023-11-10T22:23:04.713501Z",
+        "modified": "2023-11-10T22:23:04.713501Z"
       },
       {
         "urn": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/methodResponse:MethodResponse::response_200",
         "custom": true,
-        "id": "agmr-vs00x5mu1h-xc671u-GET-200",
+        "id": "agmr-v1ve06ocl6-owzlrx-GET-200",
         "type": "aws:apigateway/methodResponse:MethodResponse",
         "inputs": {
           "__defaults": [],
           "httpMethod": "GET",
-          "resourceId": "xc671u",
-          "restApi": "vs00x5mu1h",
+          "resourceId": "owzlrx",
+          "restApi": "v1ve06ocl6",
           "statusCode": "200"
         },
         "outputs": {
           "httpMethod": "GET",
-          "id": "agmr-vs00x5mu1h-xc671u-GET-200",
-          "resourceId": "xc671u",
-          "restApi": "vs00x5mu1h",
+          "id": "agmr-v1ve06ocl6-owzlrx-GET-200",
+          "resourceId": "owzlrx",
+          "restApi": "v1ve06ocl6",
           "statusCode": "200"
         },
         "parent": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:pulumi:Stack::aws_apigateway_methodResponse_MethodResponse_1-test",
@@ -184,7 +174,7 @@
           "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/resource:Resource::MyDemoResource",
           "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/restApi:RestApi::MyDemoAPI"
         ],
-        "provider": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default::a1f4c496-0c1f-43dd-9732-b9cb5aa1f4f4",
+        "provider": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default::19f04ff8-cf1c-4d97-be78-14613ed05740",
         "propertyDependencies": {
           "httpMethod": [
             "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/method:Method::MyDemoMethod"
@@ -195,15 +185,15 @@
           "restApi": [
             "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/restApi:RestApi::MyDemoAPI"
           ],
-          "statusCode": []
+          "statusCode": null
         },
-        "created": "2024-04-15T19:43:44.794514Z",
-        "modified": "2024-04-15T19:43:44.794514Z"
+        "created": "2023-11-10T22:23:04.865088Z",
+        "modified": "2023-11-10T22:23:04.865088Z"
       },
       {
         "urn": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/integration:Integration::MyDemoIntegration",
         "custom": true,
-        "id": "agi-vs00x5mu1h-xc671u-GET",
+        "id": "agi-v1ve06ocl6-owzlrx-GET",
         "type": "aws:apigateway/integration:Integration",
         "inputs": {
           "__defaults": [
@@ -212,26 +202,26 @@
           ],
           "connectionType": "INTERNET",
           "httpMethod": "GET",
-          "resourceId": "xc671u",
-          "restApi": "vs00x5mu1h",
+          "resourceId": "owzlrx",
+          "restApi": "v1ve06ocl6",
           "timeoutMilliseconds": 29000,
           "type": "MOCK"
         },
         "outputs": {
           "cacheKeyParameters": [],
-          "cacheNamespace": "xc671u",
+          "cacheNamespace": "owzlrx",
           "connectionId": "",
           "connectionType": "INTERNET",
           "contentHandling": "",
           "credentials": "",
           "httpMethod": "GET",
-          "id": "agi-vs00x5mu1h-xc671u-GET",
+          "id": "agi-v1ve06ocl6-owzlrx-GET",
           "integrationHttpMethod": "",
           "passthroughBehavior": "WHEN_NO_MATCH",
           "requestParameters": {},
           "requestTemplates": {},
-          "resourceId": "xc671u",
-          "restApi": "vs00x5mu1h",
+          "resourceId": "owzlrx",
+          "restApi": "v1ve06ocl6",
           "timeoutMilliseconds": 29000,
           "tlsConfig": null,
           "type": "MOCK",
@@ -243,7 +233,7 @@
           "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/resource:Resource::MyDemoResource",
           "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/restApi:RestApi::MyDemoAPI"
         ],
-        "provider": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default::a1f4c496-0c1f-43dd-9732-b9cb5aa1f4f4",
+        "provider": "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::pulumi:providers:aws::default::19f04ff8-cf1c-4d97-be78-14613ed05740",
         "propertyDependencies": {
           "httpMethod": [
             "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/method:Method::MyDemoMethod"
@@ -254,10 +244,10 @@
           "restApi": [
             "urn:pulumi:test::aws_apigateway_methodResponse_MethodResponse_1::aws:apigateway/restApi:RestApi::MyDemoAPI"
           ],
-          "type": []
+          "type": null
         },
-        "created": "2024-04-15T19:43:44.919849Z",
-        "modified": "2024-04-15T19:43:44.919849Z"
+        "created": "2023-11-10T22:23:05.006089Z",
+        "modified": "2023-11-10T22:23:05.006089Z"
       }
     ]
   }