Fix/stackittpr 102 objectstorage handling region in individual resources (#711)

* Revert "fix: make resource/data-source specific region attribute read-only (#682)"

This reverts commit 3e8dcc5.

* fix: Support individual regions

* fix: review findings

Author: bahkauv70

CONTRIBUTION.md

@@ -124,7 +124,7 @@ func (r *barResource) Configure(ctx context.Context, req resource.ConfigureReque
 	} else {
 		apiClient, err = foo.NewAPIClient(
 			config.WithCustomAuth(providerData.RoundTripper),
-			config.WithRegion(providerData.Region),
+			config.WithRegion(providerData.DefaultRegion),
 		)
 	}
 

docs/data-sources/objectstorage_bucket.md

@@ -26,6 +26,9 @@ data "stackit_objectstorage_bucket" "example" {
 
 - `name` (String) The bucket name. It must be DNS conform.
 - `project_id` (String) STACKIT Project ID to which the bucket is associated.
+
+### Optional
+
 - `region` (String) The resource region. If not defined, the provider region is used.
 
 ### Read-Only

docs/data-sources/objectstorage_credential.md

@@ -28,6 +28,9 @@ data "stackit_objectstorage_credentials_group" "example" {
 - `credential_id` (String) The credential ID.
 - `credentials_group_id` (String) The credential group ID.
 - `project_id` (String) STACKIT Project ID to which the credential group is associated.
+
+### Optional
+
 - `region` (String) The resource region. If not defined, the provider region is used.
 
 ### Read-Only

docs/data-sources/objectstorage_credentials_group.md

@@ -25,12 +25,12 @@ data "stackit_objectstorage_credentials_group" "example" {
 ### Required
 
 - `project_id` (String) Object Storage Project ID to which the credentials group is associated.
-- `region` (String) The resource region. If not defined, the provider region is used.
 
 ### Optional
 
 - `credentials_group_id` (String) The credentials group ID.
 - `name` (String) The credentials group's display name.
+- `region` (String) The resource region. If not defined, the provider region is used.
 
 ### Read-Only
 

docs/index.md

@@ -154,6 +154,7 @@ Note: AWS specific checks must be skipped as they do not work on STACKIT. For de
 - `argus_custom_endpoint` (String, Deprecated) Custom endpoint for the Argus service
 - `authorization_custom_endpoint` (String) Custom endpoint for the Membership service
 - `credentials_path` (String) Path of JSON from where the credentials are read. Takes precedence over the env var `STACKIT_CREDENTIALS_PATH`. Default value is `~/.stackit/credentials.json`.
+- `default_region` (String) Region will be used as the default location for regional services. Not all services require a region, some are global
 - `dns_custom_endpoint` (String) Custom endpoint for the DNS service
 - `enable_beta_resources` (Boolean) Enable beta resources. Default is false.
 - `iaas_custom_endpoint` (String) Custom endpoint for the IaaS service
@@ -169,7 +170,7 @@ Note: AWS specific checks must be skipped as they do not work on STACKIT. For de
 - `private_key_path` (String) Path for the private RSA key used for authentication, relevant for the key flow. It takes precedence over the private key that is included in the service account key.
 - `rabbitmq_custom_endpoint` (String) Custom endpoint for the RabbitMQ service
 - `redis_custom_endpoint` (String) Custom endpoint for the Redis service
-- `region` (String) Region will be used as the default location for regional services. Not all services require a region, some are global
+- `region` (String, Deprecated) Region will be used as the default location for regional services. Not all services require a region, some are global
 - `resourcemanager_custom_endpoint` (String) Custom endpoint for the Resource Manager service
 - `secretsmanager_custom_endpoint` (String) Custom endpoint for the Secrets Manager service
 - `server_backup_custom_endpoint` (String) Custom endpoint for the Server Backup service

stackit/internal/core/core.go

@@ -14,9 +14,11 @@ import (
 const Separator = ","
 
 type ProviderData struct {
-	RoundTripper                    http.RoundTripper
-	ServiceAccountEmail             string // Deprecated: ServiceAccountEmail is not required and will be removed after 12th June 2025.
+	RoundTripper        http.RoundTripper
+	ServiceAccountEmail string // Deprecated: ServiceAccountEmail is not required and will be removed after 12th June 2025.
+	// Deprecated: Use DefaultRegion instead
 	Region                          string
+	DefaultRegion                   string
 	ArgusCustomEndpoint             string
 	AuthorizationCustomEndpoint     string
 	DnsCustomEndpoint               string
@@ -41,6 +43,17 @@ type ProviderData struct {
 	EnableBetaResources             bool
 }
 
+// GetRegion returns the effective region for the provider, falling back to the deprecated _region_ attribute
+func (pd *ProviderData) GetRegion() string {
+	if pd.DefaultRegion != "" {
+		return pd.DefaultRegion
+	} else if pd.Region != "" {
+		return pd.Region
+	}
+	// final fallback
+	return "eu01"
+}
+
 // DiagsToError Converts TF diagnostics' errors into an error with a human-readable description.
 // If there are no errors, the output is nil
 func DiagsToError(diags diag.Diagnostics) error {

stackit/internal/services/argus/credential/resource.go

@@ -73,7 +73,7 @@ func (r *credentialResource) Configure(ctx context.Context, req resource.Configu
 	} else {
 		apiClient, err = argus.NewAPIClient(
 			config.WithCustomAuth(providerData.RoundTripper),
-			config.WithRegion(providerData.Region),
+			config.WithRegion(providerData.GetRegion()),
 		)
 	}
 

stackit/internal/services/argus/instance/datasource.go

@@ -62,7 +62,7 @@ func (d *instanceDataSource) Configure(ctx context.Context, req datasource.Confi
 	} else {
 		apiClient, err = argus.NewAPIClient(
 			config.WithCustomAuth(providerData.RoundTripper),
-			config.WithRegion(providerData.Region),
+			config.WithRegion(providerData.GetRegion()),
 		)
 	}
 	if err != nil {

stackit/internal/services/argus/instance/resource.go

@@ -362,7 +362,7 @@ func (r *instanceResource) Configure(ctx context.Context, req resource.Configure
 	} else {
 		apiClient, err = argus.NewAPIClient(
 			config.WithCustomAuth(providerData.RoundTripper),
-			config.WithRegion(providerData.Region),
+			config.WithRegion(providerData.GetRegion()),
 		)
 	}
 

stackit/internal/services/argus/scrapeconfig/datasource.go

@@ -64,7 +64,7 @@ func (d *scrapeConfigDataSource) Configure(ctx context.Context, req datasource.C
 	} else {
 		apiClient, err = argus.NewAPIClient(
 			config.WithCustomAuth(providerData.RoundTripper),
-			config.WithRegion(providerData.Region),
+			config.WithRegion(providerData.GetRegion()),
 		)
 	}
 	if err != nil {