Rename to internals

leapfrogtechnology · Oct 16, 2019 · d360ce5 · d360ce5
1 parent 743b9bf
commit d360ce5
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 63 deletions.
diff --git a/cli/cmd/cmd.go b/cli/cmd/cmd.go
@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/urfave/cli"
@@ -23,15 +22,6 @@ func Initialize(info *Info) error {
 	app.Usage = info.Description
 
 	app.Commands = []cli.Command{
-		{
-			Name:        "infrastructure",
-			Description: "Initialize",
-			Aliases:     nil,
-			Usage:       "Initialize your Application",
-			Action: func(c *cli.Context) {
-				fmt.Println("Shift Shift shift")
-			},
-		},
 		cli.Command{
 			Name: "setup",
 			Action: func(ctx *cli.Context) error {

diff --git a/cli/cmd/setup.go b/cli/cmd/setup.go
@@ -1,7 +1,7 @@
 package cmd
 
 import (
-	"github.com/leapfrogtechnology/shift/cli/internal/setup"
+	"github.com/leapfrogtechnology/shift/cli/internals/setup"
 )
 
 // Setup prompts user for required information for creating a project.

diff --git a/cli/internal/config/aws-config.go → cli/internals/config/aws-config.go b/cli/internal/config/aws-config.go → cli/internals/config/aws-config.go
diff --git a/cli/internal/setup/setup.go → cli/internals/setup/setup.go b/cli/internal/setup/setup.go → cli/internals/setup/setup.go
@@ -7,24 +7,24 @@ import (
 	"os"
 
 	"github.com/AlecAivazis/survey/v2"
-	"github.com/leapfrogtechnology/shift/cli/internal/config"
+	"github.com/leapfrogtechnology/shift/cli/internals/config"
+	"github.com/leapfrogtechnology/shift/core/structs"
 )
 
 type projectDetails struct {
 	ProjectName string
 }
 
 type deploymentDetails struct {
-	DeploymentName string
 	CloudProvider  string
 	Profile        string
 	Region         string
 	DeploymentType string
+	Environment    string
 }
 
 type frontendBuildInformation struct {
-	BuildCommand string
-	DistFolder   string
+	DistFolder string
 }
 
 type backendBuildInformation struct {
@@ -33,26 +33,6 @@ type backendBuildInformation struct {
 	DockerfilePath  string
 }
 
-type deployment struct {
-	Name            string `json:"name"`
-	Platform        string `json:"platform"`
-	Profile         string `json:"profile"`
-	Region          string `json:"region"`
-	Type            string `json:"type"`
-	BuildCommand    string `json:"buildCommand"`
-	DistFolder      string `json:"distFolder"`
-	Port            string `json:"port"`
-	HealthCheckPath string `json:"healthCheckPath"`
-	SlackURL        string `json:"slackURL"`
-	DockerFilePath  string `json:"dockerFilePath"`
-}
-
-// Project defines the overall structure for a project deployment.
-type Project struct {
-	ProjectName string     `json:"projectName"`
-	Deployment  deployment `json:"deployment"`
-}
-
 func askProjectDetails() *projectDetails {
 	questions := []*survey.Question{
 		{
@@ -75,12 +55,6 @@ func askProjectDetails() *projectDetails {
 
 func askDeploymentDetails() *deploymentDetails {
 	questions := []*survey.Question{
-		{
-			Name: "deploymentName",
-			Prompt: &survey.Input{
-				Message: "Deployment Name:",
-			},
-		},
 		{
 			Name: "cloudProvider",
 			Prompt: &survey.Select{
@@ -105,10 +79,16 @@ func askDeploymentDetails() *deploymentDetails {
 		{
 			Name: "deploymentType",
 			Prompt: &survey.Select{
-				Message: "Choose Deployment Type:",
+				Message: "Choose Deployment Type: ",
 				Options: []string{"Frontend", "Backend"},
 			},
 		},
+		{
+			Name: "environment",
+			Prompt: &survey.Input{
+				Message: "Environment name: ",
+			},
+		},
 	}
 
 	answers := &deploymentDetails{}
@@ -124,16 +104,10 @@ func askDeploymentDetails() *deploymentDetails {
 
 func askFrontendBuildInformation() *frontendBuildInformation {
 	questions := []*survey.Question{
-		{
-			Name: "buildCommand",
-			Prompt: &survey.Input{
-				Message: "Build Command: ",
-			},
-		},
 		{
 			Name: "distFolder",
 			Prompt: &survey.Input{
-				Message: "Distribution Folder: ",
+				Message: "Build Directory: ",
 			},
 		},
 	}
@@ -208,20 +182,19 @@ func Run() {
 
 	slackEndpoint := askSlackEndpoint()
 
-	projectRequest := Project{
-		ProjectName: projectDetails.ProjectName,
-		Deployment: deployment{
-			Name:            deploymentDetails.DeploymentName,
-			Platform:        deploymentDetails.CloudProvider,
-			Profile:         deploymentDetails.Profile,
-			Region:          deploymentDetails.Region,
-			Type:            deploymentDetails.DeploymentType,
-			BuildCommand:    frontendBuildInformation.BuildCommand,
-			DistFolder:      frontendBuildInformation.DistFolder,
-			Port:            backendBuildInformation.Port,
-			HealthCheckPath: backendBuildInformation.HealthCheckPath,
-			SlackURL:        slackEndpoint,
-			DockerFilePath:  backendBuildInformation.DockerfilePath,
+	projectRequest := structs.Project{
+		Name:            projectDetails.ProjectName,
+		Platform:        deploymentDetails.CloudProvider,
+		Profile:         deploymentDetails.Profile,
+		Region:          deploymentDetails.Region,
+		Type:            deploymentDetails.DeploymentType,
+		DistDir:         frontendBuildInformation.DistFolder,
+		Port:            backendBuildInformation.Port,
+		HealthCheckPath: backendBuildInformation.HealthCheckPath,
+		SlackURL:        slackEndpoint,
+		DockerFilePath:  backendBuildInformation.DockerfilePath,
+		Env: map[string]structs.Env{
+			deploymentDetails.Environment: structs.Env{},
 		},
 	}