Pull request #7: Upgrade Go dependencies, update models, update & please linters

Thomas Delbende · lporcheron · commit 287d42989aa7 · 2025-02-17T13:41:39.000Z
Merge in PRODUCT/bleemeo-go from upgrade-deps-2025-02-14 to main

* commit 'c2384e7574b3481f55f35e88a22824a99e76c453':
  chore: update resources
  chore: update enums
  chore: update copyright year from 2024 to 2025
  chore: update &amp; please linters
  chore: upgrade Go dependencies
diff --git a/.golangci.yml b/.golangci.yml
@@ -7,17 +7,15 @@ linters:
   disable:
     # Base linters disabled for all projects.
     - funlen
-    - gomnd  # Too picky. For example it says that 1000 (used in number of ms in one second) is a magic number.
-    - mnd # Same as above.
+    - mnd  # Too picky. For example it says that 1000 (used in number of ms in one second) is a magic number.
     - exhaustruct # Same as above.
     - gci # Conflicts with gofumpt.
     - varnamelen # I think there is too many false-positive.
     - ireturn # Complain that interface A implementation method return an interface B... it's a requirement of interface A that is unavoidable.
     - nonamedreturns # Warn for every named return, not useful.
     - interfacebloat # Warn when an interface has too many methods, not useful.
     # Deprecated and replaced linter.
-    - execinquery
-    - exportloopref
+    - tenv
     # We use maintidx to lint function complexity.
     - gocyclo
     - cyclop
