Merge branch 'main' into chore_rename_tf_to_tofu

go.sum

@@ -718,8 +718,6 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug
 golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
-golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
-golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
 golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=

integrationtest/fixtures/binding-cleanup/fake-bad-bind.tf

@@ -1,4 +1,12 @@
 // Fails as required "length" parameter is missing
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
+
 resource "random_string" "random" {}
 
 output bind_output { value = random_string.random.result }

integrationtest/fixtures/binding-cleanup/fake-good-bind.tf

@@ -1,3 +1,11 @@
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
+
 resource "random_string" "random" {
   length = 10
 }

integrationtest/fixtures/binding-cleanup/fake-provision.tf

@@ -1,3 +1,11 @@
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
+
 resource "random_uuid" "random" {}
 
 output provision_output { value = random_uuid.random.result }

integrationtest/fixtures/golden-path/fake-uuid-bind.tf

@@ -1,3 +1,11 @@
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
+
 resource "random_uuid" "random" {}
 
 output bind_output { value = random_uuid.random.result }

integrationtest/fixtures/golden-path/fake-uuid-provision.tf

@@ -1,3 +1,11 @@
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
+
 resource "random_uuid" "random" {}
 
 output provision_output { value = random_uuid.random.result }

integrationtest/fixtures/maintenance-info/fake-provision.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     random = {
-      source = "hashicorp/random"
+      source = "registry.terraform.io/hashicorp/random"
       version = "3.5.1"
     }
   }

integrationtest/fixtures/osbapi/fake-provision.tf

@@ -1,4 +1,10 @@
-provider "random" { }
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
 
 resource "random_integer" "priority" {
   min = 1

integrationtest/fixtures/prevent-destroy-during-update/fake-provision.tf

@@ -1,4 +1,10 @@
-provider "random" { }
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
 
 variable length { type = number }
 

integrationtest/fixtures/provision-cleanup/fake-string-provision.tf

@@ -1,4 +1,12 @@
 // Fails as required "length" parameter is missing
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
+
 resource "random_string" "random" {}
 
 output provision_output { value = random_string.random.result }

integrationtest/fixtures/subsume/fake-string-service.yml

@@ -24,6 +24,7 @@ provision:
   import_parameters_to_delete: [ "random_string.random.id", "random_string.random.result" ]
   template_refs:
     main: fake-string-provision.tf
+    versions: versions.tf
   outputs:
     - field_name: provision_output
       type: string

integrationtest/fixtures/subsume/fake-uuid-service.yml

@@ -21,6 +21,7 @@ provision:
   import_parameters_to_delete: [ "random_uuid.random.id" , "random_uuid.random.result" ]
   template_refs:
     main: fake-uuid-provision.tf
+    versions: versions.tf
   outputs:
     - field_name: provision_output
       type: string

integrationtest/fixtures/subsume/versions.tf

@@ -0,0 +1,7 @@
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}

integrationtest/fixtures/termination-recovery/fake-uuid-bind.tf

@@ -1,3 +1,11 @@
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
+
 resource "random_uuid" "random" {}
 
 output bind_output { value = random_uuid.random.result }

integrationtest/fixtures/termination-recovery/fake-uuid-provision.tf

@@ -1,3 +1,11 @@
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
+
 resource "random_uuid" "random" {}
 
 output provision_output { value = random_uuid.random.result }

integrationtest/fixtures/terraform-block-action-before-upgrade-updated/fake-provision.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     random = {
-      source = "hashicorp/random"
+      source = "registry.terraform.io/hashicorp/random"
       version = "3.5.1"
     }
   }

integrationtest/fixtures/terraform-block-action-before-upgrade/fake-provision.tf

@@ -1,3 +1,11 @@
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
+
 provider "random" { }
 
 resource "random_integer" "priority" {

integrationtest/fixtures/terraform-module-upgrade-updated/fake-provision.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     random = {
-      source  = "hashicorp/random"
+      source  = "registry.terraform.io/hashicorp/random"
       version = "3.5.1"
     }
   }

integrationtest/fixtures/terraform-module-upgrade/fake-provision.tf

@@ -1,4 +1,10 @@
-provider "random" { }
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
 
 resource "random_password" "password" {
   length = 5

integrationtest/fixtures/terraform-rename-provider/fake-provision.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     random = {
-      source = "ContentSquare/random"
+      source = "registry.terraform.io/ContentSquare/random"
       version = "3.1.0"
     }
   }

integrationtest/fixtures/terraform-upgrade-updated/fake-bind.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     random = {
-      source  = "hashicorp/random"
+      source  = "registry.terraform.io/hashicorp/random"
       version = "3.5.1"
     }
   }

integrationtest/fixtures/terraform-upgrade-updated/fake-provision.tf

@@ -1,7 +1,7 @@
 terraform {
   required_providers {
     random = {
-      source  = "hashicorp/random"
+      source  = "registry.terraform.io/hashicorp/random"
       version = "3.5.1"
     }
   }

integrationtest/fixtures/terraform-upgrade/fake-bind.tf

@@ -1,4 +1,10 @@
-provider "random" { }
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
 
 resource "random_integer" "priority" {
   min = 1

integrationtest/fixtures/terraform-upgrade/fake-provision.tf

@@ -1,4 +1,10 @@
-provider "random" { }
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+    }
+  }
+}
 
 resource "random_integer" "priority" {
   min = 1

integrationtest/fixtures/tf_attribute_skip/fake-provision.tf

@@ -1,15 +1,5 @@
 ## new versions of terraform fail with a different error to the one we want to trigger if this file is empty.
 ## adding some dummy terraform to test errors when a particular field is not present.
-
-terraform {
-  required_providers {
-    random = {
-      source  = "hashicorp/random"
-      version = "3.5.1"
-    }
-  }
-}
-
 resource "random_integer" "priority" {
   min = 3
   max = 4

integrationtest/fixtures/tf_attribute_skip/fake-service.yml

@@ -20,6 +20,7 @@ plans:
 provision:
   template_refs:
     main: fake-provision.tf
+    versions: versions.tf
   user_inputs:
     - field_name: skip
       type: boolean

integrationtest/fixtures/tf_attribute_skip/versions.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    random = {
+      source  = "registry.terraform.io/hashicorp/random"
+      version = "3.5.1"
+    }
+  }
+}

