feat: adds CLI tool… - input-output-hk/catalyst-ci@54ff4961

Home / Input Output / catalyst-ci / 54ff4961

View on GitHub

File Changes

a

cli/Earthfile

+61/-0

+

VERSION 0.7

+

FROM golang:1.20-alpine3.18

+

deps:

+

    WORKDIR /work

+

    COPY go.mod go.sum ./

+

    RUN go mod download

+

    # Install external deps

+

    RUN apk add --no-cache gcc musl-dev

+

    # Make sure the ginkgo binary is available for the test stage

+

    RUN go install github.com/onsi/ginkgo/v2

+

    SAVE ARTIFACT go.mod AS LOCAL go.mod

+

    SAVE ARTIFACT go.sum AS LOCAL go.sum

+

check:

+

    FROM +deps

+

    COPY --dir cmd pkg pkg .

+

    RUN go fmt ./...

+

    RUN go vet ./...

+

test:

+

    FROM +check

+

    RUN ginkgo ./...

+

build:

+

    FROM +check

+

    RUN go build -o bin/ci cmd/main.go

+

    SAVE ARTIFACT bin/ci ci

+

docker:

+

    FROM earthly/earthly:v0.7.6

+

    ARG tag=latest

+

    ARG registry

+

    WORKDIR /workspace

+

    # Add runtime dependencies

+

    RUN apk add --no-cache aws-cli bash git jq

+

    # Trust WORKDIR

+

    RUN git config --global --add safe.directory /workspace

+

    COPY +build/ci /usr/local/bin/ci

+

    IF [ "$registry" = "" ]

+

        ARG registry_final=$registry

+

    ELSE

+

        ARG registry_final=${registry}/

+

END

+

    ENTRYPOINT ["/usr/local/bin/ci"]

+

    SAVE IMAGE --push ${registry_final}ci:${tag}

\ No newline at end of file

a

cli/cmd/main.go

+203/-0

+

package main

+

