Merge branch 'main' into PER-13046-add-tenant-tf

Author: EliMoshkovich

.github/workflows/test.yml

@@ -82,39 +82,54 @@ jobs:
           TF_ACC: "1"
           PERMITIO_API_KEY: ${{ secrets.PERMITIO_API_KEY_1_0 }}
           PERMITIO_TIMEOUT: 20
-        run: go test -v -cover ./internal/provider/
+        run: |
+          for i in 1 2 3 4 5; do
+            go test -v -cover ./internal/provider/ && break || sleep 10
+          done
 
       - name: Run tests with Terraform 1.1
         if: matrix.terraform == '1.1.*'
         env:
           TF_ACC: "1"
           PERMITIO_API_KEY: ${{ secrets.PERMITIO_API_KEY_1_1 }}
           PERMITIO_TIMEOUT: 20
-        run: go test -v -cover ./internal/provider/
+        run: |
+          for i in 1 2 3 4 5; do
+            go test -v -cover ./internal/provider/ && break || sleep 10
+          done
 
       - name: Run tests with Terraform 1.2
         if: matrix.terraform == '1.2.*'
         env:
           TF_ACC: "1"
           PERMITIO_API_KEY: ${{ secrets.PERMITIO_API_KEY_1_2 }}
           PERMITIO_TIMEOUT: 20
-        run: go test -v -cover ./internal/provider/
+        run: |
+          for i in 1 2 3 4 5; do
+            go test -v -cover ./internal/provider/ && break || sleep 10
+          done
 
       - name: Run tests with Terraform 1.3
         if: matrix.terraform == '1.3.*'
         env:
           TF_ACC: "1"
           PERMITIO_API_KEY: ${{ secrets.PERMITIO_API_KEY_1_3 }}
           PERMITIO_TIMEOUT: 20
-        run: go test -v -cover ./internal/provider/
+        run: |
+          for i in 1 2 3 4 5; do
+            go test -v -cover ./internal/provider/ && break || sleep 10
+          done
 
       - name: Run tests with Terraform 1.4
         if: matrix.terraform == '1.4.*'
         env:
           TF_ACC: "1"
           PERMITIO_API_KEY: ${{ secrets.PERMITIO_API_KEY_1_4 }}
           PERMITIO_TIMEOUT: 20
-        run: go test -v -cover ./internal/provider/
+        run: |
+          for i in 1 2 3 4 5; do
+            go test -v -cover ./internal/provider/ && break || sleep 10
+          done
 
         
 

docs/data-sources/permitio_role.md

@@ -23,8 +23,9 @@ description: |-
 ### Optional
 
 - `description` (String)
-- `extends` (List of String)
-- `permissions` (List of String)
+- `extends` (Set of String)
+- `permissions` (Set of String)
+- `resource` (String)
 - `updated_at` (String)
 
 ### Read-Only
@@ -34,3 +35,4 @@ description: |-
 - `id` (String) The ID of this resource.
 - `organization_id` (String)
 - `project_id` (String)
+- `resource_id` (String)

internal/provider/roles/role_data_source.go

@@ -75,13 +75,22 @@ func (d *RoleDataSource) Schema(_ context.Context, _ datasource.SchemaRequest, r
 				Optional: true,
 				Computed: true,
 			},
-			"permissions": schema.ListAttribute{
+			"permissions": schema.SetAttribute{
 				ElementType: types.StringType,
 				Optional:    true,
+				Computed:    true,
 			},
-			"extends": schema.ListAttribute{
+			"extends": schema.SetAttribute{
 				ElementType: types.StringType,
 				Optional:    true,
+				Computed:    true,
+			},
+			"resource": schema.StringAttribute{
+				Optional: true,
+				Computed: true,
+			},
+			"resource_id": schema.StringAttribute{
+				Computed: true,
 			},
 		},
 	}