fixup

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

Author: Fyusel

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`".
+- `name` (String) The credentials group's display name.
 - `urn` (String) Credentials group uniform resource name (URN)

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

@@ -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/credential/resource.go

@@ -424,17 +424,18 @@ func (r *credentialResource) Delete(ctx context.Context, req resource.DeleteRequ
 // The expected format of the resource import identifier is: project_id,credentials_group_id,credential_id
 func (r *credentialResource) ImportState(ctx context.Context, req resource.ImportStateRequest, resp *resource.ImportStateResponse) {
 	idParts := strings.Split(req.ID, core.Separator)
-	if len(idParts) != 3 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" {
+	if len(idParts) != 4 || idParts[0] == "" || idParts[1] == "" || idParts[2] == "" || idParts[3] == "" {
 		core.LogAndAddError(ctx, &resp.Diagnostics,
 			"Error importing credential",
-			fmt.Sprintf("Expected import identifier with format [project_id],[credentials_group_id],[credential_id], got %q", req.ID),
+			fmt.Sprintf("Expected import identifier with format [project_id],[region],[credentials_group_id],[credential_id], 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("credentials_group_id"), idParts[1])...)
-	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("credential_id"), idParts[2])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("credentials_group_id"), idParts[2])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("credential_id"), idParts[3])...)
 	tflog.Info(ctx, "ObjectStorage credential state imported")
 }
 
@@ -507,6 +508,7 @@ func mapFields(credentialResp *objectstorage.CreateAccessKeyResponse, model *Mod
 
 	idParts := []string{
 		model.ProjectId.ValueString(),
+		region,
 		model.CredentialsGroupId.ValueString(),
 		credentialId,
 	}

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

@@ -77,8 +77,7 @@ func (r *credentialsGroupDataSource) Schema(_ context.Context, _ datasource.Sche
 			},
 			"credentials_group_id": schema.StringAttribute{
 				Description: descriptions["credentials_group_id"],
-				Optional:    true,
-				Computed:    true,
+				Required:    true,
 			},
 			"project_id": schema.StringAttribute{
 				Description: descriptions["project_id"],
@@ -90,7 +89,6 @@ func (r *credentialsGroupDataSource) Schema(_ context.Context, _ datasource.Sche
 			},
 			"name": schema.StringAttribute{
 				Description: descriptions["name"],
-				Optional:    true,
 				Computed:    true,
 			},
 			"urn": schema.StringAttribute{

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

@@ -291,16 +291,17 @@ func (r *credentialsGroupResource) Delete(ctx context.Context, req resource.Dele
 // The expected format of the resource import identifier is: project_id, credentials_group_id
 func (r *credentialsGroupResource) 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 credentialsGroup",
-			fmt.Sprintf("Expected import identifier with format [project_id],[credentials_group_id], got %q", req.ID),
+			fmt.Sprintf("Expected import identifier with format [project_id],[region],[credentials_group_id], 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("credentials_group_id"), idParts[1])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("region"), idParts[1])...)
+	resp.Diagnostics.Append(resp.State.SetAttribute(ctx, path.Root("credentials_group_id"), idParts[2])...)
 	tflog.Info(ctx, "ObjectStorage credentials group state imported")
 }
 
@@ -336,6 +337,7 @@ func mapCredentialsGroup(credentialsGroup objectstorage.CredentialsGroup, model
 
 	idParts := []string{
 		model.ProjectId.ValueString(),
+		model.Region.ValueString(),
 		credentialsGroupId,
 	}
 	model.Id = types.StringValue(

stackit/internal/services/objectstorage/objectstorage_acc_test.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"strings"
 	"testing"
+	"time"
 
 	"github.com/hashicorp/terraform-plugin-testing/config"
 	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
@@ -27,7 +28,7 @@ var testConfigVarsMin = config.Variables{
 	"project_id":                           config.StringVariable(testutil.ProjectId),
 	"objectstorage_bucket_name":            config.StringVariable(fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(20, acctest.CharSetAlpha))),
 	"objectstorage_credentials_group_name": config.StringVariable(fmt.Sprintf("tf-acc-test-%s", acctest.RandStringFromCharSet(20, acctest.CharSetAlpha))),
-	"expiration_timestamp":                 config.StringVariable("2027-01-02T03:04:05Z"),
+	"expiration_timestamp":                 config.StringVariable(fmt.Sprintf("%d-01-02T03:04:05Z", time.Now().Year()+1)),
 }
 
 func TestAccObjectStorageResourceMin(t *testing.T) {
@@ -62,33 +63,53 @@ func TestAccObjectStorageResourceMin(t *testing.T) {
 						"stackit_objectstorage_credentials_group.credentials_group", "credentials_group_id",
 					),
 					resource.TestCheckResourceAttrSet("stackit_objectstorage_credential.credential", "credential_id"),
-					resource.TestCheckResourceAttr("stackit_objectstorage_credential.credential", "expiration_timestamp", testutil.ConvertConfigVariable(testConfigVarsMin["expiration_timestamp"])),
 					resource.TestCheckResourceAttrSet("stackit_objectstorage_credential.credential", "name"),
 					resource.TestCheckResourceAttrSet("stackit_objectstorage_credential.credential", "access_key"),
 					resource.TestCheckResourceAttrSet("stackit_objectstorage_credential.credential", "secret_access_key"),
+
+					// credential_time data
+					resource.TestCheckResourceAttrPair(
+						"stackit_objectstorage_credential.credential_time", "project_id",
+						"stackit_objectstorage_credentials_group.credentials_group", "project_id",
+					),
+					resource.TestCheckResourceAttrPair(
+						"stackit_objectstorage_credential.credential_time", "credentials_group_id",
+						"stackit_objectstorage_credentials_group.credentials_group", "credentials_group_id",
+					),
+					resource.TestCheckResourceAttrSet("stackit_objectstorage_credential.credential_time", "credential_id"),
+					resource.TestCheckResourceAttr("stackit_objectstorage_credential.credential_time", "expiration_timestamp", testutil.ConvertConfigVariable(testConfigVarsMin["expiration_timestamp"])),
+					resource.TestCheckResourceAttrSet("stackit_objectstorage_credential.credential_time", "name"),
+					resource.TestCheckResourceAttrSet("stackit_objectstorage_credential.credential_time", "access_key"),
+					resource.TestCheckResourceAttrSet("stackit_objectstorage_credential.credential_time", "secret_access_key"),
 				),
 			},
 			// Data source
 			{
 				ConfigVariables: testConfigVarsMin,
 				Config: fmt.Sprintf(`
