-
Notifications
You must be signed in to change notification settings - Fork 393
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
1. Add support for gcp cmk #2015
Conversation
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.
Also, documentation for this resource wasn't updated to describe it. Also, please say that either AWS or GCP is required
// CustomerManagedKey contains key information and metadata for BYOK for E2 | ||
type CustomerManagedKey struct { | ||
CustomerManagedKeyID string `json:"customer_managed_key_id,omitempty" tf:"computed"` | ||
AwsKeyInfo *AwsKeyInfo `json:"aws_key_info" tf:"force_new"` | ||
AwsKeyInfo *AwsKeyInfo `json:"aws_key_info,omitempty" tf:"force_new"` |
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.
it makes sense to add conflicts:
annotations to each of the fields, so people won't be able to specify both AWS & GCP keys
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.
backend validates it anyway
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.
@alexott
Made the changes as suggested. Added conflicts to both AwsKeyInfo and GcpKeyInfo. Please verify. Will send the new revision.
// CustomerManagedKey contains key information and metadata for BYOK for E2
// You must specify either AwsKeyInfo for AWS or GcpKeyInfo for GCP, but not both
type CustomerManagedKey struct {
CustomerManagedKeyID string `json:"customer_managed_key_id,omitempty" tf:"computed"`
AwsKeyInfo *AwsKeyInfo `json:"aws_key_info,omitempty" tf:"force_new,conflicts:gcp_key_info"`
GcpKeyInfo *GcpKeyInfo `json:"gcp_key_info,omitempty" tf:"force_new,conflicts:aws_key_info"`
AccountID string `json:"account_id" tf:"force_new"`
CreationTime int64 `json:"creation_time,omitempty" tf:"computed"`
UseCases []string `json:"use_cases"`
}
yes, it's ok to leave out documentation until the public preview |
2. Add details to gcp guide for authentication with service account (SA-1)
c524c21
to
705c130
Compare
@alexott Addressed your comments. Please take a look whenever you get time. |
…e provider Co-authored-by: Serge Smertin <259697+nfx@users.noreply.github.com>
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## master #2015 +/- ##
=======================================
Coverage 90.34% 90.34%
=======================================
Files 136 136
Lines 10887 10887
=======================================
Hits 9836 9836
Misses 665 665
Partials 386 386
|
Tested acceptance test by running
bash-3.2$ scripts/run.sh gcp-accounts 'TestGcpaAccCustomerManagedKeysForStorage' --debug --tee
-