Update STACKIT SDK modules (#93)

stackit-pipeline · renovate-bot · vicentepinto98 · web-flow · commit e74c65367798 · 2024-03-04T14:16:45.000Z
* Update STACKIT SDK modules

* Update services and core

---------

Co-authored-by: Renovate Bot &lt;renovate@whitesourcesoftware.com&gt;
Co-authored-by: vicentepinto98 &lt;vicente.pinto@freiheit.com&gt;
diff --git a/go.mod b/go.mod
@@ -10,25 +10,23 @@ require (
 	github.com/spf13/cobra v1.8.0
 	github.com/spf13/pflag v1.0.5
 	github.com/spf13/viper v1.18.2
-	github.com/stackitcloud/stackit-sdk-go/core v0.7.7
-	github.com/stackitcloud/stackit-sdk-go/services/authorization v0.1.0
-	github.com/stackitcloud/stackit-sdk-go/services/dns v0.8.3
-	github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.11.0
-	github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.10.0
-	github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.9.1
-	github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.7.6
-	github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.3.5
-	github.com/stackitcloud/stackit-sdk-go/services/ske v0.10.0
+	github.com/stackitcloud/stackit-sdk-go/core v0.10.0
+	github.com/stackitcloud/stackit-sdk-go/services/authorization v0.1.1
+	github.com/stackitcloud/stackit-sdk-go/services/dns v0.8.4
+	github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.11.1
+	github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.10.1
+	github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.9.2
+	github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.7.7
+	github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.3.6
+	github.com/stackitcloud/stackit-sdk-go/services/ske v0.10.1
 	github.com/zalando/go-keyring v0.2.3
 	golang.org/x/mod v0.15.0
 	golang.org/x/oauth2 v0.17.0
 	golang.org/x/text v0.14.0
 )
 
 require (
-	github.com/MicahParks/keyfunc/v2 v2.1.0 // indirect
 	github.com/alessio/shellescape v1.4.2 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.3 // indirect
 	github.com/danieljoos/wincred v1.2.1 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
@@ -49,11 +47,11 @@ require (
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
-	github.com/stackitcloud/stackit-sdk-go/services/logme v0.10.0
-	github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.10.0
-	github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.8.5
+	github.com/stackitcloud/stackit-sdk-go/services/logme v0.10.1
+	github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.10.1
+	github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.8.6
 	github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.10.0
-	github.com/stackitcloud/stackit-sdk-go/services/redis v0.10.0
+	github.com/stackitcloud/stackit-sdk-go/services/redis v0.10.1
 	github.com/subosito/gotenv v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20240119083558-1b970713d09a // indirect
diff --git a/go.sum b/go.sum
@@ -1,9 +1,5 @@
-github.com/MicahParks/keyfunc/v2 v2.1.0 h1:6ZXKb9Rp6qp1bDbJefnG7cTH8yMN1IC/4nf+GVjO99k=
-github.com/MicahParks/keyfunc/v2 v2.1.0/go.mod h1:rW42fi+xgLJ2FRRXAfNx9ZA8WpD4OeE/yHVMteCkw9k=
 github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0=
 github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
-github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
-github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM=
 github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/danieljoos/wincred v1.2.1 h1:dl9cBrupW8+r5250DYkYxocLeZ1Y4vB1kxgtjxw8GQs=
@@ -77,34 +73,34 @@ github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.18.2 h1:LUXCnvUvSM6FXAsj6nnfc8Q2tp1dIgUfY9Kc8GsSOiQ=
 github.com/spf13/viper v1.18.2/go.mod h1:EKmWIqdnk5lOcmR72yw6hS+8OPYcwD0jteitLMVB+yk=
-github.com/stackitcloud/stackit-sdk-go/core v0.7.7 h1:w1T8I2ERT5xPHXS+UV9maSseK8tyUJQjzS21hhRSWjU=
-github.com/stackitcloud/stackit-sdk-go/core v0.7.7/go.mod h1:nfC2Tbjd73Ivn8wEp3lvG/dmiXHgl6QX+HY2Ih3aGgw=
-github.com/stackitcloud/stackit-sdk-go/services/authorization v0.1.0 h1:FkOaz7ZutvteismzVHsabddg5GLWvRCA9jEzWH1/V9Y=
-github.com/stackitcloud/stackit-sdk-go/services/authorization v0.1.0/go.mod h1:n2iI0NZdawwkGt3nqm09l8kSJ3MGgLCCOWdVzanEPzA=
-github.com/stackitcloud/stackit-sdk-go/services/dns v0.8.3 h1:Fe4P8IQT3oc5dQn8FVa3CwYzJFxb9eBPEfQwY4Z+Qwc=
-github.com/stackitcloud/stackit-sdk-go/services/dns v0.8.3/go.mod h1:0IvHx+mJLo2YYWLfkmbsnXbxm8FYf7M2YbYq9/EaWLQ=
-github.com/stackitcloud/stackit-sdk-go/services/logme v0.10.0 h1:5+X0sKPdnLT/a1Jt73YphecQpPEOpd6TY6XdK0zGqP4=
-github.com/stackitcloud/stackit-sdk-go/services/logme v0.10.0/go.mod h1:e/I/8wJEqLdzdEgsGh7UbwbMMMNL5F1os25K+vQSzOc=
-github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.10.0 h1:WxvySRZfkecOVjrpK3NiyqPL9YWKSpdBbIf55Y5HlNs=
-github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.10.0/go.mod h1:GQ+UyuUOANO/kQOIhqLmMYRH34NbZShMrfmUY6hTSjo=
-github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.11.0 h1:Ys1WYHlM/5ev5WmM3Qn/FboIlKeXbQSOU2PYlMQ2C9A=
-github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.11.0/go.mod h1:n9bUnjBIAvpnyC5oNGFZKZ/mmoA9y7CBTFwi1KV62GA=
-github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.8.5 h1:RbAorKhAoCPadWYp6tn6NZEWmafwfJvdNKW++SGc9Xo=
-github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.8.5/go.mod h1:q6D+e173zF9ST5Nyj+StFlWTHjXutwCQ49mLBA1DrRA=
-github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.10.0 h1:Uv6r3tooqHgECoq/fGu4qZ/ojkf7H2lFH2NpsMhMxXM=
-github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.10.0/go.mod h1:VSwguERmACP2LSsk5OPLwTQxzt3CA8BasjB1qs+fjpI=
-github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.9.1 h1:41M0IWsHFmt2KvoY/4vwWYNG94Tx3U3diSlYdz0thJE=
-github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.9.1/go.mod h1:bVXMSjQH1eGUF5IoPAD8BjAzhRMunDlnrwLsaCPgRQ4=
+github.com/stackitcloud/stackit-sdk-go/core v0.10.0 h1:IcY8xa/6wo8EhRE9mpCvz4EtTkkoiIa2ZwPHuc5zGyw=
+github.com/stackitcloud/stackit-sdk-go/core v0.10.0/go.mod h1:B5dkVm2HlBRG7liBVIFNqncDb6TUHnJ7t0GsKhAFuRk=
+github.com/stackitcloud/stackit-sdk-go/services/authorization v0.1.1 h1:h7dCaBlbU34WSGuEXREmCdCzQafZgdXDZuairAzeuo8=
+github.com/stackitcloud/stackit-sdk-go/services/authorization v0.1.1/go.mod h1:V+wTIfuJRV8PiSOfMX6GCTaHWltGaLCz8ImOKeHIaIA=
+github.com/stackitcloud/stackit-sdk-go/services/dns v0.8.4 h1:n/X2pVdETDXGHk+vCsg0p3b2zGxSRMJ065to/aAoncg=
+github.com/stackitcloud/stackit-sdk-go/services/dns v0.8.4/go.mod h1:PvgUVFLgELRADWk2epZdCryk0fs8b4DN47ghEJjNWhk=
+github.com/stackitcloud/stackit-sdk-go/services/logme v0.10.1 h1:/yEAySr1P+52l82g93EBEBHLcu74UNZxBg/32EwOzDo=
+github.com/stackitcloud/stackit-sdk-go/services/logme v0.10.1/go.mod h1:HSMbEONG7BoixaR7McsYgYmt/lKRc5GMzn2eIj3HFKs=
+github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.10.1 h1:Y0BwYv2+B3Dg8Wo9GkaWYf+CcNww9Xm38FB/chj6OiM=
+github.com/stackitcloud/stackit-sdk-go/services/mariadb v0.10.1/go.mod h1:2KR68oxSpkiuBGYTYlESMP37oNlSMZXVgyQbSC4PZ+8=
+github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.11.1 h1:SDeQf60BgAwsnB3366yz58ElvVwlyd7M/lPZIEqv9gU=
+github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v0.11.1/go.mod h1:/hQ7GW2hAqcKjKlNCcVJA9zNu3vGFzRaPdhMjfoIKFo=
+github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.8.6 h1:+mcoBKs6ae4eJM0Whuf6lcGuwU341vaBQjr7W/WEGZg=
+github.com/stackitcloud/stackit-sdk-go/services/objectstorage v0.8.6/go.mod h1:W9BML8bqZb2dOZe1K+M+qBBs8/QNirr3jA0xxy9tNRY=
+github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.10.1 h1:LKic8dXtXKsRst2+wY9dNjjkMyJ05QIDpOJuRmVb410=
+github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.10.1/go.mod h1:g1o1bmqtTliy9UkFlRV/6bn6GQk+hkvnny3UjMI69S0=
+github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.9.2 h1:XCVyJh25BpyKPc7mZymBSL29Rh84dylJ9VP9iWv6DUw=
+github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.9.2/go.mod h1:lr+Z68jGNX3feNcdt1WRKUgHQJ6ATOrVnoKRp3m9EsY=
 github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.10.0 h1:Fle394socpyf662g3jMrtZpZaWVgBMBIEFnh4fnGock=
 github.com/stackitcloud/stackit-sdk-go/services/rabbitmq v0.10.0/go.mod h1:JvqOSrTCiynS0x6Y9OsK54yvdB6AtIWLwXDEjoCkAIg=
-github.com/stackitcloud/stackit-sdk-go/services/redis v0.10.0 h1:4u+OiVDAI6Hpej81e+YrbzN5FT4l7ZrTw+eSRcQnCYg=
-github.com/stackitcloud/stackit-sdk-go/services/redis v0.10.0/go.mod h1:N92nAI+e4qKwCvDRI5kg9Q2g6COf9ganqp4pMlsKOYc=
-github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.7.6 h1:jH9qs24AcsknaD67Fmr6ZBTWahUz2xencE6d3dAwX+4=
-github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.7.6/go.mod h1:E04BGTJb7xLOFionBwqXQIEUddFsCfO7NB90Wxl3AJw=
-github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.3.5 h1:flglC1Vvh1S7clX8TITHgyq5xPesFrQBZszuglPZzpA=
-github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.3.5/go.mod h1:Yp2/N00jMdgHlfpYI0Z0X6XC1hR8Mfb21rwYGcLIAIk=
-github.com/stackitcloud/stackit-sdk-go/services/ske v0.10.0 h1:7UgZFANyn0dB0ouNfwLHLfq44y2/90O3lkO2j6N5yu4=
-github.com/stackitcloud/stackit-sdk-go/services/ske v0.10.0/go.mod h1:ZJyE1fG1XtwOsnd6DaayW3LXef7HeFXJxpU70Xll8Kw=
+github.com/stackitcloud/stackit-sdk-go/services/redis v0.10.1 h1:/tRad17HUcGRm448l8XyX6uhnnHVfj3VdUQquIwNq2Q=
+github.com/stackitcloud/stackit-sdk-go/services/redis v0.10.1/go.mod h1:vR/0cYTcVrPTTAHJGH2VT0H2g1D+wlx1n2WiAo6r5LI=
+github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.7.7 h1:yFxTdMj5al2pR4ZIOKKxoN8CHo2kTylurArt+jJMzxI=
+github.com/stackitcloud/stackit-sdk-go/services/resourcemanager v0.7.7/go.mod h1:GvNV2GR0x0VGHzixGNgAJibqjwiVFwbxakpyu+qdijc=
+github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.3.6 h1:3kkNh2kHi55w9dgh0MC1Zbn8fDpYxcXl3tvYjH8t9xo=
+github.com/stackitcloud/stackit-sdk-go/services/serviceaccount v0.3.6/go.mod h1:OOciROyQxPOYLo8OM/DE5ESH11+DvAyRt6wg7R+HVkg=
+github.com/stackitcloud/stackit-sdk-go/services/ske v0.10.1 h1:MZABtJ8HFOKG3KCCv5duibxBSAU1zTFAO0V9bso3N9M=
+github.com/stackitcloud/stackit-sdk-go/services/ske v0.10.1/go.mod h1:7M7bsVHN0REuwoZRYz5nK2yBwsMJcHTsVFHlG83QP2A=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
diff --git a/internal/pkg/auth/service_account.go b/internal/pkg/auth/service_account.go
@@ -118,9 +118,7 @@ func initKeyFlowWithStorage() (*keyFlowWithStorage, error) {
 	cfg := &clients.KeyFlowConfig{
 		ServiceAccountKey: serviceAccountKey,
 		PrivateKey:        authFields[PRIVATE_KEY],
-		ClientRetry:       clients.NewRetryConfig(),
 		TokenUrl:          authFields[TOKEN_CUSTOM_ENDPOINT],
-		JWKSUrl:           authFields[JWKS_CUSTOM_ENDPOINT],
 	}
 
 	keyFlow := &clients.KeyFlow{}
diff --git a/internal/pkg/auth/user_token_flow.go b/internal/pkg/auth/user_token_flow.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/spf13/cobra"
-	"github.com/stackitcloud/stackit-sdk-go/core/clients"
 )
 
 type userTokenFlow struct {
@@ -66,7 +65,7 @@ func (utf *userTokenFlow) RoundTrip(req *http.Request) (*http.Response, error) {
 	}
 
 	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", utf.accessToken))
-	return clients.Do(utf.client, req, nil)
+	return utf.client.Do(req)
 }
 
 func loadVarsFromStorage(utf *userTokenFlow) error {

Original file line number	Diff line number	Diff line change
`@@ -118,9 +118,7 @@ func initKeyFlowWithStorage() (*keyFlowWithStorage, error) {`
`118`	`118`	`cfg := &clients.KeyFlowConfig{`
`119`	`119`	`ServiceAccountKey: serviceAccountKey,`
`120`	`120`	`PrivateKey: authFields[PRIVATE_KEY],`
`121`		`- ClientRetry: clients.NewRetryConfig(),`
`122`	`121`	`TokenUrl: authFields[TOKEN_CUSTOM_ENDPOINT],`
`123`		`- JWKSUrl: authFields[JWKS_CUSTOM_ENDPOINT],`
`124`	`122`	`}`
`125`	`123`
`126`	`124`	`keyFlow := &clients.KeyFlow{}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@ import (`
`10`	`10`
`11`	`11`	`"github.com/golang-jwt/jwt/v5"`
`12`	`12`	`"github.com/spf13/cobra"`
`13`		`- "github.com/stackitcloud/stackit-sdk-go/core/clients"`
`14`	`13`	`)`
`15`	`14`
`16`	`15`	`type userTokenFlow struct {`
`@@ -66,7 +65,7 @@ func (utf userTokenFlow) RoundTrip(req http.Request) (*http.Response, error) {`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", utf.accessToken))`
`69`		`- return clients.Do(utf.client, req, nil)`
	`68`	`+ return utf.client.Do(req)`
`70`	`69`	`}`
`71`	`70`
`72`	`71`	`func loadVarsFromStorage(utf *userTokenFlow) error {`