use v1

GoogleCloudPlatform · Jun 13, 2019 · 87c5f30 · 87c5f30
1 parent e62f8a9
commit 87c5f30
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/third_party/terraform/resources/resource_service_networking_connection.go.erb b/third_party/terraform/resources/resource_service_networking_connection.go.erb
@@ -9,7 +9,7 @@ import (
 	"strings"
 
 	"github.com/hashicorp/terraform/helper/schema"
-	"google.golang.org/api/servicenetworking/v1beta"
+	"google.golang.org/api/servicenetworking/v1"
 )
 
 func resourceServiceNetworkingConnection() *schema.Resource {

diff --git a/third_party/terraform/utils/config.go.erb b/third_party/terraform/utils/config.go.erb
@@ -45,9 +45,7 @@ import (
 	"google.golang.org/api/pubsub/v1"
 	"google.golang.org/api/runtimeconfig/v1beta1"
 	"google.golang.org/api/servicemanagement/v1"
-<% unless version == 'ga' -%>
-	"google.golang.org/api/servicenetworking/v1beta"
-<% end -%>
+	"google.golang.org/api/servicenetworking/v1"
 	"google.golang.org/api/serviceusage/v1"
 	"google.golang.org/api/sourcerepo/v1"
 	"google.golang.org/api/spanner/v1"
@@ -105,9 +103,7 @@ type Config struct {
 	clientCloudFunctions         *cloudfunctions.Service
 	clientCloudIoT               *cloudiot.Service
 	clientAppEngine              *appengine.APIService
-	<% unless version == 'ga' -%>
 	clientServiceNetworking      *servicenetworking.APIService
-	<% end -%>
 	clientStorageTransfer        *storagetransfer.Service
 
 	bigtableClientFactory *BigtableClientFactory
@@ -383,14 +379,12 @@ func (c *Config) LoadAndValidate() error {
 	}
 	c.clientComposer.UserAgent = userAgent
 
-	<% unless version == 'ga' -%>
 	log.Printf("[INFO] Instantiating Service Networking Client...")
 	c.clientServiceNetworking, err = servicenetworking.NewService(context, option.WithHTTPClient(client))
 	if err != nil {
 		return err
 	}
 	c.clientServiceNetworking.UserAgent = userAgent
-	<% end -%>
 
 	log.Printf("[INFO] Instantiating Google Cloud Storage Transfer Client...")
 	c.clientStorageTransfer, err = storagetransfer.NewService(context, option.WithHTTPClient(client))

diff --git a/third_party/terraform/utils/service_networking_operation.go.erb b/third_party/terraform/utils/service_networking_operation.go.erb
@@ -3,7 +3,7 @@ package google
 
 import (
 	"github.com/hashicorp/terraform/helper/resource"
-	"google.golang.org/api/servicenetworking/v1beta"
+	"google.golang.org/api/servicenetworking/v1"
 )
 
 type ServiceNetworkingOperationWaiter struct {