replace yaml package

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

config/config.go

@@ -2,42 +2,47 @@ package config
 
 import (
 	"encoding/json"
+	"fmt"
 	"time"
 )
 
 type (
 	Config struct {
-		Azure      Azure `yaml:"azure"`
+		Azure      Azure `json:"azure"`
 		Collectors struct {
-			General        CollectorBase           `yaml:"general"`
-			Resource       CollectorBase           `yaml:"resource"`
-			Quota          CollectorBase           `yaml:"quota"`
-			Defender       CollectorBase           `yaml:"defender"`
-			ResourceHealth CollectorResourceHealth `yaml:"resourceHealth"`
-			Iam            CollectorBase           `yaml:"iam"`
-			Graph          CollectorGraph          `yaml:"graph"`
-			Costs          CollectorCosts          `yaml:"costs"`
-			Budgets        CollectorBudgets        `yaml:"budgets"`
-			Reservation    CollectorReservation    `yaml:"reservation"`
-			Portscan       CollectorPortscan       `yaml:"portscan"`
-		} `yaml:"collectors"`
+			General        CollectorBase           `json:"general"`
+			Resource       CollectorBase           `json:"resource"`
+			Quota          CollectorBase           `json:"quota"`
+			Defender       CollectorBase           `json:"defender"`
+			ResourceHealth CollectorResourceHealth `json:"resourceHealth"`
+			Iam            CollectorBase           `json:"iam"`
+			Graph          CollectorGraph          `json:"graph"`
+			Costs          CollectorCosts          `json:"costs"`
+			Budgets        CollectorBudgets        `json:"budgets"`
+			Reservation    CollectorReservation    `json:"reservation"`
+			Portscan       CollectorPortscan       `json:"portscan"`
+		} `json:"collectors"`
 	}
 
 	Azure struct {
-		Subscriptions []string `yaml:"subscriptions"`
-		Locations     []string `yaml:"locations"`
+		Subscriptions []string `json:"subscriptions"`
+		Locations     []string `json:"locations"`
 
-		ResourceTags      []string `yaml:"resourceTags"`
-		ResourceGroupTags []string `yaml:"resourceGroupTags"`
+		ResourceTags      []string `json:"resourceTags"`
+		ResourceGroupTags []string `json:"resourceGroupTags"`
 	}
 
 	CollectorBase struct {
-		ScrapeTime *time.Duration `yaml:"scrapeTime"`
+		ScrapeTime *time.Duration `json:"scrapeTime"`
 		// Cron *string
 	}
 )
 
 func (c *CollectorBase) IsEnabled() bool {
+	if c == nil {
+		return false
+	}
+
 	return c.ScrapeTime != nil && c.ScrapeTime.Seconds() > 0
 }
 
@@ -48,3 +53,22 @@ func (c *Config) GetJson() []byte {
 	}
 	return jsonBytes
 }
+
+func (c *CollectorBase) UnmarshalJSON(b []byte) error {
+	aux := &struct {
+		ScrapeTime *string `json:"scrapeTime"`
+	}{}
+	if err := json.Unmarshal(b, &aux); err != nil {
+		return err
+	}
+
+	if aux.ScrapeTime != nil {
+		scrapeTime, err := time.ParseDuration(*aux.ScrapeTime)
+		if err != nil {
+			return fmt.Errorf(`unable to parse "%s" as time.Duration: %w`, *aux.ScrapeTime, err)
+		}
+		c.ScrapeTime = &scrapeTime
+	}
+
+	return nil
+}

config/config_budget.go

@@ -2,8 +2,8 @@ package config
 
 type (
 	CollectorBudgets struct {
-		CollectorBase `yaml:",inline"`
+		*CollectorBase
 
-		Scopes []string `yaml:"scopes"`
+		Scopes []string `json:"scopes"`
 	}
 )

config/config_cost.go

