more remove beta flags (custom endpoints)

GoogleCloudPlatform · Jun 15, 2019 · 844a0df · 844a0df
1 parent ff9fb98
commit 844a0df
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/third_party/terraform/utils/provider.go.erb b/third_party/terraform/utils/provider.go.erb
@@ -108,7 +108,6 @@ func Provider() terraform.ResourceProvider {
 			<% unless version == 'ga' -%>
 			// start beta-only products
 			IAPCustomEndpointEntryKey: IAPCustomEndpointEntry,
-			ServiceNetworkingCustomEndpointEntryKey:      ServiceNetworkingCustomEndpointEntry,
 			// end beta-only products
 			<% end -%>
 			CloudBillingCustomEndpointEntryKey:           CloudBillingCustomEndpointEntry,
@@ -126,6 +125,7 @@ func Provider() terraform.ResourceProvider {
 			RuntimeconfigCustomEndpointEntryKey:          RuntimeconfigCustomEndpointEntry,
 			IAMCustomEndpointEntryKey:                    IAMCustomEndpointEntry,
 			ServiceManagementCustomEndpointEntryKey:      ServiceManagementCustomEndpointEntry,
+			ServiceNetworkingCustomEndpointEntryKey:      ServiceNetworkingCustomEndpointEntry,
 			ServiceUsageCustomEndpointEntryKey:           ServiceUsageCustomEndpointEntry,
 			BigQueryCustomEndpointEntryKey:                BigQueryCustomEndpointEntry,
 			CloudFunctionsCustomEndpointEntryKey:         CloudFunctionsCustomEndpointEntry,
@@ -402,7 +402,6 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 
 	<% unless version == 'ga' -%>
 	config.IAPBasePath = d.Get(IAPCustomEndpointEntryKey).(string)
-	config.ServiceNetworkingBasePath = d.Get(ServiceNetworkingCustomEndpointEntryKey).(string)
 	<% end -%>
 	config.CloudBillingBasePath = d.Get(CloudBillingCustomEndpointEntryKey).(string)
 	config.ComposerBasePath = d.Get(ComposerCustomEndpointEntryKey).(string)
@@ -419,6 +418,7 @@ func providerConfigure(d *schema.ResourceData) (interface{}, error) {
 	config.RuntimeconfigBasePath = d.Get(RuntimeconfigCustomEndpointEntryKey).(string)
 	config.IAMBasePath = d.Get(IAMCustomEndpointEntryKey).(string)
 	config.ServiceManagementBasePath = d.Get(ServiceManagementCustomEndpointEntryKey).(string)
+	config.ServiceNetworkingBasePath = d.Get(ServiceNetworkingCustomEndpointEntryKey).(string)
 	config.ServiceUsageBasePath = d.Get(ServiceUsageCustomEndpointEntryKey).(string)
 	config.BigQueryBasePath = d.Get(BigQueryCustomEndpointEntryKey).(string)
 	config.CloudFunctionsBasePath = d.Get(CloudFunctionsCustomEndpointEntryKey).(string)
@@ -467,7 +467,6 @@ func ConfigureBasePaths(c *Config) {
 	<% unless version == 'ga' -%>
 	// start beta-only products
 	c.IAPBasePath = IAPDefaultBasePath
-	c.ServiceNetworkingBasePath = ServiceNetworkingDefaultBasePath
 	// end beta-only products
 	<% end -%>
 	c.CloudBillingBasePath = CloudBillingDefaultBasePath
@@ -484,6 +483,7 @@ func ConfigureBasePaths(c *Config) {
 	c.RuntimeconfigBasePath = RuntimeconfigDefaultBasePath
 	c.IAMBasePath = IAMDefaultBasePath
 	c.ServiceManagementBasePath = ServiceManagementDefaultBasePath
+	c.ServiceNetworkingBasePath = ServiceNetworkingDefaultBasePath
 	c.ServiceUsageBasePath = ServiceUsageDefaultBasePath
 	c.BigQueryBasePath = BigQueryDefaultBasePath
 	c.CloudFunctionsBasePath = CloudFunctionsDefaultBasePath