Skip to content

Commit

Permalink
undo the removal of the resourcerefs, write a function specifically f…
Browse files Browse the repository at this point in the history
…or backend refs.
  • Loading branch information
nat-henderson committed Nov 25, 2020
1 parent a1eff96 commit 97f42e1
Show file tree
Hide file tree
Showing 2 changed files with 68 additions and 7 deletions.
30 changes: 23 additions & 7 deletions products/compute/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2728,7 +2728,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
defaultService: !ruby/object:Overrides::Terraform::PropertyOverride
# ResourceRef only supports 1 type and UrlMap has references to a BackendBucket or BackendService.
# Just read the self_link string instead of extracting the name and making a self_link out of it.
custom_expand: 'templates/terraform/custom_expand/resourceref_as_string.go.erb'
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
description: The backend service or backend bucket to use when none of the given rules match.
hostRules: !ruby/object:Overrides::Terraform::PropertyOverride
name: "host_rule"
Expand All @@ -2740,21 +2740,37 @@ overrides: !ruby/object:Overrides::ResourceOverrides
pathMatchers.defaultService: !ruby/object:Overrides::Terraform::PropertyOverride
# ResourceRef only supports 1 type and UrlMap has references to a BackendBucket or BackendService.
# Just read the self_link string instead of extracting the name and making a self_link out of it.
custom_expand: 'templates/terraform/custom_expand/resourceref_as_string.go.erb'
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
description: The backend service or backend bucket to use when none of the given paths match.
pathMatchers.pathRules: !ruby/object:Overrides::Terraform::PropertyOverride
name: "path_rule"
pathMatchers.pathRules.paths: !ruby/object:Overrides::Terraform::PropertyOverride
is_set: true
pathMatchers.pathRules.service: !ruby/object:Overrides::Terraform::PropertyOverride
pathMatchers.defaultRouteAction.weightedBackendServices.backendService: !ruby/object:Overrides::Terraform::PropertyOverride
# ResourceRef only supports 1 type and UrlMap has references to a BackendBucket or BackendService.
# Just read the self_link string instead of extracting the name and making a self_link out of it.
custom_expand: 'templates/terraform/custom_expand/resourceref_as_string.go.erb'
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
pathMatchers.defaultRouteAction.requestMirrorPolicy.backendService: !ruby/object:Overrides::Terraform::PropertyOverride
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
defaultRouteAction.weightedBackendServices.backendService: !ruby/object:Overrides::Terraform::PropertyOverride
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
defaultRouteAction.requestMirrorPolicy.backendService: !ruby/object:Overrides::Terraform::PropertyOverride
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
pathMatchers.routeRules.service: !ruby/object:Overrides::Terraform::PropertyOverride
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
pathMatchers.pathRules.service: !ruby/object:Overrides::Terraform::PropertyOverride
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
description: The backend service or backend bucket to use if any of the given paths match.
pathMatchers.routeRules.routeAction.weightedBackendServices.backendService: !ruby/object:Overrides::Terraform::PropertyOverride
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
pathMatchers.pathRules.routeAction.weightedBackendServices.backendService: !ruby/object:Overrides::Terraform::PropertyOverride
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
pathMatchers.routeRules.routeAction.requestMirrorPolicy.backendService: !ruby/object:Overrides::Terraform::PropertyOverride
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
pathMatchers.pathRules.routeAction.requestMirrorPolicy.backendService: !ruby/object:Overrides::Terraform::PropertyOverride
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
tests.service: !ruby/object:Overrides::Terraform::PropertyOverride
# ResourceRef only supports 1 type and UrlMap has references to a BackendBucket or BackendService.
# Just read the self_link string instead of extracting the name and making a self_link out of it.
custom_expand: 'templates/terraform/custom_expand/resourceref_as_string.go.erb'
custom_expand: 'templates/terraform/custom_expand/reference_to_backend.erb'
description: The backend service or backend bucket link that should be matched by this test.
tests: !ruby/object:Overrides::Terraform::PropertyOverride
name: "test"
Expand Down
45 changes: 45 additions & 0 deletions templates/terraform/custom_expand/reference_to_backend.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<%# The license inside this block applies to this file.
# Copyright 2017 Google Inc.
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-%>
func expand<%= prefix -%><%= titlelize_property(property) -%>(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
// This method returns a full self link from whatever the input is.
if v == nil || v.(string) == "" {
// It does not try to construct anything from empty.
return "", nil
} else if strings.HasPrefix(v.(string), "https://") {
// Anything that starts with a URL scheme is assumed to be a self link worth using.
return v, nil
} else if strings.HasPrefix(v.(string), "projects/") {
// If the self link references a project, we'll just stuck the compute prefix on it
url, err := replaceVars(d, config, "{{ComputeBasePath}}" + v.(string))
if err != nil {
return "", err
}
return url, nil
} else if strings.HasPrefix(v.(string), "regions/") || strings.HasPrefix(v.(string), "zones/") {
// For regional or zonal resources which include their region or zone, just put the project in front.
url, err := replaceVars(d, config, "{{ComputeBasePath}}projects/{{project}}/")
if err != nil {
return nil, err
}
return url + v.(string), nil
}
// Anything else is assumed to be a reference to a global backend service.
f, err := parseGlobalFieldValue("backendServices", v.(string), "project", d, config, true)
if err != nil {
return "", err
}

return f.RelativeLink(), nil
}

0 comments on commit 97f42e1

Please sign in to comment.