Skip to content

Commit ef2acad

Browse files
sdodsleysdodsley
authored
Merge pull request #57 from PureStorage-OpenConnect/extend-uagent
Extend user-agent string
2 parents 4a03164 + 70121a0 commit ef2acad

25 files changed

+36
-35
lines changed

‎cmd/fb-om-exporter/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,9 @@ func metricsHandler(w http.ResponseWriter, r *http.Request) {
145145
return
146146
}
147147

148+
uagent := r.Header.Get("User-Agent")
148149
registry := prometheus.NewRegistry()
149-
fbclient := client.NewRestClient(address, apitoken, apiver, debug)
150+
fbclient := client.NewRestClient(address, apitoken, apiver, uagent, debug)
150151
if fbclient.Error != nil {
151152
http.Error(w, "Error connecting to FlashBlade. Check your management endpoint and/or api token are correct.", http.StatusBadRequest)
152153
return

‎internal/openmetrics-exporter/alerts_collector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func TestAlertsCollector(t *testing.T) {
5151
alert := strings.Split(a, "\n")
5252
want[fmt.Sprintf("label:{name:\"action\" value:\"%s\"} label:{name:\"code\" value:\"%s\"} label:{name:\"component_name\" value:\"%s\"} label:{name:\"component_type\" value:\"%s\"} label:{name:\"created\" value:\"%s\"} label:{name:\"kburl\" value:\"%s\"} label:{name:\"severity\" value:\"%s\"} label:{name:\"summary\" value:\"%s\"} gauge:{value:%g}", alert[0], alert[1], alert[2], alert[3], alert[4], alert[5], alert[6], alert[7], n)] = true
5353
}
54-
c := client.NewRestClient(e, "fake-api-token", "latest", false)
54+
c := client.NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
5555
ac := NewAlertsCollector(c)
5656
metricsCheck(t, ac, want)
5757
server.Close()

‎internal/openmetrics-exporter/arrays_collector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestArraysCollector(t *testing.T) {
3636
endp := strings.Split(server.URL, "/")
3737
e := endp[len(endp)-1]
3838
want := make(map[string]bool)
39-
c := client.NewRestClient(e, "fake-api-token", "latest", false)
39+
c := client.NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
for _, a := range arrs.Items {
4141
want[fmt.Sprintf("label:{name:\"array_name\" value:\"%s\"} label:{name:\"os\" value:\"%s\"} label:{name:\"system_id\" value:\"%s\"} label:{name:\"version\" value:\"%s\"} gauge:{value:1}", a.Name, a.Os, a.Id, a.Version)] = true
4242
}

‎internal/openmetrics-exporter/arrays_http_perf_collector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestArraysHttpPerfCollector(t *testing.T) {
3636
endp := strings.Split(server.URL, "/")
3737
e := endp[len(endp)-1]
3838
want := make(map[string]bool)
39-
c := client.NewRestClient(e, "fake-api-token", "latest", false)
39+
c := client.NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
for _, p := range arrs.Items {
4141
want[fmt.Sprintf("label:{name:\"dimension\" value:\"others_per_sec\"} gauge:{value:%g}", p.OthersPerSec)] = true
4242
want[fmt.Sprintf("label:{name:\"dimension\" value:\"read_dirs_per_sec\"} gauge:{value:%g}", p.ReadDirsPerSec)] = true

‎internal/openmetrics-exporter/arrays_nfs_perf_collector_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestArraysNfsPerfCollector(t *testing.T) {
3636
endp := strings.Split(server.URL, "/")
3737
e := endp[len(endp)-1]
3838
want := make(map[string]bool)
39-
c := client.NewRestClient(e, "fake-api-token", "latest", false)
39+
c := client.NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
for _, p := range arrs.Items {
4141
want[fmt.Sprintf("label:{name:\"dimension\" value:\"fsinfos_per_sec\"} gauge:{value:%g}", p.FsinfosPerSec)] = true
4242
want[fmt.Sprintf("label:{name:\"dimension\" value:\"fsstats_per_sec\"} gauge:{value:%g}", p.FsstatsPerSec)] = true

‎internal/rest-client/alerts_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,15 @@ func TestAlerts(t *testing.T) {
4444
endp := strings.Split(server.URL, "/")
4545
e := endp[len(endp)-1]
4646
t.Run("alerts_open", func(t *testing.T) {
47-
c := NewRestClient(e, "fake-api-token", "latest", false)
47+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4848
al := c.GetAlerts("state='open'")
4949
if diff := cmp.Diff(al.Items, aopen.Items); diff != "" {
5050
t.Errorf("Mismatch (-want +got):\n%s", diff)
5151
server.Close()
5252
}
5353
})
5454
t.Run("alerts_all", func(t *testing.T) {
55-
c := NewRestClient(e, "fake-api-token", "latest", false)
55+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
5656
al := c.GetAlerts("")
5757
if diff := cmp.Diff(al.Items, aall.Items); diff != "" {
5858
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/arrays_http_perf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestArraysHttpPerformance(t *testing.T) {
3636
e := endp[len(endp)-1]
3737
t.Run("arrays_http_performance_1", func(t *testing.T) {
3838
defer server.Close()
39-
c := NewRestClient(e, "fake-api-token", "latest", false)
39+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
ahpl := c.GetArraysHttpPerformance()
4141
if diff := cmp.Diff(ahpl.Items[0], arrhp.Items[0]); diff != "" {
4242
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/arrays_nfs_perf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestArraysNfsPerformance(t *testing.T) {
3636
e := endp[len(endp)-1]
3737
t.Run("arrays_http_performance_1", func(t *testing.T) {
3838
defer server.Close()
39-
c := NewRestClient(e, "fake-api-token", "latest", false)
39+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
apl := c.GetArraysNfsPerformance()
4141
if diff := cmp.Diff(apl.Items[0], arrsp.Items[0]); diff != "" {
4242
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/arrays_perf_replication_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestArraysPerformanceReplication(t *testing.T) {
3737
e := endp[len(endp)-1]
3838
t.Run("array_performance_replication_1", func(t *testing.T) {
3939
defer server.Close()
40-
c := NewRestClient(e, "fake-api-token", "latest", false)
40+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4141
aprl := c.GetArraysPerformanceReplication()
4242
if diff := cmp.Diff(aprl.Items, arrpr.Items); diff != "" {
4343
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/arrays_perf_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,39 +71,39 @@ func TestArraysPerformance(t *testing.T) {
7171
endp := strings.Split(server.URL, "/")
7272
e := endp[len(endp)-1]
7373
t.Run("array_perf_all", func(t *testing.T) {
74-
c := NewRestClient(e, "fake-api-token", "latest", false)
74+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
7575
pl := c.GetArraysPerformance("all")
7676
if diff := cmp.Diff(pl.Items, aall.Items); diff != "" {
7777
t.Errorf("Mismatch (-want +got):\n%s", diff)
7878
server.Close()
7979
}
8080
})
8181
t.Run("array_perf_http", func(t *testing.T) {
82-
c := NewRestClient(e, "fake-api-token", "latest", false)
82+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
8383
pl := c.GetArraysPerformance("HTTP")
8484
if diff := cmp.Diff(pl.Items, ahttp.Items); diff != "" {
8585
t.Errorf("Mismatch (-want +got):\n%s", diff)
8686
server.Close()
8787
}
8888
})
8989
t.Run("array_perf_nfs", func(t *testing.T) {
90-
c := NewRestClient(e, "fake-api-token", "latest", false)
90+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
9191
pl := c.GetArraysPerformance("NFS")
9292
if diff := cmp.Diff(pl.Items, anfs.Items); diff != "" {
9393
t.Errorf("Mismatch (-want +got):\n%s", diff)
9494
server.Close()
9595
}
9696
})
9797
t.Run("array_perf_smb", func(t *testing.T) {
98-
c := NewRestClient(e, "fake-api-token", "latest", false)
98+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
9999
pl := c.GetArraysPerformance("SMB")
100100
if diff := cmp.Diff(pl.Items, asmb.Items); diff != "" {
101101
t.Errorf("Mismatch (-want +got):\n%s", diff)
102102
server.Close()
103103
}
104104
})
105105
t.Run("array_perf_s3", func(t *testing.T) {
106-
c := NewRestClient(e, "fake-api-token", "latest", false)
106+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
107107
pl := c.GetArraysPerformance("S3")
108108
if diff := cmp.Diff(pl.Items, as3.Items); diff != "" {
109109
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/arrays_s3_perf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestArraysS3Performance(t *testing.T) {
3636
e := endp[len(endp)-1]
3737
t.Run("array_s3_specific_1", func(t *testing.T) {
3838
defer server.Close()
39-
c := NewRestClient(e, "fake-api-token", "latest", false)
39+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
pl := c.GetArraysS3Performance()
4141
if diff := cmp.Diff(pl.Items, as3.Items); diff != "" {
4242
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/arrays_space_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,23 +53,23 @@ func TestArraysSpace(t *testing.T) {
5353
endp := strings.Split(server.URL, "/")
5454
e := endp[len(endp)-1]
5555
t.Run("arrays_space_1", func(t *testing.T) {
56-
c := NewRestClient(e, "fake-api-token", "latest", false)
56+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
5757
asl := c.GetArraysSpace("array")
5858
if diff := cmp.Diff(asl.Items, arrsa.Items); diff != "" {
5959
t.Errorf("Mismatch (-want +got):\n%s", diff)
6060
server.Close()
6161
}
6262
})
6363
t.Run("arrays_space_2", func(t *testing.T) {
64-
c := NewRestClient(e, "fake-api-token", "latest", false)
64+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
6565
asfs := c.GetArraysSpace("file-system")
6666
if diff := cmp.Diff(asfs.Items, arrsfs.Items); diff != "" {
6767
t.Errorf("Mismatch (-want +got):\n%s", diff)
6868
server.Close()
6969
}
7070
})
7171
t.Run("arrays_space_3", func(t *testing.T) {
72-
c := NewRestClient(e, "fake-api-token", "latest", false)
72+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
7373
aso := c.GetArraysSpace("object-store")
7474
if diff := cmp.Diff(aso.Items, arrso.Items); diff != "" {
7575
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/arrays_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestArraysInfo(t *testing.T) {
3636
e := endp[len(endp)-1]
3737
t.Run("arrays_1", func(t *testing.T) {
3838
defer server.Close()
39-
c := NewRestClient(e, "fake-api-token", "latest", false)
39+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
al := c.GetArrays()
4141
if diff := cmp.Diff(al.Items, arr.Items); diff != "" {
4242
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/blades_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestBlades(t *testing.T) {
3636
e := endp[len(endp)-1]
3737
t.Run("blades_1", func(t *testing.T) {
3838
defer server.Close()
39-
c := NewRestClient(e, "fake-api-token", "latest", false)
39+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
bl := c.GetBlades()
4141
if diff := cmp.Diff(bl.Items, abl.Items); diff != "" {
4242
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/buckets_perf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestBucketsPerformance(t *testing.T) {
4343
e := endp[len(endp)-1]
4444
t.Run("buckets_performance_1", func(t *testing.T) {
4545
defer server.Close()
46-
c := NewRestClient(e, "fake-api-token", "latest", false)
46+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4747
b := c.GetBuckets()
4848
pl := c.GetBucketsPerformance(b)
4949
if diff := cmp.Diff(pl.Items, bpl.Items); diff != "" {

‎internal/rest-client/buckets_s3_perf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestBucketsS3Performance(t *testing.T) {
4343
e := endp[len(endp)-1]
4444
t.Run("buckets_s3_performance_1", func(t *testing.T) {
4545
defer server.Close()
46-
c := NewRestClient(e, "fake-api-token", "latest", false)
46+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4747
b := c.GetBuckets()
4848
pl := c.GetBucketsS3Performance(b)
4949
if diff := cmp.Diff(pl.Items, bpl.Items); diff != "" {

‎internal/rest-client/buckets_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestBuckets(t *testing.T) {
3636
e := endp[len(endp)-1]
3737
t.Run("buckets_1", func(t *testing.T) {
3838
defer server.Close()
39-
c := NewRestClient(e, "fake-api-token", "latest", false)
39+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
bl := c.GetBuckets()
4141
if diff := cmp.Diff(bl.Items, ab.Items); diff != "" {
4242
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/clients_perf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestClientsPerformance(t *testing.T) {
3636
e := endp[len(endp)-1]
3737
t.Run("clients_performance_1", func(t *testing.T) {
3838
defer server.Close()
39-
c := NewRestClient(e, "fake-api-token", "latest", false)
39+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
cp := c.GetClientsPerformance()
4141
if diff := cmp.Diff(cp.Items, cpl.Items); diff != "" {
4242
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/filesystems_perf_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestFileSystemsPerformance(t *testing.T) {
4242
endp := strings.Split(server.URL, "/")
4343
e := endp[len(endp)-1]
4444
t.Run("filesystems_performance_all", func(t *testing.T) {
45-
c := NewRestClient(e, "fake-api-token", "latest", false)
45+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4646
f := c.GetFileSystems()
4747
fl := c.GetFileSystemsPerformance(f, "all")
4848
if diff := cmp.Diff(fl.Items, fpl.Items); diff != "" {
@@ -51,7 +51,7 @@ func TestFileSystemsPerformance(t *testing.T) {
5151
}
5252
})
5353
t.Run("filesystems_performance_nfs", func(t *testing.T) {
54-
c := NewRestClient(e, "fake-api-token", "latest", false)
54+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
5555
f := c.GetFileSystems()
5656
fl := c.GetFileSystemsPerformance(f, "NFS")
5757
if diff := cmp.Diff(fl.Items, fpl.Items); diff != "" {
@@ -60,7 +60,7 @@ func TestFileSystemsPerformance(t *testing.T) {
6060
}
6161
})
6262
t.Run("filesystems_performance_smb", func(t *testing.T) {
63-
c := NewRestClient(e, "fake-api-token", "latest", false)
63+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
6464
f := c.GetFileSystems()
6565
fl := c.GetFileSystemsPerformance(f, "SMB")
6666
if diff := cmp.Diff(fl.Items, fpl.Items); diff != "" {

‎internal/rest-client/filesystems_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func TestFileSystems(t *testing.T) {
3535
e := endp[len(endp)-1]
3636
t.Run("filesystems_1", func(t *testing.T) {
3737
defer server.Close()
38-
c := NewRestClient(e, "fake-api-token", "latest", false)
38+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
3939
fsl := c.GetFileSystems()
4040
if diff := cmp.Diff(fsl.Items, fs.Items); diff != "" {
4141
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/flashblade_client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ type FBClient struct {
4040
Error error
4141
}
4242

43-
func NewRestClient(endpoint string, apitoken string, apiversion string, debug bool) *FBClient {
43+
func NewRestClient(endpoint string, apitoken string, apiversion string, uagent string, debug bool) *FBClient {
4444
type ApiVersions struct {
4545
Versions []string `json:"versions"`
4646
}
@@ -92,7 +92,7 @@ func NewRestClient(endpoint string, apitoken string, apiversion string, debug bo
9292
fb.XAuthToken = res.Header().Get("x-auth-token")
9393
fb.RestClient.SetBaseURL("https://" + endpoint + "/api/" + fb.ApiVersion)
9494
fb.RestClient.SetHeader("x-auth-token", fb.XAuthToken)
95-
fb.RestClient.SetHeader("User-Agent", FBRestUserAgent)
95+
fb.RestClient.SetHeader("User-Agent", FBRestUserAgent + " (" + uagent + ")")
9696
return fb
9797
}
9898

‎internal/rest-client/flashblade_client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestNewRestClient(t *testing.T) {
3030
e := endp[len(endp)-1]
3131
t.Run("login", func(t *testing.T) {
3232
defer server.Close()
33-
c := NewRestClient(e, "fake-api-token", "latest", false)
33+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
3434
if c.EndPoint != e || c.ApiToken != "fake-api-token" || c.XAuthToken != "faketoken" {
3535
t.Errorf("expected (%s, fake-api-token, faketoken), got (%s %s %s)", e, c.EndPoint, c.ApiToken, c.XAuthToken)
3636
}

‎internal/rest-client/hardware_connectors_perf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestHwConnectorsPerformance(t *testing.T) {
3636
e := endp[len(endp)-1]
3737
t.Run("hardware_1", func(t *testing.T) {
3838
defer server.Close()
39-
c := NewRestClient(e, "fake-api-token", "latest", false)
39+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
hl := c.GetHwConnectorsPerformance()
4141
if diff := cmp.Diff(hl.Items, hw.Items); diff != "" {
4242
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/hardware_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestHardware(t *testing.T) {
3636
e := endp[len(endp)-1]
3737
t.Run("hardware_1", func(t *testing.T) {
3838
defer server.Close()
39-
c := NewRestClient(e, "fake-api-token", "latest", false)
39+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
hl := c.GetHardware()
4141
if diff := cmp.Diff(hl.Items, hw.Items); diff != "" {
4242
t.Errorf("Mismatch (-want +got):\n%s", diff)

‎internal/rest-client/nfs_export_policies_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestNFSExportPolicies(t *testing.T) {
3636
e := endp[len(endp)-1]
3737
t.Run("nfs_policies_1", func(t *testing.T) {
3838
defer server.Close()
39-
c := NewRestClient(e, "fake-api-token", "latest", false)
39+
c := NewRestClient(e, "fake-api-token", "latest", "test-user-agent-string", false)
4040
pl := c.GetNFSExportPolicies()
4141
if diff := cmp.Diff(pl.Items, nfsp.Items); diff != "" {
4242
t.Errorf("Mismatch (-want +got):\n%s", diff)

0 commit comments

Comments
 (0)