diff --git a/authentication.go b/authentication.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/authentication_test.go b/authentication_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/client.go b/client.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/client_test.go b/client_test.go
@@ -1,3 +1,19 @@
+// Copyright 2015-2025 Bleemeo
+//
+// bleemeo.com an infrastructure monitoring solution in the Cloud
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 package bleemeo
 
 import (
diff --git a/common_test.go b/common_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/doc.go b/doc.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/enums.go b/enums.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
@@ -34,6 +34,7 @@ const (
 	AgentType_vSphereCluster     AgentType = "vsphere_cluster"
 	AgentType_vSphereHost        AgentType = "vsphere_host"
 	AgentType_vSphereVM          AgentType = "vsphere_vm"
+	AgentType_Application        AgentType = "application"
 )
 
 type DisconnectionReason int
diff --git a/errors.go b/errors.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/go.mod b/go.mod
@@ -4,5 +4,5 @@ go 1.19
 
 require (
 	github.com/google/go-cmp v0.6.0
-	golang.org/x/oauth2 v0.23.0
+	golang.org/x/oauth2 v0.26.0
 )
diff --git a/go.sum b/go.sum
@@ -1,4 +1,4 @@
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-golang.org/x/oauth2 v0.23.0 h1:PbgcYx2W7i4LvjJWEbf0ngHV6qJYr86PkAV3bXdLEbs=
-golang.org/x/oauth2 v0.23.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
+golang.org/x/oauth2 v0.26.0 h1:afQXWNNaeC4nvZ0Ed9XvCCzXM6UHJG7iCg0W4fPqSBE=
+golang.org/x/oauth2 v0.26.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
diff --git a/iterator.go b/iterator.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/iterator_test.go b/iterator_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/lint.sh b/lint.sh
@@ -2,7 +2,7 @@
 
 set -e
 
-LINTER_VERSION=v1.61.0
+LINTER_VERSION=v1.64.5
 
 USER_UID=$(id -u)
 
diff --git a/options.go b/options.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/options_test.go b/options_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
@@ -22,7 +22,6 @@ import (
 	"fmt"
 	"net/http"
 	"net/url"
-	"os"
 	"strings"
 	"testing"
 	"time"
@@ -56,8 +55,6 @@ func mustParseURL(t *testing.T, s string) *url.URL {
 }
 
 func TestOptions(t *testing.T) {
-	t.Parallel()
-
 	creds := WithCredentials("u", "")
 	oauthMockClient := &http.Client{Transport: oauthMockTransport{}}
 	defaultEndpointURL := mustParseURL(t, defaultEndpoint)
@@ -228,13 +225,8 @@ func TestOptions(t *testing.T) {
 		tc := testCase
 
 		t.Run(tc.name, func(t *testing.T) {
-			t.Parallel()
-
 			for k, v := range tc.env {
-				err := os.Setenv(k, v)
-				if err != nil {
-					t.Fatal("Failed to define environment:", err)
-				}
+				t.Setenv(k, v)
 			}
 
 			client, err := NewClient(append(tc.options, WithHTTPClient(oauthMockClient))...)
diff --git a/resources.go b/resources.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
@@ -23,39 +23,46 @@ type Resource = string
 const (
 	ResourceAccount               Resource = "v1/account/"
 	ResourceAccountConfig         Resource = "v1/accountconfig/"
-	ResourceAgentConfig           Resource = "v1/agentconfig/"
-	ResourceApplication           Resource = "v1/application/"
-	ResourceAuditLog              Resource = "v1/auditlog/"
 	ResourceAgent                 Resource = "v1/agent/"
+	ResourceAgentConfig           Resource = "v1/agentconfig/"
 	ResourceAgentFact             Resource = "v1/agentfact/"
 	ResourceAgentType             Resource = "v1/agenttype/"
+	ResourceApplication           Resource = "v1/application/"
+	ResourceAuditLog              Resource = "v1/auditlog/"
 	ResourceAWSIntegration        Resource = "v1/awsintegration/"
 	ResourceContactsGroup         Resource = "v1/contactsgroup/"
 	ResourceContainer             Resource = "v1/container/"
 	ResourceDashboard             Resource = "v1/dashboard/"
 	ResourceEvent                 Resource = "v1/event/"
+	ResourceFlappyConfiguration   Resource = "v1/flappyconfiguration/"
+	ResourceForecast              Resource = "v1/forecast/"
+	ResourceForecastConfiguration Resource = "v1/forecastconfiguration/"
 	ResourceGloutonConfigItem     Resource = "v1/gloutonconfigitem/"
 	ResourceGloutonCrashReport    Resource = "v1/gloutoncrashreport/"
 	ResourceGloutonDiagnostic     Resource = "v1/gloutondiagnostic/"
 	ResourceHealthCheck           Resource = "v1/healthcheck/"
 	ResourceIntegration           Resource = "v1/integration/"
 	ResourceIntegrationTemplate   Resource = "v1/integrationtemplate/"
+	ResourceDashboardLayout       Resource = "v1/dashboardlayout/"
 	ResourceLimit                 Resource = "v1/limit/"
 	ResourceMetric                Resource = "v1/metric/"
+	ResourceMetricAnnotation      Resource = "v1/metricannotation/"
 	ResourceMetricName            Resource = "v1/metricname/"
 	ResourceMetricOperation       Resource = "v1/metricoperation/"
 	ResourceMetricTemplateGroup   Resource = "v1/metrictemplategroup/"
 	ResourceNotificationExecution Resource = "v1/notificationexecution/"
 	ResourceNotificationRule      Resource = "v1/notificationrule/"
+	ResourcePublicStatusPage      Resource = "v1/publicstatuspage/"
 	ResourceRecordingRule         Resource = "v1/recordingrule/"
 	ResourceReport                Resource = "v1/report/"
-	ResourceSilence               Resource = "v1/silence/"
-	ResourceSilenceRecurrent      Resource = "v1/silencerecurrent/"
-	ResourceSlo                   Resource = "v1/slo/"
 	ResourceServerGroup           Resource = "v1/servergroup/"
 	ResourceService               Resource = "v1/service/"
 	ResourceSession               Resource = "v1/session/"
+	ResourceSilence               Resource = "v1/silence/"
+	ResourceSilenceRecurrent      Resource = "v1/silencerecurrent/"
+	ResourceSlo                   Resource = "v1/slo/"
 	ResourceTag                   Resource = "v1/tag/"
 	ResourceUser                  Resource = "v1/user/"
 	ResourceWidget                Resource = "v1/widget/"
+	ResourceWidgetAnnotation      Resource = "v1/widgetannotation/"
 )
diff --git a/types.go b/types.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/utils.go b/utils.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //
diff --git a/utils_test.go b/utils_test.go
@@ -1,4 +1,4 @@
-// Copyright 2015-2024 Bleemeo
+// Copyright 2015-2025 Bleemeo
 //
 // bleemeo.com an infrastructure monitoring solution in the Cloud
 //

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Copyright 2015-2024 Bleemeo`
	`1`	`+// Copyright 2015-2025 Bleemeo`
`2`	`2`	`//`
`3`	`3`	`// bleemeo.com an infrastructure monitoring solution in the Cloud`
`4`	`4`	`//`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@ go 1.19`
`4`	`4`
`5`	`5`	`require (`
`6`	`6`	`github.com/google/go-cmp v0.6.0`
`7`		`- golang.org/x/oauth2 v0.23.0`
	`7`	`+ golang.org/x/oauth2 v0.26.0`
`8`	`8`	`)`