Skip to content

Commit 35c19b2

Browse files
committed
switch to goccy/go-yaml package
Signed-off-by: Markus Blaschke <[email protected]>
1 parent 988efd6 commit 35c19b2

File tree

10 files changed

+73
-89
lines changed

10 files changed

+73
-89
lines changed

config/config.go

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package config
22

33
import (
44
"encoding/json"
5-
"fmt"
65
"time"
76
)
87

@@ -53,22 +52,3 @@ func (c *Config) GetJson() []byte {
5352
}
5453
return jsonBytes
5554
}
56-
57-
func (c *CollectorBase) UnmarshalJSON(b []byte) error {
58-
aux := &struct {
59-
ScrapeTime *string `json:"scrapeTime"`
60-
}{}
61-
if err := json.Unmarshal(b, &aux); err != nil {
62-
return err
63-
}
64-
65-
if aux.ScrapeTime != nil {
66-
scrapeTime, err := time.ParseDuration(*aux.ScrapeTime)
67-
if err != nil {
68-
return fmt.Errorf(`unable to parse "%s" as time.Duration: %w`, *aux.ScrapeTime, err)
69-
}
70-
c.ScrapeTime = &scrapeTime
71-
}
72-
73-
return nil
74-
}

config/config_budget.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package config
22

33
type (
44
CollectorBudgets struct {
5-
*CollectorBase
5+
*CollectorBase `yaml:",inline"`
66

77
Scopes []string `json:"scopes"`
88
}

config/config_cost.go

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

99
type (
1010
CollectorCosts struct {
11-
*CollectorBase
11+
*CollectorBase `yaml:",inline"`
1212

1313
RequestDelay time.Duration `json:"requestDelay"`
1414

config/config_graph.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package config
22

33
type (
44
CollectorGraph struct {
5-
*CollectorBase
5+
*CollectorBase `yaml:",inline"`
66

77
Filter struct {
88
Application *string `json:"application"`

config/config_portscan.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package config
22

33
type (
44
CollectorPortscan struct {
5-
*CollectorBase
5+
*CollectorBase `yaml:",inline"`
66

77
Scanner struct {
88
Parallel int `json:"parallel"`

config/config_reservation.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package config
22

33
type (
44
CollectorReservation struct {
5-
*CollectorBase
5+
*CollectorBase `yaml:",inline"`
66

77
Scopes []string `json:"scopes"`
88
Granularity string `json:"granularity"`

config/config_resourcehealth.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package config
22

33
type (
44
CollectorResourceHealth struct {
5-
*CollectorBase
5+
*CollectorBase `yaml:",inline"`
66

77
SummaryMaxLength int `json:"summaryMaxLength"`
88
}

go.mod

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@ require (
88
github.com/anvie/port-scanner v0.0.0-20180225151059-8159197d3770
99
github.com/jessevdk/go-flags v1.6.1
1010
github.com/prometheus/client_golang v1.22.0
11-
github.com/prometheus/common v0.63.0 // indirect
11+
github.com/prometheus/common v0.64.0 // indirect
1212
github.com/prometheus/procfs v0.16.1 // indirect
1313
github.com/remeh/sizedwaitgroup v1.0.0
14-
golang.org/x/crypto v0.37.0 // indirect
15-
golang.org/x/sys v0.32.0 // indirect
14+
golang.org/x/crypto v0.38.0 // indirect
15+
golang.org/x/sys v0.33.0 // indirect
1616
google.golang.org/protobuf v1.36.6 // indirect
1717
)
1818

1919
require (
2020
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
21-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0 // indirect
21+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.0 // indirect
2222
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
2323
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/advisor/armadvisor v1.2.0
2424
github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/authorization/armauthorization/v2 v2.2.0
@@ -59,7 +59,7 @@ require (
5959
github.com/microsoft/kiota-serialization-json-go v1.1.2 // indirect
6060
github.com/microsoft/kiota-serialization-multipart-go v1.1.2 // indirect
6161
github.com/microsoft/kiota-serialization-text-go v1.1.2 // indirect
62-
github.com/microsoftgraph/msgraph-sdk-go v1.69.0
62+
github.com/microsoftgraph/msgraph-sdk-go v1.72.0
6363
github.com/microsoftgraph/msgraph-sdk-go-core v1.3.2
6464
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6565
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -70,38 +70,40 @@ require (
7070
github.com/prometheus/client_model v0.6.2 // indirect
7171
github.com/robfig/cron v1.2.0 // indirect
7272
github.com/stretchr/testify v1.10.0 // indirect
73-
github.com/webdevops/go-common v0.0.0-20250501164923-7cab87d11d0f
74-
go.opentelemetry.io/otel v1.35.0 // indirect
75-
go.opentelemetry.io/otel/metric v1.35.0 // indirect
76-
go.opentelemetry.io/otel/trace v1.35.0 // indirect
73+
github.com/webdevops/go-common v0.0.0-20250501225441-53b22a3a9550
74+
go.opentelemetry.io/otel v1.36.0 // indirect
75+
go.opentelemetry.io/otel/metric v1.36.0 // indirect
76+
go.opentelemetry.io/otel/trace v1.36.0 // indirect
7777
go.uber.org/multierr v1.11.0 // indirect
7878
go.uber.org/zap v1.27.0
79-
golang.org/x/net v0.39.0 // indirect
80-
golang.org/x/oauth2 v0.29.0 // indirect
81-
golang.org/x/term v0.31.0 // indirect
82-
golang.org/x/text v0.24.0 // indirect
79+
golang.org/x/net v0.40.0 // indirect
80+
golang.org/x/oauth2 v0.30.0 // indirect
81+
golang.org/x/term v0.32.0 // indirect
82+
golang.org/x/text v0.25.0 // indirect
8383
golang.org/x/time v0.11.0 // indirect
8484
gopkg.in/inf.v0 v0.9.1 // indirect
8585
gopkg.in/yaml.v3 v3.0.1 // indirect
86-
k8s.io/api v0.33.0 // indirect
87-
k8s.io/apimachinery v0.33.0 // indirect
88-
k8s.io/client-go v0.33.0 // indirect
86+
k8s.io/api v0.33.1 // indirect
87+
k8s.io/apimachinery v0.33.1 // indirect
88+
k8s.io/client-go v0.33.1 // indirect
8989
k8s.io/klog/v2 v2.130.1 // indirect
9090
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
91-
k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
91+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979 // indirect
9292
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
9393
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
94-
sigs.k8s.io/yaml v1.4.0
94+
sigs.k8s.io/yaml v1.4.0 // indirect
9595
)
9696

97+
require github.com/goccy/go-yaml v1.17.1
98+
9799
require (
98-
github.com/KimMachineGun/automemlimit v0.7.1 // indirect
100+
github.com/KimMachineGun/automemlimit v0.7.2 // indirect
99101
github.com/dustin/go-humanize v1.0.1 // indirect
100102
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
101103
github.com/google/go-cmp v0.7.0 // indirect
102104
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
103105
github.com/pkg/errors v0.9.1 // indirect
104-
github.com/std-uritemplate/std-uritemplate/go/v2 v2.0.3 // indirect
106+
github.com/std-uritemplate/std-uritemplate/go/v2 v2.0.5 // indirect
105107
github.com/x448/float16 v0.8.4 // indirect
106108
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
107109
go.uber.org/automaxprocs v1.6.0 // indirect

0 commit comments

Comments
 (0)