images: Change 'any' to 'anything' to avoid clash with built-in type 'any'

stefanberger · stefanberger · commit 002abac5a58a · 2023-05-01T11:30:48.000-04:00
Signed-off-by: Stefan Berger &lt;stefanb@linux.ibm.com&gt;
diff --git a/cmd/ctd-decoder/main.go b/cmd/ctd-decoder/main.go
@@ -99,17 +99,17 @@ func getPayload() (*imgcrypt.Payload, error) {
 	if err != nil {
 		return nil, fmt.Errorf("read payload: %w", err)
 	}
-	var any types.Any
-	if err := proto.Unmarshal(data, &any); err != nil {
+	var anything types.Any
+	if err := proto.Unmarshal(data, &anything); err != nil {
 		return nil, fmt.Errorf("could not proto.Unmarshal() decrypt data: %w", err)
 	}
-	v, err := typeurl.UnmarshalAny(&any)
+	v, err := typeurl.UnmarshalAny(&anything)
 	if err != nil {
 		return nil, fmt.Errorf("could not UnmarshalAny() the decrypt data: %w", err)
 	}
 	l, ok := v.(*imgcrypt.Payload)
 	if !ok {
-		return nil, fmt.Errorf("unknown payload type %s", any.TypeUrl)
+		return nil, fmt.Errorf("unknown payload type %s", anything.TypeUrl)
 	}
 	return l, nil
 }
diff --git a/images/encryption/client.go b/images/encryption/client.go
@@ -35,13 +35,13 @@ import (
 func WithDecryptedUnpack(data *imgcrypt.Payload) diff.ApplyOpt {
 	return func(_ context.Context, desc ocispec.Descriptor, c *diff.ApplyConfig) error {
 		data.Descriptor = desc
-		any, err := typeurl.MarshalAny(data)
+		anything, err := typeurl.MarshalAny(data)
 		if err != nil {
 			return fmt.Errorf("failed to marshal payload: %w", err)
 		}
 
 		for _, id := range imgcrypt.PayloadToolIDs {
-			setProcessorPayload(c, id, any)
+			setProcessorPayload(c, id, anything)
 		}
 		return nil
 	}

Original file line number	Diff line number	Diff line change
`@@ -99,17 +99,17 @@ func getPayload() (*imgcrypt.Payload, error) {`
`99`	`99`	`if err != nil {`
`100`	`100`	`return nil, fmt.Errorf("read payload: %w", err)`
`101`	`101`	`}`
`102`		`- var any types.Any`
`103`		`- if err := proto.Unmarshal(data, &any); err != nil {`
	`102`	`+ var anything types.Any`
	`103`	`+ if err := proto.Unmarshal(data, &anything); err != nil {`
`104`	`104`	`return nil, fmt.Errorf("could not proto.Unmarshal() decrypt data: %w", err)`
`105`	`105`	`}`
`106`		`- v, err := typeurl.UnmarshalAny(&any)`
	`106`	`+ v, err := typeurl.UnmarshalAny(&anything)`
`107`	`107`	`if err != nil {`
`108`	`108`	`return nil, fmt.Errorf("could not UnmarshalAny() the decrypt data: %w", err)`
`109`	`109`	`}`
`110`	`110`	`l, ok := v.(*imgcrypt.Payload)`
`111`	`111`	`if !ok {`
`112`		`- return nil, fmt.Errorf("unknown payload type %s", any.TypeUrl)`
	`112`	`+ return nil, fmt.Errorf("unknown payload type %s", anything.TypeUrl)`
`113`	`113`	`}`
`114`	`114`	`return l, nil`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,13 +35,13 @@ import (`
`35`	`35`	`func WithDecryptedUnpack(data *imgcrypt.Payload) diff.ApplyOpt {`
`36`	`36`	`return func(_ context.Context, desc ocispec.Descriptor, c *diff.ApplyConfig) error {`
`37`	`37`	`data.Descriptor = desc`
`38`		`- any, err := typeurl.MarshalAny(data)`
	`38`	`+ anything, err := typeurl.MarshalAny(data)`
`39`	`39`	`if err != nil {`
`40`	`40`	`return fmt.Errorf("failed to marshal payload: %w", err)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`for _, id := range imgcrypt.PayloadToolIDs {`
`44`		`- setProcessorPayload(c, id, any)`
	`44`	`+ setProcessorPayload(c, id, anything)`
`45`	`45`	`}`
`46`	`46`	`return nil`
`47`	`47`	`}`