[feature] TravisCI now allows per component configuration + allows to set a specific make command to run

config/config_test.go

@@ -59,7 +59,7 @@ func Test_detectVersion(t *testing.T) {
 	}
 }
 
-func intptr(i int64) *int64 {
+func intptr(i int) *int {
 	return &i
 }
 
@@ -111,9 +111,9 @@ func TestUpgradeConfigVersion(t *testing.T) {
 						Enabled: boolptr(true),
 					},
 					TravisCI: &v1.TravisCI{
-						Enabled:        true,
-						AWSIAMRoleName: "travis-role",
-						TestBuckets:    13,
+						Enabled:        boolptr(true),
+						AWSIAMRoleName: util.StrPtr("travis-role"),
+						TestBuckets:    intptr(13),
 					},
 				},
 			},

config/v1/config.go

@@ -126,9 +126,10 @@ type Module struct {
 }
 
 type TravisCI struct {
-	Enabled        bool   `json:"enabled,omitempty"`
-	AWSIAMRoleName string `json:"aws_iam_role_name"`
-	TestBuckets    int    `json:"test_buckets"`
+	Enabled        *bool   `json:"enabled,omitempty"`
+	AWSIAMRoleName *string `json:"aws_iam_role_name"`
+	TestBuckets    *int    `json:"test_buckets"`
+	Command        *string `json:"command"`
 }
 
 type Config struct {

config/v2/config.go

@@ -148,6 +148,15 @@ func (c *Config) Generate(r *rand.Rand, size int) reflect.Value {
 		return &str
 	}
 
+	randBoolPtr := func(r *rand.Rand, s int) *bool {
+		b := r.Float32() > 0.5
+		return &b
+	}
+	randIntPtr := func(r *rand.Rand, s int) *int {
+		i := r.Intn(s)
+		return &i
+	}
+
 	randStringMap := func(r *rand.Rand, s int) map[string]string {
 		m := map[string]string{}
 
@@ -226,8 +235,8 @@ func (c *Config) Generate(r *rand.Rand, size int) reflect.Value {
 			c.Tools = &Tools{}
 			if r.Float32() < 0.5 {
 				c.Tools.TravisCI = &v1.TravisCI{
-					Enabled:     r.Float32() < 0.5,
-					TestBuckets: r.Intn(size),
+					Enabled:     randBoolPtr(r, s),
+					TestBuckets: randIntPtr(r, s),
 				}
 			}
 			if r.Float32() < 0.5 {

config/v2/resolvers.go

@@ -194,6 +194,28 @@ func ResolveAtlantis(commons ...Common) *Atlantis {
 	}
 }
 
+func ResolveTravis(commons ...Common) *v1.TravisCI {
+	enabled := false
+	testCommand := "check"
+	for _, c := range commons {
+		if c.Tools != nil && c.Tools.TravisCI != nil && c.Tools.TravisCI.Enabled != nil {
+			enabled = *c.Tools.TravisCI.Enabled
+		}
+
+		if c.Tools != nil && c.Tools.TravisCI != nil && c.Tools.TravisCI.Command != nil {
+			testCommand = *c.Tools.TravisCI.Command
+		}
+	}
+
+	roleName := lastNonNil(TravisRoleNameGetter, commons...)
+
+	return &v1.TravisCI{
+		Enabled:        &enabled,
+		AWSIAMRoleName: roleName,
+		Command:        &testCommand,
+	}
+}
+
 func OwnerGetter(comm Common) *string {
 	return comm.Owner
 }
@@ -367,3 +389,17 @@ func AtlantisRoleNameGetter(comm Common) *string {
 	}
 	return comm.Tools.Atlantis.RoleName
 }
+
+func TravisRoleNameGetter(comm Common) *string {
+	if comm.Tools == nil || comm.Tools.TravisCI == nil {
+		return nil
+	}
+	return comm.Tools.TravisCI.AWSIAMRoleName
+}
+
+func TravisTestCommandGetter(comm Common) *string {
+	if comm.Tools == nil || comm.Tools.TravisCI == nil {
+		return nil
+	}
+	return comm.Tools.TravisCI.Command
+}

config/v2/validation.go

@@ -11,6 +11,11 @@ import (
 	validator "gopkg.in/go-playground/validator.v9"
 )
 
+var validTravisCommands = map[string]struct{}{
+	"check": struct{}{},
+	"lint":  struct{}{},
+}
+
 // Validate validates the config
 func (c *Config) Validate() ([]string, error) {
 	if c == nil {
@@ -49,12 +54,10 @@ func (c *Config) Validate() ([]string, error) {
 	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
-	w, e := c.ValidateToolsTravis()
-	warnings = append(warnings, w...)
-	errs = multierror.Append(errs, e)
-	w, e = c.ValidateToolsTfLint()
+	w, e := c.ValidateToolsTfLint()
 	warnings = append(warnings, w...)
 	errs = multierror.Append(errs, e)
 
@@ -200,17 +203,27 @@ func (c *Config) ValidateBlessProviders() error {
 	return errs
 }
 
-func (c *Config) ValidateToolsTravis() ([]string, error) {
-	var warns []string
+func (c *Config) ValidateTravis() error {
 	var errs *multierror.Error
 	c.WalkComponents(func(component string, comms ...Common) {
-		c := comms[len(comms)-1]
-		if c.Tools != nil && c.Tools.TravisCI != nil {
-			warns = append(warns, fmt.Sprintf("per-component travisci config is not implemented, ignoring config in %s", component))
+		t := ResolveTravis(comms...)
+		if t.Enabled == nil || *t.Enabled == false {
+			return // nothing to do
+		}
+
+		if t.AWSIAMRoleName == nil || *t.AWSIAMRoleName == "" {
+			errs = multierror.Append(errs, fmt.Errorf("if travis is enabled, aws_role_name must be set"))
+		}
+
+		if t.Command != nil {
+			_, ok := validTravisCommands[*t.Command]
+			if !ok {
+				errs = multierror.Append(errs, fmt.Errorf("unrecognized travisci command %s (%s)", *t.Command, component))
+			}
 		}
 	})
 
-	return warns, errs
+	return errs
 }
 
 func (c *Config) ValidateToolsTfLint() ([]string, error) {

config/v2/validation_test.go

@@ -176,3 +176,26 @@ func TestConfig_ValidateAWSProviders(t *testing.T) {
 		})
 	}
 }
+
+func TestConfig_ValidateTravis(t *testing.T) {
+	tests := []struct {
+		fileName string
+		wantErr  bool
+	}{
+		{"v2_invalid_travis_command", true},
+	}
+	for _, tt := range tests {
+		t.Run(tt.fileName, func(t *testing.T) {
+			r := require.New(t)
+
+			b, e := util.TestFile(tt.fileName)
+			r.NoError(e)
+			c, e := ReadConfig(b)
+			r.NoError(e)
+
+			if err := c.ValidateTravis(); (err != nil) != tt.wantErr {
+				t.Errorf("Config.ValidateTravis() error = %v, wantErr %v (err != nil) %v", err, tt.wantErr, (err != nil))
+			}
+		})
+	}
+}

plan/plan.go

@@ -39,6 +39,7 @@ type ComponentCommon struct {
 	Project   string
 	Providers Providers `yaml:"providers"`
 	TfLint    TfLint
+	TravisCI  TravisComponent
 }
 
 type AtlantisComponent struct {
@@ -47,6 +48,14 @@ type AtlantisComponent struct {
 	RolePath string `yaml:"role_path"`
 }
 
+type TravisComponent struct {
+	Enabled        bool `yaml:"enabled"`
+	AWSProfileName string
+	AWSRoleName    string
+	AWSAccountID   string
+	Command        string
+}
+
 type Providers struct {
 	AWS       *AWSProvider       `yaml:"aws"`
 	Snowflake *SnowflakeProvider `yaml:"snowflake"`
@@ -153,8 +162,8 @@ func Eval(c *v2.Config) (*Plan, error) {
 	}
 
 	p.Modules = p.buildModules(c)
-	p.TravisCI = p.buildTravisCI(c, v)
 	p.Atlantis = p.buildAtlantis()
+	p.TravisCI = p.buildTravisCI(c, v)
 
 	return p, nil
 }
@@ -323,7 +332,15 @@ func resolveComponentCommon(commons ...v2.Common) ComponentCommon {
 	if atlantisPlan.Enabled {
 		atlantisPlan.RoleName = *atlantisConfig.RoleName
 		atlantisPlan.RolePath = *atlantisConfig.RolePath
+	}
 
+	travisConfig := v2.ResolveTravis(commons...)
+	travisPlan := TravisComponent{
+		Enabled: *travisConfig.Enabled,
+	}
+	if travisPlan.Enabled {
+		travisPlan.AWSRoleName = *travisConfig.AWSIAMRoleName
+		travisPlan.Command = *travisConfig.Command
 	}
 
 	return ComponentCommon{
@@ -346,6 +363,7 @@ func resolveComponentCommon(commons ...v2.Common) ComponentCommon {
 		Owner:     v2.ResolveRequiredString(v2.OwnerGetter, commons...),
 		Project:   v2.ResolveRequiredString(v2.ProjectGetter, commons...),
 		Common:    Common{TerraformVersion: v2.ResolveRequiredString(v2.TerraformVersionGetter, commons...)},
+		TravisCI:  travisPlan,
 	}
 }