Fix the private module path for MMV1 templates (GoogleCloudPlatform#7810

)
kimihrr · Apr 21, 2023 · dc726ac · dc726ac
1 parent 924ded3
commit dc726ac
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/mmv1/templates/terraform/iam_policy.go.erb b/mmv1/templates/terraform/iam_policy.go.erb
@@ -23,7 +23,11 @@ import (
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"google.golang.org/api/cloudresourcemanager/v1"
 
-	transport_tpg "github.com/hashicorp/terraform-provider-google<%= "-" + version unless version == 'ga'  -%>/google<%= "-" + version unless version == 'ga'  -%>/transport"
+<% if version == 'private' -%>
+    transport_tpg "internal/terraform-next/google-private/transport"
+<% else -%>
+    transport_tpg "github.com/hashicorp/terraform-provider-google<%= "-" + version unless version == 'ga'  -%>/google<%= "-" + version unless version == 'ga'  -%>/transport"
+<% end -%>
 )
 <% resource_name = product_ns + object.name -%>
 <%

diff --git a/mmv1/templates/terraform/operation.go.erb b/mmv1/templates/terraform/operation.go.erb
@@ -14,7 +14,11 @@ import (
 <% end -%>
   "fmt"
   "time"
+<% if version == 'private' -%>
+  transport_tpg "internal/terraform-next/google-private/transport"
+<% else -%>
   transport_tpg "github.com/hashicorp/terraform-provider-google<%= "-" + version unless version == 'ga'  -%>/google<%= "-" + version unless version == 'ga'  -%>/transport"
+<% end -%>
 )
 
 type <%= product_name -%>OperationWaiter struct {

diff --git a/mmv1/templates/terraform/resource.erb b/mmv1/templates/terraform/resource.erb
@@ -37,7 +37,11 @@ import (
   "github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
   "github.com/hashicorp/terraform-plugin-sdk/v2/diag"
   "github.com/hashicorp/terraform-plugin-sdk/v2/helper/logging"
-  transport_tpg "github.com/hashicorp/terraform-provider-google<%= "-" + version unless version == 'ga'  -%>/google<%= "-" + version unless version == 'ga'  -%>/transport"
+<% if version == 'private' -%>
+    transport_tpg "internal/terraform-next/google-private/transport"
+<% else -%>
+    transport_tpg "github.com/hashicorp/terraform-provider-google<%= "-" + version unless version == 'ga'  -%>/google<%= "-" + version unless version == 'ga'  -%>/transport"
+<% end -%>
 
 <% if object.gettable_properties.reject { |p| p.ignore_read }.any? { |prop| prop.flatten_object } -%>
   "google.golang.org/api/googleapi"