fix failing tests

Signed-off-by: Rakshit Gondwal <rakshitgondwal3@gmail.com>
buildsafedev · Oct 10, 2024 · 82a0d29 · 82a0d29
1 parent 58660c5
commit 82a0d29
Show file tree

Hide file tree

Showing 2 changed files with 108 additions and 2 deletions.
diff --git a/pkg/nix/template/oci.go b/pkg/nix/template/oci.go
@@ -184,8 +184,8 @@ func handleCombinedLayers(layer string, fl Flake) []string {
 			combinedLayer = append(combinedLayer, "inputs.self.runtimeEnvs.${system}.runtime")
 		case part == "packages.dev":
 			combinedLayer = append(combinedLayer, "inputs.self.devEnvs.${system}.development")
-		case part == "gomodule" || part == "rustapp" || part == "jsnpmapp" || part == "poetryapp":
-			combinedLayer = append(combinedLayer, "inputs.self.packages.${system}.default")
+		// case part == "gomodule" || part == "rustapp" || part == "jsnpmapp" || part == "poetryapp":
+		// 	combinedLayer = append(combinedLayer, "inputs.self.packages.${system}.default")
 		case strings.HasPrefix(part, "packages.dev."):
 			pkgName := strings.TrimPrefix(part, "packages.dev.")
 			if value, exists := fl.DevPackages[pkgName]; exists {
@@ -217,6 +217,7 @@ func handleIndividualLayers(layer string, fl Flake) [][]string {
 	case layer == "packages.runtime":
 		newLayers = append(newLayers, []string{"inputs.self.runtimeEnvs.${system}.runtime"})
 	case layer == "packages.dev":
+		newLayers = append(newLayers, []string{"inputs.self.devEnvs.${system}.development"})
 	case layer == "gomodule" || layer == "rustapp" || layer == "jsnpmapp" || layer == "poetryapp":
 		newLayers = append(newLayers, []string{"inputs.self.packages.${system}.default"})
 	case strings.HasPrefix(layer, "packages.dev."):

diff --git a/pkg/nix/template/oci_test.go b/pkg/nix/template/oci_test.go
@@ -332,6 +332,111 @@ func TestGetLayers(t *testing.T) {
 				})`,
 			},
 		},
+		{
+			name:   "App OCI for Go",
+			layers: []string{"gomodule"},
+			fl: Flake{
+				DevPackages: map[string]string{
+					"bash": "f2c55c8e7d3d843f75e2f18c8bf707b8a77c8a0f",
+				},
+				RuntimePackages: map[string]string{
+					"go": "d919897915f0f91216d2501b617d670deee993a0",
+				},
+			},
+			expected: []string{
+				`(nix2containerPkgs.nix2container.buildLayer { 
+					copyToRoot = [
+						inputs.self.packages.${system}.default
+					];
+				})`,
+			},
+		},
+		{
+			name:   "App OCI for Python",
+			layers: []string{"poetryapp"},
+			fl: Flake{
+				DevPackages: map[string]string{
+					"bash": "f2c55c8e7d3d843f75e2f18c8bf707b8a77c8a0f",
+				},
+				RuntimePackages: map[string]string{
+					"go": "d919897915f0f91216d2501b617d670deee993a0",
+				},
+			},
+			expected: []string{
+				`(nix2containerPkgs.nix2container.buildLayer { 
+					copyToRoot = [
+						inputs.self.packages.${system}.default
+					];
+				})`,
+			},
+		},
+		{
+			name:   "App OCI for Rust",
+			layers: []string{"rustapp"},
+			fl: Flake{
+				DevPackages: map[string]string{
+					"bash": "f2c55c8e7d3d843f75e2f18c8bf707b8a77c8a0f",
+				},
+				RuntimePackages: map[string]string{
+					"go": "d919897915f0f91216d2501b617d670deee993a0",
+				},
+			},
+			expected: []string{
+				`(nix2containerPkgs.nix2container.buildLayer { 
+					copyToRoot = [
+						inputs.self.packages.${system}.default
+					];
+				})`,
+			},
+		},
+		{
+			name:   "App OCI for NPM",
+			layers: []string{"jsnpmapp"},
+			fl: Flake{
+				DevPackages: map[string]string{
+					"bash": "f2c55c8e7d3d843f75e2f18c8bf707b8a77c8a0f",
+				},
+				RuntimePackages: map[string]string{
+					"go": "d919897915f0f91216d2501b617d670deee993a0",
+				},
+			},
+			expected: []string{
+				`(nix2containerPkgs.nix2container.buildLayer { 
+					copyToRoot = [
+						inputs.self.packages.${system}.default
+					];
+				})`,
+			},
+		},
+		{
+			name:   "App and runtime and dev",
+			layers: []string{"packages.dev", "packages.runtime", "gomodule"},
+			fl: Flake{
+				DevPackages: map[string]string{
+					"bash": "f2c55c8e7d3d843f75e2f18c8bf707b8a77c8a0f",
+				},
+				RuntimePackages: map[string]string{
+					"go": "d919897915f0f91216d2501b617d670deee993a0",
+				},
+			},
+			expected: []string{
+				`(nix2containerPkgs.nix2container.buildLayer { 
+					copyToRoot = [
+						inputs.self.devEnvs.${system}.development
+					];
+				})`,
+				`(nix2containerPkgs.nix2container.buildLayer { 
+					copyToRoot = [
+						inputs.self.runtimeEnvs.${system}.runtime
+					];
+				})`,
+				`(nix2containerPkgs.nix2container.buildLayer { 
+					copyToRoot = [
+						inputs.self.packages.${system}.default
+					];
+				})`,
+			},
+		},
 	}
 
 	for _, tt := range tests {