diff --git a/README.md b/README.md index dd14598f..bff318fa 100644 --- a/README.md +++ b/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 } diff --git a/docs/resources/role.md b/docs/resources/role.md index c17ca635..c4551eb0 100644 --- a/docs/resources/role.md +++ b/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 } ``` diff --git a/docs/resources/scope.md b/docs/resources/scope.md index 375d7c14..adb7e0c0 100644 --- a/docs/resources/scope.md +++ b/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"] } ``` diff --git a/examples/resources/boundary_role/project-specific/resource.tf b/examples/resources/boundary_role/project-specific/resource.tf index d43781b7..89187f7d 100644 --- a/examples/resources/boundary_role/project-specific/resource.tf +++ b/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 } diff --git a/examples/resources/boundary_role/user-grants/resource.tf b/examples/resources/boundary_role/user-grants/resource.tf index 63d93293..fd110a58 100644 --- a/examples/resources/boundary_role/user-grants/resource.tf +++ b/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 } diff --git a/examples/resources/boundary_scope/role.tf b/examples/resources/boundary_scope/role.tf index f6a2cbbb..b9f405d0 100644 --- a/examples/resources/boundary_scope/role.tf +++ b/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"] } diff --git a/internal/provider/data_source_scope_test.go b/internal/provider/data_source_scope_test.go index 0a9dd6cd..6f93de2f 100644 --- a/internal/provider/data_source_scope_test.go +++ b/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"] } diff --git a/internal/provider/resource_account_ldap_test.go b/internal/provider/resource_account_ldap_test.go index f7f0d34d..968076c0 100644 --- a/internal/provider/resource_account_ldap_test.go +++ b/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] }` ) diff --git a/internal/provider/resource_role_test.go b/internal/provider/resource_role_test.go index 071a8d39..d4ab6f43 100644 --- a/internal/provider/resource_role_test.go +++ b/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" { diff --git a/internal/provider/resource_scope_test.go b/internal/provider/resource_scope_test.go index 71f1d0cd..a7a8b8a6 100644 --- a/internal/provider/resource_scope_test.go +++ b/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"] } `