Skip to content

Commit c675f2d

Browse files
committed
replace yaml library
Signed-off-by: Markus Blaschke <mblaschke82@gmail.com>
1 parent 3cbb36f commit c675f2d

File tree

6 files changed

+20
-16
lines changed

6 files changed

+20
-16
lines changed

auditor/auditor.report.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"sync"
88
"time"
99

10-
yaml "gopkg.in/yaml.v3"
10+
yaml "sigs.k8s.io/yaml"
1111

1212
"github.com/webdevops/azure-auditor/auditor/types"
1313
"github.com/webdevops/azure-auditor/auditor/validator"

auditor/config.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@ import (
44
"os"
55

66
"go.uber.org/zap"
7-
"gopkg.in/yaml.v3"
7+
"sigs.k8s.io/yaml"
88

99
"github.com/webdevops/azure-auditor/auditor/validator"
1010
)
1111

1212
type (
1313
AuditConfig struct {
14-
RoleAssignments *validator.AuditConfigValidation `yaml:"roleAssignments"`
15-
ResourceGroups *validator.AuditConfigValidation `yaml:"resourceGroups"`
16-
ResourceProviders *validator.AuditConfigValidation `yaml:"resourceProviders"`
17-
ResourceProviderFeatures *validator.AuditConfigValidation `yaml:"resourceProviderFeatures"`
18-
KeyvaultAccessPolicies *validator.AuditConfigValidation `yaml:"keyvaultAccessPolicies"`
19-
ResourceGraph *AuditConfigResourceGraph `yaml:"resourceGraph"`
20-
LogAnalytics *AuditConfiLogAnalytics `yaml:"logAnalytics"`
14+
RoleAssignments *validator.AuditConfigValidation `json:"roleAssignments"`
15+
ResourceGroups *validator.AuditConfigValidation `json:"resourceGroups"`
16+
ResourceProviders *validator.AuditConfigValidation `json:"resourceProviders"`
17+
ResourceProviderFeatures *validator.AuditConfigValidation `json:"resourceProviderFeatures"`
18+
KeyvaultAccessPolicies *validator.AuditConfigValidation `json:"keyvaultAccessPolicies"`
19+
ResourceGraph *AuditConfigResourceGraph `json:"resourceGraph"`
20+
LogAnalytics *AuditConfiLogAnalytics `json:"logAnalytics"`
2121
}
2222

2323
AuditConfigResourceGraph struct {
24-
Enabled bool `yaml:"enabled"`
25-
Queries map[string]*validator.AuditConfigValidation `yaml:"queries"`
24+
Enabled bool `json:"enabled"`
25+
Queries map[string]*validator.AuditConfigValidation `json:"queries"`
2626
}
2727

2828
AuditConfiLogAnalytics struct {
29-
Enabled bool `yaml:"enabled"`
30-
Queries map[string]*validator.AuditConfigValidation `yaml:"queries"`
29+
Enabled bool `json:"enabled"`
30+
Queries map[string]*validator.AuditConfigValidation `json:"queries"`
3131
}
3232
)
3333

auditor/validator/validator_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"testing"
55
"time"
66

7-
"gopkg.in/yaml.v3"
7+
"sigs.k8s.io/yaml"
88
)
99

1010
type (

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ require (
2828
github.com/webdevops/go-common v0.0.0-20250501125726-52273986367f
2929
go.uber.org/zap v1.27.0
3030
go.uber.org/zap/exp v0.3.0
31-
gopkg.in/yaml.v3 v3.0.1
31+
sigs.k8s.io/yaml v1.4.0
3232
)
3333

3434
require (
@@ -81,6 +81,7 @@ require (
8181
golang.org/x/text v0.24.0 // indirect
8282
google.golang.org/protobuf v1.36.6 // indirect
8383
gopkg.in/sourcemap.v1 v1.0.5 // indirect
84+
gopkg.in/yaml.v3 v3.0.1 // indirect
8485
k8s.io/apimachinery v0.33.0 // indirect
8586
k8s.io/klog/v2 v2.130.1 // indirect
8687
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect

go.sum

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ github.com/gofrs/uuid v4.4.0+incompatible h1:3qXRTX8/NbyulANqlc0lchS1gqAVxRgsuW1
6565
github.com/gofrs/uuid v4.4.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
6666
github.com/golang-jwt/jwt/v5 v5.2.2 h1:Rl4B7itRWVtYIHFrSNd7vhTiz9UpLdi6gZhZ3wEeDy8=
6767
github.com/golang-jwt/jwt/v5 v5.2.2/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
68+
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
6869
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
6970
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
7071
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
@@ -185,3 +186,5 @@ k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
185186
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
186187
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e h1:KqK5c/ghOm8xkHYhlodbp6i6+r+ChV2vuAuVRdFbLro=
187188
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
189+
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
190+
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
flags "github.com/jessevdk/go-flags"
2222
"github.com/prometheus/client_golang/prometheus/promhttp"
2323
"github.com/webdevops/go-common/azuresdk/prometheus/tracing"
24-
yaml "gopkg.in/yaml.v3"
24+
"sigs.k8s.io/yaml"
2525

2626
auditor "github.com/webdevops/azure-auditor/auditor"
2727
"github.com/webdevops/azure-auditor/auditor/types"

0 commit comments

Comments
 (0)