Switch to containerd extension

fix #251

Signed-off-by: yanxuean <yan.xuean@zte.com.cn>

pkg/store/container/metadata.go

@@ -35,9 +35,13 @@ const metadataVersion = "v1" // nolint
 type versionedMetadata struct {
 	// Version indicates the version of the versioned container metadata.
 	Version string
-	Metadata
+	// Metadata's type is metadataInternal. If not there will be a recursive call in MarshalJSON.
+	Metadata metadataInternal
 }
 
+// metadataInternal is for internal use.
+type metadataInternal Metadata
+
 // Metadata is the unversioned container metadata.
 type Metadata struct {
 	// ID is the container id.
@@ -52,16 +56,16 @@ type Metadata struct {
 	ImageRef string
 }
 
-// Encode encodes Metadata into bytes in json format.
-func (c *Metadata) Encode() ([]byte, error) {
+// MarshalJSON encodes Metadata into bytes in json format.
+func (c *Metadata) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&versionedMetadata{
 		Version:  metadataVersion,
-		Metadata: *c,
+		Metadata: metadataInternal(*c),
 	})
 }
 
-// Decode decodes Metadata from bytes.
-func (c *Metadata) Decode(data []byte) error {
+// UnmarshalJSON decodes Metadata from bytes.
+func (c *Metadata) UnmarshalJSON(data []byte) error {
 	versioned := &versionedMetadata{}
 	if err := json.Unmarshal(data, versioned); err != nil {
 		return err
@@ -69,8 +73,8 @@ func (c *Metadata) Decode(data []byte) error {
 	// Handle old version after upgrade.
 	switch versioned.Version {
 	case metadataVersion:
-		*c = versioned.Metadata
+		*c = Metadata(versioned.Metadata)
 		return nil
 	}
-	return fmt.Errorf("unsupported version")
+	return fmt.Errorf("unsupported version: %q", versioned.Version)
 }

pkg/store/container/metadata_test.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 )
 
-func TestMetadataEncodeDecode(t *testing.T) {
+func TestMetadataMarshalUnmarshal(t *testing.T) {
 	meta := &Metadata{
 		ID:        "test-id",
 		Name:      "test-name",
@@ -37,17 +37,44 @@ func TestMetadataEncodeDecode(t *testing.T) {
 		},
 		ImageRef: "test-image-ref",
 	}
-	assert := assertlib.New(t)
-	data, err := meta.Encode()
-	assert.NoError(err)
-	newMeta := &Metadata{}
-	assert.NoError(newMeta.Decode(data))
-	assert.Equal(meta, newMeta)
 
-	unsupported, err := json.Marshal(&versionedMetadata{
-		Version:  "random-test-version",
-		Metadata: *meta,
+	assert := assertlib.New(t)
+	newMeta := &Metadata{}
+	newVerMeta := &versionedMetadata{}
+
+	t.Logf("should be able to do json.marshal")
+	data, err := json.Marshal(meta)
+	assert.NoError(err)
+	data1, err := json.Marshal(&versionedMetadata{
+		Version:  metadataVersion,
+		Metadata: metadataInternal(*meta),
 	})
 	assert.NoError(err)
-	assert.Error(newMeta.Decode(unsupported))
+	assert.Equal(data, data1)
+
+	t.Logf("should be able to do MarshalJSON")
+	data, err = meta.MarshalJSON()
+	assert.NoError(err)
+	assert.NoError(newMeta.UnmarshalJSON(data))
+	assert.Equal(meta, newMeta)
+
+	t.Logf("should be able to do MarshalJSON and json.Unmarshal")
+	data, err = meta.MarshalJSON()
+	assert.NoError(err)
+	assert.NoError(json.Unmarshal(data, newVerMeta))
+	assert.Equal(meta, (*Metadata)(&newVerMeta.Metadata))
+
+	t.Logf("should be able to do json.Marshal and UnmarshalJSON")
+	data, err = json.Marshal(meta)
+	assert.NoError(err)
+	assert.NoError(newMeta.UnmarshalJSON(data))
+	assert.Equal(meta, newMeta)
+
+	t.Logf("should json.Unmarshal fail for unsupported version")
+	unsupported, err := json.Marshal(&versionedMetadata{
+		Version:  "random-test-version",
+		Metadata: metadataInternal(*meta),
+	})
+	assert.NoError(err)
+	assert.Error(json.Unmarshal(unsupported, &newMeta))
 }

pkg/store/sandbox/metadata.go

@@ -35,9 +35,13 @@ const metadataVersion = "v1" // nolint
 type versionedMetadata struct {
 	// Version indicates the version of the versioned sandbox metadata.
 	Version string
-	Metadata
+	// Metadata's type is metadataInternal. If not there will be a recursive call in MarshalJSON.
+	Metadata metadataInternal
 }
 
+// metadataInternal is for internal use.
+type metadataInternal Metadata
+
 // Metadata is the unversioned sandbox metadata.
 type Metadata struct {
 	// ID is the sandbox id.
@@ -50,16 +54,16 @@ type Metadata struct {
 	NetNSPath string
 }
 
-// Encode encodes Metadata into bytes in json format.
-func (c *Metadata) Encode() ([]byte, error) {
+// MarshalJSON encodes Metadata into bytes in json format.
+func (c *Metadata) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&versionedMetadata{
 		Version:  metadataVersion,
-		Metadata: *c,
+		Metadata: metadataInternal(*c),
 	})
 }
 
-// Decode decodes Metadata from bytes.
-func (c *Metadata) Decode(data []byte) error {
+// UnmarshalJSON decodes Metadata from bytes.
+func (c *Metadata) UnmarshalJSON(data []byte) error {
 	versioned := &versionedMetadata{}
 	if err := json.Unmarshal(data, versioned); err != nil {
 		return err
@@ -67,8 +71,8 @@ func (c *Metadata) Decode(data []byte) error {
 	// Handle old version after upgrade.
 	switch versioned.Version {
 	case metadataVersion:
-		*c = versioned.Metadata
+		*c = Metadata(versioned.Metadata)
 		return nil
 	}
-	return fmt.Errorf("unsupported version")
+	return fmt.Errorf("unsupported version: %q", versioned.Version)
 }

pkg/store/sandbox/metadata_test.go

@@ -24,7 +24,7 @@ import (
 	"k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
 )
 
-func TestMetadataEncodeDecode(t *testing.T) {
+func TestMetadataMarshalUnmarshal(t *testing.T) {
 	meta := &Metadata{
 		ID:   "test-id",
 		Name: "test-name",
@@ -38,16 +38,42 @@ func TestMetadataEncodeDecode(t *testing.T) {
 		},
 	}
 	assert := assertlib.New(t)
-	data, err := meta.Encode()
-	assert.NoError(err)
 	newMeta := &Metadata{}
-	assert.NoError(newMeta.Decode(data))
-	assert.Equal(meta, newMeta)
+	newVerMeta := &versionedMetadata{}
 
-	unsupported, err := json.Marshal(&versionedMetadata{
-		Version:  "random-test-version",
-		Metadata: *meta,
+	t.Logf("should be able to do json.marshal")
+	data, err := json.Marshal(meta)
+	assert.NoError(err)
+	data1, err := json.Marshal(&versionedMetadata{
+		Version:  metadataVersion,
+		Metadata: metadataInternal(*meta),
 	})
 	assert.NoError(err)
-	assert.Error(newMeta.Decode(unsupported))
+	assert.Equal(data, data1)
+
+	t.Logf("should be able to do MarshalJSON")
+	data, err = meta.MarshalJSON()
+	assert.NoError(err)
+	assert.NoError(newMeta.UnmarshalJSON(data))
+	assert.Equal(meta, newMeta)
+
+	t.Logf("should be able to do MarshalJSON and json.Unmarshal")
+	data, err = meta.MarshalJSON()
+	assert.NoError(err)
+	assert.NoError(json.Unmarshal(data, newVerMeta))
+	assert.Equal(meta, (*Metadata)(&newVerMeta.Metadata))
+
+	t.Logf("should be able to do json.Marshal and UnmarshalJSON")
+	data, err = json.Marshal(meta)
+	assert.NoError(err)
+	assert.NoError(newMeta.UnmarshalJSON(data))
+	assert.Equal(meta, newMeta)
+
+	t.Logf("should json.Unmarshal fail for unsupported version")
+	unsupported, err := json.Marshal(&versionedMetadata{
+		Version:  "random-test-version",
+		Metadata: metadataInternal(*meta),
+	})
+	assert.NoError(err)
+	assert.Error(json.Unmarshal(unsupported, &newMeta))
 }