fixup! simplify file name formatting

Author: dkoshkin

pkg/handlers/generic/mutation/imageregistries/credentials/credential_provider_config_files.go

@@ -108,7 +108,9 @@ func templateFilesForImageCredentialProviderConfigs(
 		files = append(files, *kubeletCredentialProviderConfigFile)
 	}
 
-	kubeletDynamicCredentialProviderConfigFile, err := templateDynamicCredentialProviderConfig(configs)
+	kubeletDynamicCredentialProviderConfigFile, err := templateDynamicCredentialProviderConfig(
+		configs,
+	)
 	if err != nil {
 		return nil, err
 	}

pkg/handlers/generic/mutation/mirrors/containerd_files.go

@@ -9,7 +9,6 @@ import (
 	"fmt"
 	"net/url"
 	"path"
-	"regexp"
 	"strings"
 	"text/template"
 
@@ -60,9 +59,7 @@ func (c containerdConfig) filePathFromURL() (string, error) {
 		registryHostWithPath = path.Join(registryURL.Host, registryURL.Path)
 	}
 
-	// replace all non-alphanumeric characters with "-"
-	re := regexp.MustCompile(`[^a-zA-Z0-9]+`)
-	replaced := re.ReplaceAllString(registryHostWithPath, "-")
+	replaced := strings.Replace(registryHostWithPath, "/", "-", -1)
 
 	return fmt.Sprintf(mirrorCACertPathOnRemoteFmt, replaced), nil
 }
@@ -114,7 +111,10 @@ func generateContainerdHostsFile(
 			var registryCACertPathOnRemote string
 			registryCACertPathOnRemote, err = config.filePathFromURL()
 			if err != nil {
-				return nil, fmt.Errorf("failed generating CA certificate file path from URL: %w", err)
+				return nil, fmt.Errorf(
+					"failed generating CA certificate file path from URL: %w",
+					err,
+				)
 			}
 			input.CACertPath = registryCACertPathOnRemote
 		}

pkg/handlers/generic/mutation/mirrors/containerd_files_test.go

@@ -85,7 +85,7 @@ func Test_generateContainerdHostsFile(t *testing.T) {
 				Append:      false,
 				Content: `[host."https://mymirror.com/v2"]
   capabilities = ["pull", "resolve"]
-  ca = "/etc/certs/mymirror-com.pem"
+  ca = "/etc/certs/mymirror.com.pem"
   # don't rely on Containerd to add the v2/ suffix
   # there is a bug where it is added incorrectly for mirrors with a path
   override_path = true
@@ -105,6 +105,10 @@ func Test_generateContainerdHostsFile(t *testing.T) {
 					URL:    "https://myregistry.com",
 					CACert: "myregistrycert",
 				},
+				{
+					URL:    "https://172.100.0.10:5000/myproject",
+					CACert: "myregistrycert",
+				},
 			},
 			want: &cabpkv1.File{
 				Path:        "/etc/containerd/certs.d/_default/hosts.toml",
@@ -114,12 +118,14 @@ func Test_generateContainerdHostsFile(t *testing.T) {
 				Append:      false,
 				Content: `[host."https://mymirror.com/v2"]
   capabilities = ["pull", "resolve"]
-  ca = "/etc/certs/mymirror-com.pem"
+  ca = "/etc/certs/mymirror.com.pem"
   # don't rely on Containerd to add the v2/ suffix
   # there is a bug where it is added incorrectly for mirrors with a path
   override_path = true
 [host."https://myregistry.com/v2"]
-  ca = "/etc/certs/myregistry-com.pem"
+  ca = "/etc/certs/myregistry.com.pem"
+[host."https://172.100.0.10:5000/v2/myproject"]
+  ca = "/etc/certs/172.100.0.10:5000-myproject.pem"
 `,
 			},
 			wantErr: nil,
@@ -139,7 +145,7 @@ func Test_generateContainerdHostsFile(t *testing.T) {
 				Encoding:    "",
 				Append:      false,
 				Content: `[host."https://myregistry.com/v2"]
-  ca = "/etc/certs/myregistry-com.pem"
+  ca = "/etc/certs/myregistry.com.pem"
 `,
 			},
 			wantErr: nil,
@@ -184,7 +190,7 @@ func Test_generateRegistryCACertFiles(t *testing.T) {
 			},
 			want: []cabpkv1.File{
 				{
-					Path:        "/etc/certs/registry-example-com.pem",
+					Path:        "/etc/certs/registry.example.com.pem",
 					Owner:       "",
 					Permissions: "0600",
 					Encoding:    "",

pkg/handlers/generic/mutation/mirrors/inject_test.go

@@ -101,7 +101,7 @@ var _ = Describe("Generate Global mirror patches", func() {
 							"path", "/etc/containerd/certs.d/_default/hosts.toml",
 						),
 						gomega.HaveKeyWithValue(
-							"path", "/etc/certs/registry-example-com.pem",
+							"path", "/etc/certs/registry.example.com.pem",
 						),
 						gomega.HaveKeyWithValue(
 							"path", "/etc/caren/containerd/patches/registry-config.toml",
@@ -179,7 +179,7 @@ var _ = Describe("Generate Global mirror patches", func() {
 							"path", "/etc/containerd/certs.d/_default/hosts.toml",
 						),
 						gomega.HaveKeyWithValue(
-							"path", "/etc/certs/registry-example-com.pem",
+							"path", "/etc/certs/registry.example.com.pem",
 						),
 						gomega.HaveKeyWithValue(
 							"path", "/etc/caren/containerd/patches/registry-config.toml",