Merge branch 'main' into feat/support-wif-ske-exec

Author: Galin-Karabadzhakov

docs/stackit_kms_key_create.md

@@ -41,7 +41,7 @@ stackit kms key create [flags]
       --import-only          States whether versions can be created or only imported
       --keyring-id string    ID of the KMS key ring
       --name string          The display name to distinguish multiple keys
-      --protection string    The underlying system that is responsible for protecting the key material. (one of: [software])
+      --protection string    The underlying system that is responsible for protecting the key material. (one of: [software, hsm])
       --purpose string       Purpose of the key. (one of: [symmetric_encrypt_decrypt, asymmetric_encrypt_decrypt, message_authentication_code, asymmetric_sign_verify])
 ```
 

docs/stackit_kms_wrapping-key_create.md

@@ -28,7 +28,7 @@ stackit kms wrapping-key create [flags]
   -h, --help                 Help for "stackit kms wrapping-key create"
       --keyring-id string    ID of the KMS key ring
       --name string          The display name to distinguish multiple wrapping keys
-      --protection string    The underlying system that is responsible for protecting the key material. (one of: [software])
+      --protection string    The underlying system that is responsible for protecting the key material. (one of: [software, hsm])
       --purpose string       Purpose of the key. (one of: [wrap_symmetric_key, wrap_asymmetric_key])
 ```
 

go.mod

@@ -265,7 +265,7 @@ require (
 	github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
 	github.com/spf13/afero v1.15.0 // indirect
 	github.com/spf13/cast v1.10.0 // indirect
-	github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0
+	github.com/stackitcloud/stackit-sdk-go/services/kms v1.13.0
 	github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.15.1
 	github.com/stackitcloud/stackit-sdk-go/services/logme v1.3.0
 	github.com/stackitcloud/stackit-sdk-go/services/mariadb v1.1.0

go.sum

@@ -610,8 +610,8 @@ github.com/stackitcloud/stackit-sdk-go/services/iaas v1.14.1 h1:P8XhOi8TLA7NbLHh
 github.com/stackitcloud/stackit-sdk-go/services/iaas v1.14.1/go.mod h1:/QpOsaCOQjwGgQqG8y9xXqryp25AfkorPjInX9xIeOU=
 github.com/stackitcloud/stackit-sdk-go/services/intake v0.11.1 h1:f9sKrmLxBK9g0zS9qGGDFVQx+6HjBALL18ibfPFOqPw=
 github.com/stackitcloud/stackit-sdk-go/services/intake v0.11.1/go.mod h1:UXhPs7JXjQvTp14d4ZffSLnFMQyB7y1cj100XWwQudI=
-github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0 h1:OrUaDypQNr1nOXZfVQXCwUpN4YhR5y0vtvYi9/Ogoi4=
-github.com/stackitcloud/stackit-sdk-go/services/kms v1.11.0/go.mod h1:pVaCmb1ZHAPGVRlSlBlVOjThp9Tb2sX9+nRX0M+d1KU=
+github.com/stackitcloud/stackit-sdk-go/services/kms v1.13.0 h1:4S9gcTlijtvlF8wYZR5anbQ98oIP2+fIaEsvBXluux4=
+github.com/stackitcloud/stackit-sdk-go/services/kms v1.13.0/go.mod h1:pVaCmb1ZHAPGVRlSlBlVOjThp9Tb2sX9+nRX0M+d1KU=
 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.15.1 h1:+NT2okD80TlFNDTKSgaEvV/o7LevTrATqcDL0r4nuhU=
 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.15.1/go.mod h1:+Ld3dn648I+YKcBV3fEkYpDSr3fel421+LurJGywSBs=
 github.com/stackitcloud/stackit-sdk-go/services/logme v1.3.0 h1:GR2hjluc/LDqj+QnNUh57XH1vp9Tlcf22TlIwYtRG4Q=

internal/cmd/kms/key/create/create.go

@@ -44,7 +44,7 @@ var (
 	)
 	protectionFlag = flags.StringEnumFlag(
 		"protection",
-		kms.AllowedProtectionEnumValues,
+		[]string{"software", "hsm"},
 		"The underlying system that is responsible for protecting the key material.")
 )
 
@@ -57,7 +57,7 @@ type inputModel struct {
 	Name        *string
 	ImportOnly  bool // Default false
 	Purpose     kms.Purpose
-	Protection  kms.Protection
+	Protection  string
 }
 
 func NewCmd(params *types.CmdParams) *cobra.Command {

internal/cmd/kms/key/create/create_test.go

@@ -23,7 +23,7 @@ const (
 	testPurpose     = kms.PURPOSE_ASYMMETRIC_ENCRYPT_DECRYPT
 	testDescription = "my key description"
 	testImportOnly  = "true"
-	testProtection  = kms.PROTECTION_SOFTWARE
+	testProtection  = "software"
 )
 
 type testCtxKey struct{}

internal/cmd/kms/key/describe/describe_test.go

@@ -167,7 +167,7 @@ func TestOutputResult(t *testing.T) {
 				Id:           testKeyID,
 				ImportOnly:   true,
 				KeyRingId:    testKeyRingID,
-				Protection:   kms.PROTECTION_SOFTWARE,
+				Protection:   "software",
 				Purpose:      kms.PURPOSE_SYMMETRIC_ENCRYPT_DECRYPT,
 				State:        kms.KEYSTATE_ACTIVE,
 			},

internal/cmd/kms/wrappingkey/create/create.go

@@ -43,7 +43,7 @@ var (
 	)
 	protectionFlag = flags.StringEnumFlag(
 		"protection",
-		kms.AllowedProtectionEnumValues,
+		[]string{"software", "hsm"},
 		"The underlying system that is responsible for protecting the key material.")
 )
 
@@ -55,7 +55,7 @@ type inputModel struct {
 	Description *string
 	Name        *string
 	Purpose     kms.WrappingPurpose
-	Protection  kms.Protection
+	Protection  string
 }
 
 func NewCmd(params *types.CmdParams) *cobra.Command {

internal/cmd/kms/wrappingkey/create/create_test.go

@@ -22,7 +22,7 @@ const (
 	testDisplayName = "my-key"
 	testPurpose     = kms.WRAPPINGPURPOSE_WRAP_ASYMMETRIC_KEY
 	testDescription = "my key description"
-	testProtection  = kms.PROTECTION_SOFTWARE
+	testProtection  = "software"
 )
 
 type testCtxKey struct{}

internal/cmd/kms/wrappingkey/describe/describe_test.go

@@ -158,7 +158,7 @@ func TestOutputResult(t *testing.T) {
 				Algorithm:   kms.WRAPPINGALGORITHM_RSA_2048_OAEP_SHA256,
 				ExpiresAt:   testTime,
 				KeyRingId:   testKeyRingID,
-				Protection:  kms.PROTECTION_SOFTWARE,
+				Protection:  "software",
 				PublicKey:   utils.Ptr("-----BEGIN PUBLIC KEY-----\nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQ...\n-----END PUBLIC KEY-----"),
 				Purpose:     kms.WRAPPINGPURPOSE_WRAP_ASYMMETRIC_KEY,
 			},