found another place we should ignore missing values, if necessary

Author: djeebus

pkg/argo_client/manifests.go

@@ -363,7 +363,9 @@ func packageApp(ctx context.Context, source v1alpha1.ApplicationSource, refs []v
 			src := filepath.Join(appPath, valueFile)
 			dst := filepath.Join(tempAppDir, valueFile)
 			if err = copyFile(src, dst); err != nil {
-				return "", errors.Wrapf(err, "failed to copy file: %q", valueFile)
+				if !ignoreValuesFileCopyError(source, valueFile, err) {
+					return "", errors.Wrapf(err, "failed to copy file: %q", valueFile)
+				}
 			}
 		}
 	}
@@ -401,10 +403,7 @@ func processValueReference(
 	src := filepath.Join(refRepo.Directory, refPath)
 	dst := filepath.Join(tempDir, refPath)
 	if err = copyFile(src, dst); err != nil {
-		// handle source.spec.helm.ignoreMissingValues = true
-		if errors.Is(err, os.ErrNotExist) && source.Helm.IgnoreMissingValueFiles {
-			log.Debug().Str("valueFile", valueFile).Msg("ignore missing values file, because source.Helm.IgnoreMissingValueFiles is true")
-		} else {
+		if !ignoreValuesFileCopyError(source, valueFile, err) {
 			return "", errors.Wrapf(err, "failed to copy referenced value file: %q", valueFile)
 		}
 	}
@@ -416,6 +415,15 @@ func processValueReference(
 	return relPath, nil
 }
 
+func ignoreValuesFileCopyError(source v1alpha1.ApplicationSource, valueFile string, err error) bool {
+	if errors.Is(err, os.ErrNotExist) && source.Helm.IgnoreMissingValueFiles {
+		log.Debug().Str("valueFile", valueFile).Msg("ignore missing values file, because source.Helm.IgnoreMissingValueFiles is true")
+		return true
+	}
+
+	return false
+}
+
 var valueRef = regexp.MustCompile(`^\$([^/]+)/(.*)$`)
 var ErrInvalidSourceRef = errors.New("invalid value ref")
 

pkg/argo_client/manifests_test.go

@@ -205,6 +205,59 @@ func TestPackageApp(t *testing.T) {
 			),
 		},
 
+		"missing-values-can-be-accpetable": {
+			pullRequest: vcs.PullRequest{
+				CloneURL: "git@github.com:testuser/testrepo.git",
+				BaseRef:  "main",
+				HeadRef:  "update-code",
+			},
+
+			app: v1alpha1.Application{
+				Spec: v1alpha1.ApplicationSpec{
+					Sources: []v1alpha1.ApplicationSource{
+						{
+							RepoURL:        "git@github.com:testuser/testrepo.git",
+							Path:           "app1/",
+							TargetRevision: "main",
+							Helm: &v1alpha1.ApplicationSourceHelm{
+								IgnoreMissingValueFiles: true,
+								ValueFiles: []string{
+									"./values.yaml",
+									"missing.yaml",
+									"$staging/base.yaml",
+									"$staging/missing.yaml",
+								},
+							},
+						},
+						{
+							Ref:            "staging",
+							RepoURL:        "git@github.com:testuser/otherrepo.git",
+							TargetRevision: "main",
+						},
+					},
+				},
+			},
+
+			filesByRepo: map[repoAndTarget][]string{
+				repoAndTarget{"git@github.com:testuser/testrepo.git", "main"}: {
+					"app1/Chart.yaml",
+					"app1/values.yaml",
+					"app2/Chart.yaml",
+					"app2/values.yaml",
+				},
+
+				repoAndTarget{"git@github.com:testuser/otherrepo.git", "main"}: {
+					"base.yaml",
+				},
+			},
+
+			expectedFiles: newSet[string](
+				"app1/Chart.yaml",
+				"app1/values.yaml",
+				"base.yaml",
+			),
+		},
+
 		"refs-are-copied": {
 			pullRequest: vcs.PullRequest{
 				CloneURL: "git@github.com:testuser/testrepo.git",