forked from GoogleCloudPlatform/magic-modules
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Allow
google_container_cluster.id
reference for the value for the g…
…ke_cluster of a `google_gke_hub_membership` (GoogleCloudPlatform#4985) Co-authored-by: upodroid <[email protected]>
- Loading branch information
1 parent
026bb08
commit 4425178
Showing
5 changed files
with
40 additions
and
2 deletions.
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
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
9 changes: 9 additions & 0 deletions
9
mmv1/templates/terraform/constants/gke_hub_membership_diff.go
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,9 @@ | ||
func suppressGkeHubEndpointSelfLinkDiff(_, old, new string, _ *schema.ResourceData) bool { | ||
// The custom expander injects //container.googleapis.com/ if a selflink is supplied. | ||
selfLink := strings.TrimPrefix(old, "//container.googleapis.com/") | ||
if selfLink == new { | ||
return true | ||
} | ||
|
||
return false | ||
} |
22 changes: 22 additions & 0 deletions
22
mmv1/templates/terraform/custom_expand/gke_hub_membership.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,22 @@ | ||
<%# The license inside this block applies to this file. | ||
# Copyright 2021 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) { | ||
if strings.HasPrefix(v.(string), "//container.googleapis.com/") { | ||
return v, nil | ||
} else { | ||
v = "//container.googleapis.com/" + v.(string) | ||
return v, 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