Merge branch 'main' into kms-beta

Author: JanStern

.github/workflows/renovate.yaml

@@ -13,7 +13,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v5
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@v43.0.11
+        uses: renovatebot/github-action@v43.0.12
         with:
           configurationFile: .github/renovate.json
           token: ${{ secrets.RENOVATE_TOKEN }}

go.mod

@@ -20,7 +20,7 @@ require (
 	github.com/stackitcloud/stackit-sdk-go/services/authorization v0.8.1
 	github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.1
 	github.com/stackitcloud/stackit-sdk-go/services/git v0.7.1
-	github.com/stackitcloud/stackit-sdk-go/services/iaas v0.29.2
+	github.com/stackitcloud/stackit-sdk-go/services/iaas v0.30.0
 	github.com/stackitcloud/stackit-sdk-go/services/mongodbflex v1.5.2
 	github.com/stackitcloud/stackit-sdk-go/services/opensearch v0.24.1
 	github.com/stackitcloud/stackit-sdk-go/services/postgresflex v1.2.1

go.sum

@@ -573,10 +573,10 @@ github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.1 h1:CnhAMLql0MNmAeq4r
 github.com/stackitcloud/stackit-sdk-go/services/dns v0.17.1/go.mod h1:7Bx85knfNSBxulPdJUFuBePXNee3cO+sOTYnUG6M+iQ=
 github.com/stackitcloud/stackit-sdk-go/services/git v0.7.1 h1:hkFixFnBcQzU4BSIZFITc8N0gK0pUYk7mk0wdUu5Ki8=
 github.com/stackitcloud/stackit-sdk-go/services/git v0.7.1/go.mod h1:Ng1EzrRndG3iGXGH90AZJz//wfK+2YOyDwTnTLwX3a4=
-github.com/stackitcloud/stackit-sdk-go/services/iaas v0.29.2 h1:BvrbqLi9u0943TTkflPDLGbXgqgVzv7oy8tZHD3q3lg=
-github.com/stackitcloud/stackit-sdk-go/services/iaas v0.29.2/go.mod h1:b/jgJf7QHdRzU2fmZeJJtu5j0TAevDRghzcn5MyRmOI=
 github.com/stackitcloud/stackit-sdk-go/services/kms v1.0.0 h1:zxoOv7Fu+FmdsvTKiKkbmLItrMKfL+QoVtz9ReEF30E=
 github.com/stackitcloud/stackit-sdk-go/services/kms v1.0.0/go.mod h1:KEPVoO21pC4bjy5l0nyhjUJ0+uVwVWb+k2TYrzJ8xYw=
+github.com/stackitcloud/stackit-sdk-go/services/iaas v0.30.0 h1:01+noyCSadNH3ALHufcVXxNs0hBsetzJkOMN1Fe0VLc=
+github.com/stackitcloud/stackit-sdk-go/services/iaas v0.30.0/go.mod h1:854gnLR92NvAbJAA1xZEumrtNh1DoBP1FXTMvhwYA6w=
 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.5.1 h1:OdJEs8eOfrzn9tCBDLxIyP8hX50zPfcXNYnRoQX+chs=
 github.com/stackitcloud/stackit-sdk-go/services/loadbalancer v1.5.1/go.mod h1:11uzaOPCF9SeDHXEGOPMlHDD3J5r2TnvCGUwW9Igq9c=
 github.com/stackitcloud/stackit-sdk-go/services/logme v0.25.1 h1:hv5WrRU9rN6Jx4OwdOGJRyaQrfA9p1tzEoQK6/CDyoA=

internal/cmd/auth/get-access-token/get_access_token.go

@@ -45,7 +45,8 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 
 			accessToken, err := auth.GetValidAccessToken(params.Printer)
 			if err != nil {
-				return err
+				params.Printer.Debug(print.ErrorLevel, "get valid access token: %v", err)
+				return &cliErr.SessionExpiredError{}
 			}
 
 			switch model.OutputFormat {

internal/cmd/curl/curl.go

@@ -181,17 +181,10 @@ func getBearerToken(p *print.Printer) (string, error) {
 		return "", &errors.SessionExpiredError{}
 	}
 
-	accessToken, err := auth.GetAccessToken()
+	accessToken, err := auth.GetValidAccessToken(p)
 	if err != nil {
-		return "", err
-	}
-
-	accessTokenExpired, err := auth.TokenExpired(accessToken)
-	if err != nil {
-		return "", err
-	}
-	if accessTokenExpired {
-		return "", &errors.AccessTokenExpiredError{}
+		p.Debug(print.ErrorLevel, "get valid access token: %v", err)
+		return "", &errors.SessionExpiredError{}
 	}
 
 	return accessToken, nil

internal/cmd/ske/kubeconfig/login/login.go

@@ -120,11 +120,11 @@ func NewCmd(params *params.CmdParams) *cobra.Command {
 }
 
 type clusterConfig struct {
-	STACKITProjectID string `json:"stackitProjectId"`
+	STACKITProjectID string `json:"stackitProjectID"`
 	ClusterName      string `json:"clusterName"`
+	Region           string `json:"region"`
 
 	cacheKey string
-	Region   string
 }
 
 func parseClusterConfig(p *print.Printer, cmd *cobra.Command) (*clusterConfig, error) {
@@ -157,8 +157,10 @@ func parseClusterConfig(p *print.Printer, cmd *cobra.Command) (*clusterConfig, e
 
 	config.cacheKey = fmt.Sprintf("ske-login-%x", sha256.Sum256([]byte(execCredential.Spec.Cluster.Server)))
 
-	globalFlags := globalflags.Parse(p, cmd)
-	config.Region = globalFlags.Region
+	// NOTE: Fallback if region is not set in the kubeconfig (this was the case in the past)
+	if config.Region == "" {
+		config.Region = globalflags.Parse(p, cmd).Region
+	}
 
 	return config, nil
 }

internal/pkg/auth/auth.go

@@ -202,7 +202,7 @@ func GetValidAccessToken(p *print.Printer) (string, error) {
 	// Refresh the tokens
 	err = refreshTokens(utf)
 	if err != nil {
-		return "", fmt.Errorf("refresh access token: %w", err)
+		return "", fmt.Errorf("access token and refresh token expired: %w", err)
 	}
 
 	// Return the new access token