import (

+

	"encoding/json"

+

	"fmt"

+

	"os"

+

	"path/filepath"

+

	"strings"

+

	"text/template"

+

	"time"

+

	"github.com/alecthomas/kong"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg/executors"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg/git_clients"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg/parsers"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg/scanners"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg/util"

+

	"github.com/spf13/afero"

+

// TagTemplate is a template for generating image tags.

+

type TagTemplate struct {

+

	Hash      string

+

	Timestamp string

+

	Version   string

+

var cli struct {

+

	Images imagesCmd `cmd:"" help:"Find the images generated by an Earthfile target."`

+

	Scan   scanCmd   `cmd:"" help:"Scan for Earthfiles."`

+

	Tags   tagsCmd   `cmd:"" help:"Generate image tags with the current git context."`

+

type imagesCmd struct {

+

	JsonOutput bool   `short:"j" long:"json" help:"Output in JSON format"`

+

	Path       string `                      help:"path to Earthfile"               arg:"" type:"path"`

+

	Target     string `short:"t"             help:"The target to search for images"                    required:"true"`

+

func (c *imagesCmd) Run() error {

+

	parser := parsers.NewEarthlyParser()

+

	earthfile, err := parser.Parse(c.Path)

+

	if err != nil {

+

		return err

+

	images, err := earthfile.GetImages(c.Target)

+

	if err != nil {

+

		return err

+

	if c.JsonOutput {

+

		jsonImages, err := json.Marshal(images)

+

		if err != nil {

+

			return err

+

		fmt.Println(string(jsonImages))

+

		return nil

+

	} else {

+

		for _, image := range images {

+

			fmt.Println(image)

+

	return nil

+

type scanCmd struct {

+

	JsonOutput bool     `short:"j" long:"json"   help:"Output in JSON format"`

+

	Images     bool     `short:"i" long:"images" help:"Also output images for the target of each Earthfile (requires -t option)"`

+

	Paths      []string `                        help:"paths to scan for Earthfiles"                                             arg:"" type:"path"`

+

	Target     string   `short:"t"               help:"filter by Earthfiles that include this target"                                               default:""`

+

func (c *scanCmd) Run() error {

+

	parser := parsers.NewEarthlyParser()

+

	scanner := scanners.NewFileScanner(c.Paths, parser, afero.NewOsFs())

+

	var files []pkg.Earthfile

+

	var err error

+

	if c.Target != "" {

+

		files, err = scanner.ScanForTarget(c.Target)

+

	} else {

+

		files, err = scanner.Scan()

+

	if err != nil {

+

		return err

+

	if c.Images {

+

		if c.Target == "" {

+

			return fmt.Errorf(

+

				"the --images (-i) option requires the --target (-t) option",

+

		var output = make(map[string][]string)

+

		for _, file := range files {

+

			images, err := file.GetImages(c.Target)

+

			if err != nil {

+

				return err

+

			output[filepath.Dir(file.Path)] = images

+

		if c.JsonOutput {

+

			var outFinal []interface{}

+

			for path, images := range output {

+

				out := struct {

+

					Images []string `json:"images"`

+

					Path   string   `json:"path"`

+

}{

+

					Images: images,

+

					Path:   path,

+

				outFinal = append(outFinal, out)

+

			jsonOutput, err := json.Marshal(outFinal)

+

			if err != nil {

+

				return err

+

			fmt.Println(string(jsonOutput))

+

		} else {

+

			for path, images := range output {

+

				fmt.Printf("%s %s\n", path, strings.Join(images, ","))

+

		return nil

+

	if c.JsonOutput {

+

		var paths []string

+

		for _, file := range files {

+

			paths = append(paths, filepath.Dir(file.Path))

+

		jsonFiles, err := json.Marshal(paths)

+

		if err != nil {

+

			return err

+

		fmt.Println(string(jsonFiles))

+

	} else {

+

		for _, file := range files {

+

			fmt.Println(filepath.Dir(file.Path))

+

	return nil

+

type tagsCmd struct {

+

	TemplateString string `arg:"" help:"template for generating image tags" default:"{{ .Hash }}"`

+

func (c *tagsCmd) Run() error {

+

	executor := executors.NewLocalExecutor("git")

+

	client := git_clients.NewExternalGitClient(executor)

+

	// Collect the highest version from the git tags

+

	tags, err := client.Tags()

+

	if err != nil {

+

		return err

+

	highest := util.GetHighestVersion(tags)

+

	// Get the current git commit hash

+

	hash, err := executor.Run("rev-parse", "HEAD")

+

	if err != nil {

+

		return err

+

	// Get the current timestamp

+

	timestamp := time.Now().Format("20060102150405")

+

	// Generate the tag

+

	tmpl, err := template.New("tag").Parse(c.TemplateString)

+

	if err != nil {

+

		return err

+

	data := TagTemplate{

+

		Hash:      hash,

+

		Timestamp: timestamp,

+

		Version:   highest,

+

	err = tmpl.Execute(os.Stdout, data)

+

	if err != nil {

+

		return err

+

	return nil

+

func main() {

+

	ctx := kong.Parse(&cli)

...

a

cli/go.mod

+26/-0

+

module github.com/input-output-hk/catalyst-ci/cli

+

go 1.19

+

require (

+

	github.com/Masterminds/semver/v3 v3.2.1

+

	github.com/alecthomas/kong v0.7.1

+

	github.com/onsi/ginkgo/v2 v2.6.1

+

	github.com/onsi/gomega v1.24.2

+

	github.com/spf13/afero v1.9.5

+

require (

+

	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230219212500-1f9a474cc2dc // indirect

+

	github.com/earthly/earthly/ast v0.0.2-0.20230524145153-17fad8c8f79b // indirect

+

	github.com/go-logr/logr v1.2.3 // indirect

+

	github.com/google/go-cmp v0.5.9 // indirect

+

	github.com/kr/text v0.2.0 // indirect

+

	github.com/pkg/errors v0.9.1 // indirect

+

	golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 // indirect

+

	golang.org/x/net v0.10.0 // indirect

+

	golang.org/x/sys v0.8.0 // indirect

+

	golang.org/x/text v0.9.0 // indirect

+

	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect

+

	gopkg.in/yaml.v3 v3.0.1 // indirect

+

a

cli/go.sum

+475/-0

+

cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=

+

cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=

+

cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=

+

cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=

+

cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=

+

cloud.google.com/go v0.44.3/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=

+

cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=

+

cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=

+

cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=

+

cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=

+

cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=

+

cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=

+

cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=

+

cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=

+

cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=

+

cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=

+

cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI=

+

cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk=

+

cloud.google.com/go v0.75.0/go.mod h1:VGuuCn7PG0dwsd5XPVm2Mm3wlh3EL55/79EKB6hlPTY=

+

cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=

+

cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=

+

cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=

+

cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=

+

cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=

+

cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=

+

cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=

+

cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=

+

cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=

+

cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=

+

cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=

+

cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=

+

cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=

+

cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=

+

cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=

+

cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=

+

cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=

+

cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=

+

dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=

+

github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=

+

github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=

+

github.com/Masterminds/semver/v3 v3.2.1 h1:RN9w6+7QoMeJVGyfmbcgs28Br8cvmnucEXnY0rYXWg0=

+

github.com/Masterminds/semver/v3 v3.2.1/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYrf8m9wsX0PNOMQ=

+

github.com/alecthomas/assert/v2 v2.1.0 h1:tbredtNcQnoSd3QBhQWI7QZ3XHOVkw1Moklp2ojoH/0=

+

github.com/alecthomas/kong v0.7.1 h1:azoTh0IOfwlAX3qN9sHWTxACE2oV8Bg2gAwBsMwDQY4=

+

github.com/alecthomas/kong v0.7.1/go.mod h1:n1iCIO2xS46oE8ZfYCNDqdR0b0wZNrXAIAqro/2132U=

+

github.com/alecthomas/repr v0.1.0 h1:ENn2e1+J3k09gyj2shc0dHr/yjaWSHRlrJ4DPMevDqE=

+

github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230219212500-1f9a474cc2dc h1:ikxgKfnYm4kXCOohe1uCkVFwZcABDZbVsqginko+GY8=

+

github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230219212500-1f9a474cc2dc/go.mod h1:pSwJ0fSY5KhvocuWSx4fz3BA8OrA1bQn+K1Eli3BRwM=

+

github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=

+

github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=

+

github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=

+

github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=

+

github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=

+

github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=

+

github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=

+

github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=

+

github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=

+

github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

+

github.com/earthly/earthly/ast v0.0.2-0.20230524145153-17fad8c8f79b h1:kwdLqircFHqYNLrBuSOybPpGPnqaqXEcRvJOWiSqRZw=

+

github.com/earthly/earthly/ast v0.0.2-0.20230524145153-17fad8c8f79b/go.mod h1:OoxU/3mRER8gdd4l1lxF6EgK+0vf7zQ8m9g269y6hWI=

+

github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

+

github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=

+

github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=

+

github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po=

+

github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=

+

github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=

+

github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=

+

github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=

+

github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=

+

github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0=

+

github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=

+

github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=

+

github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=

+

github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=

+

github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=

+

github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=

+

github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=

+

github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=

+

github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=

+

github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=

+

github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=

+

github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=

+

github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

+

github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

+

github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

+

github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=

+

github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=

+

github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=

+

github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=

+

github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=

+

github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=

+

github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=

+

github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=

+

github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=

+

github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=

+

github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=

+

github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=

+

github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=

+

github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=

+

github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=

+

github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=

+

github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=

+

github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

+

github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

+

github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

+

github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

+

github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

+

github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=

+

github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=

+

github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=

+

github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=

+

github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=

+

github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=

+

github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=

+

github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=

+

github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=

+

github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=

+

github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=

+

github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=

+

github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=

+

github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=

+

github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=

+

github.com/google/pprof v0.0.0-20201218002935-b9804c9f04c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=

+

github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=

+

github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=

+

github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=

+

github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=

+

github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g=

+

github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

+

github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=

+

github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=

+

github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

+

github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

+

github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=

+

github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=

+

github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=

+

github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=

+

github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

+

github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=

+

github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=

+

github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=

+

github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=

+

github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=

+

github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=

+

github.com/onsi/ginkgo/v2 v2.6.1 h1:1xQPCjcqYw/J5LchOcp4/2q/jzJFjiAOc25chhnDw+Q=

+

github.com/onsi/ginkgo/v2 v2.6.1/go.mod h1:yjiuMwPokqY1XauOgju45q3sJt6VzQ/Fict1LFVcsAo=

+

github.com/onsi/gomega v1.24.2 h1:J/tulyYK6JwBldPViHJReihxxZ+22FHs0piGjQAvoUE=

+

github.com/onsi/gomega v1.24.2/go.mod h1:gs3J10IS7Z7r7eXRoNJIrNqU4ToQukCJhFtKrWgHWnk=

+

github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

+

github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=

+

github.com/pkg/sftp v1.13.1/go.mod h1:3HaPG6Dq1ILlpPZRO0HVMrsydcdLt6HRDccSgb87qRg=

+

github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=

+

github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=

+

github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=

+

github.com/spf13/afero v1.9.5 h1:stMpOSZFs//0Lv29HduCmli3GUfpFoF3Y1Q/aXj/wVM=

+

github.com/spf13/afero v1.9.5/go.mod h1:UBogFpq8E9Hx+xc5CNTTEpTnuHVmXDwZcZcE1eb/UhQ=

+

github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

+

github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=

+

github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=

+

github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=

+

github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

+

github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

+

github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

+

github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

+

go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=

+

go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=

+

go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

+

go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

+

go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

+

go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=

+

golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

+

golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

+

golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

+

golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

+

golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=

+

golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4=

+

golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=

+

golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=

+

golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=

+

golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=

+

golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=

+

golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=

+

golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=

+

golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=

+

golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=

+

golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=

+

golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=

+

golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2 h1:Jvc7gsqn21cJHCmAWx0LiimpP18LZmUxkT5Mp7EZ1mI=

+

golang.org/x/exp v0.0.0-20230224173230-c95f2b4c22f2/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=

+

golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=

+

golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=

+

golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

+

golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=

+

golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=

+

golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

+

golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

+

golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

+

golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=

+

golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=

...

a

cli/pkg/earthfile.go

+91/-0

+

package pkg

+

import (

+

	"fmt"

+

	"regexp"

+

	"strings"

+

	"github.com/earthly/earthly/ast/spec"

+

// Earthfile represents a parsed Earthfile.

+

type Earthfile struct {

+

	BaseRecipe     spec.Block           `json:"baseRecipe"`

+

	Path           string               `json:"path,omitempty"`

+

	SourceLocation *spec.SourceLocation `json:"sourceLocation,omitempty"`

+

	Targets        []spec.Target        `json:"targets,omitempty"`

+

	UserCommands   []spec.UserCommand   `json:"userCommands,omitempty"`

+

	Version        *spec.Version        `json:"version,omitempty"`

+

func (e Earthfile) GetImages(target string) ([]string, error) {

+

	commands, err := e.GetCommands(target, "SAVE IMAGE")

+

	if err != nil {

+

		return nil, err

+

	if len(commands) == 0 {

+

		return nil, nil

+

	var images []string

+

	for _, command := range commands {

+

		for _, arg := range command.Args {

+

			if !strings.HasPrefix(arg, "--") {

+

				// Remove any variables from the string

+

				re := regexp.MustCompile(`\$\{[^}]+\}`)

+

				processedStr := re.ReplaceAllString(arg, "")

+

				// Remove any tags from the string

+

				imageName := strings.Split(processedStr, ":")[0]

+

				images = append(images, imageName)

+

	return images, nil

+

func (e Earthfile) GetCommands(

+

	target string,

+

	command string,

+

) ([]*spec.Command, error) {

+

	var commands []*spec.Command

+

	t, err := e.GetTarget(target)

+

	if err != nil {

+

		return nil, err

+

	for _, statement := range t.Recipe {

+

		if statement.Command != nil && statement.Command.Name == command {

+

			commands = append(commands, statement.Command)

+

	return commands, nil

+

func (e Earthfile) GetTarget(target string) (*spec.Target, error) {

+

	for _, t := range e.Targets {

+

		if t.Name == target {

+

			return &t, nil

+

	return nil, fmt.Errorf("target %s not found in %s", target, e.Path)

+

// EarthfileParser is an interface that can parse Earthfiles.

+

type EarthfileParser interface {

+

	Parse(path string) (Earthfile, error)

+

// EarthfileScanner is an interface that can scan for Earthfiles.

+

type EarthfileScanner interface {

+

	// Scan returns a list of Earthfiles.

+

	Scan() ([]Earthfile, error)

+

	// ScanForTarget returns a list of Earthfiles that contain the given target.

+

	ScanForTarget(target string) ([]Earthfile, error)

+

a

cli/pkg/executor.go

+7/-0

+

package pkg

+

// Executor is an interface that can execute programs.

+

type Executor interface {

+

	// Run executes a program.

+

	Run(args ...string) (string, error)

+

a

cli/pkg/executors/executors_suite_test.go

+13/-0

+

package executors_test

+

import (

+

	"testing"

+

	. "github.com/onsi/ginkgo/v2"

+

	. "github.com/onsi/gomega"

+

func TestEarthlyExecutor(t *testing.T) {

+

	RegisterFailHandler(Fail)

+

	RunSpecs(t, "EarthlyExecutor Suite")

+

a

cli/pkg/executors/local.go

+19/-0

+

package executors

+

import "os/exec"

+

type LocalExecutor struct {

+

	Path string

+

func (l LocalExecutor) Run(args ...string) (string, error) {

+

	cmd := exec.Command(l.Path, args...)

+

	out, err := cmd.Output()

+

	return string(out), err

+

func NewLocalExecutor(path string) LocalExecutor {

+

	return LocalExecutor{

+

		Path: path,

+

a

cli/pkg/executors/local_test.go

+32/-0

+

package executors_test

+

import (

+

	"errors"

+

	"os/exec"

+

	. "github.com/onsi/ginkgo/v2"

+

	. "github.com/onsi/gomega"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg/executors"

+

var _ = Describe("LocalExecutor", func() {

+

	Describe("Run", func() {

+

		It("should execute the command and return the output", func() {

+

			executor := executors.NewLocalExecutor("echo")

+

			expectedOutput := "Hello, world!\n"

+

			output, err := executor.Run("-n", expectedOutput)

+

			Expect(err).To(BeNil())

+

			Expect(output).To(Equal(expectedOutput))

+

})

+

		It("should return an error if the command fails", func() {

+

			executor := executors.NewLocalExecutor("does_not_exist")

+

			_, err := executor.Run()

+

			Expect(err).NotTo(BeNil())

+

			Expect(errors.Is(err, exec.ErrNotFound)).To(BeTrue())

+

})

+

})

+

})

a

cli/pkg/git_client.go

+7/-0

+

package pkg

+

// GitClient is an interface for interacting with git

+

type GitClient interface {

+

	// Tags returns a list of tags in the repository

+

	Tags() ([]string, error)

+

a

cli/pkg/git_clients/external.go

+26/-0

+

package git_clients

+

import (

+

	"strings"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg"

+

type ExternalGitClient struct {

+

	exec pkg.Executor

+

func (e ExternalGitClient) Tags() ([]string, error) {

+

	output, err := e.exec.Run("tag", "-l")

+

	if err != nil {

+

		return nil, err

+

	return strings.Split(output, "\n"), nil

+

func NewExternalGitClient(executor pkg.Executor) ExternalGitClient {

+

	return ExternalGitClient{

+

		exec: executor,

+

a

cli/pkg/git_clients/external_test.go

+34/-0

+

package git_clients_test

+

import (

+

	"errors"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg/git_clients"

+

	. "github.com/onsi/ginkgo/v2"

+

	. "github.com/onsi/gomega"

+

var _ = Describe("Tags", func() {

+

	It("should return a list of tags", func() {

+

		ex := &mockExecutor{

+

			commandOutput: "v1.0.0\nv1.1.0\nv1.2.0",

+

		c := git_clients.NewExternalGitClient(ex)

+

		tags, err := c.Tags()

+

		Expect(err).To(BeNil())

+

		Expect(tags).To(Equal([]string{"v1.0.0", "v1.1.0", "v1.2.0"}))

+

})

+

	It("should return an error if the executor returns an error", func() {

+

		ex := &mockExecutor{

+

			commandOutput: "",

+

			err:           errors.New("failed to run command"),

+

		c := git_clients.NewExternalGitClient(ex)

+

		tags, err := c.Tags()

+

		Expect(err).NotTo(BeNil())

+

		Expect(tags).To(BeNil())

+

})

+

})

a

cli/pkg/git_clients/git_clients_suite_test.go

+22/-0

+

package git_clients_test

+

import (

+

	"testing"

+

	. "github.com/onsi/ginkgo/v2"

+

	. "github.com/onsi/gomega"

+

type mockExecutor struct {

+

	commandOutput string

+

	err           error

+

func (m *mockExecutor) Run(args ...string) (string, error) {

+

	return m.commandOutput, m.err

+

func TestGitClients(t *testing.T) {

+

	RegisterFailHandler(Fail)

+

	RunSpecs(t, "GitClients Suite")

+

a

cli/pkg/parsers/earthly_parser.go

+56/-0

+

package parsers

+

import (

+

	"context"

+

	"github.com/earthly/earthly/ast"

+

	"github.com/earthly/earthly/ast/spec"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg"

+

// EarthlyParser implements an EarthfileParser using the Earthly AST parser.

+

type EarthlyParser struct {

+

	AstParser AstParser

+

func (e EarthlyParser) Parse(path string) (pkg.Earthfile, error) {

+

	ef, err := e.AstParser.Parse(context.Background(), path, false)

+

	if err != nil {

+

		return pkg.Earthfile{}, err

+

	return pkg.Earthfile{

+

		BaseRecipe:     ef.BaseRecipe,

+

		Path:           path,

+

		SourceLocation: ef.SourceLocation,

+

		Targets:        ef.Targets,

+

		UserCommands:   ef.UserCommands,

+

		Version:        ef.Version,

+

	}, nil

+

func NewEarthlyParser() EarthlyParser {

+

	return EarthlyParser{

+

		AstParser: EarthlyAstParser{},

+

// AstParser wraps the Earthly AST parser.

+

type AstParser interface {

+

	Parse(

+

		ctx context.Context,

+

		path string,

+

		useCopy bool,

+

	) (spec.Earthfile, error)

+

// EarthlyAstParser implements an AstParser using the Earthly AST parser.

+

type EarthlyAstParser struct{}

+

func (e EarthlyAstParser) Parse(

+

	ctx context.Context,

+

	path string,

+

	useCopy bool,

+

) (spec.Earthfile, error) {

+

	return ast.Parse(ctx, path, useCopy)

+

a

cli/pkg/parsers/earthly_parser_test.go

+53/-0

+

package parsers_test

+

import (

+

	"context"

+

	"errors"

+

	"github.com/earthly/earthly/ast/spec"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg/parsers"

+

	. "github.com/onsi/ginkgo/v2"

+

	. "github.com/onsi/gomega"

+

type mockAstParser struct {

+

	ef  spec.Earthfile

+

	err error

+

func (m mockAstParser) Parse(

+

	ctx context.Context,

+

	path string,

+

	useCopy bool,

+

) (spec.Earthfile, error) {

+

	return m.ef, m.err

+

var _ = Describe("EarthlyParser", func() {

+

	Describe("Parse", func() {

+

		It("should parse the Earthfile and return the pkg.Earthfile", func() {

+

			mock := mockAstParser{

+

				ef: spec.Earthfile{Targets: []spec.Target{{Name: "target"}}},

+

			parser := parsers.EarthlyParser{AstParser: mock}

+

			expectedPath := "/path/to/Earthfile"

+

			earthfile, err := parser.Parse(expectedPath)

+

			Expect(err).To(BeNil())

+

			Expect(earthfile.Path).To(Equal(expectedPath))

+

			Expect(earthfile.Targets).To(HaveLen(1))

+

			Expect(earthfile.Targets[0].Name).To(Equal("target"))

+

})

+

		It("should return an error if the ast parser fails", func() {

+

			mock := mockAstParser{err: errors.New("parse error")}

+

			parser := parsers.EarthlyParser{AstParser: mock}

+

			_, err := parser.Parse("/path/to/Earthfile")

+

			Expect(err).NotTo(BeNil())

+

			Expect(err.Error()).To(Equal("parse error"))

+

})

+

})

+

})

a

cli/pkg/parsers/parsers_suite_test.go

+13/-0

+

package parsers_test

+

import (

+

	"testing"

+

	. "github.com/onsi/ginkgo/v2"

+

	. "github.com/onsi/gomega"

+

func TestParsers(t *testing.T) {

+

	RegisterFailHandler(Fail)

+

	RunSpecs(t, "Parsers Suite")

+

a

cli/pkg/scanners/file_scanner.go

+90/-0

+

package scanners

+

import (

+

	"os"

+

	"path/filepath"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg"

+

	"github.com/spf13/afero"

+

// FileScanner is an interface that can scan for Earthfiles at the given paths.

+

type FileScanner struct {

+

	fs     afero.Fs

+

	parser pkg.EarthfileParser

+

	paths  []string

+

func (f *FileScanner) Scan() ([]pkg.Earthfile, error) {

+

	earthfiles, err := f.scan(func(e pkg.Earthfile) (bool, error) {

+

		return true, nil

+

})

+

	if err != nil {

+

		return nil, err

+

	return earthfiles, nil

+

func (f *FileScanner) ScanForTarget(target string) ([]pkg.Earthfile, error) {

+

	earthfiles, err := f.scan(func(e pkg.Earthfile) (bool, error) {

+

		for _, t := range e.Targets {

+

			if t.Name == target {

+

				return true, nil

+

		return false, nil

+

})

+

	if err != nil {

+

		return nil, err

+

	return earthfiles, nil

+

func (f *FileScanner) scan(

+

	filter func(pkg.Earthfile) (bool, error),

+

) ([]pkg.Earthfile, error) {

+

	var earthfiles []pkg.Earthfile

+

	for _, path := range f.paths {

+

		if err := afero.Walk(f.fs, path, func(path string, info os.FileInfo, err error) error {

+

			// Filter to Earthfiles

+

			if filepath.Base(path) != "Earthfile" {

+

				return nil

+

			earthfile, err := f.parser.Parse(path)

+

			if err != nil {

+

				return err

+

			include, err := filter(earthfile)

+

			if err != nil {

+

				return err

+

			if include {

+

				earthfiles = append(earthfiles, earthfile)

+

			return nil

+

		}); err != nil {

+

			return nil, err

+

	return earthfiles, nil

+

// NewFileScanner creates a new FileScanner.

+

func NewFileScanner(

+

	paths []string,

+

	parser pkg.EarthfileParser,

+

	fs afero.Fs,

+

) *FileScanner {

+

	return &FileScanner{

+

		fs:     fs,

+

		parser: parser,

+

		paths:  paths,

+

a

cli/pkg/scanners/file_scanner_test.go

+112/-0

+

package scanners_test

+

import (

+

	"errors"

+

	"github.com/earthly/earthly/ast/spec"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg/scanners"

+

	"github.com/spf13/afero"

+

	. "github.com/onsi/ginkgo/v2"

+

	. "github.com/onsi/gomega"

+

var _ = Describe("FileScanner", func() {

+

	var (

+

		fs     afero.Fs

+

		parser pkg.EarthfileParser

+

	BeforeEach(func() {

+

		fs = afero.NewMemMapFs()

+

})

+

	Describe("Scan", func() {

+

		BeforeEach(func() {

+

			afero.WriteFile(fs, "/test/Earthfile", []byte("target:"), 0644)

+

			afero.WriteFile(fs, "/test/pkg/Earthfile", []byte("target:"), 0644)

+

			parser = &mockParser{

+

				earthfile: pkg.Earthfile{},

+

				err:       nil,

+

})

+

		It("should return Earthfiles", func() {

+

			fScanner := scanners.NewFileScanner([]string{"/test"}, parser, fs)

+

			earthfiles, err := fScanner.Scan()

+

			Expect(err).NotTo(HaveOccurred())

+

			Expect(len(earthfiles)).To(Equal(2))

+

			Expect(earthfiles[0].Path).To(Equal("/test/Earthfile"))

+

			Expect(earthfiles[1].Path).To(Equal("/test/pkg/Earthfile"))

+

})

+

		Context("when the parser fails", func() {

+

			BeforeEach(func() {

+

				parser = &mockParser{

+

					earthfile: pkg.Earthfile{},

+

					err:       errors.New("executor error"),

+

})

+

			It("should return an error", func() {

+

				fScanner := scanners.NewFileScanner(

+

					[]string{"/test"},

+

					parser,

+

fs,

+

				_, err := fScanner.ScanForTarget("docker")

+

				Expect(err).To(MatchError("executor error"))

+

})

+

})

+

})

+

	Describe("ScanForTarget", func() {

+

		BeforeEach(func() {

+

			afero.WriteFile(fs, "/test/Earthfile", []byte("docker"), 0644)

+

			parser = &mockParser{

+

				earthfile: pkg.Earthfile{

+

					Targets: []spec.Target{

+

							Name: "docker",

+

},

+

},

+

},

+

})

+

		It("should return Earthfiles with docker target", func() {

+

			fScanner := scanners.NewFileScanner([]string{"/test"}, parser, fs)

+

			earthfiles, err := fScanner.ScanForTarget("docker")

+

			Expect(err).NotTo(HaveOccurred())

+

			Expect(len(earthfiles)).To(Equal(1))

+

			Expect(earthfiles[0].Path).To(Equal("/test/Earthfile"))

+

})

+

		Context("when the Earthfile does not contain docker target", func() {

+

			BeforeEach(func() {

+

				afero.WriteFile(fs, "/test/Earthfile", []byte("other"), 0644)

+

				parser = &mockParser{

+

					earthfile: pkg.Earthfile{

+

						Targets: []spec.Target{

+

								Name: "other",

+

},

+

},

+

},

+

})

+

			It("should return an empty slice", func() {

+

				fScanner := scanners.NewFileScanner(

+

					[]string{"/test"},

+

					parser,

+

fs,

+

				earthfiles, err := fScanner.ScanForTarget("docker")

+

				Expect(err).NotTo(HaveOccurred())

+

				Expect(len(earthfiles)).To(Equal(0))

+

})

+

})

+

})

+

})

a

cli/pkg/scanners/scanners_suite_test.go

+24/-0

+

package scanners_test

+

import (

+

	"testing"

+

	"github.com/input-output-hk/catalyst-ci/cli/pkg"

+

	. "github.com/onsi/ginkgo/v2"

+

	. "github.com/onsi/gomega"

+

type mockParser struct {

+

	earthfile pkg.Earthfile

+

	err       error

+

func (m *mockParser) Parse(path string) (pkg.Earthfile, error) {

+

	m.earthfile.Path = path

+

	return m.earthfile, m.err

+

func TestFileScanner(t *testing.T) {

+

	RegisterFailHandler(Fail)

+

	RunSpecs(t, "FileScanner Suite")

+

a

cli/pkg/util/semver.go

+29/-0

+

package util

+

import (

+

	"sort"

+

	"github.com/Masterminds/semver/v3"

+

func GetHighestVersion(versions []string) string {

+

	var parsedVersions []*semver.Version

+

	for _, version := range versions {

+

		parsedVersion, err := semver.NewVersion(version)

+

		// We ignore invalid versions

+

		if err == nil {

+

			parsedVersions = append(parsedVersions, parsedVersion)

+

	// If there are no valid versions, we return v0.0.0

+

	if len(parsedVersions) == 0 {

+

		return "v0.0.0"

+

	// We sort the versions in reverse order to get the highest version

+

	sort.Sort(sort.Reverse(semver.Collection(parsedVersions)))

+

	return parsedVersions[0].Original()

+

a

cli/pkg/util/semver_test.go

+48/-0

Diff too large – View on GitHub

3,556 commits this week Sep 14, 2023 - Sep 21, 2023

Showing 25 of 3556 recent commits.

Yesterday's Report

New Repo Discovered

New Releases