Merge branch 'main' into generator-bot-13518986874/sqlserverflex

Author: marceljk

CHANGELOG.md

@@ -4,6 +4,8 @@
   - **Feature:** Add method to create inquiries: `InquiriesCreateInquiry`
   - **Feature:** Add `sort` property to `ApiListCatalogProductsRequest`
   - **Feature:** Add payload `ApproveSubscriptionPayload` for `ApiApproveSubscriptionRequest`
+- `postgresflex`: [v1.0.0](services/postgresflex/CHANGELOG.md#v100-2025-02-24)
+  - **Breaking Change:** The region is no longer specified within the client configuration. Instead, the region must be passed as a parameter to any region-specific request.
 - `sqlserverflex`: [v1.0.0](services/sqlserverflex/CHANGELOG.md#v100-2025-02-25)
   - **Breaking Change:** The region is no longer specified within the client configuration. Instead, the region must be passed as a parameter to any region-specific request.
   - **Feature:** Add method to delete all instances for a project: `TerminateProject`

core/auth/auth.go

@@ -27,6 +27,8 @@ const (
 	privateKeyPathCredentialType        credentialType = "private_key_path"
 )
 
+var userHomeDir = os.UserHomeDir
+
 // SetupAuth sets up authentication based on the configuration. The different options are
 // custom authentication, no authentication, explicit key flow, explicit token flow or default authentication
 func SetupAuth(cfg *config.Configuration) (rt http.RoundTripper, err error) {
@@ -195,7 +197,7 @@ func readCredentialsFile(path string) (*Credentials, error) {
 		customPath, customPathSet := os.LookupEnv("STACKIT_CREDENTIALS_PATH")
 		if !customPathSet || customPath == "" {
 			path = credentialsFilePath
-			home, err := os.UserHomeDir()
+			home, err := userHomeDir()
 			if err != nil {
 				return nil, fmt.Errorf("getting home directory: %w", err)
 			}

core/auth/auth_test.go

@@ -16,6 +16,16 @@ import (
 	"github.com/stackitcloud/stackit-sdk-go/core/config"
 )
 
+func setTemporaryHome(t *testing.T) {
+	old := userHomeDir
+	t.Cleanup(func() {
+		userHomeDir = old
+	})
+	userHomeDir = func() (string, error) {
+		return t.TempDir(), nil
+	}
+}
+
 func fixtureServiceAccountKey(mods ...func(*clients.ServiceAccountKeyResponse)) *clients.ServiceAccountKeyResponse {
 	validUntil := time.Now().Add(time.Hour)
 	serviceAccountKeyResponse := &clients.ServiceAccountKeyResponse{
@@ -150,6 +160,7 @@ func TestSetupAuth(t *testing.T) {
 		},
 	} {
 		t.Run(test.desc, func(t *testing.T) {
+			setTemporaryHome(t)
 			if test.setKeys {
 				t.Setenv("STACKIT_SERVICE_ACCOUNT_KEY_PATH", saKeyFile.Name())
 				t.Setenv("STACKIT_PRIVATE_KEY_PATH", privateKeyFile.Name())
@@ -232,6 +243,7 @@ func TestReadCredentials(t *testing.T) {
 		},
 	} {
 		t.Run(test.desc, func(t *testing.T) {
+			setTemporaryHome(t)
 			t.Setenv("STACKIT_CREDENTIALS_PATH", test.pathEnv)
 
 			var credential string
@@ -342,6 +354,7 @@ func TestDefaultAuth(t *testing.T) {
 		},
 	} {
 		t.Run(test.desc, func(t *testing.T) {
+			setTemporaryHome(t)
 			if test.setKeys {
 				t.Setenv("STACKIT_SERVICE_ACCOUNT_KEY_PATH", saKeyFile.Name())
 				t.Setenv("STACKIT_PRIVATE_KEY_PATH", privateKeyFile.Name())
@@ -406,6 +419,7 @@ func TestTokenAuth(t *testing.T) {
 		},
 	} {
 		t.Run(test.desc, func(t *testing.T) {
+			setTemporaryHome(t)
 			t.Setenv("STACKIT_SERVICE_ACCOUNT_TOKEN", "")
 			t.Setenv("STACKIT_CREDENTIALS_PATH", "test-path")
 
@@ -499,6 +513,7 @@ func TestKeyAuth(t *testing.T) {
 		},
 	} {
 		t.Run(test.desc, func(t *testing.T) {
+			setTemporaryHome(t)
 			t.Setenv("STACKIT_SERVICE_ACCOUNT_KEY", "")
 			t.Setenv("STACKIT_SERVICE_ACCOUNT_KEY_PATH", "")
 			t.Setenv("STACKIT_PRIVATE_KEY", "")
@@ -557,7 +572,7 @@ func TestNoAuth(t *testing.T) {
 		},
 	} {
 		t.Run(test.desc, func(t *testing.T) {
-			// Get the default authentication client and ensure that it's not nil
+			setTemporaryHome(t) // Get the default authentication client and ensure that it's not nil
 			authClient, err := NoAuth()
 			if err != nil {
 				t.Fatalf("Test returned error on valid test case: %v", err)
@@ -624,6 +639,7 @@ func TestGetServiceAccountEmail(t *testing.T) {
 		},
 	} {
 		t.Run(test.description, func(t *testing.T) {
+			setTemporaryHome(t)
 			if test.envEmailSet {
 				t.Setenv("STACKIT_SERVICE_ACCOUNT_EMAIL", "env_email")
 			} else {
@@ -742,6 +758,7 @@ func TestGetPrivateKey(t *testing.T) {
 		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
+			setTemporaryHome(t)
 			t.Setenv("STACKIT_CREDENTIALS_PATH", test.credentialsFilePath)
 
 			if test.envPrivateKeyPathSet {
@@ -843,6 +860,7 @@ func TestGetServiceAccountKey(t *testing.T) {
 		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
+			setTemporaryHome(t)
 			t.Setenv("STACKIT_CREDENTIALS_PATH", test.credentialsFilePath)
 
 			if test.envServiceAccountKeyPathSet {

examples/postgresflex/go.mod

@@ -2,13 +2,11 @@ module github.com/stackitcloud/stackit-sdk-go/examples/postgresflex
 
 go 1.21
 
-require (
-	github.com/stackitcloud/stackit-sdk-go/core v0.16.0
-	github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.18.0
-)
+require github.com/stackitcloud/stackit-sdk-go/services/postgresflex v0.18.0
 
 require (
 	github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
+	github.com/stackitcloud/stackit-sdk-go/core v0.16.0 // indirect
 )

examples/postgresflex/postgresflex.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/stackitcloud/stackit-sdk-go/core/config"
 	"github.com/stackitcloud/stackit-sdk-go/services/postgresflex"
 	"github.com/stackitcloud/stackit-sdk-go/services/postgresflex/wait"
 )
@@ -14,17 +13,18 @@ func main() {
 	// Specify the project ID
 	projectId := "PROJECT_ID"
 
+	// Specify the region
+	region := "REGION"
+
 	// Create a new API client, that uses default authentication and configuration
-	postgresflexClient, err := postgresflex.NewAPIClient(
-		config.WithRegion("eu01"),
-	)
+	postgresflexClient, err := postgresflex.NewAPIClient()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Creating API client: %v\n", err)
 		os.Exit(1)
 	}
 
 	// Get the postgresql instances for your project
-	getInstancesResp, err := postgresflexClient.ListInstances(context.Background(), projectId).Execute()
+	getInstancesResp, err := postgresflexClient.ListInstances(context.Background(), projectId, region).Execute()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when calling `ListInstances`: %v\n", err)
 		os.Exit(1)
@@ -44,7 +44,7 @@ func main() {
 		Username: &username,
 		Roles:    &[]string{"login"},
 	}
-	_, err = postgresflexClient.CreateUser(context.Background(), projectId, instanceId).CreateUserPayload(createUserPayload).Execute()
+	_, err = postgresflexClient.CreateUser(context.Background(), projectId, region, instanceId).CreateUserPayload(createUserPayload).Execute()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when calling `CreateUser`: %v\n", err)
 		os.Exit(1)
@@ -53,27 +53,27 @@ func main() {
 	fmt.Printf("Created user \"%s\" associated to instance \"%s\".\n", username, *items[0].Name)
 
 	// Delete an instance
-	err = postgresflexClient.DeleteInstance(context.Background(), projectId, instanceId).Execute()
+	err = postgresflexClient.DeleteInstance(context.Background(), projectId, region, instanceId).Execute()
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when delete PostgreSQL Flex instance: %v", err)
 	}
 
-	_, err = wait.DeleteInstanceWaitHandler(context.Background(), postgresflexClient, projectId, instanceId).WaitWithContext(context.Background())
+	_, err = wait.DeleteInstanceWaitHandler(context.Background(), postgresflexClient, projectId, region, instanceId).WaitWithContext(context.Background())
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when waiting for PostgreSQL Flex instance deletion: %v", err)
 	}
 
 	fmt.Printf("Deleted PostgreSQL Flex instance \"%s\".\n", instanceId)
 
 	// Force delete an instance
-	err = postgresflexClient.ForceDeleteInstance(context.Background(), projectId, instanceId).Execute()
+	err = postgresflexClient.ForceDeleteInstance(context.Background(), projectId, region, instanceId).Execute()
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when force delete PostgreSQL Flex instance: %v", err)
 	}
 
-	_, err = wait.ForceDeleteInstanceWaitHandler(context.Background(), postgresflexClient, projectId, instanceId).WaitWithContext(context.Background())
+	_, err = wait.ForceDeleteInstanceWaitHandler(context.Background(), postgresflexClient, projectId, region, instanceId).WaitWithContext(context.Background())
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when waiting for PostgreSQL Flex instance force deletion: %v", err)
 	}

examples/runtime/runtime.go

@@ -6,7 +6,6 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/stackitcloud/stackit-sdk-go/core/config"
 	"github.com/stackitcloud/stackit-sdk-go/core/runtime"
 	"github.com/stackitcloud/stackit-sdk-go/services/postgresflex"
 )
@@ -15,30 +14,31 @@ func main() {
 	// Specify the project ID
 	projectId := "PROJECT_ID"
 
+	// Specify the region
+	region := "REGION"
+
 	// Create a new API client, that uses default authentication and configuration
-	postgresflexClient, err := postgresflex.NewAPIClient(
-		config.WithRegion("eu01"),
-	)
+	postgresflexClient, err := postgresflex.NewAPIClient()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Creating API client: %v\n", err)
 		os.Exit(1)
 	}
 
-	// Get the MongoDB Flex instances for your project and capture the HTTP response using the context
+	// Get the PostgreSQL Flex instances for your project and capture the HTTP response using the context
 	var httpResp *http.Response
 	ctxWithHTTPResp := runtime.WithCaptureHTTPResponse(context.Background(), &httpResp)
-	getInstancesResp, err := postgresflexClient.ListInstances(ctxWithHTTPResp, projectId).Execute()
+	getInstancesResp, err := postgresflexClient.ListInstances(ctxWithHTTPResp, projectId, region).Execute()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when calling `ListInstances`: %v\n", err)
 		os.Exit(1)
 	}
 	fmt.Printf("Number of instances: %v\n\n", len(*getInstancesResp.Items))
 	fmt.Printf("HTTP response: %+v\n\n", *httpResp)
 
-	// Get the MongoDB Flex instances for your project and capture the HTTP request using the context
+	// Get the PostgreSQL Flex instances for your project and capture the HTTP request using the context
 	var httpReq *http.Request
 	ctxWithHTTPReq := runtime.WithCaptureHTTPRequest(context.Background(), &httpReq)
-	getInstancesResp, err = postgresflexClient.ListInstances(ctxWithHTTPReq, projectId).Execute()
+	getInstancesResp, err = postgresflexClient.ListInstances(ctxWithHTTPReq, projectId, region).Execute()
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Error when calling `ListInstances`: %v\n", err)
 		os.Exit(1)

services/postgresflex/CHANGELOG.md

@@ -1,3 +1,6 @@
+## v1.0.0 (2025-02-24)
+- **Breaking Change:** The region is no longer specified within the client configuration. Instead, the region must be passed as a parameter to any region-specific request.
+
 ## v0.18.0 (2025-02-21)
 - **New:** Minimal go version is now Go 1.21