use the first rid, and set user agent

Author: chrroberts-pure

Makefile

@@ -4,6 +4,7 @@ GOTEST=$(GOCMD) test
 GOVET=$(GOCMD) vet
 BINARY_NAME=pure-fa-om-exporter
 MODULE_NAME=purestorage/fa-openmetrics-exporter
+UserAgentBase=Pure_FA_OpenMetrics_exporter
 VERSION?=1.0.18
 SERVICE_PORT?=9490
 DOCKER_REGISTRY?= quay.io/purestorage/
@@ -26,11 +27,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)' -X 'purestorage/fa-openmetrics-exporter/internal/rest-client.UserAgentVersion=$(VERSION)'" -o out/bin/$(BINARY_NAME) cmd/fa-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/fa-openmetrics-exporter/internal/rest-client.UserAgentVersion=$(VERSION)' -X 'purestorage/fa-openmetrics-exporter/internal/rest-client.FARestUserAgentBase=$(UserAgentBase)'" -o out/bin/$(BINARY_NAME) cmd/fa-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)' -X 'purestorage/fa-openmetrics-exporter/internal/rest-client.UserAgentVersion=$(VERSION)'" -o out/bin/$(BINARY_NAME) cmd/fa-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/fa-openmetrics-exporter/internal/rest-client.UserAgentVersion=$(VERSION)' -X 'purestorage/fa-openmetrics-exporter/internal/rest-client.FARestUserAgentBase=$(UserAgentBase)'" -o out/bin/$(BINARY_NAME) cmd/fa-om-exporter/main.go
 
 clean: ## Remove build related file
 	rm -fr ./bin

build/docker/Dockerfile

@@ -1,5 +1,6 @@
 FROM golang:alpine as build
 ARG VERSION=1.0.18
+ARG UserAgentBase=Pure_FA_OpenMetrics_exporter
 
 WORKDIR /usr/src/app
 
@@ -9,7 +10,7 @@ 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' -X 'purestorage/fa-openmetrics-exporter/internal/rest-client.UserAgentVersion=$VERSION'" -v -o /usr/local/bin/pure-fa-om-exporter cmd/fa-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/fa-openmetrics-exporter/internal/rest-client.FARestUserAgentBase=$UserAgentBase' -X 'purestorage/fa-openmetrics-exporter/internal/rest-client.UserAgentVersion=$VERSION'" -v -o /usr/local/bin/pure-fa-om-exporter cmd/fa-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/flasharray_client.go

@@ -9,7 +9,9 @@ import (
 
 var UserAgentVersion string = "development"
 
-var FARestUserAgent string = "Pure_FA_OpenMetrics_exporter/" + UserAgentVersion
+var FARestUserAgentBase string = "Dev_Pure_FA_OpenMetrics_exporter"
+
+var FARestUserAgent string = FARestUserAgentBase + "/" + UserAgentVersion
 
 type Client interface {
 	GetAlerts(filter string) *AlertsList
@@ -56,6 +58,7 @@ func NewRestClient(endpoint string, apitoken string, apiversion string, uagent s
 		"Content-Type": "application/json",
 		"Accept":       "application/json",
 		"X-Request-ID": fa.XRequestID,
+		"User-Agent":   FARestUserAgent + " (" + uagent + ")",
 	})
 	if debug {
 		fa.RestClient.SetDebug(true)
@@ -86,7 +89,9 @@ func NewRestClient(endpoint string, apitoken string, apiversion string, uagent s
 	} else {
 		fa.ApiVersion = apiversion
 	}
+	fa.XRequestID = res.Header().Get("X-Request-ID")
 	fa.RestClient.SetBaseURL("https://" + endpoint + "/api/" + fa.ApiVersion)
+	fa.RestClient.SetHeader("X-Request-ID", fa.XRequestID)
 	res, err = fa.RestClient.R().
 		SetHeader("api-token", apitoken).
 		Post("/login")
@@ -98,13 +103,8 @@ func NewRestClient(endpoint string, apitoken string, apiversion string, uagent s
 		fa.Error = errors.New("failed to login to FlashArray, check API Token")
 		return fa
 	}
-	//Get the X-Auth-Token and the X-Request-ID from the HTTP Response Headers (FA will reply with the same X-Request-ID, if provided, otherwise it will generate one.)
 	fa.XAuthToken = res.Header().Get("x-auth-token")
-	fa.XRequestID = res.Header().Get("X-Request-ID")
-	fa.RestClient.SetHeader("User-Agent", FARestUserAgent+" ("+uagent+")")
-	//Set the X-Auth-Token and the X-Request-ID from the HTTP Response Headers
 	fa.RestClient.SetHeader("x-auth-token", fa.XAuthToken)
-	fa.RestClient.SetHeader("X-Request-ID", fa.XRequestID)
 	return fa
 }