-						%s
+							%s
 
-						data "stackit_objectstorage_bucket" "bucket" {
-							project_id  = stackit_objectstorage_bucket.bucket.project_id
-							name = stackit_objectstorage_bucket.bucket.name
-						}
+							data "stackit_objectstorage_bucket" "bucket" {
+								project_id  = stackit_objectstorage_bucket.bucket.project_id
+								name = stackit_objectstorage_bucket.bucket.name
+							}
 
-						data "stackit_objectstorage_credentials_group" "credentials_group" {
-							project_id  = stackit_objectstorage_credentials_group.credentials_group.project_id
-							credentials_group_id = stackit_objectstorage_credentials_group.credentials_group.credentials_group_id
-						}
+							data "stackit_objectstorage_credentials_group" "credentials_group" {
+								project_id  = stackit_objectstorage_credentials_group.credentials_group.project_id
+								credentials_group_id = stackit_objectstorage_credentials_group.credentials_group.credentials_group_id
+							}
+	
+							data "stackit_objectstorage_credential" "credential" {
+								project_id  = stackit_objectstorage_credential.credential.project_id
+								credentials_group_id = stackit_objectstorage_credential.credential.credentials_group_id
+								credential_id  = stackit_objectstorage_credential.credential.credential_id
+							}
 
