Skip to content

Removed the required project name when running the command to make it… #153

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.

Sign up for GitHub

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

Merged
Direside merged 1 commit into from
Jun 9, 2020
Merged

Removed the required project name when running the command to make it… #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 2 additions & 8 deletions cmd/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package cmd
import (
"github.com/commitdev/zero/internal/config/projectconfig"
"github.com/commitdev/zero/internal/context"
"github.com/commitdev/zero/pkg/util/exit"
"github.com/spf13/cobra"
)

Expand All @@ -15,12 +14,7 @@ var initCmd = &cobra.Command{
Use: "init",
Short: "Create new project with provided name and initialize configuration based on user input.",
Run: func(cmd *cobra.Command, args []string) {
if len(args) < 1 {
exit.Fatal("Project name cannot be empty!")
}

projectName := args[0]
projectContext := context.Init(projectName, projectconfig.RootDir)
projectconfig.Init(projectconfig.RootDir, projectName, projectContext)
projectContext := context.Init(projectconfig.RootDir)
projectconfig.Init(projectconfig.RootDir, projectContext.Name, projectContext)
},
}
23 changes: 12 additions & 11 deletions internal/context/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,23 @@ import (
type Registry map[string][]string

// Create cloud provider context
func Init(projectName string, outDir string) *projectconfig.ZeroProjectConfig {
rootDir := path.Join(outDir, projectName)
flog.Infof(":tada: Creating project %s.", projectName)
func Init(outDir string) *projectconfig.ZeroProjectConfig {
projectConfig := defaultProjConfig()
projectConfig.Name = promptProjectName()

rootDir := path.Join(outDir, projectConfig.Name)
flog.Infof(":tada: Creating project")

err := os.MkdirAll(rootDir, os.ModePerm)
if os.IsExist(err) {
exit.Fatal("Directory %v already exists! Error: %v", projectName, err)
exit.Fatal("Directory %v already exists! Error: %v", projectConfig.Name, err)
} else if err != nil {
exit.Fatal("Error creating root: %v ", err)
}

projectConfig := defaultProjConfig(projectName)
projectConfig.Name = promptProjectName(projectName)
projectConfig.Context["ShouldPushRepoUpstream"] = promptPushRepoUpstream()
projectConfig.Context["GithubRootOrg"] = promptGithubRootOrg()
projectConfig.Context["githubPersonalToken"] = promptGithubPersonalToken(projectName)
projectConfig.Context["githubPersonalToken"] = promptGithubPersonalToken(projectConfig.Name)

// chooseCloudProvider(&projectConfig)
// fmt.Println(&projectConfig)
Expand Down Expand Up @@ -141,10 +142,10 @@ func promptGithubPersonalToken(projectName string) string {
return result
}

func promptProjectName(projectName string) string {
func promptProjectName() string {
providerPrompt := promptui.Prompt{
Label: "Project Name",
Default: projectName,
Default: "",
AllowEdit: false,
}
result, err := providerPrompt.Run()
Expand Down Expand Up @@ -234,9 +235,9 @@ func fillProviderDetails(projectConfig *projectconfig.ZeroProjectConfig, s proje
}
}

func defaultProjConfig(projectName string) projectconfig.ZeroProjectConfig {
func defaultProjConfig() projectconfig.ZeroProjectConfig {
return projectconfig.ZeroProjectConfig{
Name: projectName,
Name: "",
Infrastructure: projectconfig.Infrastructure{
AWS: nil,
},
Expand Down