Skip to content

Commit 0a74a4d

Browse files
PascalBourdierFelix-Stakater
authored andcommitted
1 parent 7f6b9ec commit 0a74a4d

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

pkg/monitors/appinsights/appinsights-monitor.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@ import (
66
"encoding/xml"
77
"errors"
88
"fmt"
9+
"net/http"
10+
"os"
11+
912
"github.com/Azure/azure-sdk-for-go/sdk/azcore"
1013
"github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
1114
"github.com/Azure/azure-sdk-for-go/sdk/azcore/policy"
1215
"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
1316
"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
1417
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/monitor/armmonitor"
15-
"net/http"
16-
"os"
1718

1819
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/applicationinsights/armapplicationinsights"
1920

@@ -194,7 +195,8 @@ func (aiService *AppinsightsMonitorService) GetByName(monitorName string) (*mode
194195
log.Info("AppInsights Monitor's GetByName method has been called")
195196
webtest, err := aiService.insightsClient.Get(aiService.ctx, aiService.resourceGroup, monitorName, nil)
196197
if err != nil {
197-
if re, ok := err.(*azcore.ResponseError); ok {
198+
var re *azcore.ResponseError
199+
if errors.As(err, &re) {
198200
if re.StatusCode == http.StatusNotFound {
199201
return nil, fmt.Errorf("Application Insights WebTest %s was not found in Resource Group %s", monitorName, aiService.resourceGroup)
200202
}

pkg/monitors/gcloud/gcloud-monitor.go

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,18 @@ package gcloud
22

33
import (
44
"context"
5+
"errors"
56
"fmt"
67
"net/url"
78
"strconv"
89

910
logf "sigs.k8s.io/controller-runtime/pkg/log"
1011

1112
monitoring "cloud.google.com/go/monitoring/apiv3/v2"
12-
monitoringpb "cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
13+
"cloud.google.com/go/monitoring/apiv3/v2/monitoringpb"
1314
"google.golang.org/api/iterator"
1415
"google.golang.org/api/option"
15-
monitoredres "google.golang.org/genproto/googleapis/api/monitoredres"
16+
"google.golang.org/genproto/googleapis/api/monitoredres"
1617

1718
endpointmonitorv1alpha1 "github.com/stakater/IngressMonitorController/v2/api/v1alpha1"
1819
"github.com/stakater/IngressMonitorController/v2/pkg/config"
@@ -52,7 +53,7 @@ func (service *MonitorService) GetByName(name string) (monitor *models.Monitor,
5253

5354
for {
5455
uptimeCheckConfig, err := uptimeCheckConfigsIterator.Next()
55-
if err == iterator.Done {
56+
if errors.Is(err, iterator.Done) {
5657
break
5758
}
5859
if err != nil {
@@ -75,7 +76,7 @@ func (service *MonitorService) GetAll() (monitors []models.Monitor) {
7576
monitors = []models.Monitor{}
7677
for {
7778
uptimeCheckConfig, err := uptimeCheckConfigsIterator.Next()
78-
if err == iterator.Done {
79+
if errors.Is(err, iterator.Done) {
7980
break
8081
}
8182
if err != nil {

0 commit comments

Comments
 (0)