argocd_application: support for kustomize.common_annotations and sync_policy.automated.allow_empty (#48)

* argocd_application: support for kustomize.common_annotations and sync_policy.automated.allow_empty
* added application destination name attribute to both application and project

Author: oboukili

argocd/resource_argocd_application_test.go

@@ -133,6 +133,11 @@ ingress:
 						"spec.0.sync_policy.0.automated.self_heal",
 						"true",
 					),
+					resource.TestCheckResourceAttr(
+						"argocd_application.sync_policy",
+						"spec.0.sync_policy.0.automated.allow_empty",
+						"true",
+					),
 					resource.TestCheckResourceAttr(
 						"argocd_application.sync_policy",
 						"spec.0.sync_policy.0.retry.0.backoff.duration",
@@ -287,6 +292,10 @@ resource "argocd_application" "kustomize" {
 		  "this.is.a.common" = "la-bel"
 		  "another.io/one"   = "true" 
 	    }
+        common_annotations = {
+		  "this.is.a.common" = "anno-tation"
+		  "another.io/one"   = "false"
+	    }
       }
     }
 
@@ -371,8 +380,9 @@ resource "argocd_application" "sync_policy" {
     
     sync_policy {
       automated = {
-        prune     = true
-        self_heal = true
+        prune       = true
+        self_heal   = true
+        allow_empty = true
       }
       retry {
         limit   = "5"

argocd/schema_application.go

@@ -22,12 +22,17 @@ func applicationSpecSchema() *schema.Schema {
 						Schema: map[string]*schema.Schema{
 							"server": {
 								Type:     schema.TypeString,
-								Required: true,
+								Optional: true,
 							},
 							"namespace": {
 								Type:     schema.TypeString,
 								Required: true,
 							},
+							"name": {
+								Type:        schema.TypeString,
+								Optional:    true,
+								Description: "Name of the destination cluster which can be used instead of server.",
+							},
 						},
 					},
 				},
@@ -134,6 +139,12 @@ func applicationSpecSchema() *schema.Schema {
 											Elem:         &schema.Schema{Type: schema.TypeString},
 											ValidateFunc: validateMetadataLabels,
 										},
+										"common_annotations": {
+											Type:         schema.TypeMap,
+											Optional:     true,
+											Elem:         &schema.Schema{Type: schema.TypeString},
+											ValidateFunc: validateMetadataAnnotations,
+										},
 									},
 								},
 							},

argocd/schema_project.go

@@ -39,12 +39,17 @@ func projectSpecSchema() *schema.Schema {
 						Schema: map[string]*schema.Schema{
 							"server": {
 								Type:     schema.TypeString,
-								Required: true,
+								Optional: true,
 							},
 							"namespace": {
 								Type:     schema.TypeString,
 								Required: true,
 							},
+							"name": {
+								Type:        schema.TypeString,
+								Optional:    true,
+								Description: "Name of the destination cluster which can be used instead of server.",
+							},
 						},
 					},
 				},

argocd/structure_application.go

@@ -205,6 +205,12 @@ func expandApplicationSourceKustomize(in []interface{}) *application.Application
 			result.CommonLabels[k] = v.(string)
 		}
 	}
+	if cas, ok := a["common_annotations"]; ok {
+		result.CommonAnnotations = make(map[string]string, 0)
+		for k, v := range cas.(map[string]interface{}) {
+			result.CommonAnnotations[k] = v.(string)
+		}
+	}
 	return result
 }
 