@@ -8,33 +8,33 @@ import (
 
 type (
 	CollectorCosts struct {
-		CollectorBase `yaml:",inline"`
+		*CollectorBase
 
-		RequestDelay time.Duration `yaml:"requestDelay"`
+		RequestDelay time.Duration `json:"requestDelay"`
 
-		Queries []CollectorCostsQuery `yaml:"queries"`
+		Queries []CollectorCostsQuery `json:"queries"`
 	}
 
 	CollectorCostsQuery struct {
-		Name          string                         `yaml:"name"`
-		Help          *string                        `yaml:"help"`
-		Scopes        *[]string                      `yaml:"scopes"`
-		Subscriptions *[]string                      `yaml:"subscriptions"`
-		TimeFrames    []string                       `yaml:"timeFrames"`
-		Dimensions    []string                       `yaml:"dimensions"`
-		ExportType    string                         `yaml:"exportType"`
-		Granularity   string                         `yaml:"granularity"`
-		ValueField    string                         `yaml:"valueField"`
-		Labels        map[string]string              `yaml:"labels"`
-		TimePeriod    *CollectorCostsQueryTimePeriod `yaml:"timePeriod"`
+		Name          string                         `json:"name"`
+		Help          *string                        `json:"help"`
+		Scopes        *[]string                      `json:"scopes"`
+		Subscriptions *[]string                      `json:"subscriptions"`
+		TimeFrames    []string                       `json:"timeFrames"`
+		Dimensions    []string                       `json:"dimensions"`
+		ExportType    string                         `json:"exportType"`
+		Granularity   string                         `json:"granularity"`
+		ValueField    string                         `json:"valueField"`
+		Labels        map[string]string              `json:"labels"`
+		TimePeriod    *CollectorCostsQueryTimePeriod `json:"timePeriod"`
 
 		config *configCollectorCostsQueryConfig
 	}
 	CollectorCostsQueryTimePeriod struct {
-		From         *time.Time     `yaml:"from"`
-		FromDuration *time.Duration `yaml:"fromDuration"`
-		To           *time.Time     `yaml:"to"`
-		ToDuration   *time.Duration `yaml:"toDuration"`
+		From         *time.Time     `json:"from"`
+		FromDuration *time.Duration `json:"fromDuration"`
+		To           *time.Time     `json:"to"`
+		ToDuration   *time.Duration `json:"toDuration"`
 	}
 
 	configCollectorCostsQueryConfig struct {

config/config_graph.go

@@ -2,11 +2,11 @@ package config
 
 type (
 	CollectorGraph struct {
-		CollectorBase `yaml:",inline"`
+		*CollectorBase
 
 		Filter struct {
-			Application      *string `yaml:"application"`
-			ServicePrincipal *string `yaml:"servicePrincipal"`
-		} `yaml:"filter"`
+			Application      *string `json:"application"`
+			ServicePrincipal *string `json:"servicePrincipal"`
+		} `json:"filter"`
 	}
 )

config/config_portscan.go

@@ -2,14 +2,14 @@ package config
 
 type (
 	CollectorPortscan struct {
-		CollectorBase `yaml:",inline"`
+		*CollectorBase
 
 		Scanner struct {
-			Parallel int `yaml:"parallel"`
-			Threads  int `yaml:"threads"`
-			Timeout  int `yaml:"timeout"`
+			Parallel int `json:"parallel"`
+			Threads  int `json:"threads"`
+			Timeout  int `json:"timeout"`
 
-			Ports []string `yaml:"ports"`
-		} `yaml:"scanner"`
+			Ports []string `json:"ports"`
+		} `json:"scanner"`
 	}
 )

config/config_reservation.go

@@ -2,10 +2,10 @@ package config
 
 type (
 	CollectorReservation struct {
-		CollectorBase `yaml:",inline"`
+		*CollectorBase
 
-		Scopes      []string `yaml:"scopes"`
-		Granularity string   `yaml:"granularity"`
-		FromDays    int      `yaml:"fromDays"`
+		Scopes      []string `json:"scopes"`
+		Granularity string   `json:"granularity"`
+		FromDays    int      `json:"fromDays"`
 	}
 )

config/config_resourcehealth.go

@@ -2,8 +2,8 @@ package config
 
 type (
 	CollectorResourceHealth struct {
-		CollectorBase `yaml:",inline"`
+		*CollectorBase
 
-		SummaryMaxLength int `yaml:"summaryMaxLength"`
+		SummaryMaxLength int `json:"summaryMaxLength"`
 	}
 )

go.mod

@@ -91,11 +91,9 @@ require (
 	k8s.io/utils v0.0.0-20250321185631-1f6e0b77f77e // indirect
 	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
-	sigs.k8s.io/yaml v1.4.0 // indirect
+	sigs.k8s.io/yaml v1.4.0
 )
 
-require gopkg.in/yaml.v2 v2.4.0
-
 require (
 	github.com/KimMachineGun/automemlimit v0.7.1 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect

go.sum

@@ -256,8 +256,6 @@ gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSP
 gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
 gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 k8s.io/api v0.33.0 h1:yTgZVn1XEe6opVpP1FylmNrIFWuDqe2H0V8CT5gxfIU=

main.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"bufio"
-	"bytes"
 	_ "embed"
 	"errors"
 	"fmt"
@@ -12,7 +10,7 @@ import (
 	"runtime"
 	"time"
 
-	"gopkg.in/yaml.v2"
+	"sigs.k8s.io/yaml"
 
 	"github.com/webdevops/azure-resourcemanager-exporter/config"
 
@@ -103,23 +101,19 @@ func initArgparser() {
 func initConfig() {
 	var err error
 
-	decoder := yaml.NewDecoder(bytes.NewReader(defaultConfig))
-	decoder.SetStrict(true)
-	err = decoder.Decode(&Config)
+	err = yaml.UnmarshalStrict(defaultConfig, &Config)
 	if err != nil {
 		logger.Fatal(err.Error())
 	}
 
 	logger.Infof(`reading config from "%v"`, Opts.Config)
 	/* #nosec */
-	file, err := os.Open(Opts.Config)
+	content, err := os.ReadFile(Opts.Config)
 	if err != nil {
 		logger.Fatal(err.Error())
 	}
 
-	decoder = yaml.NewDecoder(bufio.NewReader(file))
-	decoder.SetStrict(true)
-	err = decoder.Decode(&Config)
+	err = yaml.UnmarshalStrict(content, &Config)
 	if err != nil {
 		logger.Fatal(err.Error())
 	}