jprdonnelly/opentf
1
0
Fork 0
mirror of https://github.com/opentffoundation/opentf.git synced 2025-12-25 01:00:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removes redundant ARN parsing

Browse Source
This commit is contained in:
Graham Davison
2023-07-06 14:58:11 -07:00
parent 29e14d148b
commit 90c10ebbe9
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internal/backend/remote-state/s3/validate.go
View File

@@ -37,7 +37,8 @@ func validateKMSKeyID(path cty.Path, s string) (diags tfdiags.Diagnostics) {
}
func validateKMSKeyARN(path cty.Path, s string) (diags tfdiags.Diagnostics) {
if _, err := arn.Parse(s); err != nil {
parsedARN, err := arn.Parse(s)
if err != nil {
diags = diags.Append(tfdiags.AttributeValue(
tfdiags.Error,
"Invalid KMS Key ARN",
@@ -47,7 +48,7 @@ func validateKMSKeyARN(path cty.Path, s string) (diags tfdiags.Diagnostics) {
return diags
}
if !isKeyARN(s) {
if !isKeyARN(parsedARN) {
diags = diags.Append(tfdiags.AttributeValue(
tfdiags.Error,
"Invalid KMS Key ARN",
@@ -60,13 +61,8 @@ func validateKMSKeyARN(path cty.Path, s string) (diags tfdiags.Diagnostics) {
return diags
}
func isKeyARN(s string) bool {
parsedARN, err := arn.Parse(s)
if err != nil {
return false
}
return keyIdFromARNResource(parsedARN.Resource) != ""
func isKeyARN(arn arn.ARN) bool {
return keyIdFromARNResource(arn.Resource) != ""
}
func keyIdFromARNResource(s string) string {