-
Notifications
You must be signed in to change notification settings - Fork 1.5k
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
Spanner MR CMEK Integration #11319
Open
panerorenn9541
wants to merge
21
commits into
GoogleCloudPlatform:main
Choose a base branch
from
panerorenn9541:main
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+182
−8
Open
Spanner MR CMEK Integration #11319
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
b43da49
Update Database.yaml
panerorenn9541 a7e959f
Change kms_key_names to kmsKeyNames in description
panerorenn9541 0f58e19
Update resource_spanner_database_test.go.erb
panerorenn9541 be9a029
Merge pull request #1 from panerorenn9541/mr-cmek-integration
panerorenn9541 4a0d02f
Merge branch 'GoogleCloudPlatform:main' into main
panerorenn9541 50929aa
Update Database.yaml
panerorenn9541 aed43a4
Merge branch 'GoogleCloudPlatform:main' into main
panerorenn9541 0a04792
Add item_type to kmsKeyNames array.
panerorenn9541 7865541
Merge branch 'GoogleCloudPlatform:main' into main
panerorenn9541 8687ccc
Remove quotations from key names in resource_spanner_database_test.go…
panerorenn9541 8b8764a
Merge branch 'GoogleCloudPlatform:main' into main
panerorenn9541 f58f858
merge-with-main
ScottSuarez 3b28000
migrate pull request and fix test case/documentation
ScottSuarez 95d98d7
Don't read kms_key_names if kms_key_name is set
ScottSuarez 37586d6
Update permadiff.md
panerorenn9541 5795610
Update permadiff.md
panerorenn9541 084a6a0
Update Database.yaml
panerorenn9541 0c0c9e5
Update mmv1/templates/terraform/custom_flatten/spanner_database_kms_k…
panerorenn9541 b416e1d
Update spanner_database_kms_key_names.go.tmpl
panerorenn9541 e2144b4
Update resource_spanner_database_test.go.tmpl
panerorenn9541 2887416
Update resource_spanner_database_test.go.tmpl
panerorenn9541 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
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
31 changes: 31 additions & 0 deletions
31
mmv1/templates/terraform/custom_flatten/spanner_database_kms_key_names.go.tmpl
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,31 @@ | ||
func flatten{{$.GetPrefix}}{{$.TitlelizeProperty}}(v interface{}, d *schema.ResourceData, config *transport_tpg.Config) interface{} { | ||
// Ignore `kms_key_names` if `kms_key_name` is set, because that field takes precedence. | ||
_, kmsNameSet := d.GetOk("encryption_config.0.kms_key_name") | ||
if kmsNameSet { | ||
return nil | ||
} | ||
|
||
rawConfigValue := d.Get("encryption_config.0.kms_key_names") | ||
|
||
// Convert config value to []string | ||
configValue, err := tpgresource.InterfaceSliceToStringSlice(rawConfigValue) | ||
if err != nil { | ||
log.Printf("[ERROR] Failed to convert config value: %s", err) | ||
return v | ||
} | ||
|
||
// Convert v to []string | ||
apiStringValue, err := tpgresource.InterfaceSliceToStringSlice(v) | ||
if err != nil { | ||
log.Printf("[ERROR] Failed to convert API value: %s", err) | ||
return v | ||
} | ||
|
||
sortedStrings, err := tpgresource.SortStringsByConfigOrder(configValue, apiStringValue) | ||
if err != nil { | ||
log.Printf("[ERROR] Could not sort API response value: %s", err) | ||
return v | ||
} | ||
|
||
return sortedStrings | ||
} |
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
Oops, something went wrong.
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.
Can you remove these IAM roles? I'll manually add them once done. Then we should be good to go here.
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.
Does the
depends_on =
need to go too?