Merge pull request #190 from porter-dev/beta.3.provisioning-integration

Beta.3.provisioning integration

cmd/app/main.go

@@ -87,6 +87,7 @@ func main() {
 		Repository: repo,
 		ServerConf: appConf.Server,
 		RedisConf:  &appConf.Redis,
+		DBConf:     appConf.Db,
 	})
 
 	appRouter := router.New(a)

internal/kubernetes/agent.go

@@ -280,7 +280,7 @@ func (a *Agent) ProvisionEKS(
 		ID:        id,
 		Name:      fmt.Sprintf("prov-%s-%s", id, string(operation)),
 		Kind:      provisioner.EKS,
-		Operation: provisioner.Apply,
+		Operation: operation,
 		Redis:     redisConf,
 		Postgres:  pgConf,
 		AWS: &aws.Conf{
@@ -306,7 +306,7 @@ func (a *Agent) ProvisionTest(
 	prov := &provisioner.Conf{
 		ID:        fmt.Sprintf("%s-%d", "testing", projectID),
 		Name:      fmt.Sprintf("prov-%s-%d-%s", "testing", projectID, string(operation)),
-		Operation: provisioner.Apply,
+		Operation: operation,
 		Kind:      provisioner.Test,
 		Redis:     redisConf,
 		Postgres:  pgConf,

internal/kubernetes/provisioner/provisioner.go

@@ -52,7 +52,7 @@ const (
 func (conf *Conf) GetProvisionerJobTemplate() (*batchv1.Job, error) {
 	operation := string(conf.Operation)
 
-	if conf.Operation == "" {
+	if operation == "" {
 		operation = string(Apply)
 	}
 

server/api/api.go

@@ -93,6 +93,7 @@ func New(conf *AppConfig) (*App, error) {
 		Repo:       conf.Repository,
 		ServerConf: conf.ServerConf,
 		RedisConf:  conf.RedisConf,
+		DBConf:     conf.DBConf,
 		TestAgents: conf.TestAgents,
 		db:         conf.DB,
 		validator:  validator,