Registries proxy config: add tests

Signed-off-by: cyqsimon <28627918+cyqsimon@users.noreply.github.com>

Author: cyqsimon

image/docker/docker_client_test.go

@@ -445,3 +445,49 @@ func TestIsManifestUnknownError(t *testing.T) {
 		assert.True(t, res, "%s: %#v", c.name, err)
 	}
 }
+
+// Helper function to test that the selected proxy for a registry matches expected.
+func testProxyForRegistry(t *testing.T, ctx context.Context, sys *types.SystemContext, registry string, expectedProxy string) {
+	t.Run(fmt.Sprintf(`Expecting proxy "%s" for registry "%s"`, expectedProxy, registry), func(t *testing.T) {
+		req, err := http.NewRequest("GET", fmt.Sprintf("http://%s/v2/", registry), nil)
+		require.NoError(t, err)
+
+		// Proxy configured using environment variables have priority, so we skip if it's set.
+		envProxy, _ := http.ProxyFromEnvironment(req)
+		if envProxy != nil {
+			t.Skip("Skipping registry proxy test: proxy configured using environment variables")
+		}
+
+		client, err := newDockerClient(sys, registry, registry)
+		require.NoError(t, err)
+
+		// Ping will fail, but we only care about the side effect of setting the proxy.
+		_ = client.detectProperties(ctx)
+
+		transport, ok := client.client.Transport.(*http.Transport)
+		require.True(t, ok)
+		require.NotNil(t, transport.Proxy)
+
+		proxyURL, err := transport.Proxy(req)
+		require.NoError(t, err)
+
+		if expectedProxy == "" {
+			require.Nil(t, proxyURL)
+		} else {
+			require.NotNil(t, proxyURL)
+			assert.Equal(t, expectedProxy, proxyURL.String())
+		}
+	})
+}
+
+func TestRegistrySpecificProxy(t *testing.T) {
+	ctx := context.Background()
+	sys := &types.SystemContext{
+		SystemRegistriesConfPath:    "../pkg/sysregistriesv2/testdata/proxy.conf",
+		SystemRegistriesConfDirPath: "../pkg/sysregistriesv2/testdata/this-does-not-exist",
+		DockerInsecureSkipTLSVerify: types.OptionalBoolTrue,
+	}
+
+	testProxyForRegistry(t, ctx, sys, "registry-1.com", "")
+	testProxyForRegistry(t, ctx, sys, "registry-2.com", "https://proxy-2.example.com")
+}

image/pkg/sysregistriesv2/system_registries_v2_test.go

@@ -107,6 +107,28 @@ func TestParseLocation(t *testing.T) {
 	assert.Equal(t, "example.com:5000/with/path", location)
 }
 
+func TestParseProxy(t *testing.T) {
+	for _, valid := range []string{
+		"",
+		"http://proxy.example.com",
+		"https://proxy.example.com",
+		"socks5://proxy.example.com",
+		"socks5h://proxy.example.com:1080",
+	} {
+		_, err := ParseProxy(valid)
+		assert.Nil(t, err, valid)
+	}
+
+	for _, invalid := range []string{
+		"no-scheme.example.com",
+		"ftp://bad-scheme.example.com",
+		"ssh://bad-scheme.example.com:2222",
+	} {
+		_, err := ParseProxy(invalid)
+		assert.NotNil(t, err)
+	}
+}
+
 func TestEmptyConfig(t *testing.T) {
 	registries, err := GetRegistries(&types.SystemContext{
 		SystemRegistriesConfPath:    "testdata/empty.conf",
@@ -983,3 +1005,31 @@ func TestCredentialHelpers(t *testing.T) {
 		require.Equal(t, test.helpers, helpers, "%v", test)
 	}
 }
+
+func TestProxyConfiguration(t *testing.T) {
+	sys := &types.SystemContext{
+		SystemRegistriesConfPath:    "testdata/proxy.conf",
+		SystemRegistriesConfDirPath: "testdata/this-does-not-exist",
+	}
+
+	registries, err := GetRegistries(sys)
+	require.NoError(t, err)
+	require.Equal(t, 2, len(registries))
+
+	reg1 := registries[0]
+	assert.Equal(t, "registry-1.com", reg1.Location)
+	assert.Equal(t, "", reg1.Proxy)
+	require.Equal(t, 2, len(reg1.Mirrors))
+
+	mirror1 := reg1.Mirrors[0]
+	assert.Equal(t, "mirror-1.registry-1.com", mirror1.Location)
+	assert.Equal(t, "", mirror1.Proxy)
+
+	mirror2 := reg1.Mirrors[1]
+	assert.Equal(t, "mirror-2.registry-1.com", mirror2.Location)
+	assert.Equal(t, "http://proxy-1.example.com", mirror2.Proxy)
+
+	reg2 := registries[1]
+	assert.Equal(t, "registry-2.com", reg2.Location)
+	assert.Equal(t, "https://proxy-2.example.com", reg2.Proxy)
+}

image/pkg/sysregistriesv2/testdata/proxy.conf

@@ -0,0 +1,13 @@
+[[registry]]
+location = "registry-1.com"
+
+[[registry.mirror]]
+location = "mirror-1.registry-1.com"
+
+[[registry.mirror]]
+location = "mirror-2.registry-1.com"
+proxy = "http://proxy-1.example.com"
+
+[[registry]]
+location = "registry-2.com"
+proxy = "https://proxy-2.example.com"