feat(objectstorage): Min/Max acceptance tests

Signed-off-by: Alexander Dahmen <alexander.dahmen@inovex.de>

Author: Fyusel

docs/data-sources/objectstorage_bucket.md

@@ -33,6 +33,6 @@ data "stackit_objectstorage_bucket" "example" {
 
 ### Read-Only
 
-- `id` (String) Terraform's internal data source identifier. It is structured as "`project_id`,`name`".
+- `id` (String) Terraform's internal data source identifier. It is structured as "`project_id`,`region`,`name`".
 - `url_path_style` (String)
 - `url_virtual_hosted_style` (String)

docs/data-sources/objectstorage_credential.md

@@ -36,5 +36,5 @@ data "stackit_objectstorage_credential" "example" {
 ### Read-Only
 
 - `expiration_timestamp` (String)
-- `id` (String) Terraform's internal resource identifier. It is structured as "`project_id`,`credentials_group_id`,`credential_id`".
+- `id` (String) Terraform's internal resource identifier. It is structured as "`project_id`,`region`,`credentials_group_id`,`credential_id`".
 - `name` (String)

docs/data-sources/objectstorage_credentials_group.md

@@ -24,15 +24,15 @@ data "stackit_objectstorage_credentials_group" "example" {
 
 ### Required
 
+- `credentials_group_id` (String) The credentials group ID.
 - `project_id` (String) Object Storage Project ID to which the credentials group is associated.
 
 ### 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
 
-- `id` (String) Terraform's internal data source identifier. It is structured as "`project_id`,`credentials_group_id`".
+- `id` (String) Terraform's internal data source identifier. It is structured as "`project_id`,`region`,`credentials_group_id`".
+- `name` (String) The credentials group's display name.
 - `urn` (String) Credentials group uniform resource name (URN)

docs/resources/objectstorage_bucket.md

@@ -33,6 +33,6 @@ resource "stackit_objectstorage_bucket" "example" {
 
 ### Read-Only
 
-- `id` (String) Terraform's internal resource identifier. It is structured as "`project_id`,`name`".
+- `id` (String) Terraform's internal resource identifier. It is structured as "`project_id`,`region`,`name`".
 - `url_path_style` (String)
 - `url_virtual_hosted_style` (String)

docs/resources/objectstorage_credential.md

@@ -37,6 +37,6 @@ resource "stackit_objectstorage_credential" "example" {
 
 - `access_key` (String)
 - `credential_id` (String) The credential ID.
-- `id` (String) Terraform's internal resource identifier. It is structured as "`project_id`,`credentials_group_id`,`credential_id`".
+- `id` (String) Terraform's internal resource identifier. It is structured as "`project_id`,`region`,`credentials_group_id`,`credential_id`".
 - `name` (String)
 - `secret_access_key` (String, Sensitive)

docs/resources/objectstorage_credentials_group.md

@@ -34,5 +34,5 @@ resource "stackit_objectstorage_credentials_group" "example" {
 ### Read-Only
 
 - `credentials_group_id` (String) The credentials group ID
-- `id` (String) Terraform's internal data source identifier. It is structured as "`project_id`,`credentials_group_id`".
+- `id` (String) Terraform's internal data source identifier. It is structured as "`project_id`,`region`,`credentials_group_id`".
 - `urn` (String) Credentials group uniform resource name (URN)

stackit/internal/services/objectstorage/bucket/datasource.go

@@ -60,7 +60,7 @@ func (r *bucketDataSource) Configure(ctx context.Context, req datasource.Configu
 func (r *bucketDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) {
 	descriptions := map[string]string{
 		"main":                     "ObjectStorage bucket data source schema. Must have a `region` specified in the provider configuration.",
-		"id":                       "Terraform's internal data source identifier. It is structured as \"`project_id`,`name`\".",
+		"id":                       "Terraform's internal data source identifier. It is structured as \"`project_id`,`region`,`name`\".",
 		"name":                     "The bucket name. It must be DNS conform.",
 		"project_id":               "STACKIT Project ID to which the bucket is associated.",
 		"url_path_style":           "URL in path style.",

stackit/internal/services/objectstorage/bucket/resource.go

@@ -109,7 +109,7 @@ func (r *bucketResource) Configure(ctx context.Context, req resource.ConfigureRe
 func (r *bucketResource) Schema(_ context.Context, _ resource.SchemaRequest, resp *resource.SchemaResponse) {
 	descriptions := map[string]string{
 		"main":                     "ObjectStorage bucket resource schema. Must have a `region` specified in the provider configuration. If you are creating `credentialsgroup` and `bucket` resources simultaneously, please include the `depends_on` field so that they are created sequentially. This prevents errors from concurrent calls to the service enablement that is done in the background.",
-		"id":                       "Terraform's internal resource identifier. It is structured as \"`project_id`,`name`\".",
+		"id":                       "Terraform's internal resource identifier. It is structured as \"`project_id`,`region`,`name`\".",
 		"name":                     "The bucket name. It must be DNS conform.",
 		"project_id":               "STACKIT Project ID to which the bucket is associated.",
 		"url_path_style":           "URL in path style.",
@@ -304,16 +304,17 @@ func (r *bucketResource) Delete(ctx context.Context, req resource.DeleteRequest,
 // The expected format of the resource import identifier is: project_id,name
 func (r *bucketResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
 	idParts := strings.Split(req.ID, core.Separator)
-	if len(idParts) != 2 || idParts[0] == "" || idParts[1] == "" {
+	if len(idParts) != 3 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" {
 		core.LogAndAddError(ctx, &resp.Diagnostics,
 			"Error importing bucket",
-			fmt.Sprintf("Expected import identifier with format [project_id],[name], got %q", req.ID),
+			fmt.Sprintf("Expected import identifier with format [project_id],[region],[name], got %q", req.ID),
 		)
 		return
 	}
 
 	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("project_id"), idParts[0])...)
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("name"), idParts[1])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("name"), idParts[2])...)
 	tflog.Info(ctx, "ObjectStorage bucket state imported")
 }
 
@@ -331,6 +332,7 @@ func mapFields(bucketResp *objectstorage.GetBucketResponse, model *Model, region
 
 	idParts := []string{
 		model.ProjectId.ValueString(),
+		region,
 		model.Name.ValueString(),
 	}
 	model.Id = types.StringValue(

stackit/internal/services/objectstorage/bucket/resource_test.go

@@ -27,6 +27,8 @@ func (c *objectStorageClientMocked) EnableServiceExecute(_ context.Context, proj
 }
 
 func TestMapFields(t *testing.T) {
+	const testRegion = "eu01"
+	id := fmt.Sprintf("%s,%s,%s", "pid", testRegion, "bname")
 	tests := []struct {
 		description string
 		input       *objectstorage.GetBucketResponse
@@ -39,7 +41,7 @@ func TestMapFields(t *testing.T) {
 				Bucket: &objectstorage.Bucket{},
 			},
 			Model{
-				Id:                    types.StringValue("pid,bname"),
+				Id:                    types.StringValue(id),
 				Name:                  types.StringValue("bname"),
 				ProjectId:             types.StringValue("pid"),
 				URLPathStyle:          types.StringNull(),
@@ -57,7 +59,7 @@ func TestMapFields(t *testing.T) {
 				},
 			},
 			Model{
-				Id:                    types.StringValue("pid,bname"),
+				Id:                    types.StringValue(id),
 				Name:                  types.StringValue("bname"),
 				ProjectId:             types.StringValue("pid"),
 				URLPathStyle:          types.StringValue("url/path/style"),
@@ -75,7 +77,7 @@ func TestMapFields(t *testing.T) {
 				},
 			},
 			Model{
-				Id:                    types.StringValue("pid,bname"),
+				Id:                    types.StringValue(id),
 				Name:                  types.StringValue("bname"),
 				ProjectId:             types.StringValue("pid"),
 				URLPathStyle:          types.StringValue(""),

stackit/internal/services/objectstorage/credential/datasource.go

@@ -71,7 +71,7 @@ func (r *credentialDataSource) Configure(ctx context.Context, req datasource.Con
 func (r *credentialDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, resp *datasource.SchemaResponse) {
 	descriptions := map[string]string{
 		"main":                 "ObjectStorage credential data source schema. Must have a `region` specified in the provider configuration.",
-		"id":                   "Terraform's internal resource identifier. It is structured as \"`project_id`,`credentials_group_id`,`credential_id`\".",
+		"id":                   "Terraform's internal resource identifier. It is structured as \"`project_id`,`region`,`credentials_group_id`,`credential_id`\".",
 		"credential_id":        "The credential ID.",
 		"credentials_group_id": "The credential group ID.",
 		"project_id":           "STACKIT Project ID to which the credential group is associated.",
@@ -208,6 +208,7 @@ func mapDataSourceFields(credentialResp *objectstorage.AccessKey, model *DataSou
 
 	idParts := []string{
 		model.ProjectId.ValueString(),
+		region,
 		model.CredentialsGroupId.ValueString(),
 		credentialId,
 	}