Only sets apply_requirements if explicitly set in locals (#130)

* Fix apply_requirements bug * Fix tests updated with bug * bump versions
transcend-io · Mar 25, 2021 · b065f4a · b065f4a
1 parent ec2ca6e
commit b065f4a
Show file tree

Hide file tree

Showing 41 changed files with 152 additions and 142 deletions.
diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-VERSION=1.3.0
+VERSION=1.3.1
 PATH_BUILD=build/
 FILE_COMMAND=terragrunt-atlantis-config
 FILE_ARCH=darwin_amd64

diff --git a/README.md b/README.md
@@ -48,7 +48,7 @@ Then, make sure `terragrunt-atlantis-config` is present on your Atlantis server.
 
 ```hcl
 variable "terragrunt_atlantis_config_version" {
-  default = "1.3.0"
+  default = "1.3.1"
 }
 
 build {
@@ -92,8 +92,7 @@ locals {
 In your `atlantis.yaml` file, you will end up seeing output like:
 
 ```yaml
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
       - "*.hcl"
@@ -169,7 +168,7 @@ You can install this tool locally to checkout what kinds of config it will gener
 Recommended: Install any version via go get:
 
 ```bash
-cd && GO111MODULE=on go get github.com/transcend-io/[email protected].0 && cd -
+cd && GO111MODULE=on go get github.com/transcend-io/[email protected].1 && cd -
 ```
 
 This module officially supports golang versions v1.13, v1.14, and v1.15, tested on CircleCI with each build

diff --git a/cmd/config.go b/cmd/config.go
@@ -50,7 +50,8 @@ type AtlantisProject struct {
 	// The terraform version to use for this project
 	TerraformVersion string `json:"terraform_version,omitempty"`
 
-	ApplyRequirements []string `json:"apply_requirements,flow"`
+	// We only want to output `apply_requirements` if explicitly stated in a local value
+	ApplyRequirements *[]string `json:"apply_requirements,omitempty"`
 }
 
 // Autoplan settings for which plans affect other plans

diff --git a/cmd/generate.go b/cmd/generate.go
@@ -263,9 +263,12 @@ func createProject(sourcePath string) (*AtlantisProject, error) {
 		workflow = locals.AtlantisWorkflow
 	}
 
-	applyRequirements := defaultApplyRequirements
-	if locals.ApplyRequirements != nil && len(locals.ApplyRequirements) > 0 {
-		applyRequirements = locals.ApplyRequirements
+	applyRequirements := &defaultApplyRequirements
+	if len(defaultApplyRequirements) == 0 {
+		applyRequirements = nil
+	}
+	if locals.ApplyRequirements != nil {
+		applyRequirements = &locals.ApplyRequirements
 	}
 
 	resolvedAutoPlan := autoPlan

diff --git a/cmd/golden/apply_overrides.yaml b/cmd/golden/apply_overrides.yaml
@@ -18,4 +18,32 @@ projects:
     - '*.hcl'
     - '*.tf*'
   dir: child_that_overrides
+- apply_requirements: []
+  autoplan:
+    enabled: false
+    when_modified:
+    - '*.hcl'
+    - '*.tf*'
+  dir: child_that_overrides_to_empty
+- autoplan:
+    enabled: false
+    when_modified:
+    - '*.hcl'
+    - '*.tf*'
+  dir: standalone_module_that_does_not_specify
+- apply_requirements:
+  - mergeable
+  autoplan:
+    enabled: false
+    when_modified:
+    - '*.hcl'
+    - '*.tf*'
+  dir: standalone_module_that_specifies
+- apply_requirements: []
+  autoplan:
+    enabled: false
+    when_modified:
+    - '*.hcl'
+    - '*.tf*'
+  dir: standalone_module_that_specifies_empty
 version: 3
diff --git a/cmd/golden/autoplan.yaml b/cmd/golden/autoplan.yaml
@@ -2,22 +2,19 @@ automerge: false
 parallel_apply: true
 parallel_plan: true
 projects:
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
     - '*.tf*'
   dir: autoplan_false
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: true
     when_modified:
     - '*.hcl'
     - '*.tf*'
   dir: autoplan_true
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: true
     when_modified:
     - '*.hcl'

diff --git a/cmd/golden/basic.yaml b/cmd/golden/basic.yaml
@@ -2,8 +2,7 @@ automerge: false
 parallel_apply: true
 parallel_plan: true
 projects:
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'

diff --git a/cmd/golden/chained_dependency.yaml b/cmd/golden/chained_dependency.yaml
@@ -2,23 +2,20 @@ automerge: false
 parallel_apply: true
 parallel_plan: true
 projects:
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
     - '*.tf*'
   dir: dependency
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
     - '*.tf*'
     - ../dependency/terragrunt.hcl
   dir: depender
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
@@ -27,8 +24,7 @@ projects:
     - ../dependency/terragrunt.hcl
     - nested/terragrunt.hcl
   dir: depender_on_depender
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'

diff --git a/cmd/golden/chained_dependency_no_flag.yaml b/cmd/golden/chained_dependency_no_flag.yaml
@@ -2,32 +2,28 @@ automerge: false
 parallel_apply: true
 parallel_plan: true
 projects:
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
     - '*.tf*'
   dir: dependency
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
     - '*.tf*'
     - ../dependency/terragrunt.hcl
   dir: depender
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
     - '*.tf*'
     - ../depender/terragrunt.hcl
     - nested/terragrunt.hcl
   dir: depender_on_depender
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'

diff --git a/cmd/golden/different_workflow_names.yaml b/cmd/golden/different_workflow_names.yaml
@@ -2,23 +2,20 @@ automerge: false
 parallel_apply: true
 parallel_plan: true
 projects:
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
     - '*.tf*'
   dir: defaultWorkflow
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
     - '*.tf*'
   dir: workflowA
   workflow: workflowA
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'

diff --git a/cmd/golden/extraArguments.yaml b/cmd/golden/extraArguments.yaml
@@ -2,8 +2,7 @@ automerge: false
 parallel_apply: true
 parallel_plan: true
 projects:
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
@@ -14,15 +13,13 @@ projects:
     - dev.tfvars
     - us-east-1.tfvars
   dir: child
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
     - '*.tf*'
   dir: no_files_at_all
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
@@ -32,16 +29,14 @@ projects:
     - dev.tfvars
     - us-east-1.tfvars
   dir: only_optional_files
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
     - '*.tf*'
     - ../terraform.tfvars
   dir: only_required_files
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'

diff --git a/cmd/golden/extra_dependencies.yaml b/cmd/golden/extra_dependencies.yaml
@@ -2,8 +2,7 @@ automerge: false
 parallel_apply: true
 parallel_plan: true
 projects:
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'

diff --git a/cmd/golden/filterInfraLiveNonProd.yaml b/cmd/golden/filterInfraLiveNonProd.yaml
@@ -2,8 +2,7 @@ automerge: false
 parallel_apply: true
 parallel_plan: true
 projects:
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
@@ -12,8 +11,7 @@ projects:
     - ../../region.hcl
     - ../env.hcl
   dir: non-prod/us-east-1/qa/mysql
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
@@ -22,8 +20,7 @@ projects:
     - ../../region.hcl
     - ../env.hcl
   dir: non-prod/us-east-1/qa/webserver-cluster
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
@@ -32,8 +29,7 @@ projects:
     - ../../region.hcl
     - ../env.hcl
   dir: non-prod/us-east-1/stage/mysql
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'

diff --git a/cmd/golden/filterInfraLiveProd.yaml b/cmd/golden/filterInfraLiveProd.yaml
@@ -2,8 +2,7 @@ automerge: false
 parallel_apply: true
 parallel_plan: true
 projects:
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'
@@ -12,8 +11,7 @@ projects:
     - ../../region.hcl
     - ../env.hcl
   dir: prod/us-east-1/prod/mysql
-- apply_requirements: []
-  autoplan:
+- autoplan:
     enabled: false
     when_modified:
     - '*.hcl'