Verify discard unpacked layers setting

CHANGELOG.md

@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added 
 
+- [#237](https://github.com/XenitAB/spegel/pull/237) Verify discard unpacked layers setting.
+
 ### Changed
 
 ### Deprecated

internal/oci/containerd.go

@@ -86,11 +86,19 @@ func verifyStatusResponse(resp *runtimeapi.StatusResponse, configPath string) er
 		Registry struct {
 			ConfigPath string `json:"configPath"`
 		} `json:"registry"`
+		Containerd struct {
+			Runtimes struct {
+				DiscardUnpackedLayers bool `json:"discardUnpackedLayers"`
+			} `json:"runtimes"`
+		} `json:"containerd"`
 	}{}
 	err := json.Unmarshal([]byte(str), cfg)
 	if err != nil {
 		return err
 	}
+	if cfg.Containerd.Runtimes.DiscardUnpackedLayers {
+		return fmt.Errorf("Containerd discard unpacked layers cannot be enabled")
+	}
 	if cfg.Registry.ConfigPath == "" {
 		return fmt.Errorf("Containerd registry config path needs to be set for mirror configuration to take effect")
 	}

internal/oci/containerd_test.go

@@ -22,49 +22,55 @@ import (
 
 func TestVerifyStatusResponse(t *testing.T) {
 	tests := []struct {
-		name           string
-		infoConfigPath string
-		configPath     string
-		expectedErrMsg string
+		name                  string
+		configPath            string
+		discardUnpackedLayers bool
+		requiredConfigPath    string
+		expectedErrMsg        string
 	}{
 		{
-			name:           "empty config path",
-			infoConfigPath: "",
-			configPath:     "/etc/containerd/certs.d",
-			expectedErrMsg: "Containerd registry config path needs to be set for mirror configuration to take effect",
+			name:               "empty config path",
+			configPath:         "",
+			requiredConfigPath: "/etc/containerd/certs.d",
+			expectedErrMsg:     "Containerd registry config path needs to be set for mirror configuration to take effect",
 		},
 		{
-			name:           "single config path",
-			infoConfigPath: "/etc/containerd/certs.d",
-			configPath:     "/etc/containerd/certs.d",
+			name:               "single config path",
+			configPath:         "/etc/containerd/certs.d",
+			requiredConfigPath: "/etc/containerd/certs.d",
 		},
 		{
-			name:           "missing single config path",
-			infoConfigPath: "/etc/containerd/certs.d",
-			configPath:     "/var/lib/containerd/certs.d",
-			expectedErrMsg: "Containerd registry config path is /etc/containerd/certs.d but needs to contain path /var/lib/containerd/certs.d for mirror configuration to take effect",
+			name:               "missing single config path",
+			configPath:         "/etc/containerd/certs.d",
+			requiredConfigPath: "/var/lib/containerd/certs.d",
+			expectedErrMsg:     "Containerd registry config path is /etc/containerd/certs.d but needs to contain path /var/lib/containerd/certs.d for mirror configuration to take effect",
 		},
 		{
-			name:           "multiple config paths",
-			infoConfigPath: "/etc/containerd/certs.d:/etc/docker/certs.d",
-			configPath:     "/etc/containerd/certs.d",
+			name:               "multiple config paths",
+			configPath:         "/etc/containerd/certs.d:/etc/docker/certs.d",
+			requiredConfigPath: "/etc/containerd/certs.d",
 		},
 		{
-			name:           "missing multiple config paths",
-			infoConfigPath: "/etc/containerd/certs.d:/etc/docker/certs.d",
-			configPath:     "/var/lib/containerd/certs.d",
-			expectedErrMsg: "Containerd registry config path is /etc/containerd/certs.d:/etc/docker/certs.d but needs to contain path /var/lib/containerd/certs.d for mirror configuration to take effect",
+			name:               "missing multiple config paths",
+			configPath:         "/etc/containerd/certs.d:/etc/docker/certs.d",
+			requiredConfigPath: "/var/lib/containerd/certs.d",
+			expectedErrMsg:     "Containerd registry config path is /etc/containerd/certs.d:/etc/docker/certs.d but needs to contain path /var/lib/containerd/certs.d for mirror configuration to take effect",
+		},
+		{
+			name:                  "discard unpacked layers enabled",
+			discardUnpackedLayers: true,
+			expectedErrMsg:        "Containerd discard unpacked layers cannot be enabled",
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			resp := &runtimeapi.StatusResponse{
 				Info: map[string]string{
-					"config": fmt.Sprintf(`{"registry": {"configPath": "%s"}}`, tt.infoConfigPath),
+					"config": fmt.Sprintf(`{"registry": {"configPath": "%s"}, "containerd": {"runtimes":{"discardUnpackedLayers": %v}}}`, tt.configPath, tt.discardUnpackedLayers),
 				},
 			}
-			err := verifyStatusResponse(resp, tt.configPath)
+			err := verifyStatusResponse(resp, tt.requiredConfigPath)
 			if tt.expectedErrMsg != "" {
 				require.EqualError(t, err, tt.expectedErrMsg)
 				return