argocd_application: fix NPE during resource import

argoproj-labs · Jul 16, 2020 · b25af60 · b25af60
1 parent 0d84db7
commit b25af60
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/argocd/structure_application.go b/argocd/structure_application.go
@@ -351,15 +351,17 @@ func flattenApplicationSpec(s application.ApplicationSpec) (
 		"destination": flattenApplicationDestinations(
 			[]application.ApplicationDestination{s.Destination},
 		),
-		"ignore_difference":      flattenApplicationIgnoreDifferences(s.IgnoreDifferences),
-		"info":                   flattenApplicationInfo(s.Info),
-		"project":                s.Project,
-		"revision_history_limit": *s.RevisionHistoryLimit,
+		"ignore_difference": flattenApplicationIgnoreDifferences(s.IgnoreDifferences),
+		"info":              flattenApplicationInfo(s.Info),
+		"project":           s.Project,
 		"source": flattenApplicationSource(
 			[]application.ApplicationSource{s.Source},
 		),
 		"sync_policy": flattenApplicationSyncPolicy(s.SyncPolicy),
 	}
+	if s.RevisionHistoryLimit != nil {
+		spec["revision_history_limit"] = int(*s.RevisionHistoryLimit)
+	}
 	return []map[string]interface{}{spec}, nil
 }