Handle grant string id to ids

README.md

@@ -163,7 +163,7 @@ resource "boundary_role" "organization_readonly" {
   name        = "readonly"
   description = "Read-only role"
   principal_ids = [boundary_group.readonly_users.id]
-  grant_strings = ["id=*;type=*;actions=read"]
+  grant_strings = ["ids=*;type=*;actions=read"]
   scope_id    = boundary_scope.corp.id
 }
 
@@ -174,7 +174,7 @@ resource "boundary_role" "organization_admin" {
   principal_ids = concat(
     [for user in boundary_user.user: user.id]
   )
-  grant_strings   = ["id=*;type=*;actions=create,read,update,delete"]
+  grant_strings   = ["ids=*;type=*;actions=create,read,update,delete"]
   scope_id = boundary_scope.corp.id
 }
 

docs/resources/role.md

@@ -79,7 +79,7 @@ resource "boundary_role" "readonly" {
   name          = "readonly"
   description   = "A readonly role"
   principal_ids = [boundary_user.readonly.id]
-  grant_strings = ["id=*;type=*;actions=read"]
+  grant_strings = ["ids=*;type=*;actions=read"]
   scope_id      = boundary_scope.org.id
 }
 ```
@@ -112,7 +112,7 @@ resource "boundary_role" "readonly" {
   name          = "readonly"
   description   = "A readonly role"
   principal_ids = [boundary_user.readonly.id]
-  grant_strings = ["id=*;type=*;actions=read"]
+  grant_strings = ["ids=*;type=*;actions=read"]
   scope_id      = boundary_scope.project.id
 }
 ```

docs/resources/scope.md

@@ -55,7 +55,7 @@ resource "boundary_scope" "org" {
 resource "boundary_role" "org_admin" {
   scope_id       = boundary_scope.global.id
   grant_scope_id = boundary_scope.org.id
-  grant_strings  = ["id=*;type=*;actions=*"]
+  grant_strings  = ["ids=*;type=*;actions=*"]
   principal_ids  = ["u_auth"]
 }
 ```

examples/resources/boundary_role/project-specific/resource.tf

@@ -23,6 +23,6 @@ resource "boundary_role" "readonly" {
   name          = "readonly"
   description   = "A readonly role"
   principal_ids = [boundary_user.readonly.id]
-  grant_strings = ["id=*;type=*;actions=read"]
+  grant_strings = ["ids=*;type=*;actions=read"]
   scope_id      = boundary_scope.project.id
 }

examples/resources/boundary_role/user-grants/resource.tf

@@ -16,6 +16,6 @@ resource "boundary_role" "readonly" {
   name          = "readonly"
   description   = "A readonly role"
   principal_ids = [boundary_user.readonly.id]
-  grant_strings = ["id=*;type=*;actions=read"]
+  grant_strings = ["ids=*;type=*;actions=read"]
   scope_id      = boundary_scope.org.id
 }

examples/resources/boundary_scope/role.tf

@@ -7,6 +7,6 @@ resource "boundary_scope" "org" {
 resource "boundary_role" "org_admin" {
   scope_id       = boundary_scope.global.id
   grant_scope_id = boundary_scope.org.id
-  grant_strings  = ["id=*;type=*;actions=*"]
+  grant_strings  = ["ids=*;type=*;actions=*"]
   principal_ids  = ["u_auth"]
 }

internal/provider/data_source_scope_test.go

@@ -43,7 +43,7 @@ resource "boundary_scope" "project" {
 resource "boundary_role" "org_admin" {
 	scope_id = "global"
 	grant_scope_id = boundary_scope.org.id
-	grant_strings = ["id=*;type=*;actions=*"]
+	grant_strings = ["ids=*;type=*;actions=*"]
 	principal_ids = ["u_auth"]
 }
 

internal/provider/resource_account_ldap_test.go

@@ -93,7 +93,7 @@ resource "boundary_user" "alice" {
 resource "boundary_role" "ldap_principal" {
 	scope_id = boundary_scope.global.id
 	grant_scope_id = boundary_scope.global.id
-	grant_strings = ["id=*;type=*;actions=*"]
+	grant_strings = ["ids=*;type=*;actions=*"]
 	principal_ids = [boundary_user.alice.id]
 }`
 )

internal/provider/resource_role_test.go

@@ -146,9 +146,9 @@ resource "boundary_role" "with_groups" {
 	depends_on     = [boundary_role.proj1_admin]
 }`
 
-	readonlyGrant       = "id=*;type=*;actions=read"
-	readonlyGrantUpdate = "id=*;type=*;actions=read,create"
-	invalidGrant        = "id=*;type=*;actions=badaction"
+	readonlyGrant       = "ids=*;type=*;actions=read"
+	readonlyGrantUpdate = "ids=*;type=*;actions=read,create"
+	invalidGrant        = "ids=*;type=*;actions=badaction"
 
 	projRoleWithGrants = fmt.Sprintf(`
 resource "boundary_role" "with_grants" {

internal/provider/resource_scope_test.go

@@ -34,7 +34,7 @@ resource "boundary_scope" "org1" {
 resource "boundary_role" "org1_admin" {
 	scope_id = boundary_scope.global.id
 	grant_scope_id = boundary_scope.org1.id
-	grant_strings = ["id=*;type=*;actions=*"]
+	grant_strings = ["ids=*;type=*;actions=*"]
 	principal_ids = ["u_auth"]
 }
 `
@@ -50,7 +50,7 @@ resource "boundary_scope" "proj1" {
 resource "boundary_role" "proj1_admin" {
 	scope_id = boundary_scope.org1.id
 	grant_scope_id = boundary_scope.proj1.id
-	grant_strings = ["id=*;type=*;actions=*"]
+	grant_strings = ["ids=*;type=*;actions=*"]
 	principal_ids = ["u_auth"]
 }
 `
@@ -66,7 +66,7 @@ resource "boundary_scope" "proj1" {
 resource "boundary_role" "proj1_admin" {
 	scope_id = boundary_scope.org1.id
 	grant_scope_id = boundary_scope.proj1.id
-	grant_strings = ["id=*;type=*;actions=*"]
+	grant_strings = ["ids=*;type=*;actions=*"]
 	principal_ids = ["u_auth"]
 }
 `
@@ -81,7 +81,7 @@ resource "boundary_scope" "proj2" {
 resource "boundary_role" "proj2_admin" {
 	scope_id = boundary_scope.org1.id
 	grant_scope_id = boundary_scope.proj2.id
-	grant_strings = ["id=*;type=*;actions=*"]
+	grant_strings = ["ids=*;type=*;actions=*"]
 	principal_ids = ["u_auth"]
 }
 `