@@ -262,6 +268,9 @@ func expandApplicationSyncPolicy(_sp []interface{}) (*application.SyncPolicy, er
 			if k == "self_heal" {
 				automated.SelfHeal = v.(bool)
 			}
+			if k == "allow_empty" {
+				automated.AllowEmpty = v.(bool)
+			}
 		}
 	}
 	if v, ok := sp.(map[string]interface{})["sync_options"]; ok {
@@ -357,6 +366,7 @@ func expandApplicationDestination(dest interface{}) (
 	return application.ApplicationDestination{
 		Server:    d["server"].(string),
 		Namespace: d["namespace"].(string),
+		Name:      d["name"].(string),
 	}
 }
 
@@ -408,8 +418,9 @@ func flattenApplicationSyncPolicy(sp *application.SyncPolicy) []map[string]inter
 	backoff := make(map[string]string, 0)
 	if sp.Automated != nil {
 		result["automated"] = map[string]bool{
-			"prune":     sp.Automated.Prune,
-			"self_heal": sp.Automated.SelfHeal,
+			"prune":       sp.Automated.Prune,
+			"self_heal":   sp.Automated.SelfHeal,
+			"allow_empty": sp.Automated.AllowEmpty,
 		}
 	}
 	result["sync_options"] = []string(sp.SyncOptions)
@@ -567,11 +578,12 @@ func flattenApplicationSourceKustomize(as []*application.ApplicationSourceKustom
 				images = append(images, string(i))
 			}
 			result = append(result, map[string]interface{}{
-				"common_labels": a.CommonLabels,
-				"images":        images,
-				"name_prefix":   a.NamePrefix,
-				"name_suffix":   a.NameSuffix,
-				"version":       a.Version,
+				"common_annotations": a.CommonAnnotations,
+				"common_labels":      a.CommonLabels,
+				"images":             images,
+				"name_prefix":        a.NamePrefix,
+				"name_suffix":        a.NameSuffix,
+				"version":            a.Version,
 			})
 		}
 	}
@@ -607,6 +619,7 @@ func flattenApplicationDestinations(ds []application.ApplicationDestination) (
 		result = append(result, map[string]string{
 			"namespace": d.Namespace,
 			"server":    d.Server,
+			"name":      d.Name,
 		})
 	}
 	return

docs/resources/application.md

@@ -39,11 +39,20 @@ resource "argocd_application" "kustomize" {
 
     sync_policy {
       automated = {
-        prune     = true
-        self_heal = true
+        prune       = true
+        self_heal   = true
+        allow_empty = true
       }
       # Only available from ArgoCD 1.5.0 onwards
       sync_options = ["Validate=false"]
+      retry {
+        limit   = "5"
+        backoff = {
+          duration     = "30s"
+          max_duration = "2m"
+          factor       = "2"
+        }
+      }
     }
 
     ignore_difference {
@@ -133,8 +142,9 @@ Each `info` block can have the following attributes:
 * `value` - (Optional).
 
 The `destination` block has the following attributes:
-* `server` - (Required) The cluster URL to deploy the application to.
+* `server` - (Optional) The cluster URL to deploy the application to. At most one of `server` or `name` is required.
 * `namespace` - (Required) The namespace to deploy the application to.
+* `name` - (Optional) Name of the destination cluster which can be used instead of server (url) field. At most one of `server` or `name` is required.
 
 The `sync_policy` block has the following attributes:
 * `automated` - (Optional) map(string) of strings, will keep an application synced to the target revision. Structure is documented below
@@ -144,6 +154,7 @@ The `sync_policy` block has the following attributes:
 The `sync_policy/automated` map has the following attributes:
 * `prune` - (Optional), boolean, will prune resources automatically as part of automated sync. Defaults to `false`.
 * `self_heal` - (Optional), boolean, enables auto-syncing if the live resources differ from the targeted revision manifests. Defaults to `false`.
+* `allow_empty` - (Optional), boolean, allows apps to have zero live resources. Defaults to `false`.
 
 The `sync_policy/retry` block has the following attributes:
 * `limit` - (Optional), max number of allowed sync retries, as a string.
@@ -190,6 +201,7 @@ The `kustomize` block has the following attributes:
 * `version` - (Optional) string, contains optional Kustomize version.
 * `images` - (Optional) set of strings, kustomize image overrides.
 * `common_labels` - (Optional) map(string) of strings, adds additional kustomize commonLabels.
+* `common_annotations` - (Optional) map(string) of strings, adds additional kustomize commonAnnotations.
 
 The `ksonnet` block has the following attributes:
 * `environment` - (Optional) string, Ksonnet application environment name.

docs/resources/project.md

@@ -29,6 +29,10 @@ resource "argocd_project" "myproject" {
       server    = "https://kubernetes.default.svc"
       namespace = "foo"
     }
+    destination {
+      name      = "anothercluster"
+      namespace = "bar"
+    }
     cluster_resource_whitelist {
       group = "rbac.authorization.k8s.io"
       kind  = "ClusterRoleBinding"