Skip to content

Commit 2c24d52

Browse files
proxy-bump-3 (#366)
* bump * bump * Error format * log fix * log more descriptive * correct error format * bump * rename * bump
1 parent eec74d7 commit 2c24d52

File tree

6 files changed

+17
-17
lines changed

6 files changed

+17
-17
lines changed

Makefile

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

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

cmd/commands/git-source.go

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ type (
109109
}
110110
)
111111

112-
var versionOfGitSourceByAppProxyRefactor = semver.MustParse("0.0.326")
112+
var appProxyGitSourceSupport = semver.MustParse("0.0.328")
113113

114114
func NewGitSourceCommand() *cobra.Command {
115115
cmd := &cobra.Command{
@@ -232,8 +232,8 @@ func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error
232232
return legacyGitSourceCreate(ctx, opts)
233233
}
234234

235-
if version.LessThan(versionOfGitSourceByAppProxyRefactor) {
236-
log.G(ctx).Warnf("runtime \"%s\" is using a depracated git-source api. Versions %s and up use the app-proxy for this command", opts.RuntimeName, minAddClusterSupportedVersion)
235+
if version.LessThan(appProxyGitSourceSupport) {
236+
log.G(ctx).Warnf("runtime \"%s\" is using a depracated git-source api. Versions %s and up use the app-proxy for this command. You are using version: %s", opts.RuntimeName, appProxyGitSourceSupport, version.String())
237237
return legacyGitSourceCreate(ctx, opts)
238238
}
239239

@@ -256,7 +256,7 @@ func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error
256256
})
257257

258258
if err != nil {
259-
log.G(ctx).Errorf("failed to create git-source: %w", err)
259+
log.G(ctx).Errorf("failed to create git-source: %s", err.Error())
260260
log.G(ctx).Info("attempting creation of git-source without using app-proxy")
261261
return legacyGitSourceCreate(ctx, opts)
262262
}
@@ -611,8 +611,8 @@ func RunGitSourceDelete(ctx context.Context, opts *GitSourceDeleteOptions) error
611611
return err
612612
}
613613

614-
if version.LessThan(versionOfGitSourceByAppProxyRefactor) {
615-
log.G(ctx).Warnf("runtime \"%s\" is using a depracated git-source api. Versions %s and up use the app-proxy for this command", opts.RuntimeName, minAddClusterSupportedVersion)
614+
if version.LessThan(appProxyGitSourceSupport) {
615+
log.G(ctx).Warnf("runtime \"%s\" is using a depracated git-source api. Versions %s and up use the app-proxy for this command. You are using version: %s", opts.RuntimeName, appProxyGitSourceSupport, version.String())
616616
return legacyGitSourceDelete(ctx, opts)
617617
}
618618

@@ -623,7 +623,7 @@ func RunGitSourceDelete(ctx context.Context, opts *GitSourceDeleteOptions) error
623623

624624
err = appProxy.AppProxyGitSources().Delete(ctx, opts.GsName)
625625
if err != nil {
626-
log.G(ctx).Errorf("failed to delete git-source: %w", err)
626+
log.G(ctx).Errorf("failed to delete git-source: %s", err.Error())
627627
log.G(ctx).Info("attempting deletion of git-source without using app-proxy")
628628
err = apcmd.RunAppDelete(ctx, &apcmd.AppDeleteOptions{
629629
CloneOpts: opts.InsCloneOpts,
@@ -724,8 +724,8 @@ func RunGitSourceEdit(ctx context.Context, opts *GitSourceEditOptions) error {
724724
return err
725725
}
726726

727-
if version.LessThan(versionOfGitSourceByAppProxyRefactor) {
728-
log.G(ctx).Warnf("runtime \"%s\" is using a depracated git-source api. Versions %s and up use the app-proxy for this command", opts.RuntimeName, minAddClusterSupportedVersion)
727+
if version.LessThan(appProxyGitSourceSupport) {
728+
log.G(ctx).Warnf("runtime \"%s\" is using a depracated git-source api. Versions %s and up use the app-proxy for this command. You are using version: %s", opts.RuntimeName, appProxyGitSourceSupport, version.String())
729729
return legacyGitSourceEdit(ctx, opts)
730730
}
731731

@@ -742,7 +742,7 @@ func RunGitSourceEdit(ctx context.Context, opts *GitSourceEditOptions) error {
742742
})
743743

744744
if err != nil {
745-
log.G(ctx).Errorf("failed to edit git-source: %w", err)
745+
log.G(ctx).Errorf("failed to edit git-source: %s", err.Error())
746746
log.G(ctx).Info("attempting edit of git-source without using app-proxy")
747747
return legacyGitSourceEdit(ctx, opts)
748748
}
@@ -1317,4 +1317,4 @@ func legacyGitSourceDelete(ctx context.Context, opts *GitSourceDeleteOptions) er
13171317

13181318
log.G(ctx).Infof("Successfully deleted the git-source: %s", opts.GsName)
13191319
return nil
1320-
}
1320+
}

cmd/commands/runtime.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2235,7 +2235,7 @@ func postInstallationHandler(ctx context.Context, opts *RuntimeInstallOptions, e
22352235
})
22362236
handleCliStep(reporter.UninstallPhaseFinish, "Uninstall phase finished after rollback", err, false, true)
22372237
if err != nil {
2238-
log.G(ctx).Errorf("installation rollback failed: %w", err)
2238+
log.G(ctx).Errorf("installation rollback failed: %s", err.Error())
22392239
}
22402240
}
22412241

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.0.327/cf-linux-amd64.tar.gz | tar zx
26+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.328/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.0.327/cf-darwin-amd64.tar.gz | tar zx
39+
curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.328/cf-darwin-amd64.tar.gz | tar zx
4040

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

manifests/app-proxy/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Kustomization
33
images:
44
- name: quay.io/codefresh/cap-app-proxy
55
newName: quay.io/codefresh/cap-app-proxy
6-
newTag: 1.1112.0
6+
newTag: 1.1129.0
77
resources:
88
- app-proxy.deploy.yaml
99
- app-proxy.svc.yaml

manifests/runtime.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
namespace: "{{ namespace }}"
66
spec:
77
defVersion: 1.0.1
8-
version: 0.0.327
8+
version: 0.0.328
99
bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
1010
components:
1111
- name: events

0 commit comments

Comments
 (0)