Skip to content

Commit

Permalink
add json stdout of released charts
Browse files Browse the repository at this point in the history
  • Loading branch information
pete911 committed Jan 14, 2022
1 parent 13835e5 commit 769d5df
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 15 deletions.
31 changes: 17 additions & 14 deletions internal/hcr/releaser.go
Expand Up @@ -38,49 +38,49 @@ func NewReleaser(log *zap.Logger, config Config) (Releaser, error) {
}, nil
}

func (r Releaser) Release(ctx context.Context) error {
func (r Releaser) Release(ctx context.Context) (map[string]*chart.Chart, error) {
// check if the remote GitHub pages branch exists
if err := r.pagesRemoteBranchExists(); err != nil {
return err
return nil, err
}
r.log.Info("github pages remote branch exists")

// package charts
charts, chartsCleanup, err := r.helmClient.PackageCharts(r.config.ChartsDir)
if err != nil {
return fmt.Errorf("package charts: %w", err)
return nil, fmt.Errorf("package charts: %w", err)
}
defer chartsCleanup()
r.log.Info("charts packaged")

// add GitHub pages worktree (so we can update index)
worktreeCleanup, err := r.addPagesWorktree()
if err != nil {
return err
return nil, err
}
defer worktreeCleanup()

// release charts and update index
ok, err := r.releaseChartsAndUpdateIndex(ctx, charts)
if err != nil {
return err
return nil, err
}
if !ok {
r.log.Info("no chart changes")
return nil
return nil, nil
}
r.log.Info("released charts and updated index")

// commit and push index
if err := r.gitClient.AddAndCommit(r.ghPagesDir, "index.yaml", "update index.yaml"); err != nil {
return fmt.Errorf("git commit index to github pages: %w", err)
return nil, fmt.Errorf("git commit index to github pages: %w", err)
}
if err := r.gitClient.Push(r.ghPagesDir, r.config.Remote, r.config.PagesBranch, r.config.Token); err != nil {
return fmt.Errorf("git push github pages: %w", err)
return nil, fmt.Errorf("git push github pages: %w", err)
}

r.log.Info("index updated and pushed to github pages")
return nil
return charts, nil
}

// releaseChartsAndUpdateIndex releases helm chart as GitHub releases and updates index file in GitHub pages. If the charts
Expand All @@ -106,11 +106,7 @@ func (r Releaser) releaseChartAndUpdateIndex(ctx context.Context, chartPath stri
return false, fmt.Errorf("get github owner and repo: %w", err)
}

tag := r.config.Tag
if tag == "" {
tag = ch.Metadata.Version
}

tag := r.GetReleaseTag(ch)
ok, err := r.ghClient.ReleaseExists(ctx, owner, repo, tag)
if err != nil {
return false, fmt.Errorf("%s release %s exists: %w", ch.Name(), tag, err)
Expand Down Expand Up @@ -143,6 +139,13 @@ func (r Releaser) releaseChartAndUpdateIndex(ctx context.Context, chartPath stri
return ok, nil
}

func (r Releaser) GetReleaseTag(ch *chart.Chart) string {
if r.config.Tag != "" {
return r.config.Tag
}
return ch.Metadata.Version
}

func (r Releaser) addPagesWorktree() (cleanup func(), err error) {
if err := r.gitClient.AddWorktree(r.ghPagesDir, r.config.Remote, r.config.PagesBranch); err != nil {
return nil, fmt.Errorf("add gh-pages worktree: %w", err)
Expand Down
17 changes: 16 additions & 1 deletion main.go
Expand Up @@ -2,6 +2,7 @@ package main

import (
"context"
"encoding/json"
"fmt"
"github.com/pete911/hcr/internal/flag"
"github.com/pete911/hcr/internal/hcr"
Expand Down Expand Up @@ -33,7 +34,21 @@ func main() {
if err != nil {
log.Fatal(fmt.Sprintf("new releaser: %v", err))
}
if err := releaser.Release(context.TODO()); err != nil {

chs, err := releaser.Release(context.TODO())
if err != nil {
log.Fatal(fmt.Sprintf("release: %v", err))
}

// print released charts
var out []map[string]string
for _, ch := range chs {
out = append(out, map[string]string{"chart": ch.Name(), "version": ch.Metadata.Version, "tag": releaser.GetReleaseTag(ch)})
}
b, err := json.Marshal(out)
if err != nil {
log.Error(fmt.Sprintf("marshal released charts info: %v", err))
return
}
fmt.Println(string(b))
}

0 comments on commit 769d5df

Please sign in to comment.