support tags

Author: bakito

Makefile

@@ -21,17 +21,19 @@ test-release:
 
 ## toolbox - start
 ## Location to install dependencies to
-LOCALBIN ?= $(shell pwd)/bin
+LOCALBIN ?= $(shell test -s "cygpath -m $$(pwd)" || pwd)/bin
 $(LOCALBIN):
 	mkdir -p $(LOCALBIN)
 
 ## Tool Binaries
 SEMVER ?= $(LOCALBIN)/semver
 GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint
+DEEPCOPY_GEN ?= $(LOCALBIN)/deepcopy-gen
 
 ## Tool Versions
 SEMVER_VERSION ?= v1.1.3
 GOLANGCI_LINT_VERSION ?= v1.50.1
+DEEPCOPY_GEN_VERSION ?= v0.26.0
 
 ## Tool Installer
 .PHONY: semver
@@ -42,14 +44,20 @@ $(SEMVER): $(LOCALBIN)
 golangci-lint: $(GOLANGCI_LINT) ## Download golangci-lint locally if necessary.
 $(GOLANGCI_LINT): $(LOCALBIN)
 	test -s $(LOCALBIN)/golangci-lint || GOBIN=$(LOCALBIN) go install github.com/golangci/golangci-lint/cmd/golangci-lint@$(GOLANGCI_LINT_VERSION)
+.PHONY: deepcopy-gen
+deepcopy-gen: $(DEEPCOPY_GEN) ## Download deepcopy-gen locally if necessary.
+$(DEEPCOPY_GEN): $(LOCALBIN)
+	test -s $(LOCALBIN)/deepcopy-gen || GOBIN=$(LOCALBIN) go install k8s.io/code-generator/cmd/deepcopy-gen@$(DEEPCOPY_GEN_VERSION)
 
 ## Update Tools
 .PHONY: update-toolbox-tools
 update-toolbox-tools:
 	@rm -f \
 		$(LOCALBIN)/semver \
-		$(LOCALBIN)/golangci-lint
+		$(LOCALBIN)/golangci-lint \
+		$(LOCALBIN)/deepcopy-gen
 	toolbox makefile -f $$(pwd)/Makefile \
 		github.com/bakito/semver \
-		github.com/golangci/golangci-lint/cmd/golangci-lint
+		github.com/golangci/golangci-lint/cmd/golangci-lint \
+		k8s.io/code-generator/cmd/[email protected]/kubernetes/code-generator
 ## toolbox - end

go.mod

@@ -9,6 +9,7 @@ require (
 	github.com/onsi/gomega v1.24.2
 	github.com/spf13/cobra v1.6.1
 	github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4
 	gopkg.in/yaml.v3 v3.0.1
 )
 

go.sum

@@ -21,6 +21,8 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
 github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20211029224645-99673261e6eb/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
 golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=

pkg/github/client.go

@@ -11,7 +11,8 @@ import (
 )
 
 const (
-	latestURLPattern = "https://api.github.com/repos/%s/releases/latest"
+	latestReleaseURLPattern = "https://api.github.com/repos/%s/releases/latest"
+	latestTagURLPattern     = "https://api.github.com/repos/%s/tags"
 )
 
 func LatestRelease(client *resty.Client, repo string, quiet bool) (*types.GithubRelease, error) {
@@ -26,16 +27,37 @@ func LatestRelease(client *resty.Client, repo string, quiet bool) (*types.Github
 		}
 		ghc = ghc.SetAuthToken(t)
 	}
-	_, err := ghc.Get(latestURL(repo))
+	_, err := ghc.Get(latestReleaseURL(repo))
 	if err != nil {
 		return nil, http.CheckError(err)
 	}
+
+	if ghr.TagName == "" {
+		ght := &types.GithubTags{}
+		ghc.SetResult(ght)
+		_, err := ghc.Get(latestTagURL(repo))
+		if err != nil {
+			return nil, http.CheckError(err)
+		}
+
+		if latest := ght.GetLatest(); latest != nil {
+			ghr.TagName = latest.Name
+		}
+	}
+
 	return ghr, nil
 }
 
-func latestURL(repo string) string {
+func latestReleaseURL(repo string) string {
+	if repo != "" {
+		return fmt.Sprintf(latestReleaseURLPattern, repo)
+	}
+	return ""
+}
+
+func latestTagURL(repo string) string {
 	if repo != "" {
-		return fmt.Sprintf(latestURLPattern, repo)
+		return fmt.Sprintf(latestTagURLPattern, repo)
 	}
 	return ""
 }

pkg/types/types_github.go

@@ -1,7 +1,11 @@
 package types
 
 import (
+	"sort"
+	"strings"
 	"time"
+
+	"golang.org/x/mod/semver"
 )
 
 type GithubRelease struct {
@@ -45,3 +49,29 @@ type Asset struct {
 	UpdatedAt          time.Time `json:"updated_at"`
 	BrowserDownloadURL string    `json:"browser_download_url"`
 }
+
+type GithubTags []GithubTag
+
+func (ght GithubTags) GetLatest() *GithubTag {
+	sort.Slice(ght, func(i, j int) bool {
+		return semver.Compare(ght[i].Name, ght[j].Name) > 0
+	})
+
+	for _, tag := range ght {
+		if semver.IsValid(tag.Name) && !strings.Contains(tag.Name, "-") {
+			return &tag
+		}
+	}
+	return nil
+}
+
+type GithubTag struct {
+	Name       string `json:"name"`
+	ZipballURL string `json:"zipball_url"`
+	TarballURL string `json:"tarball_url"`
+	Commit     struct {
+		Sha string `json:"sha"`
+		URL string `json:"url"`
+	} `json:"commit"`
+	NodeID string `json:"node_id"`
+}