Add service account values to read and import (#525)

aminueza · Nov 4, 2023 · f83e303 · f83e303
1 parent ceec923
commit f83e303
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 0 deletions.
diff --git a/minio/resource_minio_service_account.go b/minio/resource_minio_service_account.go
@@ -175,6 +175,12 @@ func minioReadServiceAccount(ctx context.Context, d *schema.ResourceData, meta i
 		return NewResourceError("reading service account failed", d.Id(), err)
 	}
 
+	_ = d.Set("disable_user", output.AccountStatus == "off")
+
+	if err := d.Set("target_user", output.ParentUser); err != nil {
+		return NewResourceError("reading service account failed", d.Id(), err)
+	}
+
 	_ = d.Set("policy", output.Policy)
 
 	return nil

diff --git a/minio/resource_minio_service_account_test.go b/minio/resource_minio_service_account_test.go
@@ -30,8 +30,15 @@ func TestServiceAccount_basic(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					testAccCheckMinioServiceAccountExists(resourceName, &serviceAccount),
 					testAccCheckMinioServiceAccountAttributes(resourceName, targetUser, status),
+					resource.TestCheckResourceAttr(resourceName, "target_user", targetUser),
 				),
 			},
+			{
+				ResourceName:            resourceName,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"update_secret", "secret_key"},
+			},
 		},
 	})
 }
@@ -130,6 +137,12 @@ func TestServiceAccount_Policy(t *testing.T) {
 					testAccCheckMinioServiceAccountExists(resourceName2, &serviceAccount),
 				),
 			},
+			{
+				ResourceName:            resourceName2,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{"update_secret", "secret_key"},
+			},
 		},
 	})
 }