update makefile and improve lint

Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>

Author: mblaschke

Makefile

@@ -1,46 +1,45 @@
-.PHONY: all build clean image check vendor dependencies
-
-NAME				:= kube-bootstrap-token-manager
+PROJECT_NAME		:= kube-bootstrap-token-manager
 GIT_TAG				:= $(shell git describe --dirty --tags --always)
 GIT_COMMIT			:= $(shell git rev-parse --short HEAD)
-LDFLAGS             := -X "main.gitTag=$(GIT_TAG)" -X "main.gitCommit=$(GIT_COMMIT)" -extldflags "-static"
-
-PKGS				:= $(shell go list ./... | grep -v -E '/vendor/|/test')
-FIRST_GOPATH		:= $(firstword $(subst :, ,$(shell go env GOPATH)))
-GOLANGCI_LINT_BIN	:= $(FIRST_GOPATH)/bin/golangci-lint
+LDFLAGS				:= -X "main.gitTag=$(GIT_TAG)" -X "main.gitCommit=$(GIT_COMMIT)" -extldflags "-static"
 
+FIRST_GOPATH			:= $(firstword $(subst :, ,$(shell go env GOPATH)))
+GOLANGCI_LINT_BIN		:= $(FIRST_GOPATH)/bin/golangci-lint
 
+.PHONY: all
 all: build
 
+.PHONY: clean
 clean:
 	git clean -Xfd .
 
+.PHONY: build
 build:
-	CGO_ENABLED=0 go build -a -ldflags '$(LDFLAGS)' -o $(NAME) .
+	CGO_ENABLED=0 go build -a -ldflags '$(LDFLAGS)' -o $(PROJECT_NAME) .
 
+.PHONY: vendor
 vendor:
 	go mod tidy
 	go mod vendor
 	go mod verify
 
+.PHONY: image
 image: build
-	docker build -t $(NAME):$(TAG) .
+	docker build -t $(PROJECT_NAME):$(GIT_TAG) .
 
 build-push-development:
-	docker build -t webdevops/$(NAME):development . && docker push webdevops/$(NAME):development
+	docker build -t webdevops/$(PROJECT_NAME):development . && docker push webdevops/$(PROJECT_NAME):development
 
+.PHONY: test
 test:
 	go test ./...
 
 .PHONY: lint
 lint: $(GOLANGCI_LINT_BIN)
-	# megacheck fails to respect build flags, causing compilation failure during linting.
-	# instead, use the unused, gosimple, and staticcheck linters directly
-	$(GOLANGCI_LINT_BIN) run -D megacheck -E unused,gosimple,staticcheck --timeout=10m
+	$(GOLANGCI_LINT_BIN) run -E exportloopref,gofmt --timeout=10m
 
+.PHONY: dependencies
 dependencies: $(GOLANGCI_LINT_BIN)
-	go mod download
 
 $(GOLANGCI_LINT_BIN):
-	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(FIRST_GOPATH)/bin v1.30.0
-
+	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(FIRST_GOPATH)/bin v1.32.2

bootstraptoken/token.go

@@ -47,7 +47,7 @@ func (t *BootstrapToken) ExpirationString() (expiration string) {
 		expiration = fmt.Sprintf(
 			"%s (%s)",
 			t.expirationTime.Format(time.RFC3339),
-			t.expirationTime.Sub(time.Now()),
+			time.Until(*t.expirationTime),
 		)
 	}
 

cloudprovider/azure.go

@@ -128,7 +128,7 @@ func (m *CloudProviderAzure) FetchTokens() (tokens []*bootstraptoken.BootstrapTo
 		}
 
 		// ignore not enabled
-		if secret.Attributes.Enabled != nil && *secret.Attributes.Enabled == false {
+		if secret.Attributes.Enabled != nil && !*secret.Attributes.Enabled {
 			secretLogger.Debug("ignoring, secret is disabled")
 			continue
 		}
@@ -223,11 +223,9 @@ func (m *CloudProviderAzure) handleKeyvaultError(err error, logger *log.Entry) e
 		case "SecretNotFound":
 			// no secret found, need to create new token
 			logger.Warn("no secret found, assuming non existing token")
-			break
 		case "SecretDisabled":
 			// disabled secret, continue as there would be no token
 			logger.Warn("current secret is disabled, assuming non existing token")
-			break
 		case "ForbiddenByPolicy":
 			// access is forbidden
 			logger.Error("unable to access Azure KeyVault, please check access")

manager/manager.go

@@ -357,9 +357,5 @@ func (m *KubeBootstrapTokenManager) checkTokenRenewal(token *bootstraptoken.Boot
 	}
 
 	renewalTime := time.Now().Add(m.Opts.Sync.RecreateBefore)
-	if token.ExpirationTime().Before(renewalTime) {
-		return true
-	}
-
-	return false
+	return token.ExpirationTime().Before(renewalTime)
 }