Skip to content

Commit f0badb4

Browse files
Fix CLI wizard summary & text (#655)
* Fix CLI wizard summary & text * bump
1 parent 0b0fa38 commit f0badb4

File tree

7 files changed

+19
-15
lines changed

7 files changed

+19
-15
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=v0.1.16
1+
VERSION=v0.1.17
22

33
OUT_DIR=dist
44
YEAR?=$(shell date +"%Y")

cmd/commands/common.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ func getAccessModeFromUserSelect(accessMode *platmodel.AccessMode) error {
521521

522522
prompt := promptui.Select{
523523
Label: labelStr,
524-
Items: []string{"Codefresh Tunnel Based", "Ingress Based"},
524+
Items: []string{"Codefresh tunnel-based", "Ingress-based"},
525525
Templates: templates,
526526
}
527527

cmd/commands/runtime.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -576,13 +576,16 @@ func runRuntimeUninstall(ctx context.Context, opts *RuntimeUninstallOptions) err
576576
cfConfig.GetCurrentContext().DefaultRuntime = ""
577577
}
578578

579-
err = runPostUninstallCleanup(ctx, opts.KubeFactory, opts.RuntimeName)
580-
if err != nil {
581-
errorMsg := fmt.Sprintf("failed to do post uninstall cleanup: %v", err)
582-
if !opts.Force {
583-
return fmt.Errorf(errorMsg)
579+
580+
if !opts.Managed {
581+
err = runPostUninstallCleanup(ctx, opts.KubeFactory, opts.RuntimeName)
582+
if err != nil {
583+
errorMsg := fmt.Sprintf("failed to do post uninstall cleanup: %v", err)
584+
if !opts.Force {
585+
return fmt.Errorf(errorMsg)
586+
}
587+
log.G().Warn(errorMsg)
584588
}
585-
log.G().Warn(errorMsg)
586589
}
587590

588591
uninstallDoneStr := fmt.Sprintf("Done uninstalling runtime \"%s\"", opts.RuntimeName)

cmd/commands/runtime_install.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,13 +223,16 @@ func NewRuntimeInstallCommand() *cobra.Command {
223223
"Repository URL": installationOpts.InsCloneOpts.Repo,
224224
"Ingress class": installationOpts.IngressClass,
225225
"Installing demo resources": strconv.FormatBool(installationOpts.InstallDemoResources),
226+
"Git provider": string(installationOpts.gitProvider.Type()),
226227
}
227228

228229
if installationOpts.AccessMode == platmodel.AccessModeTunnel {
229230
finalParameters["Tunnel URL"] = installationOpts.IngressHost
231+
finalParameters["Access mode"] = "Codefresh tunnel-based"
230232
} else {
231233
finalParameters["Ingress host"] = installationOpts.IngressHost
232234
finalParameters["Internal ingress host"] = installationOpts.InternalIngressHost
235+
finalParameters["Access mode"] = "Ingress-based"
233236
}
234237

235238
if err := getApprovalFromUser(ctx, finalParameters, "runtime install"); err != nil {

docs/releases/release_notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cf version
2323

2424
```bash
2525
# download and extract the binary
26-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.16/cf-linux-amd64.tar.gz | tar zx
26+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.17/cf-linux-amd64.tar.gz | tar zx
2727

2828
# move the binary to your $PATH
2929
mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -36,7 +36,7 @@ cf version
3636

3737
```bash
3838
# download and extract the binary
39-
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.16/cf-darwin-amd64.tar.gz | tar zx
39+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.1.17/cf-darwin-amd64.tar.gz | tar zx
4040

4141
# move the binary to your $PATH
4242
mv ./cf-darwin-amd64 /usr/local/bin/cf

pkg/git/provider.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ func GetProvider(providerType ProviderType, baseURL, certFile string) (Provider,
9797
func getGitProviderFromUserSelect(baseURL string, client *http.Client) (Provider) {
9898
var providers = map[string]func(string, *http.Client) (Provider, error){
9999
"Bitbucket": NewBitbucketServerProvider,
100-
"Github": NewGithubProvider,
101-
"Gitlab": NewGitlabProvider,
100+
"GitHub": NewGithubProvider,
101+
"GitLab": NewGitlabProvider,
102102
}
103103

104104
templates := &promptui.SelectTemplates{
@@ -109,7 +109,7 @@ func getGitProviderFromUserSelect(baseURL string, client *http.Client) (Provider
109109

110110
prompt := promptui.Select{
111111
Label: labelStr,
112-
Items: []string{"Github", "Gitlab", "Bitbucket"},
112+
Items: []string{"GitHub", "GitLab", "Bitbucket"},
113113
Templates: templates,
114114
}
115115

pkg/reporter/reporter.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,6 @@ func (r *segmentAnalyticsReporter) Close(status CliStepStatus, err error) {
207207
}
208208
}
209209

210-
log.G().Infof("Closing with status %s", status)
211-
212210
r.ReportStep(CliStepData{
213211
Step: FINISH,
214212
Status: status,

0 commit comments

Comments
 (0)