-
Notifications
You must be signed in to change notification settings - Fork 1.7k
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
Allow url map to handle backend service fields that can also be backend buckets. #4269
Merged
nat-henderson
merged 2 commits into
GoogleCloudPlatform:master
from
nat-henderson:urlmap-multiref
Dec 2, 2020
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
58 changes: 58 additions & 0 deletions
58
templates/terraform/custom_expand/reference_to_backend.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| <%# 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. | ||
| -%> | ||
| <%# This provides the best long-form self link possible given the input. | ||
| # If the input is a full URL including scheme, we return it unmodified | ||
| # https://compute.googleapis.com/v1/projects/foo/regions/bar/backendBuckets/baz -> (the same) | ||
| # If the input is a partial self-link, we return it with the compute base path in front. | ||
| # projects/foo/regions/bar/backendServices/baz -> https://compute.googleapis.com/v1/projects/foo/regions/bar/backendServices/baz | ||
| # If the input is an even-more-partial link (not including projects), we return it with the compute base path | ||
| # and the specified project in front | ||
| # regions/bar/backendServices/baz -> https://compute.googleapis.com/v1/projects/provider-project/regions/bar/backendServices/baz | ||
| # If the input is just project/region/name, region/name, or just name, we treat it like a backendService. | ||
| # baz -> https://compute.googleapis.com/v1/projects/provider-project/regions/provider-region/backendServices/baz | ||
| # bar/baz -> https://compute.googleapis.com/v1/projects/provider-project/regions/bar/backendServices/baz | ||
| # foo/bar/baz -> https://compute.googleapis.com/v1/projects/foo/regions/bar/backendServices/baz | ||
| -%> | ||
| 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 | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Mind adding a comment here explaining what patterns we match on, and what values we provide if so?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!