Skip to content

Commit

Permalink
Pull request #352: Fix Bleemeo API url
Browse files Browse the repository at this point in the history
Merge in PRODUCT/glouton from PRODUCT-2607-fix-api-url to main

* commit 'bebe7ceff25653f2e6cc9f29236ff9c95934f27b':
  Update bleemeo-go version for URL join fix
  Use default base URL without an ending /
  • Loading branch information
PierreF committed Jun 13, 2024
2 parents 0c91eb6 + bebe7ce commit d7c95b3
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion config/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ func TestStructuredConfig(t *testing.T) { //nolint:maintidx
},
Bleemeo: Bleemeo{
AccountID: "myid",
APIBase: "https://api.bleemeo.com/",
APIBase: "https://api.bleemeo.com",
Cache: BleemeoCache{
DeactivatedMetricsExpirationDays: 200,
},
Expand Down
2 changes: 1 addition & 1 deletion config/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ func DefaultConfig() Config { //nolint:maintidx
Bleemeo: Bleemeo{
Enable: true,
AccountID: "",
APIBase: "https://api.bleemeo.com/",
APIBase: "https://api.bleemeo.com",
APISSLInsecure: false,
Cache: BleemeoCache{
DeactivatedMetricsExpirationDays: 200,
Expand Down
2 changes: 1 addition & 1 deletion config/testdata/full.conf
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ blackbox:

bleemeo:
account_id: "myid"
api_base: "https://api.bleemeo.com/"
api_base: "https://api.bleemeo.com"
api_ssl_insecure: true
cache:
deactivated_metrics_expiration_days: 200
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ require (
github.com/99designs/gqlgen v0.17.47
github.com/AstromechZA/etcpwdparse v0.0.0-20170319193008-f0e5f0779716
github.com/alecthomas/kingpin/v2 v2.4.0
github.com/bleemeo/bleemeo-go v0.0.0-20240612090427-06f5eed9afe1
github.com/bleemeo/bleemeo-go v0.0.0-20240613094357-8d3bf117f67f
github.com/cespare/xxhash/v2 v2.3.0
github.com/containerd/cgroups/v3 v3.0.3
github.com/containerd/containerd v1.7.17
Expand Down
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,8 @@ github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6r
github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
github.com/bleemeo/bleemeo-go v0.0.0-20240612090427-06f5eed9afe1 h1:5Gbk6SZ9Tn3wS520KJAyKPj/kdUAjpvlFGt18Lk5hJo=
github.com/bleemeo/bleemeo-go v0.0.0-20240612090427-06f5eed9afe1/go.mod h1:T3mMawPqLLqgHg0S/96dsuF0MBPzF32V53eqAmiONVU=
github.com/bleemeo/bleemeo-go v0.0.0-20240613094357-8d3bf117f67f h1:krwv4uAEyk5Yw1+0k9Xl3F1iF+wyhiGUeGUZVRnt8Jw=
github.com/bleemeo/bleemeo-go v0.0.0-20240613094357-8d3bf117f67f/go.mod h1:T3mMawPqLLqgHg0S/96dsuF0MBPzF32V53eqAmiONVU=
github.com/blues/jsonata-go v1.5.4 h1:XCsXaVVMrt4lcpKeJw6mNJHqQpWU751cnHdCFUq3xd8=
github.com/blues/jsonata-go v1.5.4/go.mod h1:uns2jymDrnI7y+UFYCqsRTEiAH22GyHnNXrkupAVFWI=
github.com/bmatcuk/doublestar/v3 v3.0.0 h1:TQtVPlDnAYwcrVNB2JiGuMc++H5qzWZd9PhkNo5WyHI=
Expand Down

0 comments on commit d7c95b3

Please sign in to comment.