Skip to content

Commit d53d8e2

Browse files
elad-codefreshelad-codefresh
authored
rev-11030-2 (#360)
* Revert "CR-10299-2 (#359)" This reverts commit c97d1ab.
1 parent c97d1ab commit d53d8e2

File tree

5 files changed

+65
-143
lines changed

5 files changed

+65
-143
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.319
1+
VERSION=v0.0.320
22

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

‎cmd/commands/git-source.go

Lines changed: 51 additions & 128 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"strings"
2222
"time"
2323

24-
"github.com/Masterminds/semver/v3"
2524
apcmd "github.com/argoproj-labs/argocd-autopilot/cmd/commands"
2625
"github.com/argoproj-labs/argocd-autopilot/pkg/application"
2726
"github.com/argoproj-labs/argocd-autopilot/pkg/fs"
@@ -40,8 +39,8 @@ import (
4039
"github.com/codefresh-io/cli-v2/pkg/store"
4140
"github.com/codefresh-io/cli-v2/pkg/util"
4241
apu "github.com/codefresh-io/cli-v2/pkg/util/aputil"
43-
eventsutil "github.com/codefresh-io/cli-v2/pkg/util/events"
4442
ingressutil "github.com/codefresh-io/cli-v2/pkg/util/ingress"
43+
eventsutil "github.com/codefresh-io/cli-v2/pkg/util/events"
4544
wfutil "github.com/codefresh-io/cli-v2/pkg/util/workflow"
4645
billyUtils "github.com/go-git/go-billy/v5/util"
4746
"github.com/juju/ansiterm"
@@ -104,8 +103,6 @@ type (
104103
}
105104
)
106105

107-
var versionOfGitSourceByAppProxyRefactor = semver.MustParse("0.0.319")
108-
109106
func NewGitSourceCommand() *cobra.Command {
110107
cmd := &cobra.Command{
111108
Use: "git-source",
@@ -208,57 +205,37 @@ func NewGitSourceCreateCommand() *cobra.Command {
208205
}
209206

210207
func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error {
211-
version, err := getRuntimeVersion(ctx, opts.RuntimeName)
208+
// upsert git-source repo
209+
210+
gsRepo, gsFs, err := opts.GsCloneOpts.GetRepo(ctx)
212211
if err != nil {
213-
return err
212+
return fmt.Errorf("failed to clone git-source repo: %w", err)
214213
}
215214

216-
if version.LessThan(versionOfGitSourceByAppProxyRefactor) {
217-
218-
log.G(ctx).Infof("runtime \"%s\" is using a depracated git-source api. Versions %s and up use the app-proxy for this command", opts.RuntimeName, minAddClusterSupportedVersion)
219-
// upsert git-source repo
220-
gsRepo, gsFs, err := opts.GsCloneOpts.GetRepo(ctx)
221-
if err != nil {
222-
return fmt.Errorf("failed to clone git-source repo: %w", err)
223-
}
224-
225-
if opts.CreateDemoResources {
226-
if err := createDemoResources(ctx, opts, gsRepo, gsFs); err != nil {
227-
return fmt.Errorf("failed to create git-source demo resources: %w", err)
228-
}
229-
} else {
230-
if err := createPlaceholderIfNeeded(ctx, opts, gsRepo, gsFs); err != nil {
231-
return fmt.Errorf("failed to create a git-source placeholder: %w", err)
232-
}
233-
}
234-
235-
appDef := &runtime.AppDef{
236-
Name: opts.GsName,
237-
Type: application.AppTypeDirectory,
238-
URL: opts.GsCloneOpts.Repo,
239-
}
240-
241-
appDef.IsInternal = util.StringIndexOf(store.Get().CFInternalGitSources, appDef.Name) > -1
242-
243-
if err := appDef.CreateApp(ctx, nil, opts.InsCloneOpts, opts.RuntimeName, store.Get().CFGitSourceType, opts.Include, ""); err != nil {
244-
return fmt.Errorf("failed to create git-source application. Err: %w", err)
215+
if opts.CreateDemoResources {
216+
if err := createDemoResources(ctx, opts, gsRepo, gsFs); err != nil {
217+
return fmt.Errorf("failed to create git-source demo resources: %w", err)
245218
}
246219
} else {
247-
appProxy, err := cfConfig.NewClient().AppProxy(ctx, opts.RuntimeName, store.Get().InsecureIngressHost)
248-
if err != nil {
249-
return err
220+
if err := createPlaceholderIfNeeded(ctx, opts, gsRepo, gsFs); err != nil {
221+
return fmt.Errorf("failed to create a git-source placeholder: %w", err)
250222
}
223+
}
251224

252-
appSpecifier := opts.GsCloneOpts.Repo
253-
isInternal := util.StringIndexOf(store.Get().CFInternalGitSources, opts.GsName) > -1
225+
appDef := &runtime.AppDef{
226+
Name: opts.GsName,
227+
Type: application.AppTypeDirectory,
228+
URL: opts.GsCloneOpts.Repo,
229+
}
254230

255-
err = appProxy.AppProxyGitSources().Create(ctx, opts.GsName, appSpecifier, opts.RuntimeName, opts.RuntimeName, isInternal)
256-
if err != nil {
257-
return fmt.Errorf("failed to create git-source: %w", err)
258-
}
231+
appDef.IsInternal = util.StringIndexOf(store.Get().CFInternalGitSources, appDef.Name) > -1
232+
233+
if err := appDef.CreateApp(ctx, nil, opts.InsCloneOpts, opts.RuntimeName, store.Get().CFGitSourceType, opts.Include, ""); err != nil {
234+
return fmt.Errorf("failed to create git-source application. Err: %w", err)
259235
}
260236

261237
log.G(ctx).Infof("Successfully created git-source: \"%s\"", opts.GsName)
238+
262239
return nil
263240
}
264241

@@ -391,7 +368,7 @@ func createCronExampleEventSource() *eventsourcev1alpha1.EventSource {
391368
Name: store.Get().CronExampleEventSourceName,
392369
},
393370
Spec: eventsourcev1alpha1.EventSourceSpec{
394-
Template: tpl,
371+
Template: tpl,
395372
EventBusName: store.Get().EventBusName,
396373
Calendar: map[string]eventsourcev1alpha1.CalendarEventSource{
397374
store.Get().CronExampleEventName: {
@@ -413,7 +390,7 @@ func createCronExampleSensor(triggers []sensorsv1alpha1.Trigger) (*sensorsv1alph
413390

414391
tpl := &sensorsv1alpha1.Template{
415392
ServiceAccountName: "argo-server",
416-
Container: &corev1.Container{},
393+
Container: &corev1.Container{},
417394
}
418395

419396
if store.Get().SetDefaultResources {
@@ -430,7 +407,7 @@ func createCronExampleSensor(triggers []sensorsv1alpha1.Trigger) (*sensorsv1alph
430407
},
431408
Spec: sensorsv1alpha1.SensorSpec{
432409
EventBusName: "codefresh-eventbus",
433-
Template: tpl,
410+
Template: tpl,
434411
Dependencies: dependencies,
435412
Triggers: triggers,
436413
},
@@ -603,36 +580,19 @@ func NewGitSourceDeleteCommand() *cobra.Command {
603580
}
604581

605582
func RunGitSourceDelete(ctx context.Context, opts *GitSourceDeleteOptions) error {
606-
version, err := getRuntimeVersion(ctx, opts.RuntimeName)
607-
if err != nil {
608-
return err
609-
}
610-
611-
if version.LessThan(versionOfGitSourceByAppProxyRefactor) {
612-
log.G(ctx).Infof("runtime \"%s\" is using a depracated git-source api. Versions %s and up use the app-proxy for this command", opts.RuntimeName, minAddClusterSupportedVersion)
613-
err = apcmd.RunAppDelete(ctx, &apcmd.AppDeleteOptions{
614-
CloneOpts: opts.InsCloneOpts,
615-
ProjectName: opts.RuntimeName,
616-
AppName: opts.GsName,
617-
Global: false,
618-
})
619-
620-
if err != nil {
621-
return fmt.Errorf("failed to delete the git-source %s. Err: %w", opts.GsName, err)
622-
}
623-
} else {
624-
appProxy, err := cfConfig.NewClient().AppProxy(ctx, opts.RuntimeName, store.Get().InsecureIngressHost)
625-
if err != nil {
626-
return err
627-
}
583+
err := apcmd.RunAppDelete(ctx, &apcmd.AppDeleteOptions{
584+
CloneOpts: opts.InsCloneOpts,
585+
ProjectName: opts.RuntimeName,
586+
AppName: opts.GsName,
587+
Global: false,
588+
})
628589

629-
err = appProxy.AppProxyGitSources().Delete(ctx, opts.GsName)
630-
if err != nil {
631-
return fmt.Errorf("failed to delete git-source: %w", err)
632-
}
590+
if err != nil {
591+
return fmt.Errorf("failed to delete the git-source %s. Err: %w", opts.GsName, err)
633592
}
634593

635594
log.G(ctx).Infof("Successfully deleted the git-source: %s", opts.GsName)
595+
636596
return nil
637597
}
638598

@@ -702,53 +662,29 @@ func NewGitSourceEditCommand() *cobra.Command {
702662
func RunGitSourceEdit(ctx context.Context, opts *GitSourceEditOptions) error {
703663
repo, fs, err := opts.InsCloneOpts.GetRepo(ctx)
704664
if err != nil {
705-
return err
665+
return fmt.Errorf("failed to clone the installation repo, attemptint to edit git-source %s. Err: %w", opts.GsName, err)
706666
}
707-
708-
version, err := getRuntimeVersion(ctx, opts.RuntimeName)
667+
c := &dirConfig{}
668+
fileName := fs.Join(apstore.Default.AppsDir, opts.GsName, opts.RuntimeName, "config_dir.json")
669+
err = fs.ReadJson(fileName, c)
709670
if err != nil {
710-
return err
671+
return fmt.Errorf("failed to read the %s of git-source: %s. Err: %w", fileName, opts.GsName, err)
711672
}
712673

713-
if version.LessThan(versionOfGitSourceByAppProxyRefactor) {
714-
log.G(ctx).Infof("runtime \"%s\" is using a depracated git-source api. Versions %s and up use the app-proxy for this command", opts.RuntimeName, minAddClusterSupportedVersion)
715-
716-
if err != nil {
717-
return fmt.Errorf("failed to clone the installation repo, attemptint to edit git-source %s. Err: %w", opts.GsName, err)
718-
}
719-
c := &dirConfig{}
720-
fileName := fs.Join(apstore.Default.AppsDir, opts.GsName, opts.RuntimeName, "config_dir.json")
721-
err = fs.ReadJson(fileName, c)
722-
if err != nil {
723-
return fmt.Errorf("failed to read the %s of git-source: %s. Err: %w", fileName, opts.GsName, err)
724-
}
725-
726-
c.Config.SrcPath = opts.GsCloneOpts.Path()
727-
c.Config.SrcRepoURL = opts.GsCloneOpts.URL()
728-
c.Config.SrcTargetRevision = opts.GsCloneOpts.Revision()
729-
730-
err = fs.WriteJson(fileName, c)
731-
if err != nil {
732-
return fmt.Errorf("failed to write the updated %s of git-source: %s. Err: %w", fileName, opts.GsName, err)
733-
}
674+
c.Config.SrcPath = opts.GsCloneOpts.Path()
675+
c.Config.SrcRepoURL = opts.GsCloneOpts.URL()
676+
c.Config.SrcTargetRevision = opts.GsCloneOpts.Revision()
734677

735-
log.G(ctx).Info("Pushing updated GitSource to the installation repo")
736-
if err := apu.PushWithMessage(ctx, repo, fmt.Sprintf("Persisted an updated git-source \"%s\"", opts.GsName)); err != nil {
737-
return fmt.Errorf("failed to persist the updated git-source: %s. Err: %w", opts.GsName, err)
738-
}
739-
} else {
740-
appProxy, err := cfConfig.NewClient().AppProxy(ctx, opts.RuntimeName, store.Get().InsecureIngressHost)
741-
if err != nil {
742-
return err
743-
}
678+
err = fs.WriteJson(fileName, c)
679+
if err != nil {
680+
return fmt.Errorf("failed to write the updated %s of git-source: %s. Err: %w", fileName, opts.GsName, err)
681+
}
744682

745-
err = appProxy.AppProxyGitSources().Edit(ctx, opts.GsName, opts.GsCloneOpts.Repo)
746-
if err != nil {
747-
return fmt.Errorf("failed to edit git-source: %w", err)
748-
}
683+
log.G(ctx).Info("Pushing updated GitSource to the installation repo")
684+
if err := apu.PushWithMessage(ctx, repo, fmt.Sprintf("Persisted an updated git-source \"%s\"", opts.GsName)); err != nil {
685+
return fmt.Errorf("failed to persist the updated git-source: %s. Err: %w", opts.GsName, err)
749686
}
750687

751-
log.G(ctx).Infof("Successfully created git-source: \"%s\"", opts.GsName)
752688
return nil
753689
}
754690

@@ -909,7 +845,7 @@ func createGithubExampleEventSource(repoURL string, ingressHost string, runtimeN
909845
},
910846
Spec: eventsourcev1alpha1.EventSourceSpec{
911847
EventBusName: store.Get().EventBusName,
912-
Template: tpl,
848+
Template: tpl,
913849
Service: &eventsourcev1alpha1.Service{
914850
Ports: []corev1.ServicePort{
915851
{
@@ -1023,7 +959,7 @@ func createGithubExampleSensor() *sensorsv1alpha1.Sensor {
1023959
}
1024960

1025961
tpl := &sensorsv1alpha1.Template{
1026-
Container: &corev1.Container{},
962+
Container: &corev1.Container{},
1027963
ServiceAccountName: store.Get().WorkflowTriggerServiceAccount,
1028964
}
1029965

@@ -1041,7 +977,7 @@ func createGithubExampleSensor() *sensorsv1alpha1.Sensor {
1041977
},
1042978
Spec: sensorsv1alpha1.SensorSpec{
1043979
EventBusName: store.Get().EventBusName,
1044-
Template: tpl,
980+
Template: tpl,
1045981
Dependencies: dependencies,
1046982
Triggers: triggers,
1047983
},
@@ -1221,16 +1157,3 @@ func unMarshalCustomObject(obj interface{}) (map[string]interface{}, error) {
12211157
}
12221158
return crd, nil
12231159
}
1224-
1225-
func getRuntimeVersion(ctx context.Context, runtimeName string) (*semver.Version, error) {
1226-
rt, err := cfConfig.NewClient().V2().Runtime().Get(ctx, runtimeName)
1227-
if err != nil {
1228-
return nil, err
1229-
}
1230-
1231-
if rt.RuntimeVersion == nil {
1232-
return nil, fmt.Errorf("runtime \"%s\" has no version", runtimeName)
1233-
}
1234-
1235-
return semver.MustParse(*rt.RuntimeVersion), nil
1236-
}

‎cmd/commands/runtime.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ func runtimeInstallCommandPreRunHandler(cmd *cobra.Command, opts *RuntimeInstall
291291
var err error
292292
handleCliStep(reporter.InstallPhasePreCheckStart, "Starting pre checks", nil, true, false)
293293

294-
opts.Version, err = getVersionIfExists(opts.versionStr)
294+
opts.Version, err = getVersionIfExists(opts)
295295
handleCliStep(reporter.InstallStepPreCheckValidateRuntimeVersion, "Validating runtime version", err, true, false)
296296
if err != nil {
297297
return err
@@ -2357,19 +2357,19 @@ func validateRuntimeName(runtime string) error {
23572357
return err
23582358
}
23592359

2360+
func getVersionIfExists(opts *RuntimeInstallOptions) (*semver.Version, error) {
2361+
if opts.versionStr != "" {
2362+
log.G().Infof("vesionStr: %s", opts.versionStr)
2363+
return semver.NewVersion(opts.versionStr)
2364+
}
2365+
2366+
return nil, nil
2367+
}
2368+
23602369
func initializeGitSourceCloneOpts(opts *RuntimeInstallOptions) {
23612370
opts.GsCloneOpts.Provider = opts.InsCloneOpts.Provider
23622371
opts.GsCloneOpts.Auth = opts.InsCloneOpts.Auth
23632372
opts.GsCloneOpts.Progress = opts.InsCloneOpts.Progress
23642373
host, orgRepo, _, _, _, suffix, _ := aputil.ParseGitUrl(opts.InsCloneOpts.Repo)
23652374
opts.GsCloneOpts.Repo = host + orgRepo + "_git-source" + suffix + "/resources" + "_" + opts.RuntimeName
23662375
}
2367-
2368-
func getVersionIfExists(versionStr string) (*semver.Version, error) {
2369-
if versionStr != "" {
2370-
log.G().Infof("vesionStr: %s", versionStr)
2371-
return semver.NewVersion(versionStr)
2372-
}
2373-
2374-
return nil, nil
2375-
}

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

Lines changed: 1 addition & 2 deletions
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.319
8+
version: 0.0.320
99
bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
1010
components:
1111
- name: events
@@ -21,4 +21,3 @@ spec:
2121
- name: app-proxy
2222
type: kustomize
2323
url: github.com/codefresh-io/cli-v2/manifests/app-proxy
24-
wait: true

0 commit comments

Comments
 (0)