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.

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

Don't allow creating profile by profile command #6672

Merged
merged 5 commits into from
Feb 20, 2020
Merged

Don't allow creating profile by profile command #6672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
089deef
Do not create profiles that do not exist
aallbrig Feb 18, 2020
ff873d2
Add tests around nonexistent profiles
aallbrig Feb 18, 2020
addb2e6
word -> line
aallbrig Feb 19, 2020
f9f828b
Merge branch 'master' into profile-command-improvement
aallbrig Feb 19, 2020
020c0f3
Use JSON output to determine desired behavior
aallbrig Feb 20, 2020
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
8 changes: 2 additions & 6 deletions cmd/minikube/cmd/config/profile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,7 @@ var ProfileCmd = &cobra.Command{
}

if !pkgConfig.ProfileExists(profile) {
err := pkgConfig.CreateEmptyProfile(profile)
if err != nil {
exit.WithError("Creating a new profile failed", err)
}
out.SuccessT("Created a new profile : {{.profile_name}}", out.V{"profile_name": profile})
out.FailureT("if you want to create a profile you can by this command: minikube start -p {{.profile_name}}", out.V{"profile_name": profile})
}

err := Set(pkgConfig.MachineProfile, profile)
Expand All @@ -91,7 +87,7 @@ var ProfileCmd = &cobra.Command{
out.ErrT(out.Sad, `Error while setting kubectl current context : {{.error}}`, out.V{"error": err})
}
}
out.SuccessT("minikube profile was successfully set to {{.profile_name}}", out.V{"profile_name": profile})
}
out.SuccessT("minikube profile was successfully set to {{.profile_name}}", out.V{"profile_name": profile})
},
}
24 changes: 23 additions & 1 deletion test/integration/functional_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,29 @@ func validateLogsCmd(ctx context.Context, t *testing.T, profile string) {

// validateProfileCmd asserts "profile" command functionality
func validateProfileCmd(ctx context.Context, t *testing.T, profile string) {
rr, err := Run(t, exec.CommandContext(ctx, Target(), "profile", "list"))
// Profile command should not create a nonexistent profile
nonexistentProfile := "lis"
rr, err := Run(t, exec.CommandContext(ctx, Target(), "profile", nonexistentProfile))
rr, err = Run(t, exec.CommandContext(ctx, Target(), "profile", "list", "--output", "json"))
if err != nil {
t.Errorf("%s failed: %v", rr.Args, err)
}
var profileJson map[string][]map[string]interface{}
err = json.Unmarshal(rr.Stdout.Bytes(), &profileJson)
if err != nil {
t.Errorf("%s failed: %v", rr.Args, err)
}
for profileK := range profileJson {
for _, p := range profileJson[profileK] {
var name = p["Name"]
if (name == nonexistentProfile) {
t.Errorf("minikube profile %s should not exist", nonexistentProfile)
}
}
}

// List profiles
rr, err = Run(t, exec.CommandContext(ctx, Target(), "profile", "list"))
if err != nil {
t.Errorf("%s failed: %v", rr.Args, err)
}
Expand Down