Skip to content

Commit

Permalink
Simplify applicationSpecSchemaV3
Browse files Browse the repository at this point in the history 
Schema for `application.spec` has not changed.
  • Loading branch information
@onematchfox
onematchfox committed Dec 6, 2022
1 parent 67def9c commit 255b2b7
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 375 deletions.
2 changes: 1 addition & 1 deletion argocd/resource_argocd_application.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func resourceArgoCDApplication() *schema.Resource {
},
Schema: map[string]*schema.Schema{
"metadata": metadataSchema("applications.argoproj.io"),
"spec": applicationSpecSchemaV2(),
"spec": applicationSpecSchemaV3(),
"wait": {
Type: schema.TypeBool,
Description: "Upon application creation or update, wait for application health/sync status to be healthy/Synced, upon application deletion, wait for application to be removed, when set to true.",
Expand Down
381 changes: 7 additions & 374 deletions argocd/schema_application.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1167,380 +1167,13 @@ func applicationSpecSchemaV2() *schema.Schema {
}

func applicationSpecSchemaV3() *schema.Schema {
return &schema.Schema{
Type: schema.TypeList,
MinItems: 1,
MaxItems: 1,
Description: "ArgoCD App application resource specs. Required attributes: destination, source.",
Required: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"destination": {
Type: schema.TypeSet,
Required: true,
MinItems: 1,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"server": {
Type: schema.TypeString,
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.",
},
},
},
},
"source": {
Type: schema.TypeList,
Required: true,
MinItems: 1,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"repo_url": {
Type: schema.TypeString,
Required: true,
},
"path": {
Type: schema.TypeString,
Optional: true,
// TODO: add validator to test path is not absolute
Default: ".",
},
"target_revision": {
Type: schema.TypeString,
Optional: true,
},
"chart": {
Type: schema.TypeString,
Optional: true,
},
"helm": {
Type: schema.TypeList,
MaxItems: 1,
MinItems: 1,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"value_files": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"values": {
Type: schema.TypeString,
Optional: true,
},
"parameter": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Optional: true,
},
"value": {
Type: schema.TypeString,
Optional: true,
},
"force_string": {
Type: schema.TypeBool,
Optional: true,
Description: "force_string determines whether to tell Helm to interpret booleans and numbers as strings",
},
},
},
},
"release_name": {
Type: schema.TypeString,
Description: "The Helm release name. If omitted it will use the application name",
Optional: true,
},
"skip_crds": {
Type: schema.TypeBool,
Description: "Helm installs custom resource definitions in the crds folder by default if they are not existing. If needed, it is possible to skip the CRD installation step with this flag",
Optional: true,
},
},
},
},
"kustomize": {
Type: schema.TypeList,
MaxItems: 1,
MinItems: 1,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name_prefix": {
Type: schema.TypeString,
Optional: true,
},
"name_suffix": {
Type: schema.TypeString,
Optional: true,
},
"version": {
Type: schema.TypeString,
Optional: true,
},
"images": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"common_labels": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
ValidateFunc: validateMetadataLabels,
},
"common_annotations": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
ValidateFunc: validateMetadataAnnotations,
},
},
},
},
"directory": {
Type: schema.TypeList,
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
// Avoid drift when recurse is explicitly set to false
// Also ignore the directory node if both recurse & jsonnet are not set or ignored
if k == "spec.0.source.0.directory.0.recurse" && old == "" && new == "false" {
return true
}
if k == "spec.0.source.0.directory.#" {
_, hasRecurse := d.GetOk("spec.0.source.0.directory.0.recurse")
_, hasJsonnet := d.GetOk("spec.0.source.0.directory.0.jsonnet")

if !hasJsonnet && !hasRecurse {
return true
}
}
return false
},
MaxItems: 1,
MinItems: 1,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"recurse": {
Type: schema.TypeBool,
Optional: true,
},
"jsonnet": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
MinItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"ext_var": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Optional: true,
},
"value": {
Type: schema.TypeString,
Optional: true,
},
"code": {
Type: schema.TypeBool,
Optional: true,
},
},
},
},
"tla": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Optional: true,
},
"value": {
Type: schema.TypeString,
Optional: true,
},
"code": {
Type: schema.TypeBool,
Optional: true,
},
},
},
},
},
},
},
},
},
},
"plugin": {
Type: schema.TypeList,
MaxItems: 1,
MinItems: 1,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Optional: true,
},
"env": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Optional: true,
},
"value": {
Type: schema.TypeString,
Optional: true,
},
},
},
},
},
},
},
},
},
},
"project": {
Type: schema.TypeString,
Optional: true,
Description: "The application project, defaults to 'default'",
Default: "default",
},
"sync_policy": {
Type: schema.TypeList,
Optional: true,
MaxItems: 1,
MinItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"automated": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeBool},
},
"sync_options": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
// TODO: add a validator
},
},
"retry": {
Type: schema.TypeList,
MaxItems: 1,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"limit": {
Type: schema.TypeString,
Description: "Max number of allowed sync retries, as a string",
Optional: true,
},
"backoff": {
Type: schema.TypeMap,
Optional: true,
Elem: &schema.Schema{Type: schema.TypeString},
},
},
},
},
},
},
},
"ignore_difference": {
Type: schema.TypeList,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"group": {
Type: schema.TypeString,
Optional: true,
},
"kind": {
Type: schema.TypeString,
Optional: true,
},
"name": {
Type: schema.TypeString,
Optional: true,
},
"namespace": {
Type: schema.TypeString,
Optional: true,
},
"json_pointers": {
Type: schema.TypeSet,
Set: schema.HashString,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
"jq_path_expressions": {
Type: schema.TypeSet,
Set: schema.HashString,
Optional: true,
Elem: &schema.Schema{
Type: schema.TypeString,
},
},
},
},
},
"info": {
Type: schema.TypeSet,
Optional: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"name": {
Type: schema.TypeString,
Optional: true,
},
"value": {
Type: schema.TypeString,
Optional: true,
},
},
},
},
"revision_history_limit": {
Type: schema.TypeInt,
Optional: true,
Default: 10,
},
},
},
}
// To support deploying applications to non-default namespaces (aka project
// source namespaces), we need to do a state migration to ensure that the Id
// on existing resources is updated to include the namespace.
// For this to happen, we need to trigger a schema version upgrade on the
// application resource however, the schema of the application `spec` has
// changed from `v2`.
return applicationSpecSchemaV2()
}

func resourceArgoCDApplicationV0() *schema.Resource {
Expand Down

0 comments on commit 255b2b7

Please sign in to comment.