read and write the runtime definition to/from the correct file (#124)

* read and write the runtime definition to/from the correct file
* use ref for component URLs

Author: ATGardner

Makefile

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

cmd/commands/runtime.go

@@ -311,7 +311,7 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 		}
 	}
 
-	err = installComponents(ctx, opts, rt)	
+	err = installComponents(ctx, opts, rt)
 	if err != nil {
 		return err
 	}
@@ -320,11 +320,11 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	fullGsPath := opts.GsCloneOpts.FS.Join(opts.GsCloneOpts.FS.Root(), gsPath)[1:]
 
 	if err = RunGitSourceCreate(ctx, &GitSourceCreateOptions{
-		InsCloneOpts: opts.InsCloneOpts,
-		GsCloneOpts:  opts.GsCloneOpts,
-		GsName:       store.Get().GitSourceName,
-		RuntimeName:  opts.RuntimeName,
-		FullGsPath:   fullGsPath,
+		InsCloneOpts:               opts.InsCloneOpts,
+		GsCloneOpts:                opts.GsCloneOpts,
+		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)
@@ -335,13 +335,13 @@ func RunRuntimeInstall(ctx context.Context, opts *RuntimeInstallOptions) error {
 	}
 	mpCloneOpts.Parse()
 	if err = RunGitSourceCreate(ctx, &GitSourceCreateOptions{
-		InsCloneOpts: opts.InsCloneOpts,
-		GsCloneOpts: mpCloneOpts,
-		GsName:       store.Get().MarketplaceGitSourceName,
-		RuntimeName:  opts.RuntimeName,
-		FullGsPath:   store.Get().MarketplaceRepo,
+		InsCloneOpts:               opts.InsCloneOpts,
+		GsCloneOpts:                mpCloneOpts,
+		GsName:                     store.Get().MarketplaceGitSourceName,
+		RuntimeName:                opts.RuntimeName,
+		FullGsPath:                 store.Get().MarketplaceRepo,
 		CreateDemoWorkflowTemplate: false,
-		Include: "**/workflowTemplate.yaml",
+		Include:                    "**/workflowTemplate.yaml",
 	}); err != nil {
 		return fmt.Errorf("failed to create `%s`: %w", store.Get().GitSourceName, err)
 	}
@@ -712,7 +712,7 @@ func RunRuntimeUpgrade(ctx context.Context, opts *RuntimeUpgradeOptions) error {
 		return err
 	}
 
-	curRt, err := runtime.Load(fs, fs.Join(apstore.Default.BootsrtrapDir, store.Get().RuntimeFilename))
+	curRt, err := runtime.Load(fs, fs.Join(apstore.Default.BootsrtrapDir, opts.RuntimeName+".yaml"))
 	if err != nil {
 		return fmt.Errorf("failed to load current runtime definition: %w", err)
 	}
@@ -846,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
 	}
 

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.116/cf-linux-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.117/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.116/cf-darwin-amd64.tar.gz | tar zx
+curl -L --output - https://github.com/codefresh-io/cli-v2/releases/download/v0.0.117/cf-darwin-amd64.tar.gz | tar zx
 
 # move the binary to your $PATH
 mv ./cf-darwin-amd64 /usr/local/bin/cf

manifests/runtime.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: "{{ namespace }}"
 spec:
   defVersion: 1.0.0
-  version: 0.0.116
+  version: 0.0.117
   bootstrapSpecifier: github.com/codefresh-io/cli-v2/manifests/argo-cd
   components:
     - name: events

pkg/runtime/runtime.go

