Skip to content

Commit

Permalink
refactor: version so it is available as a package (#209)
Browse files Browse the repository at this point in the history
  • Loading branch information
aaroniscode committed Aug 5, 2024
1 parent 0776538 commit 8ce7fa4
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 21 deletions.
3 changes: 2 additions & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ builds:
- amd64
- arm64
ldflags:
- -s -w -X github.com/awslabs/eksdemo/cmd.version={{ .Version }} -X github.com/awslabs/eksdemo/cmd.commit={{ .ShortCommit }} -X github.com/awslabs/eksdemo/cmd.date={{ .Date }}
- -s -w -X github.com/awslabs/eksdemo/pkg/version.version={{ .Version }} -X github.com/awslabs/eksdemo/pkg/version.commit={{ .ShortCommit }} -X github.com/awslabs/eksdemo/pkg/version.date={{ .Date }}
archives:
- name_template: >-
{{ .ProjectName }}_
Expand Down Expand Up @@ -54,4 +54,5 @@ changelog:
filters:
exclude:
- '^ci:'
- '^refactor:'
- '^test:'
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
COMMIT = $(shell git rev-parse --short HEAD)
DATE = $(shell date -u "+%FT%TZ")
VERSION = $(shell git describe --tags --always --dirty=dev)
VERSION_PKG := github.com/awslabs/eksdemo/cmd
VERSION_PKG := github.com/awslabs/eksdemo/pkg/version

LDFLAGS += -s -w
LDFLAGS += -X $(VERSION_PKG).date=$(DATE)
Expand Down
21 changes: 2 additions & 19 deletions cmd/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,15 @@ package cmd
import (
"fmt"

"github.com/awslabs/eksdemo/pkg/version"
"github.com/spf13/cobra"
)

var (
version string
commit string
date string
)

type Version struct {
Version string
Date string
Commit string
}

var versionCmd = &cobra.Command{
Use: "version",
Short: "Print the version and build information for eksdemo",
Run: func(cmd *cobra.Command, args []string) {
eksdemoVersion := Version{
Version: version,
Date: date,
Commit: commit,
}

fmt.Printf("eksdemo version info: %#v\n", eksdemoVersion)
fmt.Printf("eksdemo: %#v\n", version.GetVersionInfo())
},
}

Expand Down
21 changes: 21 additions & 0 deletions pkg/version/version.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package version

var (
version string
commit string
date string
)

type Info struct {
Version string
Date string
Commit string
}

func GetVersionInfo() Info {
return Info{
Version: version,
Date: date,
Commit: commit,
}
}

0 comments on commit 8ce7fa4

Please sign in to comment.