fix: resource update when conflict

Signed-off-by: asingh51 <[email protected]>
argoproj · Jan 30, 2025 · e9025ca · e9025ca
1 parent 43f83fa
commit e9025ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/cmd/argocd/commands/admin/backup.go b/cmd/argocd/commands/admin/backup.go
@@ -252,7 +252,7 @@ func NewImportCommand() *cobra.Command {
 
 			errors.CheckError(err)
 			for _, bakObj := range backupObjects {
-				if len(skipResourcesWithLabels) != 0 && isLabelMatches(bakObj, skipResourcesWithLabels) {
+				if isLabelMatches(bakObj, skipResourcesWithLabels) {
 					fmt.Printf("Skipping %s/%s %s in namespace %s\n", bakObj.GroupVersionKind().Group, bakObj.GroupVersionKind().Kind, bakObj.GetName(), bakObj.GetNamespace())
 					continue
 				}
@@ -512,9 +512,11 @@ func updateTracking(bak, live *unstructured.Unstructured) {
 
 // skip resource   if any of the specified label exists.
 func isLabelMatches(bak *unstructured.Unstructured, skipResourcesWithLabels []string) bool {
-	if bak == nil {
+
+	if len(skipResourcesWithLabels) == 0 {
 		return false
 	}
+
 	labels := bak.GetLabels()
 	for _, key := range skipResourcesWithLabels {
 		if _, exists := labels[key]; exists {

diff --git a/cmd/argocd/commands/admin/backup_test.go b/cmd/argocd/commands/admin/backup_test.go
@@ -93,12 +93,6 @@ func TestIsLabelMatches(t *testing.T) {
 		skipLabels []string
 		expected   bool
 	}{
-		{
-			name:       "Nil object",
-			obj:        nil,
-			skipLabels: []string{"test-label"},
-			expected:   false,
-		},
 		{
 			name: "Label matches",
 			obj: &unstructured.Unstructured{