Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove the last iap base path leftovers from handwritten tunnel #3243

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions third_party/terraform/utils/provider.go.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
13 changes: 0 additions & 13 deletions third_party/terraform/utils/provider_handwritten_endpoint.go.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down