Update provider generation to use generic naming for imports (#15008)

Author: roaks3

mmv1/provider/provider.go

@@ -18,10 +18,8 @@ type Provider interface {
 const TERRAFORM_PROVIDER_GA = "github.com/hashicorp/terraform-provider-google"
 const TERRAFORM_PROVIDER_BETA = "github.com/hashicorp/terraform-provider-google-beta"
 const TGC_PROVIDER = "github.com/GoogleCloudPlatform/terraform-google-conversion/v6"
-const TERRAFORM_PROVIDER_PRIVATE = "internal/terraform-next"
 const RESOURCE_DIRECTORY_GA = "google"
 const RESOURCE_DIRECTORY_BETA = "google-beta"
-const RESOURCE_DIRECTORY_PRIVATE = "google-private"
 const RESOURCE_DIRECTORY_TGC = "pkg"
 
 // # TODO: Review all object interfaces and move to private methods
@@ -40,8 +38,8 @@ func ImportPathFromVersion(v string) string {
 		tpg = TERRAFORM_PROVIDER_BETA
 		dir = RESOURCE_DIRECTORY_BETA
 	default:
-		tpg = TERRAFORM_PROVIDER_PRIVATE
-		dir = RESOURCE_DIRECTORY_PRIVATE
+		tpg = "github.com/hashicorp/terraform-provider-google-" + v
+		dir = "google-" + v
 	}
 	return fmt.Sprintf("%s/%s", tpg, dir)
 }

mmv1/provider/terraform.go

@@ -302,10 +302,8 @@ func (t *Terraform) GenerateIamDocumentation(object api.Resource, templateData T
 func (t *Terraform) FolderName() string {
 	if t.TargetVersionName == "ga" {
 		return "google"
-	} else if t.TargetVersionName == "beta" {
-		return "google-beta"
 	}
-	return "google-private"
+	return "google-" + t.TargetVersionName
 }
 
 // Similar to FullResourceName, but override-aware to prevent things like ending in _test.
@@ -732,9 +730,8 @@ func (t Terraform) replaceImportPath(outputFolder, target string) {
 		tpg = TERRAFORM_PROVIDER_BETA
 		dir = RESOURCE_DIRECTORY_BETA
 	default:
-		tpg = TERRAFORM_PROVIDER_PRIVATE
-		dir = RESOURCE_DIRECTORY_PRIVATE
-
+		tpg = "github.com/hashicorp/terraform-provider-google-" + t.TargetVersionName
+		dir = "google-" + t.TargetVersionName
 	}
 
 	sourceByte = bytes.Replace(sourceByte, []byte(gaImportPath), []byte(tpg+"/"+dir), -1)
@@ -764,7 +761,7 @@ func (t Terraform) ProviderFromVersion() string {
 	case "beta":
 		dir = RESOURCE_DIRECTORY_BETA
 	default:
-		dir = RESOURCE_DIRECTORY_PRIVATE
+		dir = "google-" + t.TargetVersionName
 	}
 	return dir
 }