integrationtest/subsume_test.go

@@ -31,7 +31,8 @@ var _ = Describe("Subsume", func() {
 	It("can subsume a resource", func() {
 		const serviceOfferingGUID = "547cad88-fa93-11eb-9f44-97feefe52547"
 		const servicePlanGUID = "59624c68-fa93-11eb-9081-e79b0e1ab5ae"
-		broker.Provision(serviceOfferingGUID, servicePlanGUID, testdrive.WithProvisionParams(`{"value":"a97fd57a-fa94-11eb-8256-930255607a99"}`))
+		_, err := broker.Provision(serviceOfferingGUID, servicePlanGUID, testdrive.WithProvisionParams(`{"value":"a97fd57a-fa94-11eb-8256-930255607a99"}`))
+		Expect(err).NotTo(HaveOccurred())
 	})
 
 	It("cancels a subsume operation when a resource would be deleted", func() {

internal/brokerpak/manifest/parser_test.go

@@ -320,9 +320,9 @@ var _ = Describe("Parser", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(m.TerraformProviders[1].Provider.String()).To(Equal(expected))
 		},
-		Entry("empty 'provider' field", "", "registry.opentofu.org/hashicorp/foo"),
-		Entry("just type", "lala", "registry.opentofu.org/hashicorp/lala"),
-		Entry("type and namespace", "mycorp/lala", "registry.opentofu.org/mycorp/lala"),
+		Entry("empty 'provider' field", "", "registry.terraform.io/hashicorp/foo"),
+		Entry("just type", "lala", "registry.terraform.io/hashicorp/lala"),
+		Entry("type and namespace", "mycorp/lala", "registry.terraform.io/mycorp/lala"),
 		Entry("fully qualified", "mything.io/mycorp/lala", "mything.io/mycorp/lala"),
 	)
 

internal/brokerpak/reader/reader.go

@@ -19,6 +19,7 @@ import (
 	"archive/zip"
 	"fmt"
 	"io"
+	"log"
 	"os"
 	"path"
 	"path/filepath"
@@ -268,6 +269,11 @@ func (pak *BrokerPakReader) readBytes(name string) ([]byte, error) {
 
 func providerInstallPath(destination string, tfProvider manifest.TerraformProvider) string {
 	plat := platform.CurrentPlatform()
+	log.Println("ProviderInstallPath:", filepath.Join(
+		destination,
+		tfProvider.Provider.String(),
+		tfProvider.Version.String(),
+		fmt.Sprintf("%s_%s", plat.Os, plat.Arch)))
 	return filepath.Join(
 		destination,
 		tfProvider.Provider.String(),

internal/brokerpak/reader/reader_test.go

@@ -35,6 +35,7 @@ var _ = Describe("reader", func() {
 				withTerraform(binaryV160),
 				withProvider("", "terraform-provider-google-beta", "1.19.0", "x4"),
 				withProvider("other-namespace/google", "terraform-provider-google", "1.19.0", "x5"),
+				withProvider("custom.registry.org/other-namespace/custom", "terraform-provider-custom", "1.19.0", "x5"),
 			)
 
 			pakReader, err := reader.OpenBrokerPak(pk)
@@ -44,11 +45,15 @@ var _ = Describe("reader", func() {
 			Expect(pakReader.ExtractPlatformBins(binOutput)).NotTo(HaveOccurred())
 
 			plat := fmt.Sprintf("%s_%s", runtime.GOOS, runtime.GOARCH)
-			hashicorpBinOutput := filepath.Join(binOutput, "registry.opentofu.org", "hashicorp")
+			hashicorpBinOutput := filepath.Join(binOutput, "registry.terraform.io", "hashicorp")
 			Expect(filepath.Join(hashicorpBinOutput, "google-beta", "1.19.0", plat, "terraform-provider-google-beta_v1.19.0_x4")).To(BeAnExistingFile())
 
-			otherNamespaceBinOutput := filepath.Join(binOutput, "registry.opentofu.org", "other-namespace")
+			otherNamespaceBinOutput := filepath.Join(binOutput, "registry.terraform.io", "other-namespace")
 			Expect(filepath.Join(otherNamespaceBinOutput, "google", "1.19.0", plat, "terraform-provider-google_v1.19.0_x5")).To(BeAnExistingFile())
+
+			customDomainBinOutput := filepath.Join(binOutput, "custom.registry.org", "other-namespace")
+			Expect(filepath.Join(customDomainBinOutput, "custom", "1.19.0", plat, "terraform-provider-custom_v1.19.0_x5")).To(BeAnExistingFile())
+
 		})
 
 		Context("single version of tofu", func() {

internal/tfproviderfqn/tfproviderfqn.go

@@ -5,7 +5,7 @@ import "fmt"
 
 const (
 	prefix           = "terraform-provider-"
-	defaultRegistry  = "registry.opentofu.org"
+	defaultRegistry  = "registry.terraform.io"
 	defaultNamespace = "hashicorp"
 )