fix: resolve comments

Signed-off-by: Junjie Gao <[email protected]>
Azure · Mar 1, 2023 · a123b9f · a123b9f
1 parent 120d114
commit a123b9f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 21 deletions.
diff --git a/cmd/notation-azure-kv/key.go b/cmd/notation-azure-kv/key.go
@@ -12,9 +12,8 @@ import (
 )
 
 func runDescribeKey(ctx context.Context) error {
-	r := os.Stdin
 	var req proto.DescribeKeyRequest
-	err := json.NewDecoder(r).Decode(&req)
+	err := json.NewDecoder(os.Stdin).Decode(&req)
 	if err != nil {
 		return proto.RequestError{
 			Code: proto.ErrorCodeValidation,

diff --git a/cmd/notation-azure-kv/main.go b/cmd/notation-azure-kv/main.go
@@ -18,12 +18,12 @@ func main() {
 	}
 	ctx := context.Background()
 	var err error
-	switch os.Args[1] {
-	case string(proto.CommandGetMetadata):
-		runGetMetadata()
-	case string(proto.CommandDescribeKey):
+	switch proto.Command(os.Args[1]) {
+	case proto.CommandGetMetadata:
+		err = runGetMetadata()
+	case proto.CommandDescribeKey:
 		err = runDescribeKey(ctx)
-	case string(proto.CommandGenerateSignature):
+	case proto.CommandGenerateSignature:
 		err = runSign(ctx)
 	default:
 		err = fmt.Errorf("invalid command: %s", os.Args[1])
@@ -44,18 +44,20 @@ func main() {
 }
 
 func help() {
-	fmt.Printf(`NAME:
-   notation-azure-kv - Notation - Notary V2 Azure KV plugin
+	fmt.Printf(`notation-azure-kv - Notation - Notary V2 Azure KV plugin
 
-USAGE:
-   notation-azure-kv [global options] command [command options] [arguments...]
+Usage:
+  notation-azure-kv <command>
 
-VERSION:
-   %s
+Version:
+  %s
 
-COMMANDS:
-   get-plugin-metadata  Get plugin metadata
-   generate-signature   Sign artifacts with keys in Azure Key Vault
-   describe-key         Azure key description
+Commands:
+  get-plugin-metadata  Get plugin metadata
+  generate-signature   Sign artifacts with keys in Azure Key Vault
+  describe-key         Azure key description
+
+Documentation:
+  https://github.com/notaryproject/notaryproject/blob/main/specs/plugin-extensibility.md#plugin-contract
 `, version.GetVersion())
 }
diff --git a/cmd/notation-azure-kv/metadata.go b/cmd/notation-azure-kv/metadata.go
@@ -25,7 +25,8 @@ func init() {
 	}
 }
 
-func runGetMetadata() {
+func runGetMetadata() error {
 	// write response
-	os.Stdout.Write(metadata)
+	_, err := os.Stdout.Write(metadata)
+	return err
 }
diff --git a/cmd/notation-azure-kv/sign.go b/cmd/notation-azure-kv/sign.go
@@ -12,9 +12,8 @@ import (
 )
 
 func runSign(ctx context.Context) error {
-	r := os.Stdin
 	var req proto.GenerateSignatureRequest
-	err := json.NewDecoder(r).Decode(&req)
+	err := json.NewDecoder(os.Stdin).Decode(&req)
 	if err != nil {
 		return proto.RequestError{
 			Code: proto.ErrorCodeValidation,