bug: get specs returns one return value #374

apigee · Jan 10, 2024 · 79dac91 · 79dac91
1 parent 82bf59f
commit 79dac91
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 8 deletions.
diff --git a/cmd/registry/apis/artifacts/getartifact.go b/cmd/registry/apis/artifacts/getartifact.go
@@ -35,8 +35,7 @@ var GetArtifactCmd = &cobra.Command{
 	},
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		if content {
-			_, err = apis.GetArtifactContents(apiName, name)
-			return err
+			return apis.GetArtifactContents(apiName, name)
 		}
 		_, err = apis.GetArtifact(apiName, name)
 		return

diff --git a/cmd/registry/apis/versions/artifacts/getartifact.go b/cmd/registry/apis/versions/artifacts/getartifact.go
@@ -34,8 +34,7 @@ var GetArtifactCmd = &cobra.Command{
 	},
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		if content {
-			_, err = versions.GetArtifactContents(apiName, apiVersion, name)
-			return err
+			return versions.GetArtifactContents(apiName, apiVersion, name)
 		}
 		_, err = versions.GetArtifact(apiName, apiVersion, name)
 		return

diff --git a/cmd/registry/apis/versions/specs/crtspec.go b/cmd/registry/apis/versions/specs/crtspec.go
@@ -15,6 +15,7 @@
 package specs
 
 import (
+	"encoding/base64"
 	"internal/apiclient"
 
 	"internal/client/registry/apis/versions"
@@ -38,8 +39,9 @@ var CreateSpecCmd = &cobra.Command{
 		if err != nil {
 			return err
 		}
+		contents := base64.URLEncoding.EncodeToString(fileContents)
 		_, err = versions.CreateSpec(apiName, apiVersion, apiSpecID,
-			name, fileName, description, sourceURI, string(fileContents), labels, annotations)
+			name, fileName, description, sourceURI, contents, labels, annotations)
 		return
 	},
 }

diff --git a/cmd/registry/apis/versions/specs/getspec.go b/cmd/registry/apis/versions/specs/getspec.go
@@ -35,7 +35,7 @@ var GetSpecCmd = &cobra.Command{
 	},
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		if content {
-			_, err = versions.GetSpecContents(apiName, apiVersion, name)
+			err = versions.GetSpecContents(apiName, apiVersion, name)
 			return err
 		}
 		_, err = versions.GetSpec(apiName, apiVersion, name)

diff --git a/cmd/registry/artifacts/getartifact.go b/cmd/registry/artifacts/getartifact.go
@@ -35,8 +35,7 @@ var GetArtifactCmd = &cobra.Command{
 	},
 	RunE: func(cmd *cobra.Command, args []string) (err error) {
 		if content {
-			_, err = artifacts.GetContents(name)
-			return err
+			return artifacts.GetContents(name)
 		}
 		_, err = artifacts.Get(name)
 		return