Repository: chanzuckerberg/fogg
Pull request #400 (2020-02-04 00:54:40)

[breaking] remove atlantis support
We never got this fully working and can't really support it. Might as
well remove it.

### Summary
A description of changes or issues addressed by this PR. Provide links to relevant PRs if any.

### Test Plan
Say unittests, or list out steps to verify changes.

### References
(Optional) Additional links to provide more context.


codecov[bot]: # [Codecov](https://codecov.io/gh/chanzuckerberg/fogg/pull/400?src=pr&el=h1) Report
> Merging [#400](https://codecov.io/gh/chanzuckerberg/fogg/pull/400?src=pr&el=desc) into [master](https://codecov.io/gh/chanzuckerberg/fogg/commit/d61f096111a964343843619fa051691e8714bc57?src=pr&el=desc) will **decrease** coverage by `1.06%`.
> The diff coverage is `n/a`.

[![Impacted file tree graph](https://codecov.io/gh/chanzuckerberg/fogg/pull/400/graphs/tree.svg?width=650&token=57DhtZ7g2A&height=150&src=pr)](https://codecov.io/gh/chanzuckerberg/fogg/pull/400?src=pr&el=tree)

```diff
@@            Coverage Diff             @@
##           master     #400      +/-   ##
==========================================
- Coverage   79.22%   78.15%   -1.07%     
==========================================
  Files          25       24       -1     
  Lines        2026     1909     -117     
==========================================
- Hits         1605     1492     -113     
+ Misses        278      276       -2     
+ Partials      143      141       -2
```


| [Impacted Files](https://codecov.io/gh/chanzuckerberg/fogg/pull/400?src=pr&el=tree) | Coverage Δ | |
|---|---|---|
| [config/v2/config.go](https://codecov.io/gh/chanzuckerberg/fogg/pull/400/diff?src=pr&el=tree#diff-Y29uZmlnL3YyL2NvbmZpZy5nbw==) | `96.87% <ø> (-0.14%)` | :arrow_down: |
| [plan/plan.go](https://codecov.io/gh/chanzuckerberg/fogg/pull/400/diff?src=pr&el=tree#diff-cGxhbi9wbGFuLmdv) | `92.79% <ø> (-0.26%)` | :arrow_down: |
| [apply/apply.go](https://codecov.io/gh/chanzuckerberg/fogg/pull/400/diff?src=pr&el=tree#diff-YXBwbHkvYXBwbHkuZ28=) | `64.31% <ø> (+0.2%)` | :arrow_up: |
| [config/v2/resolvers.go](https://codecov.io/gh/chanzuckerberg/fogg/pull/400/diff?src=pr&el=tree#diff-Y29uZmlnL3YyL3Jlc29sdmVycy5nbw==) | `95.14% <ø> (-0.33%)` | :arrow_down: |
| [config/v2/validation.go](https://codecov.io/gh/chanzuckerberg/fogg/pull/400/diff?src=pr&el=tree#diff-Y29uZmlnL3YyL3ZhbGlkYXRpb24uZ28=) | `82.95% <ø> (-0.03%)` | :arrow_down: |

------

[Continue to review full report at Codecov](https://codecov.io/gh/chanzuckerberg/fogg/pull/400?src=pr&el=continue).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/chanzuckerberg/fogg/pull/400?src=pr&el=footer). Last update [d61f096...cb75168](https://codecov.io/gh/chanzuckerberg/fogg/pull/400?src=pr&el=lastupdated). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments).


Patch:
diff --git a/apply/apply.go b/apply/apply.go
index fba50e98..825b79c5 100644
--- a/apply/apply.go
+++ b/apply/apply.go
@@ -63,13 +63,6 @@ func Apply(fs afero.Fs, conf *v2.Config, tmp *templates.T, upgrade bool) error {
 		}
 	}
 
-	if p.Atlantis.Enabled {
-		e = applyTree(fs, &tmp.Atlantis, &tmp.Common, "", p.Atlantis)
-		if e != nil {
-			return errs.WrapUser(e, "unable to apply atlantis")
-		}
-	}
-
 	e = applyAccounts(fs, p, &tmp.Account, &tmp.Common)
 	if e != nil {
 		return errs.WrapUser(e, "unable to apply accounts")
diff --git a/config/v2/config.go b/config/v2/config.go
index c9124567..3e45ad3f 100644
--- a/config/v2/config.go
+++ b/config/v2/config.go
@@ -68,7 +68,6 @@ type Account struct {
 }
 
 type Tools struct {
-	Atlantis *Atlantis    `json:"atlantis,omitempty" yaml:"atlantis,omitempty"`
 	TravisCI *v1.TravisCI `json:"travis_ci,omitempty" yaml:"travis_ci,omitempty"`
 	CircleCI *CircleCI    `json:"circle_ci,omitempty" yaml:"circle_ci,omitempty"`
 	TfLint   *v1.TfLint   `json:"tflint,omitempty" yaml:"tflint,omitempty"`
@@ -80,12 +79,6 @@ type CircleCI struct {
 	SSHKeyFingerprints []string `json:"ssh_key_fingerprints" yaml:"ssh_key_fingerprints"`
 }
 
-type Atlantis struct {
-	Enabled  *bool   `json:"enabled,omitempty"`
-	RoleName *string `json:"role_name,omitempty"`
-	RolePath *string `json:"role_path,omitempty"`
-}
-
 type Env struct {
 	Common `json:",inline" yaml:",inline"`
 
@@ -291,14 +284,6 @@ func (c *Config) Generate(r *rand.Rand, size int) reflect.Value {
 					Enabled: &p,
 				}
 			}
-			if r.Float32() < 0.5 {
-				t := true
-				c.Tools.Atlantis = &Atlantis{
-					Enabled:  &t,
-					RolePath: randStringPtr(r, s),
-					RoleName: randStringPtr(r, s),
-				}
-			}
 		}
 
 		return c
diff --git a/config/v2/resolvers.go b/config/v2/resolvers.go
index c0785491..ae7fafe9 100644
--- a/config/v2/resolvers.go
+++ b/config/v2/resolvers.go
@@ -206,24 +206,6 @@ func ResolveTfLint(commons ...Common) v1.TfLint {
 	}
 }
 
-func ResolveAtlantis(commons ...Common) *Atlantis {
-	enabled := false
-	for _, c := range commons {
-		if c.Tools != nil && c.Tools.Atlantis != nil && c.Tools.Atlantis.Enabled != nil {
-			enabled = *c.Tools.Atlantis.Enabled
-		}
-	}
-
-	roleName := lastNonNil(AtlantisRoleNameGetter, commons...)
-	rolePath := lastNonNil(AtlantisRolePathGetter, commons...)
-
-	return &Atlantis{
-		Enabled:  &enabled,
-		RoleName: roleName,
-		RolePath: rolePath,
-	}
-}
-
 func ResolveTravis(commons ...Common) *v1.TravisCI {
 	enabled := false
 	buildevents := false
@@ -466,20 +448,6 @@ func OktaProviderOrgNameGetter(comm Common) *string {
 	return comm.Providers.Okta.OrgName
 }
 
-func AtlantisRolePathGetter(comm Common) *string {
-	if comm.Tools == nil || comm.Tools.Atlantis == nil {
-		return nil
-	}
-	return comm.Tools.Atlantis.RolePath
-}
-
-func AtlantisRoleNameGetter(comm Common) *string {
-	if comm.Tools == nil || comm.Tools.Atlantis == nil {
-		return nil
-	}
-	return comm.Tools.Atlantis.RoleName
-}
-
 func TravisRoleNameGetter(comm Common) *string {
 	if comm.Tools == nil || comm.Tools.TravisCI == nil {
 		return nil
diff --git a/config/v2/validation.go b/config/v2/validation.go
index b4f91f44..f5c245d4 100644
--- a/config/v2/validation.go
+++ b/config/v2/validation.go
@@ -54,7 +54,6 @@ func (c *Config) Validate() ([]string, error) {
 	errs = multierror.Append(errs, c.ValidateBlessProviders())
 	errs = multierror.Append(errs, c.ValidateOktaProviders())
 	errs = multierror.Append(errs, c.validateModules())
-	errs = multierror.Append(errs, c.ValidateAtlantis())
 	errs = multierror.Append(errs, c.ValidateTravis())
 
 	// refactor to make it easier to manage these
@@ -174,25 +173,6 @@ func (c *Config) ValidateOktaProviders() error {
 	return errs
 }
 
-func (c *Config) ValidateAtlantis() error {
-	var errs *multierror.Error
-	c.WalkComponents(func(component string, comms ...Common) {
-		a := ResolveAtlantis(comms...)
-
-		if a.Enabled != nil && *a.Enabled {
-			if a.RoleName == nil || *a.RoleName == "" {
-				errs = multierror.Append(errs, fmt.Errorf("if atlantis is enabled, role name must be specified (currently %#v in %s)", a.RoleName, component))
-			}
-
-			backendAccountId := lastNonNil(BackendAccountIdGetter, comms...)
-			if backendAccountId == nil {
-				errs = multierror.Append(errs, fmt.Errorf("if atlantis is enabled, backend acccount id must be specified (%s)", component))
-			}
-		}
-	})
-	return errs
-}
-
 func (c *Config) ValidateBlessProviders() error {
 	var errs *multierror.Error
 	c.WalkComponents(func(component string, comms ...Common) {
diff --git a/plan/atlantis.go b/plan/atlantis.go
deleted file mode 100644
index 1c1f2fe4..00000000
--- a/plan/atlantis.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package plan
-
-import (
-	"fmt"
-	"sort"
-)
-
-type Atlantis struct {
-	Enabled  bool
-	Projects []AtlantisProject
-
-	// AWSProfiles is a map of profile name -> role info
-	// TODO de-dupe this with AWSProfile in the travis-ci plan
-	AWSProfiles map[string]AWSRole
-}
-
-type AtlantisProject struct {
-	Name             string `yaml:"name"`
-	Dir              string `yaml:"dir"`
-	TerraformVersion string `yaml:"terraform_version"`
-	PathToRepoRoot   string `yaml:"path_to_repo_root"`
-}
-
-type AWSRole struct {
-	AccountID string `yaml:"account_id"`
-	RolePath  string `yaml:"role_path"`
-	RoleName  string `yaml:"role_name"`
-}
-
-// buildAtlantis will walk all the components and build an atlantis plan
-func (p *Plan) buildAtlantis() Atlantis {
-	// TODO This func has a lot of duplication.
-	enabled := false
-	projects := []AtlantisProject{}
-	profiles := map[string]AWSRole{}
-
-	if p.Global.Atlantis.Enabled {
-		enabled = true
-		proj := AtlantisProject{
-			Name:             "global",
-			Dir:              "terraform/global",
-			PathToRepoRoot:   p.Global.PathToRepoRoot,
-			TerraformVersion: p.Global.TerraformVersion,
-		}
-
-		projects = append(projects, proj)
-
-		profiles[p.Global.Backend.Profile] = AWSRole{
-			AccountID: *p.Global.Backend.AccountID,
-			RoleName:  p.Global.Atlantis.RoleName,
-			RolePath:  p.Global.Atlantis.RolePath,
-		}
-
-		if p.Global.Providers.AWS != nil {
-			a := *p.Global.Providers.AWS
-			profiles[a.Profile] = AWSRole{
-				AccountID: *p.Global.Backend.AccountID,
-				RoleName:  p.Global.Atlantis.RoleName,
-				RolePath:  p.Global.Atlantis.RolePath,
-			}
-		}
-	}
-
-	for name, acct := range p.Accounts {
-		if acct.Atlantis.Enabled {
-			enabled = true
-			proj := AtlantisProject{
-				Name:             fmt.Sprintf("accounts/%s", name),
-				Dir:              fmt.Sprintf("terraform/accounts/%s", name),
-				PathToRepoRoot:   acct.PathToRepoRoot,
-				TerraformVersion: acct.TerraformVersion,
-			}
-			projects = append(projects, proj)
-
-			profiles[acct.Backend.Profile] = AWSRole{
-				AccountID: *acct.Backend.AccountID,
-				RoleName:  acct.Atlantis.RoleName,
-				RolePath:  acct.Atlantis.RolePath,
-			}
-
-			if acct.Providers.AWS != nil {
-				a := *acct.Providers.AWS
-				profiles[a.Profile] = AWSRole{
-					AccountID: a.AccountID.String(),
-					RoleName:  acct.Atlantis.RoleName,
-					RolePath:  acct.Atlantis.RolePath,
-				}
-			}
-		}
-	}
-
-	for envName, env := range p.Envs {
-		for cName, c := range env.Components {
-			if c.Atlantis.Enabled {
-				enabled = true
-				p := AtlantisProject{
-					Name:             fmt.Sprintf("%s/%s", envName, cName),
-					Dir:              fmt.Sprintf("terraform/envs/%s/%s", envName, cName),
-					PathToRepoRoot:   c.PathToRepoRoot,
-					TerraformVersion: c.TerraformVersion,
-				}
-				projects = append(projects, p)
-
-				profiles[c.Backend.Profile] = AWSRole{
-					AccountID: *c.Backend.AccountID,
-					RoleName:  c.Atlantis.RoleName,
-					RolePath:  c.Atlantis.RolePath,
-				}
-
-				if c.Providers.AWS != nil {
-					a := *c.Providers.AWS
-					profiles[a.Profile] = AWSRole{
-						AccountID: a.AccountID.String(),
-						RoleName:  c.Atlantis.RoleName,
-						RolePath:  c.Atlantis.RolePath,
-					}
-				}
-			}
-		}
-	}
-
-	// sort so that we get stable output
-	sort.SliceStable(projects, func(i, j int) bool {
-		return projects[i].Name < projects[j].Name
-	})
-
-	return Atlantis{
-		Enabled:     enabled,
-		Projects:    projects,
-		AWSProfiles: profiles,
-	}
-}
diff --git a/plan/aws_role.go b/plan/aws_role.go
new file mode 100644
index 00000000..ffe05ed1
--- /dev/null
+++ b/plan/aws_role.go
@@ -0,0 +1,7 @@
+package plan
+
+type AWSRole struct {
+	AccountID string `yaml:"account_id"`
+	RolePath  string `yaml:"role_path"`
+	RoleName  string `yaml:"role_name"`
+}
diff --git a/plan/plan.go b/plan/plan.go
index 3f57d228..a95282fc 100644
--- a/plan/plan.go
+++ b/plan/plan.go
@@ -16,7 +16,6 @@ import (
 // Plan represents a set of actions to take
 type Plan struct {
 	Accounts map[string]Account `json:"account" yaml:"account"`
-	Atlantis Atlantis           `json:"atlantis" yaml:"atlantis"`
 	Envs     map[string]Env     `json:"envs" yaml:"envs"`
 	Global   Component          `json:"global" yaml:"global"`
 	Modules  map[string]Module  `json:"modules" yaml:"modules"`
@@ -35,7 +34,6 @@ type Common struct {
 type ComponentCommon struct {
 	Common `yaml:",inline"`
 
-	Atlantis  AtlantisComponent `yaml:"atlantis"`
 	Backend   AWSBackend        `json:"backend" yaml:"backend"`
 	ExtraVars map[string]string `json:"extra_vars" yaml:"extra_vars"`
 	Owner     string            `json:"owner" yaml:"owner"`
@@ -47,12 +45,6 @@ type ComponentCommon struct {
 	CircleCI CircleCIComponent
 }
 
-type AtlantisComponent struct {
-	Enabled  bool   `yaml:"enabled"`
-	RoleName string `yaml:"role_name"`
-	RolePath string `yaml:"role_path"`
-}
-
 type TravisCIComponent struct {
 	CIComponent
 }
@@ -233,7 +225,6 @@ func Eval(c *v2.Config) (*Plan, error) {
 	}
 
 	p.Modules = p.buildModules(c)
-	p.Atlantis = p.buildAtlantis()
 	p.TravisCI = p.buildTravisCIConfig(c, v)
 	p.CircleCI = p.buildCircleCIConfig(c, v)
 
@@ -412,16 +403,6 @@ func resolveComponentCommon(commons ...v2.Common) ComponentCommon {
 		Enabled: *tflintConfig.Enabled,
 	}
 
-	atlantisConfig := v2.ResolveAtlantis(commons...)
-
-	atlantisPlan := AtlantisComponent{
-		Enabled: *atlantisConfig.Enabled,
-	}
-	if atlantisPlan.Enabled {
-		atlantisPlan.RoleName = *atlantisConfig.RoleName
-		atlantisPlan.RolePath = *atlantisConfig.RolePath
-	}
-
 	travisConfig := v2.ResolveTravis(commons...)
 	travisPlan := TravisCIComponent{
 		CIComponent: CIComponent{
@@ -451,7 +432,6 @@ func resolveComponentCommon(commons ...v2.Common) ComponentCommon {
 	}
 
 	return ComponentCommon{
-		Atlantis: atlantisPlan,
 		Backend: AWSBackend{
 			AccountID:   v2.ResolveOptionalString(v2.BackendAccountIdGetter, commons...),
 			Region:      v2.ResolveRequiredString(v2.BackendRegionGetter, commons...),
diff --git a/templates/account/Makefile.tmpl b/templates/account/Makefile.tmpl
index 5e5004aa..627ae243 100644
--- a/templates/account/Makefile.tmpl
+++ b/templates/account/Makefile.tmpl
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := {{ .TerraformVersion }}
 export TFLINT_ENABLED := {{ if .TfLint.Enabled }}1{{ else }}0{{ end }}
 export TF_PLUGIN_CACHE_DIR := {{ .PathToRepoRoot }}/.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := {{ if .Atlantis.Enabled }}1{{ else }}0{{ end }}
 export AWS_BACKEND_PROFILE := {{ .Backend.Profile }}
 {{if .Providers.AWS}}
 export AWS_PROVIDER_PROFILE := {{ .Providers.AWS.Profile }}
diff --git a/templates/atlantis/atlantis.yaml.tmpl b/templates/atlantis/atlantis.yaml.tmpl
deleted file mode 100644
index a7259ac4..00000000
--- a/templates/atlantis/atlantis.yaml.tmpl
+++ /dev/null
@@ -1,22 +0,0 @@
-{{ template "fogg_header" }}
----
-version: 3
-projects:
-{{ range $project := .Projects }}
-  - name: {{ $project.Name }}
-    dir: {{ $project.Dir }}
-    workflow: fogg
-    autoplan:
-      when_modified: ["{{ .PathToRepoRoot }}terraform/modules/*/*.tf", "*.tf*"]
-      enabled: true
-{{ end }}
-
-workflows:
-  fogg:
-    plan:
-      steps:
-        - run: make setup
-        - run: make plan MODE=atlantis
-    apply:
-      steps:
-        - run: make apply MODE=atlantis
diff --git a/templates/atlantis/config/atlantis-aws-config.tmpl b/templates/atlantis/config/atlantis-aws-config.tmpl
deleted file mode 100644
index f9dd89b6..00000000
--- a/templates/atlantis/config/atlantis-aws-config.tmpl
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ range $name, $profile := .AWSProfiles }}
-[profile {{ $name }}]
-role_arn = arn:aws:iam::{{ $profile.AccountID }}:role/{{ list $profile.RolePath $profile.RoleName | join "/" }}
-credential_source = Ec2InstanceMetadata
-{{ end }}
\ No newline at end of file
diff --git a/templates/global/Makefile.tmpl b/templates/global/Makefile.tmpl
index 5e5004aa..627ae243 100644
--- a/templates/global/Makefile.tmpl
+++ b/templates/global/Makefile.tmpl
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := {{ .TerraformVersion }}
 export TFLINT_ENABLED := {{ if .TfLint.Enabled }}1{{ else }}0{{ end }}
 export TF_PLUGIN_CACHE_DIR := {{ .PathToRepoRoot }}/.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := {{ if .Atlantis.Enabled }}1{{ else }}0{{ end }}
 export AWS_BACKEND_PROFILE := {{ .Backend.Profile }}
 {{if .Providers.AWS}}
 export AWS_PROVIDER_PROFILE := {{ .Providers.AWS.Profile }}
diff --git a/templates/repo/scripts/common.mk b/templates/repo/scripts/common.mk
index e782adf8..7ce87601 100644
--- a/templates/repo/scripts/common.mk
+++ b/templates/repo/scripts/common.mk
@@ -15,12 +15,6 @@ export TF_IN_AUTOMATION=1
 terraform_command ?= $(TFENV_DIR)/versions/$(TERRAFORM_VERSION)/terraform
 MODE ?= local
 
-ifeq ($(MODE),atlantis)
-	export AWS_CONFIG_FILE=$(REPO_ROOT)/config/atlantis-aws-config
-	TF_ARGS ?= -no-color
-endif
-
-
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
 		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
diff --git a/templates/repo/scripts/component.mk b/templates/repo/scripts/component.mk
index 6ca44d12..b7acf472 100644
--- a/templates/repo/scripts/component.mk
+++ b/templates/repo/scripts/component.mk
@@ -61,34 +61,12 @@ ifeq ($(HEROKU_PROVIDER),1)
 endif
 .PHONY: check-auth-heroku
 
-ifeq ($(MODE),local)
 plan: check-auth init fmt ## run a terraform plan
 	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false
-else ifeq ($(MODE),atlantis)
-plan: check-auth init lint
-	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false -out $(PLANFILE) | scenery
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: plan
 
-ifeq ($(MODE),local)
 apply: check-auth init ## run a terraform apply
-ifeq ($(ATLANTIS_ENABLED),1)
-ifneq ($(FORCE),1)
-	@echo "`tput bold`This component is configured to be used with atlantis. If you want to override and apply locally, add FORCE=1.`tput sgr0`"
-	exit -1
-endif
-endif
 	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=$(AUTO_APPROVE)
-else ifeq ($(MODE),atlantis)
-apply: check-auth ## run a terraform apply
-	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=true $(PLANFILE)
-else
-	echo "Unknown mode: $(MODE)"
-	exit -1
-endif
 .PHONY: apply
 
 docs:
@@ -104,14 +82,7 @@ test:
 .PHONY: test
 
 init: terraform check-auth ## run terraform init for this component
-ifeq ($(MODE),local)
 	@$(terraform_command) init -input=false
-else ifeq ($(MODE),atlantis)
-	@$(terraform_command) init $(TF_ARGS) -input=false
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: init
 
 check-plan: init check-auth ## run a terraform plan and check that it does not fail
diff --git a/templates/templates.go b/templates/templates.go
index 2530e475..d174a87a 100644
--- a/templates/templates.go
+++ b/templates/templates.go
@@ -7,7 +7,6 @@ import (
 
 type T struct {
 	Account          packr.Box
-	Atlantis         packr.Box
 	Common           packr.Box
 	Components       map[v1.ComponentKind]packr.Box
 	Env              packr.Box
@@ -20,9 +19,8 @@ type T struct {
 }
 
 var Templates = &T{
-	Account:  packr.NewBox("account"),
-	Atlantis: packr.NewBox("atlantis"),
-	Common:   packr.NewBox("common"),
+	Account: packr.NewBox("account"),
+	Common:  packr.NewBox("common"),
 	Components: map[v1.ComponentKind]packr.Box{
 		v1.ComponentKindTerraform:    packr.NewBox("component/terraform"),
 		v1.ComponentKindHelmTemplate: packr.NewBox("component/helm_template"),


Test patch:
diff --git a/config/v2/config_test.go b/config/v2/config_test.go
index cd617b45..e5e7d7ed 100644
--- a/config/v2/config_test.go
+++ b/config/v2/config_test.go
@@ -185,23 +185,3 @@ func TestReadBlessProviderYaml(t *testing.T) {
 	r.Equal("0.0.0", *c.Defaults.Providers.Bless.Version)
 	r.Equal([]string{"a", "b"}, c.Defaults.Providers.Bless.AdditionalRegions)
 }
-
-func TestReadAtlantis(t *testing.T) {
-	r := require.New(t)
-
-	b, e := util.TestFile("v2_full")
-	r.NoError(e)
-	r.NotNil(b)
-
-	fs, _, e := util.TestFs()
-	r.NoError(e)
-	e = afero.WriteFile(fs, "fogg.json", b, 0644)
-	r.NoError(e)
-	c, e := ReadConfig(fs, b, "fogg.json")
-
-	r.NotNil(c.Defaults.Tools)
-	r.NotNil(c.Defaults.Tools.Atlantis)
-	r.True(*c.Defaults.Tools.Atlantis.Enabled)
-	r.Equal("foo", *c.Defaults.Tools.Atlantis.RolePath)
-	r.Equal("bar", *c.Defaults.Tools.Atlantis.RoleName)
-}
diff --git a/testdata/bless_provider/scripts/common.mk b/testdata/bless_provider/scripts/common.mk
index e782adf8..7ce87601 100644
--- a/testdata/bless_provider/scripts/common.mk
+++ b/testdata/bless_provider/scripts/common.mk
@@ -15,12 +15,6 @@ export TF_IN_AUTOMATION=1
 terraform_command ?= $(TFENV_DIR)/versions/$(TERRAFORM_VERSION)/terraform
 MODE ?= local
 
-ifeq ($(MODE),atlantis)
-	export AWS_CONFIG_FILE=$(REPO_ROOT)/config/atlantis-aws-config
-	TF_ARGS ?= -no-color
-endif
-
-
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
 		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
diff --git a/testdata/bless_provider/scripts/component.mk b/testdata/bless_provider/scripts/component.mk
index 6ca44d12..b7acf472 100644
--- a/testdata/bless_provider/scripts/component.mk
+++ b/testdata/bless_provider/scripts/component.mk
@@ -61,34 +61,12 @@ ifeq ($(HEROKU_PROVIDER),1)
 endif
 .PHONY: check-auth-heroku
 
-ifeq ($(MODE),local)
 plan: check-auth init fmt ## run a terraform plan
 	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false
-else ifeq ($(MODE),atlantis)
-plan: check-auth init lint
-	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false -out $(PLANFILE) | scenery
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: plan
 
-ifeq ($(MODE),local)
 apply: check-auth init ## run a terraform apply
-ifeq ($(ATLANTIS_ENABLED),1)
-ifneq ($(FORCE),1)
-	@echo "`tput bold`This component is configured to be used with atlantis. If you want to override and apply locally, add FORCE=1.`tput sgr0`"
-	exit -1
-endif
-endif
 	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=$(AUTO_APPROVE)
-else ifeq ($(MODE),atlantis)
-apply: check-auth ## run a terraform apply
-	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=true $(PLANFILE)
-else
-	echo "Unknown mode: $(MODE)"
-	exit -1
-endif
 .PHONY: apply
 
 docs:
@@ -104,14 +82,7 @@ test:
 .PHONY: test
 
 init: terraform check-auth ## run terraform init for this component
-ifeq ($(MODE),local)
 	@$(terraform_command) init -input=false
-else ifeq ($(MODE),atlantis)
-	@$(terraform_command) init $(TF_ARGS) -input=false
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: init
 
 check-plan: init check-auth ## run a terraform plan and check that it does not fail
diff --git a/testdata/bless_provider/terraform/accounts/foo/Makefile b/testdata/bless_provider/terraform/accounts/foo/Makefile
index a71eb875..cc7c7cce 100644
--- a/testdata/bless_provider/terraform/accounts/foo/Makefile
+++ b/testdata/bless_provider/terraform/accounts/foo/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 1.1.1
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := foofoo
 
 
diff --git a/testdata/bless_provider/terraform/global/Makefile b/testdata/bless_provider/terraform/global/Makefile
index 3ca4cc81..b8ceb2fa 100644
--- a/testdata/bless_provider/terraform/global/Makefile
+++ b/testdata/bless_provider/terraform/global/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 1.1.1
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := foofoo
 
 
diff --git a/testdata/github_provider/scripts/common.mk b/testdata/github_provider/scripts/common.mk
index e782adf8..7ce87601 100644
--- a/testdata/github_provider/scripts/common.mk
+++ b/testdata/github_provider/scripts/common.mk
@@ -15,12 +15,6 @@ export TF_IN_AUTOMATION=1
 terraform_command ?= $(TFENV_DIR)/versions/$(TERRAFORM_VERSION)/terraform
 MODE ?= local
 
-ifeq ($(MODE),atlantis)
-	export AWS_CONFIG_FILE=$(REPO_ROOT)/config/atlantis-aws-config
-	TF_ARGS ?= -no-color
-endif
-
-
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
 		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
diff --git a/testdata/github_provider/scripts/component.mk b/testdata/github_provider/scripts/component.mk
index 6ca44d12..b7acf472 100644
--- a/testdata/github_provider/scripts/component.mk
+++ b/testdata/github_provider/scripts/component.mk
@@ -61,34 +61,12 @@ ifeq ($(HEROKU_PROVIDER),1)
 endif
 .PHONY: check-auth-heroku
 
-ifeq ($(MODE),local)
 plan: check-auth init fmt ## run a terraform plan
 	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false
-else ifeq ($(MODE),atlantis)
-plan: check-auth init lint
-	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false -out $(PLANFILE) | scenery
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: plan
 
-ifeq ($(MODE),local)
 apply: check-auth init ## run a terraform apply
-ifeq ($(ATLANTIS_ENABLED),1)
-ifneq ($(FORCE),1)
-	@echo "`tput bold`This component is configured to be used with atlantis. If you want to override and apply locally, add FORCE=1.`tput sgr0`"
-	exit -1
-endif
-endif
 	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=$(AUTO_APPROVE)
-else ifeq ($(MODE),atlantis)
-apply: check-auth ## run a terraform apply
-	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=true $(PLANFILE)
-else
-	echo "Unknown mode: $(MODE)"
-	exit -1
-endif
 .PHONY: apply
 
 docs:
@@ -104,14 +82,7 @@ test:
 .PHONY: test
 
 init: terraform check-auth ## run terraform init for this component
-ifeq ($(MODE),local)
 	@$(terraform_command) init -input=false
-else ifeq ($(MODE),atlantis)
-	@$(terraform_command) init $(TF_ARGS) -input=false
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: init
 
 check-plan: init check-auth ## run a terraform plan and check that it does not fail
diff --git a/testdata/github_provider/terraform/accounts/foo/Makefile b/testdata/github_provider/terraform/accounts/foo/Makefile
index 88412450..3afc7dc3 100644
--- a/testdata/github_provider/terraform/accounts/foo/Makefile
+++ b/testdata/github_provider/terraform/accounts/foo/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 1.1.1
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := foo
 
 
diff --git a/testdata/github_provider/terraform/global/Makefile b/testdata/github_provider/terraform/global/Makefile
index b81c4ac3..e4bfd01a 100644
--- a/testdata/github_provider/terraform/global/Makefile
+++ b/testdata/github_provider/terraform/global/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 1.1.1
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := foo
 
 
diff --git a/testdata/okta_provider/scripts/common.mk b/testdata/okta_provider/scripts/common.mk
index e782adf8..7ce87601 100644
--- a/testdata/okta_provider/scripts/common.mk
+++ b/testdata/okta_provider/scripts/common.mk
@@ -15,12 +15,6 @@ export TF_IN_AUTOMATION=1
 terraform_command ?= $(TFENV_DIR)/versions/$(TERRAFORM_VERSION)/terraform
 MODE ?= local
 
-ifeq ($(MODE),atlantis)
-	export AWS_CONFIG_FILE=$(REPO_ROOT)/config/atlantis-aws-config
-	TF_ARGS ?= -no-color
-endif
-
-
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
 		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
diff --git a/testdata/okta_provider/scripts/component.mk b/testdata/okta_provider/scripts/component.mk
index 6ca44d12..b7acf472 100644
--- a/testdata/okta_provider/scripts/component.mk
+++ b/testdata/okta_provider/scripts/component.mk
@@ -61,34 +61,12 @@ ifeq ($(HEROKU_PROVIDER),1)
 endif
 .PHONY: check-auth-heroku
 
-ifeq ($(MODE),local)
 plan: check-auth init fmt ## run a terraform plan
 	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false
-else ifeq ($(MODE),atlantis)
-plan: check-auth init lint
-	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false -out $(PLANFILE) | scenery
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: plan
 
-ifeq ($(MODE),local)
 apply: check-auth init ## run a terraform apply
-ifeq ($(ATLANTIS_ENABLED),1)
-ifneq ($(FORCE),1)
-	@echo "`tput bold`This component is configured to be used with atlantis. If you want to override and apply locally, add FORCE=1.`tput sgr0`"
-	exit -1
-endif
-endif
 	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=$(AUTO_APPROVE)
-else ifeq ($(MODE),atlantis)
-apply: check-auth ## run a terraform apply
-	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=true $(PLANFILE)
-else
-	echo "Unknown mode: $(MODE)"
-	exit -1
-endif
 .PHONY: apply
 
 docs:
@@ -104,14 +82,7 @@ test:
 .PHONY: test
 
 init: terraform check-auth ## run terraform init for this component
-ifeq ($(MODE),local)
 	@$(terraform_command) init -input=false
-else ifeq ($(MODE),atlantis)
-	@$(terraform_command) init $(TF_ARGS) -input=false
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: init
 
 check-plan: init check-auth ## run a terraform plan and check that it does not fail
diff --git a/testdata/okta_provider/terraform/accounts/foo/Makefile b/testdata/okta_provider/terraform/accounts/foo/Makefile
index a71eb875..cc7c7cce 100644
--- a/testdata/okta_provider/terraform/accounts/foo/Makefile
+++ b/testdata/okta_provider/terraform/accounts/foo/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 1.1.1
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := foofoo
 
 
diff --git a/testdata/okta_provider/terraform/global/Makefile b/testdata/okta_provider/terraform/global/Makefile
index 3ca4cc81..b8ceb2fa 100644
--- a/testdata/okta_provider/terraform/global/Makefile
+++ b/testdata/okta_provider/terraform/global/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 1.1.1
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := foofoo
 
 
diff --git a/testdata/snowflake_provider/scripts/common.mk b/testdata/snowflake_provider/scripts/common.mk
index e782adf8..7ce87601 100644
--- a/testdata/snowflake_provider/scripts/common.mk
+++ b/testdata/snowflake_provider/scripts/common.mk
@@ -15,12 +15,6 @@ export TF_IN_AUTOMATION=1
 terraform_command ?= $(TFENV_DIR)/versions/$(TERRAFORM_VERSION)/terraform
 MODE ?= local
 
-ifeq ($(MODE),atlantis)
-	export AWS_CONFIG_FILE=$(REPO_ROOT)/config/atlantis-aws-config
-	TF_ARGS ?= -no-color
-endif
-
-
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
 		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
diff --git a/testdata/snowflake_provider/scripts/component.mk b/testdata/snowflake_provider/scripts/component.mk
index 6ca44d12..b7acf472 100644
--- a/testdata/snowflake_provider/scripts/component.mk
+++ b/testdata/snowflake_provider/scripts/component.mk
@@ -61,34 +61,12 @@ ifeq ($(HEROKU_PROVIDER),1)
 endif
 .PHONY: check-auth-heroku
 
-ifeq ($(MODE),local)
 plan: check-auth init fmt ## run a terraform plan
 	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false
-else ifeq ($(MODE),atlantis)
-plan: check-auth init lint
-	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false -out $(PLANFILE) | scenery
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: plan
 
-ifeq ($(MODE),local)
 apply: check-auth init ## run a terraform apply
-ifeq ($(ATLANTIS_ENABLED),1)
-ifneq ($(FORCE),1)
-	@echo "`tput bold`This component is configured to be used with atlantis. If you want to override and apply locally, add FORCE=1.`tput sgr0`"
-	exit -1
-endif
-endif
 	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=$(AUTO_APPROVE)
-else ifeq ($(MODE),atlantis)
-apply: check-auth ## run a terraform apply
-	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=true $(PLANFILE)
-else
-	echo "Unknown mode: $(MODE)"
-	exit -1
-endif
 .PHONY: apply
 
 docs:
@@ -104,14 +82,7 @@ test:
 .PHONY: test
 
 init: terraform check-auth ## run terraform init for this component
-ifeq ($(MODE),local)
 	@$(terraform_command) init -input=false
-else ifeq ($(MODE),atlantis)
-	@$(terraform_command) init $(TF_ARGS) -input=false
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: init
 
 check-plan: init check-auth ## run a terraform plan and check that it does not fail
diff --git a/testdata/snowflake_provider/terraform/accounts/foo/Makefile b/testdata/snowflake_provider/terraform/accounts/foo/Makefile
index 88412450..3afc7dc3 100644
--- a/testdata/snowflake_provider/terraform/accounts/foo/Makefile
+++ b/testdata/snowflake_provider/terraform/accounts/foo/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 1.1.1
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := foo
 
 
diff --git a/testdata/snowflake_provider/terraform/global/Makefile b/testdata/snowflake_provider/terraform/global/Makefile
index b81c4ac3..e4bfd01a 100644
--- a/testdata/snowflake_provider/terraform/global/Makefile
+++ b/testdata/snowflake_provider/terraform/global/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 1.1.1
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := foo
 
 
diff --git a/testdata/v1_full/scripts/common.mk b/testdata/v1_full/scripts/common.mk
index e782adf8..7ce87601 100644
--- a/testdata/v1_full/scripts/common.mk
+++ b/testdata/v1_full/scripts/common.mk
@@ -15,12 +15,6 @@ export TF_IN_AUTOMATION=1
 terraform_command ?= $(TFENV_DIR)/versions/$(TERRAFORM_VERSION)/terraform
 MODE ?= local
 
-ifeq ($(MODE),atlantis)
-	export AWS_CONFIG_FILE=$(REPO_ROOT)/config/atlantis-aws-config
-	TF_ARGS ?= -no-color
-endif
-
-
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
 		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
diff --git a/testdata/v1_full/scripts/component.mk b/testdata/v1_full/scripts/component.mk
index 6ca44d12..b7acf472 100644
--- a/testdata/v1_full/scripts/component.mk
+++ b/testdata/v1_full/scripts/component.mk
@@ -61,34 +61,12 @@ ifeq ($(HEROKU_PROVIDER),1)
 endif
 .PHONY: check-auth-heroku
 
-ifeq ($(MODE),local)
 plan: check-auth init fmt ## run a terraform plan
 	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false
-else ifeq ($(MODE),atlantis)
-plan: check-auth init lint
-	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false -out $(PLANFILE) | scenery
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: plan
 
-ifeq ($(MODE),local)
 apply: check-auth init ## run a terraform apply
-ifeq ($(ATLANTIS_ENABLED),1)
-ifneq ($(FORCE),1)
-	@echo "`tput bold`This component is configured to be used with atlantis. If you want to override and apply locally, add FORCE=1.`tput sgr0`"
-	exit -1
-endif
-endif
 	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=$(AUTO_APPROVE)
-else ifeq ($(MODE),atlantis)
-apply: check-auth ## run a terraform apply
-	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=true $(PLANFILE)
-else
-	echo "Unknown mode: $(MODE)"
-	exit -1
-endif
 .PHONY: apply
 
 docs:
@@ -104,14 +82,7 @@ test:
 .PHONY: test
 
 init: terraform check-auth ## run terraform init for this component
-ifeq ($(MODE),local)
 	@$(terraform_command) init -input=false
-else ifeq ($(MODE),atlantis)
-	@$(terraform_command) init $(TF_ARGS) -input=false
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: init
 
 check-plan: init check-auth ## run a terraform plan and check that it does not fail
diff --git a/testdata/v1_full/terraform/accounts/bar/Makefile b/testdata/v1_full/terraform/accounts/bar/Makefile
index 7a0e614f..aa5c90e4 100644
--- a/testdata/v1_full/terraform/accounts/bar/Makefile
+++ b/testdata/v1_full/terraform/accounts/bar/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 0.13.0
 export TFLINT_ENABLED := 1
 export TF_PLUGIN_CACHE_DIR := ../../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := czi-bar
 
 export AWS_PROVIDER_PROFILE := czi-bar
diff --git a/testdata/v1_full/terraform/accounts/foo/Makefile b/testdata/v1_full/terraform/accounts/foo/Makefile
index b8dc9966..66faad0a 100644
--- a/testdata/v1_full/terraform/accounts/foo/Makefile
+++ b/testdata/v1_full/terraform/accounts/foo/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 0.12.0
 export TFLINT_ENABLED := 1
 export TF_PLUGIN_CACHE_DIR := ../../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := czi-foo
 
 export AWS_PROVIDER_PROFILE := czi-foo
diff --git a/testdata/v1_full/terraform/global/Makefile b/testdata/v1_full/terraform/global/Makefile
index c02c48fd..c022bc7a 100644
--- a/testdata/v1_full/terraform/global/Makefile
+++ b/testdata/v1_full/terraform/global/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 0.11.0
 export TFLINT_ENABLED := 1
 export TF_PLUGIN_CACHE_DIR := ../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := czi
 
 export AWS_PROVIDER_PROFILE := czi
diff --git a/testdata/v2_full/atlantis.yaml b/testdata/v2_full/atlantis.yaml
deleted file mode 100644
index b09b3edd..00000000
--- a/testdata/v2_full/atlantis.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-
-# Auto-generated by fogg. Do not edit
-# Make improvements in fogg, so that everyone can benefit.
-
----
-version: 3
-projects:
-
-  - name: accounts/bar
-    dir: terraform/accounts/bar
-    workflow: fogg
-    autoplan:
-      when_modified: ["../../../terraform/modules/*/*.tf", "*.tf*"]
-      enabled: true
-
-  - name: accounts/foo
-    dir: terraform/accounts/foo
-    workflow: fogg
-    autoplan:
-      when_modified: ["../../../terraform/modules/*/*.tf", "*.tf*"]
-      enabled: true
-
-  - name: global
-    dir: terraform/global
-    workflow: fogg
-    autoplan:
-      when_modified: ["../../terraform/modules/*/*.tf", "*.tf*"]
-      enabled: true
-
-  - name: staging/comp1
-    dir: terraform/envs/staging/comp1
-    workflow: fogg
-    autoplan:
-      when_modified: ["../../../../terraform/modules/*/*.tf", "*.tf*"]
-      enabled: true
-
-  - name: staging/comp2
-    dir: terraform/envs/staging/comp2
-    workflow: fogg
-    autoplan:
-      when_modified: ["../../../../terraform/modules/*/*.tf", "*.tf*"]
-      enabled: true
-
-  - name: staging/comp_helm_template
-    dir: terraform/envs/staging/comp_helm_template
-    workflow: fogg
-    autoplan:
-      when_modified: ["../../../../terraform/modules/*/*.tf", "*.tf*"]
-      enabled: true
-
-  - name: staging/vpc
-    dir: terraform/envs/staging/vpc
-    workflow: fogg
-    autoplan:
-      when_modified: ["../../../../terraform/modules/*/*.tf", "*.tf*"]
-      enabled: true
-
-
-workflows:
-  fogg:
-    plan:
-      steps:
-        - run: make setup
-        - run: make plan MODE=atlantis
-    apply:
-      steps:
-        - run: make apply MODE=atlantis
diff --git a/testdata/v2_full/config/atlantis-aws-config b/testdata/v2_full/config/atlantis-aws-config
deleted file mode 100644
index 6ce79a36..00000000
--- a/testdata/v2_full/config/atlantis-aws-config
+++ /dev/null
@@ -1,8 +0,0 @@
-
-[profile comp1]
-role_arn = arn:aws:iam::1234:role/foo/bar
-credential_source = Ec2InstanceMetadata
-
-[profile profile]
-role_arn = arn:aws:iam::456:role/foo/bar
-credential_source = Ec2InstanceMetadata
diff --git a/testdata/v2_full/scripts/common.mk b/testdata/v2_full/scripts/common.mk
index e782adf8..7ce87601 100644
--- a/testdata/v2_full/scripts/common.mk
+++ b/testdata/v2_full/scripts/common.mk
@@ -15,12 +15,6 @@ export TF_IN_AUTOMATION=1
 terraform_command ?= $(TFENV_DIR)/versions/$(TERRAFORM_VERSION)/terraform
 MODE ?= local
 
-ifeq ($(MODE),atlantis)
-	export AWS_CONFIG_FILE=$(REPO_ROOT)/config/atlantis-aws-config
-	TF_ARGS ?= -no-color
-endif
-
-
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
 		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
diff --git a/testdata/v2_full/scripts/component.mk b/testdata/v2_full/scripts/component.mk
index 6ca44d12..b7acf472 100644
--- a/testdata/v2_full/scripts/component.mk
+++ b/testdata/v2_full/scripts/component.mk
@@ -61,34 +61,12 @@ ifeq ($(HEROKU_PROVIDER),1)
 endif
 .PHONY: check-auth-heroku
 
-ifeq ($(MODE),local)
 plan: check-auth init fmt ## run a terraform plan
 	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false
-else ifeq ($(MODE),atlantis)
-plan: check-auth init lint
-	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false -out $(PLANFILE) | scenery
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: plan
 
-ifeq ($(MODE),local)
 apply: check-auth init ## run a terraform apply
-ifeq ($(ATLANTIS_ENABLED),1)
-ifneq ($(FORCE),1)
-	@echo "`tput bold`This component is configured to be used with atlantis. If you want to override and apply locally, add FORCE=1.`tput sgr0`"
-	exit -1
-endif
-endif
 	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=$(AUTO_APPROVE)
-else ifeq ($(MODE),atlantis)
-apply: check-auth ## run a terraform apply
-	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=true $(PLANFILE)
-else
-	echo "Unknown mode: $(MODE)"
-	exit -1
-endif
 .PHONY: apply
 
 docs:
@@ -104,14 +82,7 @@ test:
 .PHONY: test
 
 init: terraform check-auth ## run terraform init for this component
-ifeq ($(MODE),local)
 	@$(terraform_command) init -input=false
-else ifeq ($(MODE),atlantis)
-	@$(terraform_command) init $(TF_ARGS) -input=false
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: init
 
 check-plan: init check-auth ## run a terraform plan and check that it does not fail
diff --git a/testdata/v2_full/terraform/accounts/bar/Makefile b/testdata/v2_full/terraform/accounts/bar/Makefile
index c327324d..4861d569 100644
--- a/testdata/v2_full/terraform/accounts/bar/Makefile
+++ b/testdata/v2_full/terraform/accounts/bar/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 0.100.0
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 1
 export AWS_BACKEND_PROFILE := profile
 
 export AWS_PROVIDER_PROFILE := profile
diff --git a/testdata/v2_full/terraform/accounts/foo/Makefile b/testdata/v2_full/terraform/accounts/foo/Makefile
index c327324d..4861d569 100644
--- a/testdata/v2_full/terraform/accounts/foo/Makefile
+++ b/testdata/v2_full/terraform/accounts/foo/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 0.100.0
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 1
 export AWS_BACKEND_PROFILE := profile
 
 export AWS_PROVIDER_PROFILE := profile
diff --git a/testdata/v2_full/terraform/global/Makefile b/testdata/v2_full/terraform/global/Makefile
index 5879a826..5605abd0 100644
--- a/testdata/v2_full/terraform/global/Makefile
+++ b/testdata/v2_full/terraform/global/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 0.100.0
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 1
 export AWS_BACKEND_PROFILE := profile
 
 export AWS_PROVIDER_PROFILE := profile
diff --git a/testdata/v2_minimal_valid/scripts/common.mk b/testdata/v2_minimal_valid/scripts/common.mk
index e782adf8..7ce87601 100644
--- a/testdata/v2_minimal_valid/scripts/common.mk
+++ b/testdata/v2_minimal_valid/scripts/common.mk
@@ -15,12 +15,6 @@ export TF_IN_AUTOMATION=1
 terraform_command ?= $(TFENV_DIR)/versions/$(TERRAFORM_VERSION)/terraform
 MODE ?= local
 
-ifeq ($(MODE),atlantis)
-	export AWS_CONFIG_FILE=$(REPO_ROOT)/config/atlantis-aws-config
-	TF_ARGS ?= -no-color
-endif
-
-
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
 		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
diff --git a/testdata/v2_minimal_valid/scripts/component.mk b/testdata/v2_minimal_valid/scripts/component.mk
index 6ca44d12..b7acf472 100644
--- a/testdata/v2_minimal_valid/scripts/component.mk
+++ b/testdata/v2_minimal_valid/scripts/component.mk
@@ -61,34 +61,12 @@ ifeq ($(HEROKU_PROVIDER),1)
 endif
 .PHONY: check-auth-heroku
 
-ifeq ($(MODE),local)
 plan: check-auth init fmt ## run a terraform plan
 	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false
-else ifeq ($(MODE),atlantis)
-plan: check-auth init lint
-	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false -out $(PLANFILE) | scenery
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: plan
 
-ifeq ($(MODE),local)
 apply: check-auth init ## run a terraform apply
-ifeq ($(ATLANTIS_ENABLED),1)
-ifneq ($(FORCE),1)
-	@echo "`tput bold`This component is configured to be used with atlantis. If you want to override and apply locally, add FORCE=1.`tput sgr0`"
-	exit -1
-endif
-endif
 	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=$(AUTO_APPROVE)
-else ifeq ($(MODE),atlantis)
-apply: check-auth ## run a terraform apply
-	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=true $(PLANFILE)
-else
-	echo "Unknown mode: $(MODE)"
-	exit -1
-endif
 .PHONY: apply
 
 docs:
@@ -104,14 +82,7 @@ test:
 .PHONY: test
 
 init: terraform check-auth ## run terraform init for this component
-ifeq ($(MODE),local)
 	@$(terraform_command) init -input=false
-else ifeq ($(MODE),atlantis)
-	@$(terraform_command) init $(TF_ARGS) -input=false
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: init
 
 check-plan: init check-auth ## run a terraform plan and check that it does not fail
diff --git a/testdata/v2_minimal_valid/terraform/global/Makefile b/testdata/v2_minimal_valid/terraform/global/Makefile
index b81c4ac3..e4bfd01a 100644
--- a/testdata/v2_minimal_valid/terraform/global/Makefile
+++ b/testdata/v2_minimal_valid/terraform/global/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 1.1.1
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := foo
 
 
diff --git a/testdata/v2_no_aws_provider/scripts/common.mk b/testdata/v2_no_aws_provider/scripts/common.mk
index e782adf8..7ce87601 100644
--- a/testdata/v2_no_aws_provider/scripts/common.mk
+++ b/testdata/v2_no_aws_provider/scripts/common.mk
@@ -15,12 +15,6 @@ export TF_IN_AUTOMATION=1
 terraform_command ?= $(TFENV_DIR)/versions/$(TERRAFORM_VERSION)/terraform
 MODE ?= local
 
-ifeq ($(MODE),atlantis)
-	export AWS_CONFIG_FILE=$(REPO_ROOT)/config/atlantis-aws-config
-	TF_ARGS ?= -no-color
-endif
-
-
 tfenv: ## install the tfenv tool
 	@if [ ! -d ${TFENV_DIR} ]; then \
 		git clone -q https://github.com/chanzuckerberg/tfenv.git $(TFENV_DIR); \
diff --git a/testdata/v2_no_aws_provider/scripts/component.mk b/testdata/v2_no_aws_provider/scripts/component.mk
index 6ca44d12..b7acf472 100644
--- a/testdata/v2_no_aws_provider/scripts/component.mk
+++ b/testdata/v2_no_aws_provider/scripts/component.mk
@@ -61,34 +61,12 @@ ifeq ($(HEROKU_PROVIDER),1)
 endif
 .PHONY: check-auth-heroku
 
-ifeq ($(MODE),local)
 plan: check-auth init fmt ## run a terraform plan
 	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false
-else ifeq ($(MODE),atlantis)
-plan: check-auth init lint
-	@$(terraform_command) plan $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -input=false -out $(PLANFILE) | scenery
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: plan
 
-ifeq ($(MODE),local)
 apply: check-auth init ## run a terraform apply
-ifeq ($(ATLANTIS_ENABLED),1)
-ifneq ($(FORCE),1)
-	@echo "`tput bold`This component is configured to be used with atlantis. If you want to override and apply locally, add FORCE=1.`tput sgr0`"
-	exit -1
-endif
-endif
 	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=$(AUTO_APPROVE)
-else ifeq ($(MODE),atlantis)
-apply: check-auth ## run a terraform apply
-	@$(terraform_command) apply $(TF_ARGS) -refresh=$(REFRESH_ENABLED) -auto-approve=true $(PLANFILE)
-else
-	echo "Unknown mode: $(MODE)"
-	exit -1
-endif
 .PHONY: apply
 
 docs:
@@ -104,14 +82,7 @@ test:
 .PHONY: test
 
 init: terraform check-auth ## run terraform init for this component
-ifeq ($(MODE),local)
 	@$(terraform_command) init -input=false
-else ifeq ($(MODE),atlantis)
-	@$(terraform_command) init $(TF_ARGS) -input=false
-else
-	@echo "Unknown MODE: $(MODE)"
-	@exit -1
-endif
 .PHONY: init
 
 check-plan: init check-auth ## run a terraform plan and check that it does not fail
diff --git a/testdata/v2_no_aws_provider/terraform/accounts/bar/Makefile b/testdata/v2_no_aws_provider/terraform/accounts/bar/Makefile
index 7f36ac3d..e1c54e11 100644
--- a/testdata/v2_no_aws_provider/terraform/accounts/bar/Makefile
+++ b/testdata/v2_no_aws_provider/terraform/accounts/bar/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 0.100.0
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := profile
 
 
diff --git a/testdata/v2_no_aws_provider/terraform/accounts/foo/Makefile b/testdata/v2_no_aws_provider/terraform/accounts/foo/Makefile
index 7f36ac3d..e1c54e11 100644
--- a/testdata/v2_no_aws_provider/terraform/accounts/foo/Makefile
+++ b/testdata/v2_no_aws_provider/terraform/accounts/foo/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 0.100.0
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := profile
 
 
diff --git a/testdata/v2_no_aws_provider/terraform/global/Makefile b/testdata/v2_no_aws_provider/terraform/global/Makefile
index c8e2dfc4..77f12686 100644
--- a/testdata/v2_no_aws_provider/terraform/global/Makefile
+++ b/testdata/v2_no_aws_provider/terraform/global/Makefile
@@ -4,7 +4,6 @@
 export TERRAFORM_VERSION := 0.100.0
 export TFLINT_ENABLED := 0
 export TF_PLUGIN_CACHE_DIR := ../..//.terraform.d/plugin-cache
-export ATLANTIS_ENABLED := 0
 export AWS_BACKEND_PROFILE := profile