Skip to content

Commit 5181b81

Browse files
Update importMethod enum values in KeyRingImportJob (#13604) (#22314)
[upstream:e94cb775d71c90d72e076e145bfb6cc080cffddf] Signed-off-by: Modular Magician <[email protected]>
1 parent 52d1efb commit 5181b81

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.changelog/13604.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:enhancement
2+
kms: added new enum values for `import_method` field in `google_kms_key_ring_import_job` resource
3+
```

google/services/kms/resource_kms_key_ring_import_job.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ func ResourceKMSKeyRingImportJob() *schema.Resource {
6060
Type: schema.TypeString,
6161
Required: true,
6262
ForceNew: true,
63-
ValidateFunc: verify.ValidateEnum([]string{"RSA_OAEP_3072_SHA1_AES_256", "RSA_OAEP_4096_SHA1_AES_256"}),
64-
Description: `The wrapping method to be used for incoming key material. Possible values: ["RSA_OAEP_3072_SHA1_AES_256", "RSA_OAEP_4096_SHA1_AES_256"]`,
63+
ValidateFunc: verify.ValidateEnum([]string{"RSA_OAEP_3072_SHA1_AES_256", "RSA_OAEP_4096_SHA1_AES_256", "RSA_OAEP_3072_SHA256_AES_256", "RSA_OAEP_4096_SHA256_AES_256", "RSA_OAEP_3072_SHA256", "RSA_OAEP_4096_SHA256"}),
64+
Description: `The wrapping method to be used for incoming key material. Possible values: ["RSA_OAEP_3072_SHA1_AES_256", "RSA_OAEP_4096_SHA1_AES_256", "RSA_OAEP_3072_SHA256_AES_256", "RSA_OAEP_4096_SHA256_AES_256", "RSA_OAEP_3072_SHA256", "RSA_OAEP_4096_SHA256"]`,
6565
},
6666
"key_ring": {
6767
Type: schema.TypeString,

website/docs/r/kms_key_ring_import_job.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ The following arguments are supported:
7171
* `import_method` -
7272
(Required)
7373
The wrapping method to be used for incoming key material.
74-
Possible values are: `RSA_OAEP_3072_SHA1_AES_256`, `RSA_OAEP_4096_SHA1_AES_256`.
74+
Possible values are: `RSA_OAEP_3072_SHA1_AES_256`, `RSA_OAEP_4096_SHA1_AES_256`, `RSA_OAEP_3072_SHA256_AES_256`, `RSA_OAEP_4096_SHA256_AES_256`, `RSA_OAEP_3072_SHA256`, `RSA_OAEP_4096_SHA256`.
7575

7676
* `protection_level` -
7777
(Required)

0 commit comments

Comments
 (0)