Vault Test + SSH Test + Role Assignment

harness · Apr 25, 2023 · de44696 · de44696
1 parent 8d3cf87
commit de44696
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/docs/resources/platform_role_assignments.md b/docs/resources/platform_role_assignments.md
@@ -88,6 +88,8 @@ resource "harness_platform_role_assignments" "example2" {
 ### Required
 
 - `principal` (Block List, Min: 1) Principal. (see [below for nested schema](#nestedblock--principal))
+- `resource_group_identifier` (String) Resource group identifier.
+- `role_identifier` (String) Role identifier.
 
 ### Optional
 
@@ -96,8 +98,6 @@ resource "harness_platform_role_assignments" "example2" {
 - `managed` (Boolean) Managed or not.
 - `org_id` (String) Org identifier.
 - `project_id` (String) Project Identifier
-- `resource_group_identifier` (String) Resource group identifier.
-- `role_identifier` (String) Role identifier.
 
 ### Read-Only
 
@@ -106,11 +106,14 @@ resource "harness_platform_role_assignments" "example2" {
 <a id="nestedblock--principal"></a>
 ### Nested Schema for `principal`
 
+Required:
+
+- `type` (String) Type.
+
 Optional:
 
 - `identifier` (String) Identifier.
 - `scope_level` (String) Scope level.
-- `type` (String) Type.
 
 ## Import
 

diff --git a/internal/service/platform/connector/vault_test.go b/internal/service/platform/connector/vault_test.go
@@ -573,6 +573,7 @@ func TestAccResourceConnectorVault_AppRole(t *testing.T) {
 				ResourceName:      resourceName,
 				ImportState:       true,
 				ImportStateVerify: true,
+				ImportStateIdFunc: acctest.AccountLevelResourceImportStateIdFunc(resourceName),
 			},
 		},
 	})

diff --git a/internal/service/platform/role_assignments/role_assignments.go b/internal/service/platform/role_assignments/role_assignments.go
@@ -32,12 +32,12 @@ func ResourceRoleAssignments() *schema.Resource {
 			"resource_group_identifier": {
 				Description: "Resource group identifier.",
 				Type:        schema.TypeString,
-				Optional:    true,
+				Required:    true,
 			},
 			"role_identifier": {
 				Description: "Role identifier.",
 				Type:        schema.TypeString,
-				Optional:    true,
+				Required:    true,
 			},
 			"principal": {
 				Description: "Principal.",
@@ -59,7 +59,7 @@ func ResourceRoleAssignments() *schema.Resource {
 						"type": {
 							Description:  "Type.",
 							Type:         schema.TypeString,
-							Optional:     true,
+							Required:     true,
 							ValidateFunc: validation.StringInSlice([]string{"USER", "USER_GROUP", "SERVICE", "API_KEY", "SERVICE_ACCOUNT"}, false),
 						},
 					},

diff --git a/internal/service/platform/secret/sshkey_test.go b/internal/service/platform/secret/sshkey_test.go
@@ -348,7 +348,6 @@ func testAccResourceSecret_sshkey_sshPathCredential(id string, name string) stri
 			sshkey_path_credential {
 				user_name = "user_name"
 				key_path = "key_path"
-				encrypted_passphrase = "encrypted_passphrase"
 			}
 			credential_type = "KeyPath"
 		}