From 8997b2ef9133001485752fef4604c89e4308b210 Mon Sep 17 00:00:00 2001 From: bakito Date: Tue, 10 Oct 2023 19:35:25 +0200 Subject: [PATCH] update tools --- Makefile | 26 +++++++++++++++++--------- chart/Chart.yaml | 4 ++-- chart/README.md | 2 +- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 23 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 5033101..56ad1e3 100644 --- a/Makefile +++ b/Makefile @@ -10,20 +10,20 @@ tidy: test: mocks tidy fmt helm-lint test-cover # Run coverage tests test-cover: ginkgo - $(LOCALBIN)/ginkgo --cover ./... + $(GINKGO) --cover ./... release: semver - @version=$$($(LOCALBIN)/semver); \ + @version=$$($(SEMVER)); \ git tag -s $$version -m"Release $$version" - goreleaser --clean + $(GORELEASER) --clean test-release: - goreleaser --skip-publish --snapshot --clean + $(GORELEASER) --skip-publish --snapshot --clean mocks: mockgen - $(LOCALBIN)/mockgen -destination pkg/mocks/core/mock.go --package core k8s.io/client-go/kubernetes/typed/core/v1 CoreV1Interface,SecretInterface - $(LOCALBIN)/mockgen -destination pkg/mocks/ssclient/mock.go --package ssclient github.com/bitnami-labs/sealed-secrets/pkg/client/clientset/versioned/typed/sealedsecrets/v1alpha1 BitnamiV1alpha1Interface,SealedSecretInterface - $(LOCALBIN)/mockgen -destination pkg/mocks/seal/mock.go --package seal github.com/bakito/sealed-secrets-web/pkg/seal Sealer + $(MOCKGEN) -destination pkg/mocks/core/mock.go --package core k8s.io/client-go/kubernetes/typed/core/v1 CoreV1Interface,SecretInterface + $(MOCKGEN) -destination pkg/mocks/ssclient/mock.go --package ssclient github.com/bitnami-labs/sealed-secrets/pkg/client/clientset/versioned/typed/sealedsecrets/v1alpha1 BitnamiV1alpha1Interface,SealedSecretInterface + $(MOCKGEN) -destination pkg/mocks/seal/mock.go --package seal github.com/bakito/sealed-secrets-web/pkg/seal Sealer ## toolbox - start ## Current working directory @@ -37,6 +37,7 @@ $(LOCALBIN): SEMVER ?= $(LOCALBIN)/semver MOCKGEN ?= $(LOCALBIN)/mockgen GOLANGCI_LINT ?= $(LOCALBIN)/golangci-lint +GORELEASER ?= $(LOCALBIN)/goreleaser HELM_DOCS ?= $(LOCALBIN)/helm-docs GINKGO ?= $(LOCALBIN)/ginkgo @@ -44,8 +45,9 @@ GINKGO ?= $(LOCALBIN)/ginkgo SEMVER_VERSION ?= v1.1.3 MOCKGEN_VERSION ?= v1.6.0 GOLANGCI_LINT_VERSION ?= v1.54.2 -HELM_DOCS_VERSION ?= v1.11.0 -GINKGO_VERSION ?= v2.12.0 +GORELEASER_VERSION ?= v1.21.2 +HELM_DOCS_VERSION ?= v1.11.3 +GINKGO_VERSION ?= v2.13.0 ## Tool Installer .PHONY: semver @@ -60,6 +62,10 @@ $(MOCKGEN): $(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: goreleaser +goreleaser: $(GORELEASER) ## Download goreleaser locally if necessary. +$(GORELEASER): $(LOCALBIN) + test -s $(LOCALBIN)/goreleaser || GOBIN=$(LOCALBIN) go install github.com/goreleaser/goreleaser@$(GORELEASER_VERSION) .PHONY: helm-docs helm-docs: $(HELM_DOCS) ## Download helm-docs locally if necessary. $(HELM_DOCS): $(LOCALBIN) @@ -76,12 +82,14 @@ update-toolbox-tools: $(LOCALBIN)/semver \ $(LOCALBIN)/mockgen \ $(LOCALBIN)/golangci-lint \ + $(LOCALBIN)/goreleaser \ $(LOCALBIN)/helm-docs \ $(LOCALBIN)/ginkgo toolbox makefile -f $(LOCALDIR)/Makefile \ github.com/bakito/semver \ github.com/golang/mock/mockgen \ github.com/golangci/golangci-lint/cmd/golangci-lint \ + github.com/goreleaser/goreleaser \ github.com/norwoodj/helm-docs/cmd/helm-docs \ github.com/onsi/ginkgo/v2/ginkgo ## toolbox - end diff --git a/chart/Chart.yaml b/chart/Chart.yaml index adcf48d..6e7cfec 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -appVersion: v3.1.2 +appVersion: v3.1.3 description: A web interface for Sealed Secrets by Bitnami. home: https://github.com/bakito/sealed-secrets-web icon: https://raw.githubusercontent.com/bakito/sealed-secrets-web/master/assets/logo.png @@ -7,7 +7,7 @@ maintainers: - name: bakito url: https://github.com/bakito name: sealed-secrets-web -version: 3.1.2 +version: 3.1.3 #annotations: # artifacthub.io/changes: | # - kind: added diff --git a/chart/README.md b/chart/README.md index b6329b7..a1a273b 100644 --- a/chart/README.md +++ b/chart/README.md @@ -1,6 +1,6 @@ # sealed-secrets-web -![Version: 3.1.2](https://img.shields.io/badge/Version-3.1.2-informational?style=flat-square) ![AppVersion: v3.1.2](https://img.shields.io/badge/AppVersion-v3.1.2-informational?style=flat-square) +![Version: 3.1.3](https://img.shields.io/badge/Version-3.1.3-informational?style=flat-square) ![AppVersion: v3.1.3](https://img.shields.io/badge/AppVersion-v3.1.3-informational?style=flat-square) A web interface for Sealed Secrets by Bitnami. diff --git a/go.mod b/go.mod index 0509362..0a58a32 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/gin-gonic/gin v1.9.1 github.com/golang/mock v1.6.0 github.com/google/uuid v1.3.1 - github.com/onsi/ginkgo/v2 v2.12.1 + github.com/onsi/ginkgo/v2 v2.13.0 github.com/onsi/gomega v1.28.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/api v0.28.2 diff --git a/go.sum b/go.sum index 3c359ee..c66b998 100644 --- a/go.sum +++ b/go.sum @@ -94,8 +94,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA= github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ= -github.com/onsi/ginkgo/v2 v2.12.1 h1:uHNEO1RP2SpuZApSkel9nEh1/Mu+hmQe7Q+Pepg5OYA= -github.com/onsi/ginkgo/v2 v2.12.1/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= +github.com/onsi/ginkgo/v2 v2.13.0 h1:0jY9lJquiL8fcf3M4LAXN5aMlS/b2BV86HFFPCPMgE4= +github.com/onsi/ginkgo/v2 v2.13.0/go.mod h1:TE309ZR8s5FsKKpuB1YAQYBzCaAfUgatB/xlT/ETL/o= github.com/onsi/gomega v1.28.0 h1:i2rg/p9n/UqIDAMFUJ6qIUUMcsqOuUHgbpbu235Vr1c= github.com/onsi/gomega v1.28.0/go.mod h1:A1H2JE76sI14WIP57LMKj7FVfCHx3g3BcZVjJG8bjX8= github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=