Adjust the format of provider references (#3156)

mikhailshilkov · web-flow · commit 1f64e24d26d8 · 2025-08-14T19:26:42.000+03:00
The bridge part of the fix for pulumi/pulumi#20029
diff --git a/dynamic/testdata/TestSchemaGeneration/Backblaze/b2-0.8.9.golden b/dynamic/testdata/TestSchemaGeneration/Backblaze/b2-0.8.9.golden
@@ -1470,7 +1470,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:b2"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:b2/terraformConfig",
diff --git a/dynamic/testdata/TestSchemaGeneration/BunnyWay/bunnynet-0.5.1.golden b/dynamic/testdata/TestSchemaGeneration/BunnyWay/bunnynet-0.5.1.golden
@@ -3895,7 +3895,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:bunnynet"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:bunnynet/terraformConfig",
diff --git a/dynamic/testdata/TestSchemaGeneration/databricks/databricks-1.50.0.golden b/dynamic/testdata/TestSchemaGeneration/databricks/databricks-1.50.0.golden
@@ -30178,7 +30178,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:databricks"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:databricks/terraformConfig",
diff --git a/dynamic/testdata/TestSchemaGeneration/hashicorp/random-3.3.0.golden b/dynamic/testdata/TestSchemaGeneration/hashicorp/random-3.3.0.golden
@@ -837,7 +837,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:random"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:random/terraformConfig",
diff --git a/dynamic/testdata/TestSchemaGenerationFullDocs/fortinetdev/fortimanager-1.13.0.golden b/dynamic/testdata/TestSchemaGenerationFullDocs/fortinetdev/fortimanager-1.13.0.golden
@@ -291451,7 +291451,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:fortimanager"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:fortimanager/terraformConfig",
diff --git a/dynamic/testdata/TestSchemaGenerationFullDocs/hashicorp/random-3.6.3.golden b/dynamic/testdata/TestSchemaGenerationFullDocs/hashicorp/random-3.6.3.golden
@@ -939,7 +939,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:random"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:random/terraformConfig",
diff --git a/internal/testprovider_sdkv2/cmd/pulumi-resource-tpsdkv2/schema.json b/internal/testprovider_sdkv2/cmd/pulumi-resource-tpsdkv2/schema.json
@@ -157,7 +157,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:tpsdkv2"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:tpsdkv2/terraformConfig",
diff --git a/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/schema.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-muxedrandom/schema.json
@@ -1021,7 +1021,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:muxedrandom"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:muxedrandom/terraformConfig",
diff --git a/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-random/schema.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-random/schema.json
@@ -932,7 +932,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:random"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:random/terraformConfig",
diff --git a/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/schema.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-testbridge/schema.json
@@ -1037,7 +1037,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testbridge"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testbridge/terraformConfig",
diff --git a/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/schema.json b/pkg/pf/tests/internal/testprovider/cmd/pulumi-resource-tls/schema.json
@@ -926,7 +926,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:tls"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:tls/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestPFRequiredInputWithDefault.golden b/pkg/pf/tfgen/testdata/TestPFRequiredInputWithDefault.golden
@@ -69,7 +69,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-element.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-element.golden
@@ -49,7 +49,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-max-items-one.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-max-items-one.golden
@@ -40,7 +40,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-nested-object-object.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-list-nested-object-object.golden
@@ -48,7 +48,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestTypeOverride/attr-map-element.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-map-element.golden
@@ -49,7 +49,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestTypeOverride/attr-map-object-element.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-map-object-element.golden
@@ -59,7 +59,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestTypeOverride/attr-set-element.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-set-element.golden
@@ -49,7 +49,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object-element.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object-element.golden
@@ -50,7 +50,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/attr-single-nested-object.golden
@@ -50,7 +50,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestTypeOverride/no-override.golden b/pkg/pf/tfgen/testdata/TestTypeOverride/no-override.golden
@@ -59,7 +59,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/pf/tfgen/testdata/TestWriteOnlyOmit.golden b/pkg/pf/tfgen/testdata/TestWriteOnlyOmit.golden
@@ -25,7 +25,7 @@
                 "properties": {
                     "__self__": {
                         "type": "ref",
-                        "$ref": "#/resources/pulumi:providers:testprovider"
+                        "$ref": "#/provider"
                     }
                 },
                 "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/tests/testdata/TestRequiredInputWithDefault.golden b/pkg/tests/testdata/TestRequiredInputWithDefault.golden
@@ -70,7 +70,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:testprovider"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/tests/testdata/TestRequiredInputWithDefaultFlagDisabled.golden b/pkg/tests/testdata/TestRequiredInputWithDefaultFlagDisabled.golden
@@ -71,7 +71,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:testprovider"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:testprovider/terraformConfig",
diff --git a/pkg/tf2pulumi/convert/testdata/schemas/blocks.json b/pkg/tf2pulumi/convert/testdata/schemas/blocks.json
@@ -127,7 +127,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:blocks"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:blocks/terraformConfig",
diff --git a/pkg/tf2pulumi/convert/testdata/schemas/complex.json b/pkg/tf2pulumi/convert/testdata/schemas/complex.json
@@ -217,7 +217,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:complex"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:complex/terraformConfig",
diff --git a/pkg/tf2pulumi/convert/testdata/schemas/renames.json b/pkg/tf2pulumi/convert/testdata/schemas/renames.json
@@ -90,7 +90,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:renames"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:renames/terraformConfig",
diff --git a/pkg/tf2pulumi/convert/testdata/schemas/simple.json b/pkg/tf2pulumi/convert/testdata/schemas/simple.json
@@ -72,7 +72,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:simple"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:simple/terraformConfig",
diff --git a/pkg/tfgen/generate_schema.go b/pkg/tfgen/generate_schema.go
@@ -335,7 +335,6 @@ func (g *schemaGenerator) genPackageSpec(pack *pkg, sink diag.Sink) (pschema.Pac
 		// For pulumi-terraform-module, we would like to have a Terraform Config method on the provider.
 		// To do so, we Add a Function to this spec, and then add the Function to the provider's Methods,
 		// which will expose it to the provider server's Call() gRPC method.
-		providerSelfRef := "#/resources/pulumi:providers:" + pack.name.String()
 		terraformConfigFunctionToken := "pulumi:providers:" + pack.name.String() + "/terraformConfig"
 		terraformConfig := pschema.FunctionSpec{
 			Description: "This function returns a Terraform config object with terraform-namecased keys," +
@@ -346,7 +345,7 @@ func (g *schemaGenerator) genPackageSpec(pack *pkg, sink diag.Sink) (pschema.Pac
 					"__self__": {
 						TypeSpec: pschema.TypeSpec{
 							Type: "ref",
-							Ref:  providerSelfRef,
+							Ref:  "#/provider",
 						},
 					},
 				},
diff --git a/pkg/tfgen/test_data/minimuxed-replace-schema.json b/pkg/tfgen/test_data/minimuxed-replace-schema.json
@@ -89,7 +89,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:minimuxed"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:minimuxed/terraformConfig",
diff --git a/pkg/tfgen/test_data/minimuxed-schema.json b/pkg/tfgen/test_data/minimuxed-schema.json
@@ -166,7 +166,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:minimuxed"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:minimuxed/terraformConfig",
diff --git a/pkg/tfgen/test_data/minirandom-schema-csharp.json b/pkg/tfgen/test_data/minirandom-schema-csharp.json
@@ -155,7 +155,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:random"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:random/terraformConfig",
diff --git a/pkg/tfgen/test_data/nested-descriptions-schema.json b/pkg/tfgen/test_data/nested-descriptions-schema.json
@@ -145,7 +145,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:cloudflare"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:cloudflare/terraformConfig",
diff --git a/pkg/tfgen/test_data/regress-611-schema.json b/pkg/tfgen/test_data/regress-611-schema.json
@@ -4190,7 +4190,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:aws"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:aws/terraformConfig",
diff --git a/pkg/tfgen/test_data/regress-minicloudflare-schema.json b/pkg/tfgen/test_data/regress-minicloudflare-schema.json
@@ -156,7 +156,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:cloudflare"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:cloudflare/terraformConfig",
diff --git a/pkg/tfgen/test_data/regress-minirandom-schema.json b/pkg/tfgen/test_data/regress-minirandom-schema.json
@@ -135,7 +135,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:random"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:random/terraformConfig",
diff --git a/pkg/tfgen/test_data/test-propagate-language-options.json b/pkg/tfgen/test_data/test-propagate-language-options.json
@@ -152,7 +152,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:random"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:random/terraformConfig",
diff --git a/pkg/tfgen/testdata/TestConvertViaPulumiCLI/GenerateSchema.golden b/pkg/tfgen/testdata/TestConvertViaPulumiCLI/GenerateSchema.golden
@@ -63,7 +63,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:simple"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:simple/terraformConfig",
diff --git a/pkg/tfgen/testdata/TestTypeSharing.golden b/pkg/tfgen/testdata/TestTypeSharing.golden
@@ -172,7 +172,7 @@
         "properties": {
           "__self__": {
             "type": "ref",
-            "$ref": "#/resources/pulumi:providers:testprov"
+            "$ref": "#/provider"
           }
         },
         "type": "pulumi:providers:testprov/terraformConfig",

Original file line number	Diff line number	Diff line change
`@@ -1470,7 +1470,7 @@`
`1470`	`1470`	`"properties": {`
`1471`	`1471`	`"__self__": {`
`1472`	`1472`	`"type": "ref",`
`1473`		`- "$ref": "#/resources/pulumi:providers:b2"`
	`1473`	`+ "$ref": "#/provider"`
`1474`	`1474`	`}`
`1475`	`1475`	`},`
`1476`	`1476`	`"type": "pulumi:providers:b2/terraformConfig",`
Original file line number	Diff line number	Diff line change
`@@ -3895,7 +3895,7 @@`
`3895`	`3895`	`"properties": {`
`3896`	`3896`	`"__self__": {`
`3897`	`3897`	`"type": "ref",`
`3898`		`- "$ref": "#/resources/pulumi:providers:bunnynet"`
	`3898`	`+ "$ref": "#/provider"`
`3899`	`3899`	`}`
`3900`	`3900`	`},`
`3901`	`3901`	`"type": "pulumi:providers:bunnynet/terraformConfig",`
Original file line number	Diff line number	Diff line change
`@@ -30178,7 +30178,7 @@`
`30178`	`30178`	`"properties": {`
`30179`	`30179`	`"__self__": {`
`30180`	`30180`	`"type": "ref",`
`30181`		`- "$ref": "#/resources/pulumi:providers:databricks"`
	`30181`	`+ "$ref": "#/provider"`
`30182`	`30182`	`}`
`30183`	`30183`	`},`
`30184`	`30184`	`"type": "pulumi:providers:databricks/terraformConfig",`
Original file line number	Diff line number	Diff line change
`@@ -837,7 +837,7 @@`
`837`	`837`	`"properties": {`
`838`	`838`	`"__self__": {`
`839`	`839`	`"type": "ref",`
`840`		`- "$ref": "#/resources/pulumi:providers:random"`
	`840`	`+ "$ref": "#/provider"`
`841`	`841`	`}`
`842`	`842`	`},`
`843`	`843`	`"type": "pulumi:providers:random/terraformConfig",`
Original file line number	Diff line number	Diff line change
`@@ -291451,7 +291451,7 @@`
`291451`	`291451`	`"properties": {`
`291452`	`291452`	`"__self__": {`
`291453`	`291453`	`"type": "ref",`
`291454`		`- "$ref": "#/resources/pulumi:providers:fortimanager"`
	`291454`	`+ "$ref": "#/provider"`
`291455`	`291455`	`}`
`291456`	`291456`	`},`
`291457`	`291457`	`"type": "pulumi:providers:fortimanager/terraformConfig",`
Original file line number	Diff line number	Diff line change
`@@ -939,7 +939,7 @@`
`939`	`939`	`"properties": {`
`940`	`940`	`"__self__": {`
`941`	`941`	`"type": "ref",`
`942`		`- "$ref": "#/resources/pulumi:providers:random"`
	`942`	`+ "$ref": "#/provider"`
`943`	`943`	`}`
`944`	`944`	`},`
`945`	`945`	`"type": "pulumi:providers:random/terraformConfig",`
Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@`
`157`	`157`	`"properties": {`
`158`	`158`	`"__self__": {`
`159`	`159`	`"type": "ref",`
`160`		`- "$ref": "#/resources/pulumi:providers:tpsdkv2"`
	`160`	`+ "$ref": "#/provider"`
`161`	`161`	`}`
`162`	`162`	`},`
`163`	`163`	`"type": "pulumi:providers:tpsdkv2/terraformConfig",`
Original file line number	Diff line number	Diff line change
`@@ -1021,7 +1021,7 @@`
`1021`	`1021`	`"properties": {`
`1022`	`1022`	`"__self__": {`
`1023`	`1023`	`"type": "ref",`
`1024`		`- "$ref": "#/resources/pulumi:providers:muxedrandom"`
	`1024`	`+ "$ref": "#/provider"`
`1025`	`1025`	`}`
`1026`	`1026`	`},`
`1027`	`1027`	`"type": "pulumi:providers:muxedrandom/terraformConfig",`
Original file line number	Diff line number	Diff line change
`@@ -932,7 +932,7 @@`
`932`	`932`	`"properties": {`
`933`	`933`	`"__self__": {`
`934`	`934`	`"type": "ref",`
`935`		`- "$ref": "#/resources/pulumi:providers:random"`
	`935`	`+ "$ref": "#/provider"`
`936`	`936`	`}`
`937`	`937`	`},`
`938`	`938`	`"type": "pulumi:providers:random/terraformConfig",`
Original file line number	Diff line number	Diff line change
`@@ -1037,7 +1037,7 @@`
`1037`	`1037`	`"properties": {`
`1038`	`1038`	`"__self__": {`
`1039`	`1039`	`"type": "ref",`
`1040`		`- "$ref": "#/resources/pulumi:providers:testbridge"`
	`1040`	`+ "$ref": "#/provider"`
`1041`	`1041`	`}`
`1042`	`1042`	`},`
`1043`	`1043`	`"type": "pulumi:providers:testbridge/terraformConfig",`