Switch from stackit-dns-api-client-go to stackit-sdk-go

Author: SimonKienzler

cmd/webhook/cmd/root.go

@@ -13,31 +13,27 @@ import (
 	"github.com/stackitcloud/external-dns-stackit-webhook/internal/stackitprovider"
 	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/api"
 	"github.com/stackitcloud/external-dns-stackit-webhook/pkg/metrics"
+	stackitconfig "github.com/stackitcloud/stackit-sdk-go/core/config"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 	"sigs.k8s.io/external-dns/endpoint"
 )
 
 var (
-	apiPort         string
-	authBearerToken string
-	baseUrl         string
-	projectID       string
-	worker          int
-	domainFilter    []string
-	dryRun          bool
-	logLevel        string
+	apiPort      string
+	baseUrl      string
+	projectID    string
+	worker       int
+	domainFilter []string
+	dryRun       bool
+	logLevel     string
 )
 
 var rootCmd = &cobra.Command{
 	Use:   "external-dns-stackit-webhook",
 	Short: "provider webhook for the STACKIT DNS service",
 	Long:  "provider webhook for the STACKIT DNS service",
 	Run: func(cmd *cobra.Command, args []string) {
-		if len(authBearerToken) == 0 {
-			panic("auth-token is required")
-		}
-
 		logger := getLogger()
 		defer func(logger *zap.Logger) {
 			err := logger.Sync()
@@ -48,16 +44,21 @@ var rootCmd = &cobra.Command{
 
 		endpointDomainFilter := endpoint.DomainFilter{Filters: domainFilter}
 
-		stackitProvider, err := stackitprovider.NewStackitDNSProvider(stackitprovider.Config{
-			BasePath:     baseUrl,
-			Token:        authBearerToken,
-			ProjectId:    projectID,
-			DomainFilter: endpointDomainFilter,
-			DryRun:       dryRun,
-			Workers:      worker,
-		}, logger.With(zap.String("component", "stackitprovider")), &http.Client{
-			Timeout: 10 * time.Second,
-		})
+		stackitProvider, err := stackitprovider.NewStackitDNSProvider(
+			logger.With(zap.String("component", "stackitprovider")),
+			// ExternalDNS provider config
+			stackitprovider.Config{
+				ProjectId:    projectID,
+				DomainFilter: endpointDomainFilter,
+				DryRun:       dryRun,
+				Workers:      worker,
+			},
+			// STACKIT client SDK config
+			stackitconfig.WithHTTPClient(&http.Client{
+				Timeout: 10 * time.Second,
+			}),
+			stackitconfig.WithEndpoint(baseUrl),
+		)
 		if err != nil {
 			panic(err)
 		}
@@ -110,7 +111,6 @@ func init() {
 	cobra.OnInitialize(initConfig)
 
 	rootCmd.PersistentFlags().StringVar(&apiPort, "api-port", "8888", "Specifies the port to listen on.")
-	rootCmd.PersistentFlags().StringVar(&authBearerToken, "auth-token", "", "Defines the authentication token for the STACKIT API.")
 	rootCmd.PersistentFlags().StringVar(&baseUrl, "base-url", "https://dns.api.stackit.cloud", " Identifies the Base URL for utilizing the API.")
 	rootCmd.PersistentFlags().StringVar(&projectID, "project-id", "", "Specifies the project id of the STACKIT project.")
 	rootCmd.PersistentFlags().IntVar(&worker, "worker", 10, "Specifies the number "+

go.mod

@@ -3,15 +3,15 @@ module github.com/stackitcloud/external-dns-stackit-webhook
 go 1.20
 
 require (
-	github.com/antihax/optional v1.0.0
 	github.com/goccy/go-json v0.10.2
 	github.com/gofiber/adaptor/v2 v2.2.1
 	github.com/gofiber/fiber/v2 v2.50.0
 	github.com/prometheus/client_golang v1.17.0
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.17.0
-	github.com/stackitcloud/stackit-dns-api-client-go v0.0.0-20230228185514-6838d6d6f051
+	github.com/stackitcloud/stackit-sdk-go/core v0.10.0
+	github.com/stackitcloud/stackit-sdk-go/services/dns v0.8.4
 	github.com/stretchr/testify v1.8.4
 	go.uber.org/mock v0.3.0
 	go.uber.org/zap v1.26.0
@@ -27,10 +27,11 @@ require (
 	github.com/fsnotify/fsnotify v1.6.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/golang-jwt/jwt/v5 v5.2.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/google/uuid v1.3.1 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
@@ -57,18 +58,15 @@ require (
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.10.0 // indirect
 	github.com/spf13/cast v1.5.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/valyala/bytebufferpool v1.0.0 // indirect
 	github.com/valyala/fasthttp v1.50.0 // indirect
 	github.com/valyala/tcplisten v1.0.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
 	golang.org/x/net v0.17.0 // indirect
-	golang.org/x/oauth2 v0.13.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
-	google.golang.org/appengine v1.6.8 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect