update makefile and improve lint

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

Makefile

@@ -1,46 +1,45 @@
-.PHONY: all build clean image check vendor dependencies
-
-NAME				:= azure-resourcemanager-exporter
+PROJECT_NAME		:= azure-resourcemanager-exporter
 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

collector_base.go

@@ -47,7 +47,7 @@ func (c *CollectorBase) collectionStart() {
 }
 
 func (c *CollectorBase) collectionFinish() {
-	duration := time.Now().Sub(c.collectionStartTime)
+	duration := time.Since(c.collectionStartTime)
 	c.LastScrapeDuration = &duration
 
 	if !c.isHidden {

config/opts.go

@@ -19,7 +19,7 @@ type (
 		Azure struct {
 			Environment       *string  `long:"azure-environment"            env:"AZURE_ENVIRONMENT"                description:"Azure environment name" default:"AZUREPUBLICCLOUD"`
 			Subscription      []string `long:"azure-subscription"            env:"AZURE_SUBSCRIPTION_ID"     env-delim:" "  description:"Azure subscription ID"`
-			Location          []string `long:"azure-location"                env:"AZURE_LOCATION"            env-delim:" "  description:"Azure locations"                                  default:"westeurope" default:"northeurope"`
+			Location          []string `long:"azure-location"                env:"AZURE_LOCATION"            env-delim:" "  description:"Azure locations"                                  default:"westeurope" default:"northeurope"` //nolint:staticcheck
 			ResourceGroupTags []string `long:"azure-resourcegroup-tag"   env:"AZURE_RESOURCEGROUP_TAG"   env-delim:" "  description:"Azure ResourceGroup tags"                         default:"owner"`
 			ResourceTags      []string `long:"azure-resource-tag"             env:"AZURE_RESOURCE_TAG"        env-delim:" "  description:"Azure Resource tags"                              default:"owner"`
 		}

metrics_azurerm_network.go

@@ -304,8 +304,6 @@ func (m *MetricsCollectorAzureRmNetwork) collectAzureNics(ctx context.Context, l
 
 // Collect Azure PublicIP metrics
 func (m *MetricsCollectorAzureRmNetwork) collectAzurePublicIp(ctx context.Context, logger *log.Entry, callback chan<- func(), subscription subscriptions.Subscription) {
-	ipAddressList := []string{}
-
 	client := network.NewPublicIPAddressesClient(*subscription.SubscriptionID)
 	client.Authorizer = AzureAuthorizer
 
@@ -325,7 +323,6 @@ func (m *MetricsCollectorAzureRmNetwork) collectAzurePublicIp(ctx context.Contex
 
 		if val.IPAddress != nil {
 			ipAddress = stringPtrToString(val.IPAddress)
-			ipAddressList = append(ipAddressList, ipAddress)
 		} else {
 			ipAddress = "not allocated"
 			gaugeValue = 0

portscanner.go

@@ -116,7 +116,7 @@ func (c *Portscanner) Cleanup() {
 	c.mux.Lock()
 
 	orphanedIpList := []string{}
-	for ipAddress, _ := range c.List {
+	for ipAddress := range c.List {
 		if _, ok := c.PublicIps[ipAddress]; !ok {
 			orphanedIpList = append(orphanedIpList, ipAddress)
 		}