Use containerd registry mirror library.

Signed-off-by: Lantao Liu <lantaol@google.com>

pkg/server/image_pull_test.go

@@ -22,8 +22,6 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	runtime "k8s.io/cri-api/pkg/apis/runtime/v1alpha2"
-
-	criconfig "github.com/containerd/cri/pkg/config"
 )
 
 func TestParseAuth(t *testing.T) {
@@ -36,6 +34,7 @@ func TestParseAuth(t *testing.T) {
 	base64.StdEncoding.Encode(invalidAuth, []byte(testUser+"@"+testPasswd))
 	for desc, test := range map[string]struct {
 		auth           *runtime.AuthConfig
+		host           string
 		expectedUser   string
 		expectedSecret string
 		expectErr      bool
@@ -66,66 +65,92 @@ func TestParseAuth(t *testing.T) {
 			auth:      &runtime.AuthConfig{Auth: string(invalidAuth)},
 			expectErr: true,
 		},
+		"should return empty auth if server address doesn't match": {
+			auth: &runtime.AuthConfig{
+				Username:      testUser,
+				Password:      testPasswd,
+				ServerAddress: "https://registry-1.io",
+			},
+			host:           "registry-2.io",
+			expectedUser:   "",
+			expectedSecret: "",
+		},
+		"should return auth if server address matches": {
+			auth: &runtime.AuthConfig{
+				Username:      testUser,
+				Password:      testPasswd,
+				ServerAddress: "https://registry-1.io",
+			},
+			host:           "registry-1.io",
+			expectedUser:   testUser,
+			expectedSecret: testPasswd,
+		},
+		"should return auth if server address is not specified": {
+			auth: &runtime.AuthConfig{
+				Username: testUser,
+				Password: testPasswd,
+			},
+			host:           "registry-1.io",
+			expectedUser:   testUser,
+			expectedSecret: testPasswd,
+		},
 	} {
 		t.Logf("TestCase %q", desc)
-		u, s, err := ParseAuth(test.auth)
+		u, s, err := ParseAuth(test.auth, test.host)
 		assert.Equal(t, test.expectErr, err != nil)
 		assert.Equal(t, test.expectedUser, u)
 		assert.Equal(t, test.expectedSecret, s)
 	}
 }
 
-func TestCredentials(t *testing.T) {
-	c := newTestCRIService()
-	c.config.Registry.Auths = map[string]criconfig.AuthConfig{
-		"https://test1.io": {
-			Username: "username1",
-			Password: "password1",
-		},
-		"http://test2.io": {
-			Username: "username2",
-			Password: "password2",
-		},
-		"//test3.io": {
-			Username: "username3",
-			Password: "password3",
-		},
-	}
+func TestAddDefaultEndpoint(t *testing.T) {
 	for desc, test := range map[string]struct {
-		auth             *runtime.AuthConfig
-		host             string
-		expectedUsername string
-		expectedPassword string
+		endpoints []string
+		host      string
+		expected  []string
 	}{
-		"auth config from CRI should take precedence": {
-			auth: &runtime.AuthConfig{
-				Username: "username",
-				Password: "password",
+		"default endpoint not in list": {
+			endpoints: []string{
+				"https://registry-1.io",
+				"https://registry-2.io",
+			},
+			host: "registry-3.io",
+			expected: []string{
+				"https://registry-1.io",
+				"https://registry-2.io",
+				"https://registry-3.io",
 			},
-			host:             "test1.io",
-			expectedUsername: "username",
-			expectedPassword: "password",
 		},
-		"should support https host": {
-			host:             "test1.io",
-			expectedUsername: "username1",
-			expectedPassword: "password1",
+		"default endpoint in list with http": {
+			endpoints: []string{
+				"https://registry-1.io",
+				"https://registry-2.io",
+				"http://registry-3.io",
+			},
+			host: "registry-3.io",
+			expected: []string{
+				"https://registry-1.io",
+				"https://registry-2.io",
+				"http://registry-3.io",
+			},
 		},
-		"should support http host": {
-			host:             "test2.io",
-			expectedUsername: "username2",
-			expectedPassword: "password2",
-		},
-		"should support hostname only": {
-			host:             "test3.io",
-			expectedUsername: "username3",
-			expectedPassword: "password3",
+		"default endpoint in list with https": {
+			endpoints: []string{
+				"https://registry-1.io",
+				"https://registry-2.io",
+				"https://registry-3.io",
+			},
+			host: "registry-3.io",
+			expected: []string{
+				"https://registry-1.io",
+				"https://registry-2.io",
+				"https://registry-3.io",
+			},
 		},
 	} {
 		t.Logf("TestCase %q", desc)
-		username, password, err := c.credentials(test.auth)(test.host)
+		got, err := addDefaultEndpoint(test.endpoints, test.host)
 		assert.NoError(t, err)
-		assert.Equal(t, test.expectedUsername, username)
-		assert.Equal(t, test.expectedPassword, password)
+		assert.Equal(t, test.expected, got)
 	}
 }