@@ -113,26 +113,27 @@ func Download(version *semver.Version, name string) (*Runtime, error) {
 	runtime.Name = name
 	runtime.Namespace = name
 	runtime.Spec.devMode = devMode
-	for _, component := range runtime.Spec.Components {
-		component.URL = runtime.Spec.fullURL(component.URL)
+	for i := range runtime.Spec.Components {
+		runtime.Spec.Components[i].URL = runtime.Spec.fullURL(runtime.Spec.Components[i].URL)
 	}
+
 	return runtime, nil
 }
 
 func Load(fs fs.FS, filename string) (*Runtime, error) {
 	cm := &v1.ConfigMap{}
 	if err := fs.ReadYamls(filename, cm); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to load runtime from '%s': %w", filename, err)
 	}
 
 	data := cm.Data["runtime"]
 	runtime := &Runtime{}
 	if err := yaml.Unmarshal([]byte(data), runtime); err != nil {
-		return nil, err
+		return nil, fmt.Errorf("failed to unmarshal runtime from '%s': %w", filename, err)
 	}
 
-	for _, component := range runtime.Spec.Components {
-		component.URL = runtime.Spec.fullURL(component.URL)
+	for i := range runtime.Spec.Components {
+		runtime.Spec.Components[i].URL = runtime.Spec.fullURL(runtime.Spec.Components[i].URL)
 	}
 
 	return runtime, nil
@@ -141,7 +142,7 @@ func Load(fs fs.FS, filename string) (*Runtime, error) {
 func (r *Runtime) Save(fs fs.FS, filename string, config *CommonConfig) error {
 	runtimeData, err := yaml.Marshal(r)
 	if err != nil {
-		return err
+		return fmt.Errorf("failed to marshal runtime: %w", err)
 	}
 
 	cm := v1.ConfigMap{
@@ -172,7 +173,7 @@ func (r *Runtime) Upgrade(fs fs.FS, newRt *Runtime, config *CommonConfig) ([]App
 		return nil, err
 	}
 
-	if err := newRt.Save(fs, fs.Join(apstore.Default.BootsrtrapDir, store.Get().RuntimeFilename), config); err != nil {
+	if err := newRt.Save(fs, fs.Join(apstore.Default.BootsrtrapDir, r.Name+".yaml"), config); err != nil {
 		return nil, fmt.Errorf("failed to save runtime definition: %w", err)
 	}
 
@@ -250,9 +251,8 @@ func (a *AppDef) CreateApp(ctx context.Context, f kube.Factory, cloneOpts *git.C
 			Labels: map[string]string{
 				util.EscapeAppsetFieldName(store.Get().LabelKeyCFType): cfType,
 			},
-			Exclude: exclude ,
+			Exclude: exclude,
 			Include: include,
-		
 		},
 		KubeFactory: f,
 		Timeout:     timeout,

pkg/store/store.go

@@ -44,7 +44,6 @@ type Version struct {
 }
 
 type Store struct {
-  
 	ArgoCDServerName                     string
 	ArgoCDTokenKey                       string
 	ArgoCDTokenSecret                    string
@@ -76,10 +75,9 @@ type Store struct {
 	IngressPath                          string
 	LabelKeyCFType                       string
 	MarketplaceGitSourceName             string
-	MarketplaceRepo			             string
+	MarketplaceRepo                      string
 	MaxDefVersion                        *semver.Version
 	RuntimeDefURL                        string
-	RuntimeFilename                      string
 	Version                              Version
 	WaitTimeout                          time.Duration
 	WorkflowName                         string
@@ -147,9 +145,8 @@ func init() {
 	s.LabelKeyCFType = "codefresh.io/entity"
 	s.MaxDefVersion = semver.MustParse(maxDefVersion)
 	s.RuntimeDefURL = RuntimeDefURL
-	s.RuntimeFilename = "runtime.yaml"
 	s.MarketplaceGitSourceName = "marketplace-git-source"
-    s.MarketplaceRepo = "https://github.com/codefresh-io/2.0-marketplace.git/"
+	s.MarketplaceRepo = "https://github.com/codefresh-io/2.0-marketplace.git/"
 	s.WaitTimeout = 8 * time.Minute
 	s.WorkflowName = "workflow"
 	s.WorkflowReporterName = "workflow-reporter"