Skip to content

Commit 837951b

Browse files
committed
fix: lint issues in Key Manager implementation
1 parent 68f288e commit 837951b

File tree

2 files changed

+21
-9
lines changed

2 files changed

+21
-9
lines changed

internal/services/keymanager/helpers.go

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,27 @@ import (
1313
"github.com/scaleway/terraform-provider-scaleway/v2/internal/types"
1414
)
1515

16+
const (
17+
usageSymmetricEncryption = "symmetric_encryption"
18+
usageAsymmetricEncryption = "asymmetric_encryption"
19+
usageAsymmetricSigning = "asymmetric_signing"
20+
)
21+
1622
func UsageToString(u *key_manager.KeyUsage) string {
1723
if u == nil {
1824
return ""
1925
}
2026

2127
if u.SymmetricEncryption != nil {
22-
return "symmetric_encryption"
28+
return usageSymmetricEncryption
2329
}
2430

2531
if u.AsymmetricEncryption != nil {
26-
return "asymmetric_encryption"
32+
return usageAsymmetricEncryption
2733
}
2834

2935
if u.AsymmetricSigning != nil {
30-
return "asymmetric_signing"
36+
return usageAsymmetricSigning
3137
}
3238

3339
return ""
@@ -58,16 +64,19 @@ func NewKeyManagerAPIWithRegionAndID(m any, id string) (*key_manager.API, scw.Re
5864
func ExpandKeyUsageFromFields(d *schema.ResourceData) *key_manager.KeyUsage {
5965
if v, ok := d.GetOk("usage_symmetric_encryption"); ok {
6066
alg := key_manager.KeyAlgorithmSymmetricEncryption(v.(string))
67+
6168
return &key_manager.KeyUsage{SymmetricEncryption: &alg}
6269
}
6370

6471
if v, ok := d.GetOk("usage_asymmetric_encryption"); ok {
6572
alg := key_manager.KeyAlgorithmAsymmetricEncryption(v.(string))
73+
6674
return &key_manager.KeyUsage{AsymmetricEncryption: &alg}
6775
}
6876

6977
if v, ok := d.GetOk("usage_asymmetric_signing"); ok {
7078
alg := key_manager.KeyAlgorithmAsymmetricSigning(v.(string))
79+
7180
return &key_manager.KeyUsage{AsymmetricSigning: &alg}
7281
}
7382

@@ -80,14 +89,17 @@ func ExpandKeyUsageFromFields(d *schema.ResourceData) *key_manager.KeyUsage {
8089

8190
func ExpandKeyUsageLegacy(usage string) *key_manager.KeyUsage {
8291
switch usage {
83-
case "symmetric_encryption":
92+
case usageSymmetricEncryption:
8493
alg := key_manager.KeyAlgorithmSymmetricEncryptionAes256Gcm
94+
8595
return &key_manager.KeyUsage{SymmetricEncryption: &alg}
86-
case "asymmetric_encryption":
96+
case usageAsymmetricEncryption:
8797
alg := key_manager.KeyAlgorithmAsymmetricEncryptionRsaOaep3072Sha256
98+
8899
return &key_manager.KeyUsage{AsymmetricEncryption: &alg}
89-
case "asymmetric_signing":
100+
case usageAsymmetricSigning:
90101
alg := key_manager.KeyAlgorithmAsymmetricSigningEcP256Sha256
102+
91103
return &key_manager.KeyUsage{AsymmetricSigning: &alg}
92104
default:
93105
return nil

internal/services/keymanager/key_resource.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,11 +209,11 @@ func resourceKeyManagerKeyRead(ctx context.Context, d *schema.ResourceData, m an
209209

210210
if !usesLegacy {
211211
switch usageType {
212-
case "symmetric_encryption":
212+
case usageSymmetricEncryption:
213213
_ = d.Set("usage_symmetric_encryption", algorithm)
214-
case "asymmetric_encryption":
214+
case usageAsymmetricEncryption:
215215
_ = d.Set("usage_asymmetric_encryption", algorithm)
216-
case "asymmetric_signing":
216+
case usageAsymmetricSigning:
217217
_ = d.Set("usage_asymmetric_signing", algorithm)
218218
}
219219
}

0 commit comments

Comments
 (0)