Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deprecate docker support #268

Merged
merged 3 commits into from
May 25, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apply/apply_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -271,8 +271,9 @@ func TestApplySmokeTest(t *testing.T) {
c2, e := config.UpgradeConfigVersion(c)
r.NoError(e)

e = c2.Validate()
w, e := c2.Validate()
r.NoError(e)
r.Len(w, 1)

e = Apply(fs, c2, templates.Templates, false)
r.NoError(e)
Expand Down
6 changes: 4 additions & 2 deletions apply/golden_file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,9 @@ func TestIntegration(t *testing.T) {
a.NoError(e)
fmt.Printf("conf %#v\n", conf)

e = conf.Validate()
w, e := conf.Validate()
a.NoError(e)
a.Len(w, 0)

e = apply.Apply(testdataFs, conf, templates.Templates, true)
a.NoError(e)
Expand All @@ -75,8 +76,9 @@ func TestIntegration(t *testing.T) {
a.NoError(e)
fmt.Printf("conf %#v\n", conf)

e = conf.Validate()
w, e := conf.Validate()
a.NoError(e)
a.Len(w, 0)

e = apply.Apply(fs, conf, templates.Templates, true)
a.NoError(e)
Expand Down
3 changes: 2 additions & 1 deletion cmd/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ var applyCmd = &cobra.Command{
// check that we are at root of initialized git repo
openGitOrExit(fs)

config, err := readAndValidateConfig(fs, configFile)
config, warnings, err := readAndValidateConfig(fs, configFile)
printWarnings(warnings)

e = mergeConfigValidationErrors(err)
if e != nil {
Expand Down
4 changes: 3 additions & 1 deletion cmd/plan.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ var planCmd = &cobra.Command{
// check that we are at root of initialized git repo
openGitOrExit(fs)

config, err := readAndValidateConfig(fs, configFile)
config, warnings, err := readAndValidateConfig(fs, configFile)
printWarnings(warnings)

e = mergeConfigValidationErrors(err)
if e != nil {
Expand All @@ -50,6 +51,7 @@ var planCmd = &cobra.Command{
if e != nil {
return e
}

return plan.Print(p)
},
}
15 changes: 11 additions & 4 deletions cmd/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,16 @@ func openGitOrExit(fs afero.Fs) {
}
}

func readAndValidateConfig(fs afero.Fs, configFile string) (*v2.Config, error) {
func readAndValidateConfig(fs afero.Fs, configFile string) (*v2.Config, []string, error) {
conf, err := config.FindAndReadConfig(fs, configFile)
if err != nil {
return nil, errs.WrapUser(err, "unable to read config file")
return nil, nil, errs.WrapUser(err, "unable to read config file")
}
log.Debug("CONFIG")
log.Debugf("%s\n=====", pretty.Sprint(conf))

return conf, conf.Validate()
warnings, e := conf.Validate()
return conf, warnings, e
}

func mergeConfigValidationErrors(err error) error {
Expand Down Expand Up @@ -90,7 +91,7 @@ func bootstrapCmd(cmd *cobra.Command, debug bool) (afero.Fs, *v2.Config, error)
return nil, nil, err
}

config, err := readAndValidateConfig(fs, configFile)
config, _, err := readAndValidateConfig(fs, configFile)

err = mergeConfigValidationErrors(err)
if err != nil {
Expand All @@ -99,3 +100,9 @@ func bootstrapCmd(cmd *cobra.Command, debug bool) (afero.Fs, *v2.Config, error)

return fs, config, nil
}

func printWarnings(warnings []string) {
for _, w := range warnings {
log.Warn(w)
}
}
10 changes: 6 additions & 4 deletions config/v2/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,18 +16,19 @@ func TestReadConfig(t *testing.T) {
c, e := ReadConfig(b)
a.NoError(e)

e = c.Validate()
w, e := c.Validate()
a.Error(e)
a.Len(w, 0)

b2, e := util.TestFile("v2_minimal_valid")
a.NoError(e)

c, e = ReadConfig(b2)
a.NoError(e)

e = c.Validate()
w, e = c.Validate()
a.NoError(e)

a.Len(w, 0)
}

func TestReadSnowflakeProvider(t *testing.T) {
Expand All @@ -41,8 +42,9 @@ func TestReadSnowflakeProvider(t *testing.T) {
r.NoError(e)
r.NotNil(c)

e = c.Validate()
w, e := c.Validate()
r.NoError(e)
r.Len(w, 0)

r.NotNil(c.Defaults.Providers)
r.NotNil(c.Defaults.Providers.Snowflake)
Expand Down
12 changes: 9 additions & 3 deletions config/v2/validation.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ import (
)

// Validate validates the config
func (c *Config) Validate() error {
func (c *Config) Validate() ([]string, error) {
if c == nil {
return errs.NewInternal("config is nil")
return nil, errs.NewInternal("config is nil")
}

var errs *multierror.Error
var warnings []string

v := validator.New()
// This func gives us the ability to get the full path for a field deeply
Expand Down Expand Up @@ -45,7 +47,11 @@ func (c *Config) Validate() error {
errs = multierror.Append(errs, c.ValidateSnowflakeProviders())
errs = multierror.Append(errs, c.validateModules())

return errs.ErrorOrNil()
if c.Docker {
warnings = append(warnings, "Docker support is deprecated and will be removed in a future version of fogg.")
}

return warnings, errs.ErrorOrNil()
}

func ValidateAWSProvider(p *AWSProvider, component string) error {
Expand Down
2 changes: 1 addition & 1 deletion plan/plan_quick_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ func TestValidConfigNoPanic(t *testing.T) {
assertion := func(conf *v2.Config) bool {
// fmt.Printf("GOT %#v\n\n", pretty.Sprint(conf))
// validate our configuration
err := conf.Validate()
_, err := conf.Validate()

// if config is valid, there should be no panic
if err == nil {
Expand Down
3 changes: 2 additions & 1 deletion plan/plan_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,9 @@ func TestPlanBasicV2(t *testing.T) {
c2, err := v2.ReadConfig(b)
assert.Nil(t, err)

err = c2.Validate()
w, err := c2.Validate()
a.NoError(err)
a.Len(w, 0)

plan, e := Eval(c2)
assert.Nil(t, e)
Expand Down
6 changes: 4 additions & 2 deletions plan/travisci_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,9 @@ func Test_buildTravisCI_Profiles(t *testing.T) {
}},
}

err := c.Validate()
w, err := c.Validate()
a.NoError(err)
a.Len(w, 0)

p := &Plan{}
p.Accounts = p.buildAccounts(c)
Expand Down Expand Up @@ -121,8 +122,9 @@ func Test_buildTravisCI_TestBuckets(t *testing.T) {
}},
}

err := c.Validate()
w, err := c.Validate()
a.NoError(err)
a.Len(w, 0)

p := &Plan{}
p.Accounts = p.buildAccounts(c)
Expand Down