Refactor containerd host.toml generation

Refactors the code to make the test code readable.

Author: sebsoto

pkg/registries/registries.go

@@ -210,13 +210,13 @@ func (ms *mirrorSet) generateConfig(secretsConfig credentialprovider.DockerConfi
 		fallbackServer = ms.mirrors[0].host
 	}
 	result += fmt.Sprintf("server = \"https://%s\"", fallbackServer)
-	result += "\r\n"
+	result += "\n"
 
 	// Each mirror should result in an entry followed by a set of settings for interacting with the mirror host
 	for _, m := range ms.mirrors {
-		result += "\r\n"
+		result += "\n"
 		result += fmt.Sprintf("[host.\"https://%s\"]", m.host)
-		result += "\r\n"
+		result += "\n"
 
 		// Specify the operations the registry host may perform. IDMS mirrors can only be pulled by directly by digest,
 		// whereas ITMS mirrors have the additional resolve capability, which allows converting a tag name into a digest
@@ -227,7 +227,7 @@ func (ms *mirrorSet) generateConfig(secretsConfig credentialprovider.DockerConfi
 			hostCapabilities = "  capabilities = [\"pull\"]"
 		}
 		result += hostCapabilities
-		result += "\r\n"
+		result += "\n"
 
 		// Extract the mirror repo's authorization credentials, if one exists
 		if entry, ok := secretsConfig.Auths[extractHostname(m.host)]; ok {
@@ -236,9 +236,9 @@ func (ms *mirrorSet) generateConfig(secretsConfig credentialprovider.DockerConfi
 
 			// Add the access token as a request header
 			result += fmt.Sprintf("  [host.\"https://%s\".header]", m.host)
-			result += "\r\n"
+			result += "\n"
 			result += fmt.Sprintf("    authorization = \"Basic %s\"", token)
-			result += "\r\n"
+			result += "\n"
 		}
 	}
 

pkg/registries/registries_test.go

@@ -252,7 +252,11 @@ func TestGenerateConfig(t *testing.T) {
 				},
 				mirrorSourcePolicy: config.AllowContactingSource,
 			},
-			expectedOutput: "server = \"https://registry.access.redhat.com/ubi9/ubi-minimal\"\r\n\r\n[host.\"https://example.io/example/ubi-minimal\"]\r\n  capabilities = [\"pull\"]\r\n",
+			expectedOutput: `server = "https://registry.access.redhat.com/ubi9/ubi-minimal"
+
+[host."https://example.io/example/ubi-minimal"]
+  capabilities = ["pull"]
+`,
 		},
 		{
 			name: "basic one tag mirror",
@@ -263,7 +267,11 @@ func TestGenerateConfig(t *testing.T) {
 				},
 				mirrorSourcePolicy: config.AllowContactingSource,
 			},
-			expectedOutput: "server = \"https://registry.access.redhat.com/ubi9/ubi-minimal\"\r\n\r\n[host.\"https://example.io/example/ubi-minimal\"]\r\n  capabilities = [\"pull\", \"resolve\"]\r\n",
+			expectedOutput: `server = "https://registry.access.redhat.com/ubi9/ubi-minimal"
+
+[host."https://example.io/example/ubi-minimal"]
+  capabilities = ["pull", "resolve"]
+`,
 		},
 		{
 			name: "one digest mirror never contact source",
@@ -274,7 +282,11 @@ func TestGenerateConfig(t *testing.T) {
 				},
 				mirrorSourcePolicy: config.NeverContactSource,
 			},
-			expectedOutput: "server = \"https://example.io/example/ubi-minimal\"\r\n\r\n[host.\"https://example.io/example/ubi-minimal\"]\r\n  capabilities = [\"pull\"]\r\n",
+			expectedOutput: `server = "https://example.io/example/ubi-minimal"
+
+[host."https://example.io/example/ubi-minimal"]
+  capabilities = ["pull"]
+`,
 		},
 		{
 			name: "tags mirror never contact source",
@@ -285,7 +297,11 @@ func TestGenerateConfig(t *testing.T) {
 				},
 				mirrorSourcePolicy: config.NeverContactSource,
 			},
