support both serialized protos and YAML

apigee · Jun 6, 2023 · a818d2b · a818d2b
1 parent 8dab302
commit a818d2b
Show file tree

Hide file tree

Showing 22 changed files with 162 additions and 107 deletions.
diff --git a/cmd/registry/cmd/check/rules/rule1000/rule1000.go b/cmd/registry/cmd/check/rules/rule1000/rule1000.go
@@ -20,13 +20,13 @@ import (
 	"strings"
 
 	"github.com/apigee/registry/cmd/registry/cmd/check/lint"
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/pkg/application/apihub"
 	"github.com/apigee/registry/pkg/application/check"
 	"github.com/apigee/registry/pkg/mime"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
-	"google.golang.org/protobuf/proto"
 )
 
 var ruleNum = 1000
@@ -92,7 +92,7 @@ var requiredArtifacts = &lint.ProjectRule{
 func checkTaxonomies(a *rpc.Artifact) []*check.Problem {
 	message, err := mime.MessageForMimeType(a.GetMimeType())
 	if err == nil {
-		err = proto.Unmarshal(a.GetContents(), message)
+		err = patch.UnmarshalContents(a.GetContents(), a.GetMimeType(), message)
 	}
 	if err != nil {
 		return []*check.Problem{{

diff --git a/cmd/registry/cmd/check/rules/rule1001/rule1001.go b/cmd/registry/cmd/check/rules/rule1001/rule1001.go
@@ -22,11 +22,11 @@ import (
 	"strings"
 
 	"github.com/apigee/registry/cmd/registry/cmd/check/lint"
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/pkg/application/apihub"
 	"github.com/apigee/registry/pkg/application/check"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/rpc"
-	"google.golang.org/protobuf/proto"
 )
 
 var ruleNum = 1001
@@ -84,7 +84,7 @@ func taxonomies(ctx context.Context, project names.Project) *TaxList {
 	})
 	if err == nil {
 		tl := new(apihub.TaxonomyList)
-		if err = proto.Unmarshal(ac.Data, tl); err == nil {
+		if err = patch.UnmarshalContents(ac.Data, ac.GetContentType(), tl); err == nil {
 			return &TaxList{tl}
 		}
 	}

diff --git a/cmd/registry/cmd/check/rules/rule1002/rule1002.go b/cmd/registry/cmd/check/rules/rule1002/rule1002.go
@@ -20,10 +20,10 @@ import (
 	"strings"
 
 	"github.com/apigee/registry/cmd/registry/cmd/check/lint"
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/pkg/application/check"
 	"github.com/apigee/registry/pkg/mime"
 	"github.com/apigee/registry/rpc"
-	"google.golang.org/protobuf/proto"
 )
 
 var ruleNum = 1002
@@ -72,7 +72,7 @@ var internalMimeTypeContents = &lint.FieldRule{
 			}
 
 			// does not validate contents, just proves type compatibility
-			err = proto.Unmarshal(contents, message)
+			err = patch.UnmarshalContents(contents, declared, message)
 			if err != nil {
 				return []*check.Problem{{
 					Severity:   check.Problem_ERROR,

diff --git a/cmd/registry/cmd/check/rules/rule1003/rule1003.go b/cmd/registry/cmd/check/rules/rule1003/rule1003.go
@@ -21,11 +21,11 @@ import (
 	"strings"
 
 	"github.com/apigee/registry/cmd/registry/cmd/check/lint"
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/pkg/application/apihub"
 	"github.com/apigee/registry/pkg/application/check"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/rpc"
-	"google.golang.org/protobuf/proto"
 )
 
 var ruleNum = 1003
@@ -62,7 +62,7 @@ var stateIsValidLifecycleStage = &lint.ApiVersionRule{
 		})
 		if err == nil {
 			lc = new(apihub.Lifecycle)
-			err = proto.Unmarshal(ac.Data, lc)
+			err = patch.UnmarshalContents(ac.Data, ac.ContentType, lc)
 		}
 		if err != nil {
 			return []*check.Problem{{

diff --git a/cmd/registry/cmd/compute/complexity/complexity_test.go b/cmd/registry/cmd/compute/complexity/complexity_test.go
@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"github.com/apigee/registry/cmd/registry/cmd/apply"
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/pkg/connection"
 	"github.com/apigee/registry/pkg/connection/grpctest"
 	"github.com/apigee/registry/pkg/names"
@@ -33,7 +34,6 @@ import (
 	"github.com/google/go-cmp/cmp"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/testing/protocmp"
 )
 
@@ -81,7 +81,7 @@ func TestComputeComplexity(t *testing.T) {
 		artifactName := project.Api("apigeeregistry").Version("v1").Spec("protos").Artifact("complexity")
 		err = visitor.GetArtifact(ctx, registryClient, artifactName, true, func(ctx context.Context, message *rpc.Artifact) error {
 			complexity := &metrics.Complexity{}
-			err = proto.Unmarshal(message.Contents, complexity)
+			err = patch.UnmarshalContents(message.Contents, message.MimeType, complexity)
 			if err != nil {
 				return err
 			}
@@ -106,7 +106,7 @@ func TestComputeComplexity(t *testing.T) {
 		artifactName := project.Api("apigeeregistry").Version("v1").Spec("openapi").Artifact("complexity")
 		err = visitor.GetArtifact(ctx, registryClient, artifactName, true, func(ctx context.Context, message *rpc.Artifact) error {
 			complexity := &metrics.Complexity{}
-			err = proto.Unmarshal(message.Contents, complexity)
+			err = patch.UnmarshalContents(message.Contents, message.MimeType, complexity)
 			if err != nil {
 				return err
 			}
@@ -131,7 +131,7 @@ func TestComputeComplexity(t *testing.T) {
 		artifactName := project.Api("apigeeregistry").Version("v1").Spec("discovery").Artifact("complexity")
 		err = visitor.GetArtifact(ctx, registryClient, artifactName, true, func(ctx context.Context, message *rpc.Artifact) error {
 			complexity := &metrics.Complexity{}
-			err = proto.Unmarshal(message.Contents, complexity)
+			err = patch.UnmarshalContents(message.Contents, message.MimeType, complexity)
 			if err != nil {
 				return err
 			}
@@ -251,7 +251,7 @@ func TestComputeComplexityValues(t *testing.T) {
 				t.Fatalf("Failed getting artifact contents %s: %s", test.getPattern, err)
 			}
 			gotProto := &metrics.Complexity{}
-			if err := proto.Unmarshal(contents.GetData(), gotProto); err != nil {
+			if err := patch.UnmarshalContents(contents.GetData(), contents.GetContentType(), gotProto); err != nil {
 				t.Fatalf("Failed to unmarshal artifact: %s", err)
 			}
 			opts := cmp.Options{protocmp.Transform()}

diff --git a/cmd/registry/cmd/compute/conformance/conformance.go b/cmd/registry/cmd/compute/conformance/conformance.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 
 	"github.com/apigee/registry/cmd/registry/conformance"
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/pkg/application/style"
 	"github.com/apigee/registry/pkg/connection"
@@ -28,7 +29,6 @@ import (
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
 	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
 )
 
 var styleguideFilter = fmt.Sprintf("mime_type.contains('%s')", mime.MimeTypeForKind("StyleGuide"))
@@ -78,7 +78,7 @@ func Command() *cobra.Command {
 			guides := make([]*style.StyleGuide, 0)
 			if err := visitor.ListArtifacts(ctx, client, name.Project().Artifact("-"), styleguideFilter, true, func(ctx context.Context, artifact *rpc.Artifact) error {
 				guide := new(style.StyleGuide)
-				if err := proto.Unmarshal(artifact.GetContents(), guide); err != nil {
+				if err := patch.UnmarshalContents(artifact.GetContents(), artifact.GetMimeType(), guide); err != nil {
 					log.FromContext(ctx).WithError(err).Debugf("Unmarshal() to StyleGuide failed on artifact: %s", artifact.GetName())
 					return nil
 				}

diff --git a/cmd/registry/cmd/compute/conformance/conformance_test.go b/cmd/registry/cmd/compute/conformance/conformance_test.go
@@ -24,6 +24,7 @@ import (
 	"testing"
 
 	"github.com/apigee/registry/cmd/registry/cmd/apply"
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/pkg/application/style"
 	"github.com/apigee/registry/pkg/connection/grpctest"
 	"github.com/apigee/registry/rpc"
@@ -32,7 +33,6 @@ import (
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/testing/protocmp"
 )
 
@@ -477,7 +477,7 @@ func TestConformance(t *testing.T) {
 			}
 
 			gotProto := &style.ConformanceReport{}
-			if err := proto.Unmarshal(contents.GetData(), gotProto); err != nil {
+			if err := patch.UnmarshalContents(contents.GetData(), contents.GetContentType(), gotProto); err != nil {
 				t.Fatalf("Failed to unmarshal artifact: %s", err)
 			}
 

diff --git a/cmd/registry/cmd/compute/lint/lint_test.go b/cmd/registry/cmd/compute/lint/lint_test.go
@@ -19,14 +19,14 @@ import (
 	"testing"
 
 	"github.com/apigee/registry/cmd/registry/cmd/apply"
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/pkg/application/style"
 	"github.com/apigee/registry/pkg/connection"
 	"github.com/apigee/registry/pkg/connection/grpctest"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
 	"github.com/apigee/registry/server/registry"
-	"google.golang.org/protobuf/proto"
 )
 
 // TestMain will set up a local RegistryServer and grpc.Server for all
@@ -104,7 +104,7 @@ func TestComputeLint(t *testing.T) {
 		artifactName := specName.Artifact("lint-test")
 		if err = visitor.GetArtifact(ctx, registryClient, artifactName, true, func(ctx context.Context, message *rpc.Artifact) error {
 			var lint style.Lint
-			if err = proto.Unmarshal(message.Contents, &lint); err != nil {
+			if err = patch.UnmarshalContents(message.Contents, message.MimeType, &lint); err != nil {
 				return err
 			}
 			return nil
@@ -123,7 +123,7 @@ func TestComputeLint(t *testing.T) {
 		artifactName := specName.Artifact("lint-test")
 		if err = visitor.GetArtifact(ctx, registryClient, artifactName, true, func(ctx context.Context, message *rpc.Artifact) error {
 			var lint style.Lint
-			if err = proto.Unmarshal(message.Contents, &lint); err != nil {
+			if err = patch.UnmarshalContents(message.Contents, message.MimeType, &lint); err != nil {
 				return err
 			}
 			return nil
@@ -142,7 +142,7 @@ func TestComputeLint(t *testing.T) {
 		artifactName := specName.Artifact("lint-test")
 		if err = visitor.GetArtifact(ctx, registryClient, artifactName, true, func(ctx context.Context, message *rpc.Artifact) error {
 			var lint style.Lint
-			if err = proto.Unmarshal(message.Contents, &lint); err != nil {
+			if err = patch.UnmarshalContents(message.Contents, message.MimeType, &lint); err != nil {
 				return err
 			}
 			return nil

diff --git a/cmd/registry/cmd/compute/lintstats/lintstats.go b/cmd/registry/cmd/compute/lintstats/lintstats.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 	"sort"
 
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/gapic"
 	"github.com/apigee/registry/pkg/application/style"
 	"github.com/apigee/registry/pkg/connection"
@@ -135,7 +136,7 @@ func computeLintStatsSpecs(ctx context.Context,
 		}
 
 		lint := &style.Lint{}
-		err = proto.Unmarshal(contents.GetData(), lint)
+		err = patch.UnmarshalContents(contents.GetData(), contents.GetContentType(), lint)
 		if err != nil {
 			return nil
 		}
@@ -153,7 +154,7 @@ func computeLintStatsSpecs(ctx context.Context,
 				return nil // ignore missing results
 			}
 			complexity := &metrics.Complexity{}
-			err := proto.Unmarshal(contents.GetData(), complexity)
+			err := patch.UnmarshalContents(contents.GetData(), contents.GetContentType(), complexity)
 			if err != nil {
 				return nil
 			}
@@ -283,7 +284,7 @@ func aggregateLintStats(ctx context.Context,
 		return // ignore missing results
 	}
 	stats := &style.LintStats{}
-	err := proto.Unmarshal(contents.GetData(), stats)
+	err := patch.UnmarshalContents(contents.GetData(), contents.GetContentType(), stats)
 	if err != nil {
 		return
 	}

diff --git a/cmd/registry/cmd/compute/score/score.go b/cmd/registry/cmd/compute/score/score.go
@@ -17,14 +17,14 @@ package score
 import (
 	"context"
 
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/cmd/registry/patterns"
 	"github.com/apigee/registry/cmd/registry/scoring"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	scoring_message "github.com/apigee/registry/pkg/application/scoring"
 	"github.com/apigee/registry/pkg/connection"
 	"github.com/apigee/registry/rpc"
 	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
 )
 
 func Command() *cobra.Command {
@@ -67,7 +67,7 @@ func Command() *cobra.Command {
 			for _, d := range scoreDefinitions {
 				// Extract definition
 				definition := &scoring_message.ScoreDefinition{}
-				if err := proto.Unmarshal(d.GetContents(), definition); err != nil {
+				if err := patch.UnmarshalContents(d.GetContents(), d.GetMimeType(), definition); err != nil {
 					return err
 				}
 				mergedPattern, mergedFilter, err := scoring.GenerateCombinedPattern(definition.GetTargetResource(), inputPattern, filter)

diff --git a/cmd/registry/cmd/compute/scorecard/scorecard.go b/cmd/registry/cmd/compute/scorecard/scorecard.go
@@ -19,13 +19,13 @@ import (
 
 	scoring_message "github.com/apigee/registry/pkg/application/scoring"
 
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/cmd/registry/patterns"
 	"github.com/apigee/registry/cmd/registry/scoring"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	"github.com/apigee/registry/pkg/connection"
 	"github.com/apigee/registry/rpc"
 	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
 )
 
 func Command() *cobra.Command {
@@ -68,7 +68,7 @@ func Command() *cobra.Command {
 			for _, d := range scoreCardDefinitions {
 				// Extract definition
 				definition := &scoring_message.ScoreCardDefinition{}
-				if err := proto.Unmarshal(d.GetContents(), definition); err != nil {
+				if err := patch.UnmarshalContents(d.GetContents(), d.GetMimeType(), definition); err != nil {
 					return err
 				}
 				mergedPattern, mergedFilter, err := scoring.GenerateCombinedPattern(definition.GetTargetResource(), inputPattern, filter)

diff --git a/cmd/registry/cmd/compute/vocabulary/vocabulary_test.go b/cmd/registry/cmd/compute/vocabulary/vocabulary_test.go
@@ -19,14 +19,14 @@ import (
 	"testing"
 
 	"github.com/apigee/registry/cmd/registry/cmd/apply"
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/pkg/connection"
 	"github.com/apigee/registry/pkg/connection/grpctest"
 	"github.com/apigee/registry/pkg/names"
 	"github.com/apigee/registry/pkg/visitor"
 	"github.com/apigee/registry/rpc"
 	"github.com/apigee/registry/server/registry"
 	metrics "github.com/google/gnostic/metrics"
-	"google.golang.org/protobuf/proto"
 )
 
 // TestMain will set up a local RegistryServer and grpc.Server for all
@@ -73,7 +73,7 @@ func TestComputeVocabulary(t *testing.T) {
 		artifactName := project.Api("apigeeregistry").Version("v1").Spec("protos").Artifact("vocabulary")
 		err = visitor.GetArtifact(ctx, registryClient, artifactName, true, func(ctx context.Context, message *rpc.Artifact) error {
 			vocabulary := &metrics.Vocabulary{}
-			err = proto.Unmarshal(message.Contents, vocabulary)
+			err = patch.UnmarshalContents(message.Contents, message.MimeType, vocabulary)
 			if err != nil {
 				return err
 			}
@@ -98,7 +98,7 @@ func TestComputeVocabulary(t *testing.T) {
 		artifactName := project.Api("apigeeregistry").Version("v1").Spec("openapi").Artifact("vocabulary")
 		err = visitor.GetArtifact(ctx, registryClient, artifactName, true, func(ctx context.Context, message *rpc.Artifact) error {
 			vocabulary := &metrics.Vocabulary{}
-			err = proto.Unmarshal(message.Contents, vocabulary)
+			err = patch.UnmarshalContents(message.Contents, message.MimeType, vocabulary)
 			if err != nil {
 				return err
 			}
@@ -123,7 +123,7 @@ func TestComputeVocabulary(t *testing.T) {
 		artifactName := project.Api("apigeeregistry").Version("v1").Spec("discovery").Artifact("vocabulary")
 		err = visitor.GetArtifact(ctx, registryClient, artifactName, true, func(ctx context.Context, message *rpc.Artifact) error {
 			vocabulary := &metrics.Vocabulary{}
-			err = proto.Unmarshal(message.Contents, vocabulary)
+			err = patch.UnmarshalContents(message.Contents, message.MimeType, vocabulary)
 			if err != nil {
 				return err
 			}

diff --git a/cmd/registry/cmd/resolve/resolve.go b/cmd/registry/cmd/resolve/resolve.go
@@ -19,6 +19,7 @@ import (
 	"fmt"
 
 	"github.com/apigee/registry/cmd/registry/controller"
+	"github.com/apigee/registry/cmd/registry/patch"
 	"github.com/apigee/registry/cmd/registry/tasks"
 	controller_message "github.com/apigee/registry/pkg/application/controller"
 	"github.com/apigee/registry/pkg/connection"
@@ -27,7 +28,6 @@ import (
 	"github.com/apigee/registry/rpc"
 	"github.com/google/uuid"
 	"github.com/spf13/cobra"
-	"google.golang.org/protobuf/proto"
 )
 
 func fetchManifest(
@@ -45,7 +45,7 @@ func fetchManifest(
 	}
 
 	contents := body.GetData()
-	err = proto.Unmarshal(contents, manifest)
+	err = patch.UnmarshalContents(contents, body.GetContentType(), manifest)
 	if err != nil {
 		return nil, err
 	}