From cad31c316c6626835b5ce205835e66e39dec6498 Mon Sep 17 00:00:00 2001 From: Sam Levenick Date: Tue, 10 Mar 2020 16:24:17 -0700 Subject: [PATCH] Remove the last iap base path leftovers from handwritten tunnel --- third_party/terraform/utils/provider.go.erb | 5 ----- .../utils/provider_handwritten_endpoint.go.erb | 13 ------------- 2 files changed, 18 deletions(-) diff --git a/third_party/terraform/utils/provider.go.erb b/third_party/terraform/utils/provider.go.erb index 8667f25204ce..15daaebbd8ef 100644 --- a/third_party/terraform/utils/provider.go.erb +++ b/third_party/terraform/utils/provider.go.erb @@ -121,11 +121,6 @@ func Provider() terraform.ResourceProvider { <% end -%> // Handwritten Products / Versioned / Atypical Entries - <% unless version == 'ga' -%> - // start beta-only products - IAPCustomEndpointEntryKey: IAPCustomEndpointEntry, - // end beta-only products - <% end -%> CloudBillingCustomEndpointEntryKey: CloudBillingCustomEndpointEntry, ComposerCustomEndpointEntryKey: ComposerCustomEndpointEntry, ComputeBetaCustomEndpointEntryKey: ComputeBetaCustomEndpointEntry, diff --git a/third_party/terraform/utils/provider_handwritten_endpoint.go.erb b/third_party/terraform/utils/provider_handwritten_endpoint.go.erb index ccd177c8a5ef..b41771cd7a89 100644 --- a/third_party/terraform/utils/provider_handwritten_endpoint.go.erb +++ b/third_party/terraform/utils/provider_handwritten_endpoint.go.erb @@ -139,19 +139,6 @@ var IamCredentialsCustomEndpointEntry = &schema.Schema{ }, IamCredentialsDefaultBasePath), } -<% unless version == 'ga' -%> -var IAPDefaultBasePath = "https://iap.googleapis.com/v1beta1/" -var IAPCustomEndpointEntryKey = "iap_custom_endpoint" -var IAPCustomEndpointEntry = &schema.Schema{ - Type: schema.TypeString, - Optional: true, - ValidateFunc: validateCustomEndpoint, - DefaultFunc: schema.MultiEnvDefaultFunc([]string{ - "GOOGLE_IAP_CUSTOM_ENDPOINT", - }, IAPDefaultBasePath), -} - -<% end -%> var ResourceManagerV2Beta1DefaultBasePath = "https://cloudresourcemanager.googleapis.com/v2beta1/" var ResourceManagerV2Beta1CustomEndpointEntryKey = "resource_manager_v2beta1_custom_endpoint" var ResourceManagerV2Beta1CustomEndpointEntry = &schema.Schema{