wip (#60)

Author: oren-codefresh

Makefile

@@ -1,4 +1,5 @@
-VERSION=v0.0.113
+VERSION=v0.0.114
+
 OUT_DIR=dist
 YEAR?=$(shell date +"%Y")
 

cmd/commands/git-source.go

@@ -52,11 +52,14 @@ import (
 
 type (
 	GitSourceCreateOptions struct {
-		InsCloneOpts *git.CloneOptions
-		GsCloneOpts  *git.CloneOptions
-		GsName       string
-		RuntimeName  string
-		FullGsPath   string
+		InsCloneOpts               *git.CloneOptions
+		GsCloneOpts                *git.CloneOptions
+		GsName                     string
+		RuntimeName                string
+		FullGsPath                 string
+		CreateDemoWorkflowTemplate bool
+		Exclude                    string
+		Include                    string
 	}
 
 	GitSourceDeleteOptions struct {
@@ -152,11 +155,12 @@ func NewGitSourceCreateCommand() *cobra.Command {
 			ctx := cmd.Context()
 
 			return RunGitSourceCreate(ctx, &GitSourceCreateOptions{
-				InsCloneOpts: insCloneOpts,
-				GsCloneOpts:  gsCloneOpts,
-				GsName:       args[1],
-				RuntimeName:  args[0],
-				FullGsPath:   gsCloneOpts.Path(),
+				InsCloneOpts:               insCloneOpts,
+				GsCloneOpts:                gsCloneOpts,
+				GsName:                     args[1],
+				RuntimeName:                args[0],
+				FullGsPath:                 gsCloneOpts.Path(),
+				CreateDemoWorkflowTemplate: false,
 			})
 		},
 	}
@@ -174,40 +178,43 @@ func NewGitSourceCreateCommand() *cobra.Command {
 }
 
 func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error {
-	gsRepo, gsFs, err := opts.GsCloneOpts.GetRepo(ctx)
-	if err != nil {
-		return err
-	}
+	if opts.CreateDemoWorkflowTemplate {
 
-	fi, err := gsFs.ReadDir(".")
-	if err != nil {
-		return fmt.Errorf("failed to read files in git-source repo. Err: %w", err)
-	}
-
-	if len(fi) == 0 {
-		err = createCronExamplePipeline(&gitSourceCronExampleOptions{
-			runtimeName: opts.RuntimeName,
-			gsCloneOpts: opts.GsCloneOpts,
-			gsFs:        gsFs,
-		})
+		gsRepo, gsFs, err := opts.GsCloneOpts.GetRepo(ctx)
 		if err != nil {
-			return fmt.Errorf("failed to create cron example pipeline. Error: %w", err)
+			return err
 		}
 
-		err = createGithubExamplePipeline(&gitSourceGithubExampleOptions{
-			runtimeName: opts.RuntimeName,
-			gsCloneOpts: opts.GsCloneOpts,
-			gsFs:        gsFs,
-		})
+		fi, err := gsFs.ReadDir(".")
 		if err != nil {
-			return fmt.Errorf("failed to create github example pipeline. Error: %w", err)
+			return fmt.Errorf("failed to read files in git-source repo. Err: %w", err)
 		}
 
-		commitMsg := fmt.Sprintf("Created demo pipelines in %s Directory", opts.GsCloneOpts.Path())
+		if len(fi) == 0 {
+			err = createCronExamplePipeline(&gitSourceCronExampleOptions{
+				runtimeName: opts.RuntimeName,
+				gsCloneOpts: opts.GsCloneOpts,
+				gsFs:        gsFs,
+			})
+			if err != nil {
+				return fmt.Errorf("failed to create cron example pipeline. Error: %w", err)
+			}
 
-		log.G(ctx).Info("Pushing demo pipelines to the new git-source repo")
-		if err := apu.PushWithMessage(ctx, gsRepo, commitMsg); err != nil {
-			return fmt.Errorf("failed to push demo pipelines to git-source repo: %w", err)
+			err = createGithubExamplePipeline(&gitSourceGithubExampleOptions{
+				runtimeName: opts.RuntimeName,
+				gsCloneOpts: opts.GsCloneOpts,
+				gsFs:        gsFs,
+			})
+			if err != nil {
+				return fmt.Errorf("failed to create github example pipeline. Error: %w", err)
+			}
+
+			commitMsg := fmt.Sprintf("Created demo pipelines in %s Directory", opts.GsCloneOpts.Path())
+
+			log.G(ctx).Info("Pushing demo pipelines to the new git-source repo")
+			if err := apu.PushWithMessage(ctx, gsRepo, commitMsg); err != nil {
+				return fmt.Errorf("failed to push demo pipelines to git-source repo: %w", err)
+			}
 		}
 	}
 
@@ -217,7 +224,7 @@ func RunGitSourceCreate(ctx context.Context, opts *GitSourceCreateOptions) error
 		URL:  opts.GsCloneOpts.Repo,
 	}
 
-	if err := appDef.CreateApp(ctx, nil, opts.InsCloneOpts, opts.RuntimeName, store.Get().CFGitSourceType); err != nil {
+	if err := appDef.CreateApp(ctx, nil, opts.InsCloneOpts, opts.RuntimeName, store.Get().CFGitSourceType, opts.Include, ""); err != nil {
 		return fmt.Errorf("failed to create git-source application. Err: %w", err)
 	}
 	log.G(ctx).Infof("Successfully created the git-source: '%s'", opts.GsName)

cmd/commands/runtime.go

@@ -306,27 +306,14 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 
 	for _, component := range rt.Spec.Components {
 		log.G(ctx).Infof("Creating component '%s'", component.Name)
-		if err = component.CreateApp(ctx, opts.KubeFactory, opts.InsCloneOpts, opts.RuntimeName, store.Get().CFComponentType); err != nil {
+		if err = component.CreateApp(ctx, opts.KubeFactory, opts.InsCloneOpts, opts.RuntimeName, store.Get().CFComponentType, "", ""); err != nil {
 			return fmt.Errorf("failed to create '%s' application: %w", component.Name, err)
 		}
 	}
 
-	if opts.IngressHost != "" {
-		if err = createWorkflowsIngress(ctx, opts.InsCloneOpts, rt); err != nil {
-			return fmt.Errorf("failed to patch Argo-Workflows ingress: %w", err)
-		}
-	}
-
-	if err = createCodefreshArgoAgentReporter(ctx, opts.InsCloneOpts, opts, rt); err != nil {
-		return fmt.Errorf("failed to create argocd-agent-reporter: %w", err)
-	}
-
-	if err = createEventsReporter(ctx, opts.InsCloneOpts, opts, rt); err != nil {
-		return fmt.Errorf("failed to create events-reporter: %w", err)
-	}
-
-	if err = createWorkflowReporter(ctx, opts.InsCloneOpts, opts); err != nil {
-		return fmt.Errorf("failed to create workflows-reporter: %w", err)
+	err = installComponents(ctx, opts, rt)	
+	if err != nil {
+		return err
 	}
 
 	gsPath := opts.GsCloneOpts.FS.Join(apstore.Default.AppsDir, store.Get().GitSourceName, opts.RuntimeName)
@@ -338,6 +325,23 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		GsName:       store.Get().GitSourceName,
 		RuntimeName:  opts.RuntimeName,
 		FullGsPath:   fullGsPath,
+		CreateDemoWorkflowTemplate: true,
+	}); err != nil {
+		return fmt.Errorf("failed to create `%s`: %w", store.Get().GitSourceName, err)
+	}
+
+	mpCloneOpts := &git.CloneOptions{
+		Repo: store.Get().MarketplaceRepo,
+	}
+	mpCloneOpts.Parse()
+	if err = RunGitSourceCreate(ctx, &GitSourceCreateOptions{
+		InsCloneOpts: opts.InsCloneOpts,
+		GsCloneOpts: mpCloneOpts,
+		GsName:       store.Get().MarketplaceGitSourceName,
+		RuntimeName:  opts.RuntimeName,
+		FullGsPath:   store.Get().MarketplaceRepo,
+		CreateDemoWorkflowTemplate: false,
+		Include: "**/workflowTemplate.yaml",
 	}); err != nil {
 		return fmt.Errorf("failed to create `%s`: %w", store.Get().GitSourceName, err)
 	}
@@ -355,6 +359,28 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	return nil
 }
 
+func installComponents(ctx context.Context, opts *RuntimeInstallOptions, rt *runtime.Runtime) error {
+	var err error
+	if opts.IngressHost != "" {
+		if err = createWorkflowsIngress(ctx, opts.InsCloneOpts, rt); err != nil {
+			return fmt.Errorf("failed to patch Argo-Workflows ingress: %w", err)
+		}
+	}
+
+	if err = createCodefreshArgoAgentReporter(ctx, opts.InsCloneOpts, opts, rt); err != nil {
+		return fmt.Errorf("failed to create argocd-agent-reporter: %w", err)
+	}
+
+	if err = createEventsReporter(ctx, opts.InsCloneOpts, opts, rt); err != nil {
+		return fmt.Errorf("failed to create events-reporter: %w", err)
+	}
+
+	if err = createWorkflowReporter(ctx, opts.InsCloneOpts, opts); err != nil {
+		return fmt.Errorf("failed to create workflows-reporter: %w", err)
+	}
+	return nil
+}
+
 func preInstallationChecks(ctx context.Context, opts *RuntimeInstallOptions) error {
 	log.G(ctx).Debug("running pre-installation checks...")
 
@@ -707,7 +733,7 @@ func RunRuntimeUpgrade(ctx context.Context, opts *RuntimeUpgradeOptions) error {
 
 	for _, component := range newComponents {
 		log.G(ctx).Infof("Creating app '%s'", component.Name)
-		if err = component.CreateApp(ctx, nil, opts.CloneOpts, opts.RuntimeName, store.Get().CFComponentType); err != nil {
+		if err = component.CreateApp(ctx, nil, opts.CloneOpts, opts.RuntimeName, store.Get().CFComponentType, "", ""); err != nil {
 			return fmt.Errorf("failed to create '%s' application: %w", component.Name, err)
 		}
 	}
@@ -820,7 +846,7 @@ func createEventsReporter(ctx context.Context, cloneOpts *git.CloneOptions, opts
 		Type: application.AppTypeDirectory,
 		URL:  cloneOpts.URL() + "/" + resPath,
 	}
-	if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, store.Get().CFComponentType); err != nil {
+	if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, store.Get().CFComponentType,"", ""); err != nil {
 		return err
 	}
 
@@ -875,7 +901,7 @@ func createWorkflowReporter(ctx context.Context, cloneOpts *git.CloneOptions, op
 		Type: application.AppTypeDirectory,
 		URL:  cloneOpts.URL() + "/" + resPath,
 	}
-	if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, store.Get().CFComponentType); err != nil {
+	if err := appDef.CreateApp(ctx, opts.KubeFactory, cloneOpts, opts.RuntimeName, store.Get().CFComponentType, "", ""); err != nil {
 		return err
 	}
 

docs/releases/release_notes.md

@@ -20,7 +20,7 @@ cf version
 ### Linux
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.113/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.114/cf-linux-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-linux-amd64 /usr/local/bin/cf
@@ -32,7 +32,7 @@ cf version
 ### Mac
 ```bash
 # download and extract the binary
-curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.113/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.114/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

go.mod

@@ -4,8 +4,8 @@ go 1.16
 
 require (
 	github.com/Masterminds/semver/v3 v3.1.1
-	github.com/argoproj-labs/applicationset v0.1.0
-	github.com/argoproj-labs/argocd-autopilot v0.2.18
+	github.com/argoproj-labs/applicationset v0.2.0
+	github.com/argoproj-labs/argocd-autopilot v0.2.20
 	github.com/argoproj/argo-cd/v2 v2.1.2
 	github.com/argoproj/argo-events v1.4.0
 	github.com/argoproj/argo-workflows/v3 v3.1.6
@@ -30,7 +30,6 @@ require (
 )
 
 replace (
-	github.com/argoproj-labs/applicationset => github.com/argoproj-labs/applicationset v0.0.0-20210614145856-2c62537a8e5a
 	github.com/argoproj/argo-events => github.com/argoproj/argo-events v0.17.1-0.20210615165534-d403c441bc1d
 	github.com/argoproj/gitops-engine => github.com/argoproj/gitops-engine v0.3.1-0.20210709004906-a4c77d5c70fb
 	k8s.io/api => k8s.io/api v0.21.1