Add fogg apply/plan --no-plugins flag

apply/apply.go

@@ -28,7 +28,7 @@ import (
 const rootPath = "terraform"
 
 // Apply will run a plan and apply all the changes to the current repo.
-func Apply(fs afero.Fs, conf *config.Config, tmp *templates.T, upgrade bool) error {
+func Apply(fs afero.Fs, conf *config.Config, tmp *templates.T, upgrade bool, noPlugins bool) error {
 	if !upgrade {
 		toolVersion, err := util.VersionString()
 		if err != nil {
@@ -39,7 +39,7 @@ func Apply(fs afero.Fs, conf *config.Config, tmp *templates.T, upgrade bool) err
 			return errs.NewUserf("fogg version (%s) is different than version currently used to manage repo (%s). To upgrade add --upgrade.", toolVersion, repoVersion)
 		}
 	}
-	p, err := plan.Eval(conf, false)
+	p, err := plan.Eval(conf, false, noPlugins)
 	if err != nil {
 		return errs.WrapUser(err, "unable to evaluate plan")
 	}

apply/apply_test.go

@@ -158,7 +158,7 @@ func TestApplySmokeTest(t *testing.T) {
 	c, e := config.ReadConfig(ioutil.NopCloser(strings.NewReader(json)))
 	assert.Nil(t, e)
 
-	e = Apply(fs, c, templates.Templates, false)
+	e = Apply(fs, c, templates.Templates, false, false)
 	assert.Nil(t, e)
 }
 

cmd/apply.go

@@ -14,6 +14,7 @@ func init() {
 	applyCmd.Flags().StringP("config", "c", "fogg.json", "Use this to override the fogg config file.")
 	applyCmd.Flags().BoolP("verbose", "v", false, "use this to turn on verbose output")
 	applyCmd.Flags().BoolP("upgrade", "u", false, "use this when running a new version of fogg")
+	applyCmd.Flags().Bool("no-plugins", false, "do not apply fogg plugins; this may result in unexpected behavior.")
 	rootCmd.AddCommand(applyCmd)
 }
 
@@ -54,6 +55,11 @@ var applyCmd = &cobra.Command{
 			return e
 		}
 
+		noPlugins, e := cmd.Flags().GetBool("no-plugins")
+		if e != nil {
+			return e
+		}
+
 		// check that we are at root of initialized git repo
 		openGitOrExit(pwd)
 
@@ -65,7 +71,7 @@ var applyCmd = &cobra.Command{
 		}
 
 		// apply
-		e = apply.Apply(fs, config, templates.Templates, upgrade)
+		e = apply.Apply(fs, config, templates.Templates, upgrade, noPlugins)
 
 		return e
 	},

cmd/plan.go

@@ -13,6 +13,7 @@ import (
 func init() {
 	planCmd.Flags().StringP("config", "c", "fogg.json", "Use this to override the fogg config file.")
 	planCmd.Flags().BoolP("verbose", "v", false, "use this to turn on verbose output")
+	planCmd.Flags().Bool("no-plugins", false, "do not apply fogg plugins; this may result in unexpected behavior.")
 	rootCmd.AddCommand(planCmd)
 }
 
@@ -49,6 +50,11 @@ var planCmd = &cobra.Command{
 			return errs.WrapInternal(e, "couldn't parse config flag")
 		}
 
+		noPlugins, e := cmd.Flags().GetBool("no-plugins")
+		if e != nil {
+			return e
+		}
+
 		// check that we are at root of initialized git repo
 		openGitOrExit(pwd)
 
@@ -59,7 +65,7 @@ var planCmd = &cobra.Command{
 			return e
 		}
 
-		p, e := plan.Eval(config, verbose)
+		p, e := plan.Eval(config, verbose, noPlugins)
 		if e != nil {
 			return e
 		}

plan/plan.go

@@ -119,15 +119,17 @@ type Plan struct {
 }
 
 // Eval evaluats a config
-func Eval(config *config.Config, verbose bool) (*Plan, error) {
+func Eval(config *config.Config, verbose bool, noPlugins bool) (*Plan, error) {
 	p := &Plan{}
 	v, e := util.VersionString()
 	if e != nil {
 		return nil, errs.WrapInternal(e, "unable to parse fogg version")
 	}
 	p.Version = v
-	p.Plugins.SetCustomPluginsPlan(config.Plugins.CustomPlugins)
-	p.Plugins.SetTerraformProvidersPlan(config.Plugins.TerraformProviders)
+	if !noPlugins {
+		p.Plugins.SetCustomPluginsPlan(config.Plugins.CustomPlugins)
+		p.Plugins.SetTerraformProvidersPlan(config.Plugins.TerraformProviders)
+	}
 
 	var err error
 	p.Accounts = p.buildAccounts(config)

plan/plan_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/chanzuckerberg/fogg/config"
+	"github.com/chanzuckerberg/fogg/plugins"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )
@@ -67,7 +68,7 @@ func TestPlanBasic(t *testing.T) {
 	c, err := config.ReadConfig(r)
 	assert.Nil(t, err)
 
-	plan, e := Eval(c, true)
+	plan, e := Eval(c, true, false)
 	assert.Nil(t, e)
 	assert.NotNil(t, plan)
 	assert.NotNil(t, plan.Accounts)
@@ -94,6 +95,33 @@ func TestPlanBasic(t *testing.T) {
 
 	assert.NotNil(t, plan.Envs["staging"].Components["comp1"])
 	assert.Equal(t, "0.100.0", plan.Envs["staging"].Components["comp1"].TerraformVersion)
+
+	assert.NotNil(t, plan.Plugins.CustomPlugins)
+	assert.Len(t, plan.Plugins.CustomPlugins, 1)
+	assert.NotNil(t, plan.Plugins.CustomPlugins["custom"])
+	assert.Equal(t, plugins.TypePluginFormatZip, plan.Plugins.CustomPlugins["custom"].Format)
+	assert.Equal(t, "https://example.com/custom.zip", plan.Plugins.CustomPlugins["custom"].URL)
+
+	assert.NotNil(t, plan.Plugins.TerraformProviders)
+	assert.Len(t, plan.Plugins.TerraformProviders, 1)
+	assert.NotNil(t, plan.Plugins.TerraformProviders["provider"])
+	assert.Equal(t, plugins.TypePluginFormatTar, plan.Plugins.TerraformProviders["provider"].Format)
+	assert.Equal(t, "https://example.com/provider.tar.gz", plan.Plugins.TerraformProviders["provider"].URL)
+}
+
+func TestPlanNoPlugins(t *testing.T) {
+	f, _ := os.Open("testdata/full.json")
+	defer f.Close()
+	r := bufio.NewReader(f)
+	c, err := config.ReadConfig(r)
+	assert.Nil(t, err)
+
+	plan, e := Eval(c, true, true)
+	assert.Nil(t, e)
+	assert.NotNil(t, plan)
+
+	assert.Nil(t, plan.Plugins.CustomPlugins)
+	assert.Nil(t, plan.Plugins.TerraformProviders)
 }
 
 func TestExtraVarsComposition(t *testing.T) {
@@ -103,7 +131,7 @@ func TestExtraVarsComposition(t *testing.T) {
 	c, err := config.ReadConfig(r)
 	assert.Nil(t, err)
 
-	plan, e := Eval(c, true)
+	plan, e := Eval(c, true, false)
 	assert.Nil(t, e)
 	assert.NotNil(t, plan)
 

plan/testdata/full.json

@@ -28,7 +28,7 @@
       },
       "components": {
         "vpc": {
-					"module_source": "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v1.30.0",
+          "module_source": "github.com/terraform-aws-modules/terraform-aws-vpc?ref=v1.30.0",
           "extra_vars": {
             "foo": "bar3"
           }
@@ -38,5 +38,19 @@
       }
     },
     "prod": {}
+  },
+  "plugins": {
+    "terraform_providers": {
+      "provider": {
+        "url": "https://example.com/provider.tar.gz",
+        "format": "tar"
+      }
+    },
+    "custom_plugins": {
+      "custom": {
+        "url": "https://example.com/custom.zip",
+        "format": "zip"
+      }
+    }
   }
 }