Make customers use key ID, not fingerprint (#112)

spacelift-io · Jan 2, 2023 · 8d16d03 · 8d16d03
1 parent db5c3ea
commit 8d16d03
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,3 +14,4 @@ spacectl
 build
 dist
 key.*
+*.asc
diff --git a/internal/cmd/provider/create_version.go b/internal/cmd/provider/create_version.go
@@ -65,7 +65,7 @@ func createVersion() cli.ActionFunc {
 				ProtocolVersions: cliCtx.StringSlice(flagProviderVersionProtocols.Name),
 				SHASumsFileSHA:   checksumsFileChecksum,
 				SignatureFileSHA: signatureFileChecksum,
-				SigningKeyID:     cliCtx.String(gpgKeyFingerprint.Name),
+				SigningKeyID:     cliCtx.String(flagGPGKeyID.Name),
 			},
 		}
 

diff --git a/internal/cmd/provider/flags.go b/internal/cmd/provider/flags.go
@@ -60,9 +60,9 @@ var flagRequiredVersionID = &cli.StringFlag{
 	Required: true,
 }
 
-var gpgKeyFingerprint = &cli.StringFlag{
-	Name:     "gpg-fingerprint",
-	Usage:    "ID (fingerprint) of the GPG key used to sign the provider version",
-	EnvVars:  []string{"GPG_FINGERPRINT"},
+var flagGPGKeyID = &cli.StringFlag{
+	Name:     "gpg-key-id",
+	Usage:    "ID of the GPG key used to sign the provider version",
+	EnvVars:  []string{"GPG_KEY_ID"},
 	Required: true,
 }
diff --git a/internal/cmd/provider/provider.go b/internal/cmd/provider/provider.go
@@ -54,7 +54,7 @@ func Command() *cli.Command {
 					flagProviderType,
 					flagProviderVersionProtocols,
 					flagGoReleaserDir,
-					gpgKeyFingerprint,
+					flagGPGKeyID,
 				},
 				Action:    createVersion(),
 				Before:    authenticated.Ensure,