fix: refactors tests and fixes bugs

defenseunicorns · Feb 27, 2024 · 06101ef · 06101ef
1 parent 70b2c68
commit 06101ef
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 26 deletions.
diff --git a/src/pkg/bundle/deploy.go b/src/pkg/bundle/deploy.go
@@ -369,7 +369,6 @@ func (b *Bundle) processOverrideVariables(overrideMap *map[string]map[string]*va
 			overrideVal = sharedConfigOverride
 		} else {
 			// use default v if no config v is set
-			//overrideVal = "sharedConfigOverride"
 			overrideVal = v.Default
 		}
 

diff --git a/src/pkg/bundle/remove.go b/src/pkg/bundle/remove.go
@@ -89,7 +89,7 @@ func removePackages(packagesToRemove []types.Package, b *Bundle, zarfPackageName
 		pkg := packagesToRemove[i]
 		zarfPackageName := pkg.Name
 		// use the name map if it has been set (remote pkgs where the pkg name isn't consistent)
-		if zarfPackageNameMap[pkg.Name] != "" {
+		if _, ok := zarfPackageNameMap[pkg.Name]; ok {
 			zarfPackageName = zarfPackageNameMap[pkg.Name]
 		}
 

diff --git a/src/test/bundles/01-uds-bundle/local/uds-bundle.yaml b/src/test/bundles/01-uds-bundle/local/uds-bundle.yaml
diff --git a/...dles/01-uds-bundle/remote/uds-bundle.yaml → ...est/bundles/01-uds-bundle/uds-bundle.yaml b/...dles/01-uds-bundle/remote/uds-bundle.yaml → ...est/bundles/01-uds-bundle/uds-bundle.yaml
diff --git a/src/test/e2e/bundle_test.go b/src/test/e2e/bundle_test.go
@@ -109,21 +109,14 @@ func TestLocalBundleWithRemotePkgs(t *testing.T) {
 	pkg = fmt.Sprintf("src/test/packages/podinfo/zarf-package-podinfo-%s-0.0.1.tar.zst", e2e.Arch)
 	zarfPublish(t, pkg, "localhost:889")
 
-	bundleDir := "src/test/bundles/01-uds-bundle/remote"
+	bundleDir := "src/test/bundles/01-uds-bundle"
 	bundlePath := filepath.Join(bundleDir, fmt.Sprintf("uds-bundle-example-remote-%s-0.0.1.tar.zst", e2e.Arch))
 
 	createLocal(t, bundleDir, e2e.Arch)
 	inspectLocal(t, bundlePath)
 	inspectLocalAndSBOMExtract(t, bundlePath)
 	deploy(t, bundlePath)
 	remove(t, bundlePath)
-
-	// Test create using custom tmpDir
-	runCmd(t, "create "+bundleDir+" --tmpdir ./customtmp --confirm --insecure")
-
-	// remove customtmp folder if it exists
-	err := os.RemoveAll("./customtmp")
-	require.NoError(t, err)
 }
 
 func TestPackagesFlag(t *testing.T) {
@@ -178,8 +171,8 @@ func TestResumeFlag(t *testing.T) {
 	e2e.CreateZarfPkg(t, "src/test/packages/nginx", false)
 	e2e.CreateZarfPkg(t, "src/test/packages/podinfo", false)
 
-	bundleDir := "src/test/bundles/01-uds-bundle/local"
-	bundlePath := filepath.Join(bundleDir, fmt.Sprintf("uds-bundle-example-local-%s-0.0.1.tar.zst", e2e.Arch))
+	bundleDir := "src/test/bundles/03-local-and-remote"
+	bundlePath := filepath.Join(bundleDir, fmt.Sprintf("uds-bundle-test-local-and-remote-%s-0.0.1.tar.zst", e2e.Arch))
 
 	createLocal(t, bundleDir, e2e.Arch)
 	inspectLocal(t, bundlePath)
@@ -237,7 +230,7 @@ func TestRemoteBundleWithRemotePkgs(t *testing.T) {
 	}
 
 	tarballPath := filepath.Join("build", fmt.Sprintf("uds-bundle-example-remote-%s-0.0.1.tar.zst", e2e.Arch))
-	bundlePath := "src/test/bundles/01-uds-bundle/remote"
+	bundlePath := "src/test/bundles/01-uds-bundle"
 	createRemoteInsecure(t, bundlePath, bundleRef.Registry, e2e.Arch)
 
 	// Test without oci prefix
@@ -531,4 +524,7 @@ func TestBundleTmpDir(t *testing.T) {
 	case <-time.After(10 * time.Second): // Timeout after 10 seconds
 		t.Fatal("timeout waiting for directory to get populated")
 	}
+	// remove customtmp folder if it exists
+	err = os.RemoveAll("./customtmp")
+	require.NoError(t, err)
 }