-						data "stackit_objectstorage_credential" "credential" {
-							project_id  = stackit_objectstorage_credential.credential.project_id
-							credentials_group_id = stackit_objectstorage_credential.credential.credentials_group_id
-							credential_id  = stackit_objectstorage_credential.credential.credential_id
-						}`,
+							data "stackit_objectstorage_credential" "credential_time" {
+								project_id  = stackit_objectstorage_credential.credential_time.project_id
+								credentials_group_id = stackit_objectstorage_credential.credential_time.credentials_group_id
+								credential_id  = stackit_objectstorage_credential.credential_time.credential_id
+							}`,
 					testutil.ObjectStorageProviderConfig()+resourceMinConfig,
 				),
 				Check: resource.ComposeAggregateTestCheckFunc(
@@ -143,6 +164,28 @@ func TestAccObjectStorageResourceMin(t *testing.T) {
 						"stackit_objectstorage_credential.credential", "expiration_timestamp",
 						"data.stackit_objectstorage_credential.credential", "expiration_timestamp",
 					),
+
+					// Credential_time data
+					resource.TestCheckResourceAttrPair(
+						"stackit_objectstorage_credential.credential_time", "project_id",
+						"data.stackit_objectstorage_credential.credential_time", "project_id",
+					),
+					resource.TestCheckResourceAttrPair(
+						"stackit_objectstorage_credential.credential_time", "credentials_group_id",
+						"data.stackit_objectstorage_credential.credential_time", "credentials_group_id",
+					),
+					resource.TestCheckResourceAttrPair(
+						"stackit_objectstorage_credential.credential_time", "credential_id",
+						"data.stackit_objectstorage_credential.credential_time", "credential_id",
+					),
+					resource.TestCheckResourceAttrPair(
+						"stackit_objectstorage_credential.credential_time", "name",
+						"data.stackit_objectstorage_credential.credential_time", "name",
+					),
+					resource.TestCheckResourceAttrPair(
+						"stackit_objectstorage_credential.credential_time", "expiration_timestamp",
+						"data.stackit_objectstorage_credential.credential_time", "expiration_timestamp",
+					),
 				),
 			},
 			// Import
@@ -159,11 +202,10 @@ func TestAccObjectStorageResourceMin(t *testing.T) {
 						return "", fmt.Errorf("couldn't find attribute credentials_group_id")
 					}
 
-					return fmt.Sprintf("%s,%s", testutil.ProjectId, credentialsGroupId), nil
+					return fmt.Sprintf("%s,%s,%s", testutil.ProjectId, testutil.Region, credentialsGroupId), nil
 				},
-				ImportState:             true,
-				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"region"},
+				ImportState:       true,
+				ImportStateVerify: true,
 			},
 			{
 				ConfigVariables: testConfigVarsMin,
@@ -181,11 +223,11 @@ func TestAccObjectStorageResourceMin(t *testing.T) {
 					if !ok {
 						return "", fmt.Errorf("couldn't find attribute credential_id")
 					}
-					return fmt.Sprintf("%s,%s,%s", testutil.ProjectId, credentialsGroupId, credentialId), nil
+					return fmt.Sprintf("%s,%s,%s,%s", testutil.ProjectId, testutil.Region, credentialsGroupId, credentialId), nil
 				},
 				ImportState:             true,
 				ImportStateVerify:       true,
-				ImportStateVerifyIgnore: []string{"access_key", "secret_access_key", "region"},
+				ImportStateVerifyIgnore: []string{"access_key", "secret_access_key"},
 			},
 			// Deletion is done by the framework implicitly
 		},

stackit/internal/services/objectstorage/testfiles/resource-min.tf

@@ -17,5 +17,10 @@ resource "stackit_objectstorage_credentials_group" "credentials_group" {
 resource "stackit_objectstorage_credential" "credential" {
   project_id           = stackit_objectstorage_credentials_group.credentials_group.project_id
   credentials_group_id = stackit_objectstorage_credentials_group.credentials_group.credentials_group_id
+}
+
+resource "stackit_objectstorage_credential" "credential_time" {
+  project_id           = stackit_objectstorage_credentials_group.credentials_group.project_id
+  credentials_group_id = stackit_objectstorage_credentials_group.credentials_group.credentials_group_id
   expiration_timestamp = var.expiration_timestamp
 }