images: prepare for typeurl.Any

Kazuyoshi Kato · Kazuyoshi Kato · commit f842da460337 · 2022-03-22T16:12:31.000Z
typeurl.MarshalAny returns typeurl.Any since containerd/typeurl#32. Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
diff --git a/images/encryption/any.go b/images/encryption/any.go
@@ -0,0 +1,42 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package encryption
+
+import "github.com/gogo/protobuf/types"
+
+type anyMap map[string]*types.Any
+
+type any interface {
+	GetTypeUrl() string
+	GetValue() []byte
+}
+
+func fromAny(from any) *types.Any {
+	if from == nil {
+		return nil
+	}
+
+	pbany, ok := from.(*types.Any)
+	if ok {
+		return pbany
+	}
+
+	return &types.Any{
+		TypeUrl: from.GetTypeUrl(),
+		Value:   from.GetValue(),
+	}
+}
diff --git a/images/encryption/any_test.go b/images/encryption/any_test.go
@@ -0,0 +1,42 @@
+/*
+   Copyright The containerd Authors.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+*/
+
+package encryption
+
+import (
+	"testing"
+
+	"github.com/gogo/protobuf/types"
+)
+
+func TestFromAny(t *testing.T) {
+	pbany := &types.Any{}
+
+	var testcases = []struct {
+		input    any
+		expected *types.Any
+	}{
+		{input: nil, expected: nil},
+		{input: pbany, expected: pbany},
+	}
+
+	for _, tc := range testcases {
+		actual := fromAny(tc.input)
+		if actual != tc.expected {
+			t.Fatalf("expected %v, but got %v", tc.expected, actual)
+		}
+	}
+}
diff --git a/images/encryption/client.go b/images/encryption/client.go
@@ -28,24 +28,25 @@ import (
 	"github.com/containerd/typeurl"
 
 	encconfig "github.com/containers/ocicrypt/config"
-	"github.com/gogo/protobuf/types"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 )
 
 // WithDecryptedUnpack allows to pass parameters the 'layertool' needs to the applier
 func WithDecryptedUnpack(data *imgcrypt.Payload) diff.ApplyOpt {
 	return func(_ context.Context, desc ocispec.Descriptor, c *diff.ApplyConfig) error {
 		if c.ProcessorPayloads == nil {
-			c.ProcessorPayloads = make(map[string]*types.Any)
+			c.ProcessorPayloads = make(anyMap)
 		}
 		data.Descriptor = desc
 		any, err := typeurl.MarshalAny(data)
 		if err != nil {
 			return fmt.Errorf("failed to marshal payload: %w", err)
 		}
 
+		pbany := fromAny(any)
+
 		for _, id := range imgcrypt.PayloadToolIDs {
-			c.ProcessorPayloads[id] = any
+			c.ProcessorPayloads[id] = pbany
 		}
 		return nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -28,24 +28,25 @@ import (`
`28`	`28`	`"github.com/containerd/typeurl"`
`29`	`29`
`30`	`30`	`encconfig "github.com/containers/ocicrypt/config"`
`31`		`- "github.com/gogo/protobuf/types"`
`32`	`31`	`ocispec "github.com/opencontainers/image-spec/specs-go/v1"`
`33`	`32`	`)`
`34`	`33`
`35`	`34`	`// WithDecryptedUnpack allows to pass parameters the 'layertool' needs to the applier`
`36`	`35`	`func WithDecryptedUnpack(data *imgcrypt.Payload) diff.ApplyOpt {`
`37`	`36`	`return func(_ context.Context, desc ocispec.Descriptor, c *diff.ApplyConfig) error {`
`38`	`37`	`if c.ProcessorPayloads == nil {`
`39`		`- c.ProcessorPayloads = make(map[string]*types.Any)`
	`38`	`+ c.ProcessorPayloads = make(anyMap)`
`40`	`39`	`}`
`41`	`40`	`data.Descriptor = desc`
`42`	`41`	`any, err := typeurl.MarshalAny(data)`
`43`	`42`	`if err != nil {`
`44`	`43`	`return fmt.Errorf("failed to marshal payload: %w", err)`
`45`	`44`	`}`
`46`	`45`
	`46`	`+ pbany := fromAny(any)`
	`47`	`+`
`47`	`48`	`for _, id := range imgcrypt.PayloadToolIDs {`
`48`		`- c.ProcessorPayloads[id] = any`
	`49`	`+ c.ProcessorPayloads[id] = pbany`
`49`	`50`	`}`
`50`	`51`	`return nil`
`51`	`52`	`}`