Merge pull request #60 from PureStorage-OpenConnect/version_string

Make build version number dynamic in useragent string

Author: sdodsley

Makefile

@@ -3,7 +3,7 @@ GOTEST=$(GOCMD) test
 GOVET=$(GOCMD) vet
 BINARY_NAME=pure-fb-om-exporter
 MODULE_NAME=purestorage/fb-openmetrics-exporter
-VERSION?=1.0.10
+VERSION?=1.0.11
 SERVICE_PORT?=9491
 DOCKER_REGISTRY?= quay.io/purestorage/
 EXPORT_RESULT?=false # for CI please set EXPORT_RESULT to true
@@ -25,11 +25,11 @@ init:
 
 build: ## Build project and put the output binary in out/bin/
 	mkdir -p out/bin
-	CGO_ENABLED=0 GO111MODULE=on $(GOCMD) build -a -mod=readonly -tags 'netgo osusergo static_build' -ldflags='-X main.version=v$(VERSION)' -o out/bin/$(BINARY_NAME) cmd/fb-om-exporter/main.go
+	CGO_ENABLED=0 GO111MODULE=on $(GOCMD) build -a -mod=readonly -tags 'netgo osusergo static_build' -ldflags="-X 'main.version=v$(VERSION)' -X 'purestorage/fb-openmetrics-exporter/internal/rest-client.UserAgentVersion=$(VERSION)'" -o out/bin/$(BINARY_NAME) cmd/fb-om-exporter/main.go
 
 build-with-vendor: ## Build project using the vendor directory and put the output binary in out/bin/
 	mkdir -p out/bin
-	CGO_ENABLED=0 GO111MODULE=on $(GOCMD) build -a -mod=vendor -tags 'netgo osusergo static_build' -ldflags='-X main.version=v$(VERSION)' -o out/bin/$(BINARY_NAME) cmd/fb-om-exporter/main.go
+	CGO_ENABLED=0 GO111MODULE=on $(GOCMD) build -a -mod=vendor -tags 'netgo osusergo static_build' -ldflags="-X 'main.version=v$(VERSION)' -X 'purestorage/fb-openmetrics-exporter/internal/rest-client.UserAgentVersion=$(VERSION)'" -o out/bin/$(BINARY_NAME) cmd/fb-om-exporter/main.go
 
 clean: ## Remove build related file
 	rm -fr ./bin

build/docker/Dockerfile

@@ -1,5 +1,5 @@
 FROM golang:alpine as build
-ARG VERSION=1.0.10
+ARG VERSION=1.0.11
 
 WORKDIR /usr/src/app
 
@@ -8,7 +8,7 @@ COPY go.mod go.sum ./
 RUN go mod download && go mod verify
 
 COPY . .
-RUN CGO_ENABLED=1 go build -mod=readonly -a -tags 'netgo osusergo static_build' -ldflags="-X main.version=v$VERSION" -v -o /usr/local/bin/pure-fb-om-exporter cmd/fb-om-exporter/main.go
+RUN CGO_ENABLED=1 go build -mod=readonly -a -tags 'netgo osusergo static_build' -ldflags="-X 'main.version=v$VERSION' -X 'purestorage/fb-openmetrics-exporter/internal/rest-client.UserAgentVersion=$VERSION'" -v -o /usr/local/bin/pure-fb-om-exporter cmd/fb-om-exporter/main.go
 
 
 # alpine is used here as it seems to be the minimal image that passes quay.io vulnerability scan

internal/rest-client/flashblade_client.go

@@ -7,7 +7,9 @@ import (
 	"github.com/go-resty/resty/v2"
 )
 
-const FBRestUserAgent = "Pure_FB_OpenMetrics_exporter/1.0"
+var UserAgentVersion string = "development"
+
+var FBRestUserAgent string = "Pure_FB_OpenMetrics_exporter/" + UserAgentVersion
 
 type Client interface {
 	GetAlerts(filter string) *AlertsList
@@ -92,7 +94,7 @@ func NewRestClient(endpoint string, apitoken string, apiversion string, uagent s
 	fb.XAuthToken = res.Header().Get("x-auth-token")
 	fb.RestClient.SetBaseURL("https://" + endpoint + "/api/" + fb.ApiVersion)
 	fb.RestClient.SetHeader("x-auth-token", fb.XAuthToken)
-	fb.RestClient.SetHeader("User-Agent", FBRestUserAgent + " (" + uagent + ")")
+	fb.RestClient.SetHeader("User-Agent", FBRestUserAgent+" ("+uagent+")")
 	return fb
 }