[kms] Add KeySpec and KeyUsage to key metadata

dzbarsky · Jul 30, 2023 · c09d207 · c09d207
1 parent 2bb49e8
commit c09d207
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/services/kms/key/key.go b/services/kms/key/key.go
@@ -24,6 +24,7 @@ import (
 type metadata struct {
 	// Immutable
 	Id                   string
+	KeySpec              string
 	Usage                types.Usage
 	EncryptionAlgorithms []types.EncryptionAlgorithm
 	MacAlgorithms        []string
@@ -75,6 +76,10 @@ func (k Key) Enabled() bool {
 	return k.metadata.Enabled
 }
 
+func (k Key) KeySpec() string {
+	return k.metadata.KeySpec
+}
+
 func (k Key) Usage() types.Usage {
 	return k.metadata.Usage
 }
@@ -170,6 +175,7 @@ type Options struct {
 	PersistPath string
 	Usage       types.Usage
 	Id          string
+	KeySpec     string
 	Description string
 	Tags        map[string]string
 }
@@ -179,6 +185,7 @@ func (o Options) makeKey() *Key {
 		persistPath: o.PersistPath,
 		metadata: metadata{
 			Id:          o.Id,
+			KeySpec:     o.KeySpec,
 			Usage:       o.Usage,
 			Description: o.Description,
 			Tags:        o.Tags,

diff --git a/services/kms/kms.go b/services/kms/kms.go
@@ -149,6 +149,7 @@ func (k *KMS) CreateKey(input CreateKeyInput) (*CreateKeyOutput, *awserrors.Erro
 		PersistPath: persistPath,
 		Usage:       usage,
 		Id:          keyId,
+		KeySpec:     input.KeySpec,
 		Description: input.Description,
 		Tags:        tags,
 	}
@@ -220,9 +221,11 @@ func (k *KMS) toAPI(key *key.Key) APIKeyMetadata {
 		Description:          key.Description(),
 		Enabled:              key.Enabled(),
 		EncryptionAlgorithms: key.EncryptionAlgorithms(),
+		KeyId:                key.Id(),
+		KeySpec:              key.KeySpec(),
+		KeyUsage:             key.Usage(),
 		MacAlgorithms:        key.MacAlgorithms(),
 		SigningAlgorithms:    key.SigningAlgorithms(),
-		KeyId:                key.Id(),
 	}
 }
 

diff --git a/services/kms/types.go b/services/kms/types.go
@@ -196,6 +196,8 @@ type APIKeyMetadata struct {
 	Enabled              bool
 	EncryptionAlgorithms []types.EncryptionAlgorithm
 	KeyId                string
+	KeySpec              string
+	KeyUsage             types.Usage
 	MacAlgorithms        []string
 	SigningAlgorithms    []types.SigningAlgorithm
 }