Skip to content

Commit 3cbb36f

Browse files
mblaschkemblaschke
committed
update deps and switch to golang 1.24
Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>
1 parent 51769b0 commit 3cbb36f

15 files changed

+129
-217
lines changed

‎Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#############################################
22
# Build
33
#############################################
4-
FROM --platform=$BUILDPLATFORM golang:1.23-alpine as build
4+
FROM --platform=$BUILDPLATFORM golang:1.24-alpine as build
55

66
RUN apk upgrade --no-cache --force
77
RUN apk add --update build-base make git

‎auditor/auditor.azure.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armresources"
99
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions"
1010

11-
"github.com/Azure/go-autorest/autorest/to"
11+
"github.com/webdevops/go-common/utils/to"
1212
)
1313

1414
func (auditor *AzureAuditor) getSubscriptionList(ctx context.Context) (list map[string]*armsubscriptions.Subscription) {
@@ -52,7 +52,7 @@ func (auditor *AzureAuditor) getResourceList(ctx context.Context, subscription *
5252
auditor.Logger.Panic(err)
5353
}
5454

55-
for _, item := range result.ResourceListResult.Value {
55+
for _, item := range result.Value {
5656
resourceID := strings.ToLower(to.String(item.ID))
5757
list[resourceID] = item
5858
}
@@ -91,7 +91,7 @@ func (auditor *AzureAuditor) getRoleDefinitionList(ctx context.Context, subscrip
9191
auditor.Logger.Panic(err)
9292
}
9393

94-
for _, item := range result.RoleDefinitionListResult.Value {
94+
for _, item := range result.Value {
9595
resourceID := strings.ToLower(to.String(item.ID))
9696
list[resourceID] = item
9797
}

‎auditor/auditor.enrich.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strings"
77

88
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions"
9-
"github.com/Azure/go-autorest/autorest/to"
9+
"github.com/webdevops/go-common/utils/to"
1010

1111
azureCommon "github.com/webdevops/go-common/azuresdk/armclient"
1212

‎auditor/auditor.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import (
1111
"time"
1212

1313
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions"
14-
"github.com/Azure/go-autorest/autorest/to"
1514
"github.com/patrickmn/go-cache"
1615
cron "github.com/robfig/cron/v3"
16+
"github.com/webdevops/go-common/utils/to"
1717

1818
"go.uber.org/zap"
1919
"go.uber.org/zap/zapio"

‎auditor/auditor.keyvaultaccesspolicies.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ import (
66

77
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/keyvault/armkeyvault"
88
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions"
9-
"github.com/Azure/go-autorest/autorest/azure"
10-
"github.com/Azure/go-autorest/autorest/to"
119
prometheusCommon "github.com/webdevops/go-common/prometheus"
10+
"github.com/webdevops/go-common/utils/to"
1211
"go.uber.org/zap"
1312

1413
azureCommon "github.com/webdevops/go-common/azuresdk/armclient"
@@ -50,8 +49,8 @@ func (auditor *AzureAuditor) fetchKeyvaultAccessPolicies(ctx context.Context, lo
5049
logger.Panic(err)
5150
}
5251

53-
for _, item := range result.ResourceListResult.Value {
54-
resourceInfo, _ := azure.ParseResourceID(to.String(item.ID))
52+
for _, item := range result.Value {
53+
resourceInfo, _ := azureCommon.ParseResourceId(to.String(item.ID))
5554

5655
keyvaultResource, err := client.Get(ctx, resourceInfo.ResourceGroup, resourceInfo.ResourceName, nil)
5756
if err != nil {

‎auditor/auditor.resourcegroups.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
"github.com/webdevops/azure-auditor/auditor/validator"
99

10-
"github.com/Azure/go-autorest/autorest/to"
1110
prometheusCommon "github.com/webdevops/go-common/prometheus"
11+
"github.com/webdevops/go-common/utils/to"
1212
"go.uber.org/zap"
1313
)
1414

‎auditor/auditor.resourceproviderfeatures.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"github.com/webdevops/azure-auditor/auditor/validator"
1212

13-
"github.com/Azure/go-autorest/autorest/to"
1413
prometheusCommon "github.com/webdevops/go-common/prometheus"
14+
"github.com/webdevops/go-common/utils/to"
1515
)
1616

1717
func (auditor *AzureAuditor) auditResourceProviderFeatures(ctx context.Context, logger *zap.SugaredLogger, subscription *armsubscriptions.Subscription, report *AzureAuditorReport, callback chan<- func()) {
@@ -48,7 +48,7 @@ func (auditor *AzureAuditor) fetchResourceProviderFeatures(ctx context.Context,
4848
logger.Panic(err)
4949
}
5050

51-
for _, feature := range result.FeatureOperationsListResult.Value {
51+
for _, feature := range result.Value {
5252
if strings.EqualFold(to.String(feature.Properties.State), "Registered") {
5353
nameParts := strings.SplitN(stringPtrToStringLower(feature.Name), "/", 2)
5454

‎auditor/auditor.resourceproviders.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010

1111
"github.com/webdevops/azure-auditor/auditor/validator"
1212

13-
"github.com/Azure/go-autorest/autorest/to"
1413
prometheusCommon "github.com/webdevops/go-common/prometheus"
14+
"github.com/webdevops/go-common/utils/to"
1515
)
1616

1717
func (auditor *AzureAuditor) auditResourceProviders(ctx context.Context, logger *zap.SugaredLogger, subscription *armsubscriptions.Subscription, report *AzureAuditorReport, callback chan<- func()) {
@@ -49,7 +49,7 @@ func (auditor *AzureAuditor) fetchResourceProviders(ctx context.Context, logger
4949
logger.Panic(err)
5050
}
5151

52-
for _, resourceProvider := range result.ProviderListResult.Value {
52+
for _, resourceProvider := range result.Value {
5353
if strings.EqualFold(to.String(resourceProvider.RegistrationState), "Registered") {
5454
obj := map[string]interface{}{
5555
"resource.id": stringPtrToStringLower(resourceProvider.ID),

‎auditor/auditor.roleassignments.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77

88
armauthorization "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2"
99
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/resources/armsubscriptions"
10-
"github.com/Azure/go-autorest/autorest/to"
1110
prometheusCommon "github.com/webdevops/go-common/prometheus"
11+
"github.com/webdevops/go-common/utils/to"
1212
"go.uber.org/zap"
1313

1414
azureCommon "github.com/webdevops/go-common/azuresdk/armclient"
@@ -53,7 +53,7 @@ func (auditor *AzureAuditor) fetchRoleAssignments(ctx context.Context, logger *z
5353
logger.Panic(err)
5454
}
5555

56-
for _, roleAssignment := range result.RoleAssignmentListResult.Value {
56+
for _, roleAssignment := range result.Value {
5757
scopeResourceId := strings.ToLower(to.String(roleAssignment.Properties.Scope))
5858

5959
azureScope, _ := azureCommon.ParseResourceId(scopeResourceId)

‎auditor/misc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package auditor
33
import (
44
"strings"
55

6-
"github.com/Azure/go-autorest/autorest/to"
6+
"github.com/webdevops/go-common/utils/to"
77
)
88

99
func cronspecIsValid(cronspec string) bool {

0 commit comments

Comments
 (0)