-			expectedOutput: "server = \"https://example.io/example/ubi-minimal\"\r\n\r\n[host.\"https://example.io/example/ubi-minimal\"]\r\n  capabilities = [\"pull\", \"resolve\"]\r\n",
+			expectedOutput: `server = "https://example.io/example/ubi-minimal"
+
+[host."https://example.io/example/ubi-minimal"]
+  capabilities = ["pull", "resolve"]
+`,
 		},
 		{
 			name: "multiple mirrors",
@@ -298,7 +314,21 @@ func TestGenerateConfig(t *testing.T) {
 				},
 				mirrorSourcePolicy: config.AllowContactingSource,
 			},
-			expectedOutput: "server = \"https://registry.access.redhat.com/ubi9/ubi-minimal\"\r\n\r\n[host.\"https://example.io/example/ubi-minimal\"]\r\n  capabilities = [\"pull\"]\r\n\r\n[host.\"https://mirror.example.com/redhat\"]\r\n  capabilities = [\"pull\"]\r\n  [host.\"https://mirror.example.com/redhat\".header]\r\n    authorization = \"Basic dXNlcjpwYXNz\"\r\n\r\n[host.\"https://mirror.example.net/image\"]\r\n  capabilities = [\"pull\", \"resolve\"]\r\n  [host.\"https://mirror.example.net/image\".header]\r\n    authorization = \"Basic dXNlcm5hbWU6cGFzc3dvcmQ=\"\r\n",
+			expectedOutput: `server = "https://registry.access.redhat.com/ubi9/ubi-minimal"
+
+[host."https://example.io/example/ubi-minimal"]
+  capabilities = ["pull"]
+
+[host."https://mirror.example.com/redhat"]
+  capabilities = ["pull"]
+  [host."https://mirror.example.com/redhat".header]
+    authorization = "Basic dXNlcjpwYXNz"
+
+[host."https://mirror.example.net/image"]
+  capabilities = ["pull", "resolve"]
+  [host."https://mirror.example.net/image".header]
+    authorization = "Basic dXNlcm5hbWU6cGFzc3dvcmQ="
+`,
 		},
 		{
 			name: "multiple mirrors never contact source",
@@ -311,7 +341,21 @@ func TestGenerateConfig(t *testing.T) {
 				},
 				mirrorSourcePolicy: config.NeverContactSource,
 			},
-			expectedOutput: "server = \"https://example.io/example/ubi-minimal\"\r\n\r\n[host.\"https://example.io/example/ubi-minimal\"]\r\n  capabilities = [\"pull\"]\r\n\r\n[host.\"https://mirror.example.com/redhat\"]\r\n  capabilities = [\"pull\"]\r\n  [host.\"https://mirror.example.com/redhat\".header]\r\n    authorization = \"Basic dXNlcjpwYXNz\"\r\n\r\n[host.\"https://mirror.example.net\"]\r\n  capabilities = [\"pull\", \"resolve\"]\r\n  [host.\"https://mirror.example.net\".header]\r\n    authorization = \"Basic dXNlcm5hbWU6cGFzc3dvcmQ=\"\r\n",
+			expectedOutput: `server = "https://example.io/example/ubi-minimal"
+
+[host."https://example.io/example/ubi-minimal"]
+  capabilities = ["pull"]
+
+[host."https://mirror.example.com/redhat"]
+  capabilities = ["pull"]
+  [host."https://mirror.example.com/redhat".header]
+    authorization = "Basic dXNlcjpwYXNz"
+
+[host."https://mirror.example.net"]
+  capabilities = ["pull", "resolve"]
+  [host."https://mirror.example.net".header]
+    authorization = "Basic dXNlcm5hbWU6cGFzc3dvcmQ="
+`,
 		},
 	}