Skip to content

Commit 167243e

Browse files
committed
fix(spanner): fix spanner table iam binding triggering an apply on permissions reorder
1 parent 4ead0f3 commit 167243e

File tree

110 files changed

+823
-1217
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+823
-1217
lines changed

docs/data-sources/google_bigtable_table_iam_policy.md

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,20 @@ description: |-
99

1010

1111

12-
## Example Usage
1312

14-
```terraform
15-
terraform {
16-
required_providers {
17-
alis = {
18-
source = "alis-exchange/alis"
19-
version = "1.1.0"
20-
}
21-
}
22-
}
2313

24-
provider "alis" {
25-
}
14+
## Example Usage
2615

16+
```terraform
2717
data "alis_google_bigtable_table_iam_policy" "policy" {
28-
project = var.ALIS_OS_PROJECT
29-
instance = var.ALIS_OS_BIGTABLE_INSTANCE
18+
project = var.GOOGLE_PROJECT
19+
instance = var.BIGTABLE_INSTANCE
3020
table = "tf-test"
3121
}
32-
33-
output "test_iam" {
34-
description = "The IAM policy for the table"
35-
value = data.alis_google_bigtable_table_iam_policy.policy
36-
}
3722
```
3823

24+
25+
3926
<!-- schema generated by tfplugindocs -->
4027
## Schema
4128

docs/data-sources/google_discovery_engine_data_store_schemas.md

Lines changed: 5 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,34 +9,20 @@ description: |-
99

1010

1111

12-
## Example Usage
1312

14-
```terraform
15-
terraform {
16-
required_providers {
17-
alis = {
18-
source = "alis-exchange/alis"
19-
version = "1.1.0"
20-
}
21-
}
22-
}
2313

24-
provider "alis" {
25-
}
14+
## Example Usage
2615

16+
```terraform
2717
data "alis_google_discovery_engine_data_store_schemas" "schemas" {
28-
project = var.ALIS_OS_PROJECT
18+
project = var.GOOGLE_PROJECT
2919
location = "global"
3020
collection_id = "default_collection"
31-
data_store_id = var.ALIS_OS_DISCOVERY_ENGINE_DATASTORE
21+
data_store_id = var.DISCOVERY_ENGINE_DATASTORE
3222
}
23+
```
3324

3425

35-
output "test_iam" {
36-
description = "Available schemas"
37-
value = data.alis_google_discovery_engine_data_store_schemas.schemas
38-
}
39-
```
4026

4127
<!-- schema generated by tfplugindocs -->
4228
## Schema

docs/data-sources/google_spanner_database_iam_policy.md

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,20 @@ description: |-
99

1010

1111

12-
## Example Usage
1312

14-
```terraform
15-
terraform {
16-
required_providers {
17-
alis = {
18-
source = "alis-exchange/alis"
19-
version = "1.1.0"
20-
}
21-
}
22-
}
2313

24-
provider "alis" {
25-
}
14+
## Example Usage
2615

16+
```terraform
2717
data "alis_google_spanner_database_iam_policy" "policy" {
28-
project = var.ALIS_OS_PROJECT
29-
instance = var.ALIS_OS_SPANNER_INSTANCE
18+
project = var.GOOGLE_PROJECT
19+
instance = var.SPANNER_INSTANCE
3020
database = "tf-test"
3121
}
32-
33-
output "test_iam" {
34-
description = "The IAM policy for the database"
35-
value = data.alis_google_spanner_database_iam_policy.policy
36-
}
3722
```
3823

24+
25+
3926
<!-- schema generated by tfplugindocs -->
4027
## Schema
4128

docs/data-sources/google_spanner_database_roles.md

Lines changed: 6 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,33 +9,20 @@ description: |-
99

1010

1111

12-
## Example Usage
1312

14-
```terraform
15-
terraform {
16-
required_providers {
17-
alis = {
18-
source = "alis-exchange/alis"
19-
version = "1.1.2"
20-
}
21-
}
22-
}
2313

24-
provider "alis" {
25-
}
14+
## Example Usage
2615

16+
```terraform
2717
data "alis_google_spanner_database_roles" "roles" {
28-
project = var.ALIS_OS_PROJECT
29-
instance = var.ALIS_OS_SPANNER_INSTANCE
18+
project = var.GOOGLE_PROJECT
19+
instance = var.SPANNER_INSTANCE
3020
database = "tf-test"
3121
}
32-
33-
output "test_iam" {
34-
description = "The Roles in the Spanner Database."
35-
value = data.alis_google_spanner_database_roles.roles
36-
}
3722
```
3823

24+
25+
3926
<!-- schema generated by tfplugindocs -->
4027
## Schema
4128

docs/data-sources/google_spanner_table_iam_binding.md

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,22 @@ description: |-
1111
Authoritative for a given role. Updates the table IAM policy to grant a role along with permissions.
1212
Other roles and permissions within the IAM policy for the table are preserved.
1313

14-
## Example Usage
1514

16-
```terraform
17-
terraform {
18-
required_providers {
19-
alis = {
20-
source = "alis-exchange/alis"
21-
version = "1.1.2"
22-
}
23-
}
24-
}
2515

26-
provider "alis" {
27-
}
16+
## Example Usage
2817

18+
```terraform
2919
data "alis_google_spanner_table_iam_binding" "admin_binding" {
30-
project = var.ALIS_OS_PROJECT
31-
instance = var.ALIS_OS_SPANNER_INSTANCE
20+
project = var.GOOGLE_PROJECT
21+
instance = var.SPANNER_INSTANCE
3222
database = "tf-test"
3323
table = "tftest"
3424
role = "admin"
3525
}
36-
37-
output "test_iam" {
38-
description = "The IAM policy for the database"
39-
value = data.alis_google_spanner_table_iam_binding.admin_binding
40-
}
4126
```
4227

28+
29+
4330
<!-- schema generated by tfplugindocs -->
4431
## Schema
4532

@@ -53,5 +40,5 @@ output "test_iam" {
5340

5441
### Read-Only
5542

56-
- `permissions` (List of String) The permissions that should be granted to the role.
43+
- `permissions` (Set of String) The permissions that should be granted to the role.
5744
Valid permissions are: `SELECT`, `INSERT`, `UPDATE`, `DELETE`.

docs/index.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,27 @@ description: |-
1010

1111
Custom terraform provider for managing various google resources used in ALIS.
1212

13+
14+
1315
## Example Usage
1416

1517
```terraform
1618
terraform {
1719
required_providers {
1820
alis = {
1921
source = "alis-exchange/alis"
20-
version = "1.1.0"
22+
version = ">= 1.4.0"
2123
}
2224
}
2325
}
2426
2527
provider "alis" {
28+
project = var.GOOGLE_PROJECT
2629
}
2730
```
2831

32+
33+
2934
<!-- schema generated by tfplugindocs -->
3035
## Schema
3136

docs/resources/google_bigtable_gc_policy.md

Lines changed: 12 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,14 @@ description: |-
99

1010

1111

12-
## Example Usage
1312

14-
```terraform
15-
terraform {
16-
required_providers {
17-
alis = {
18-
source = "alis-exchange/alis"
19-
version = "1.1.0"
20-
}
21-
}
22-
}
2313

24-
provider "alis" {
25-
}
14+
## Example Usage
2615

16+
```terraform
2717
resource "alis_google_bigtable_gc_policy" "simple" {
28-
project = var.ALIS_OS_PROJECT
29-
instance = var.ALIS_OS_BIGTABLE_INSTANCE
18+
project = var.GOOGLE_PROJECT
19+
instance = var.BIGTABLE_INSTANCE
3020
table = "tf-test"
3121
column_family = "0"
3222
gc_rules = jsonencode({
@@ -39,8 +29,8 @@ resource "alis_google_bigtable_gc_policy" "simple" {
3929
}
4030
4131
resource "alis_google_bigtable_gc_policy" "complex_union" {
42-
project = var.ALIS_OS_PROJECT
43-
instance = var.ALIS_OS_BIGTABLE_INSTANCE
32+
project = var.GOOGLE_PROJECT
33+
instance = var.BIGTABLE_INSTANCE
4434
table = "tf-test"
4535
column_family = "1"
4636
gc_rules = jsonencode({
@@ -57,8 +47,8 @@ resource "alis_google_bigtable_gc_policy" "complex_union" {
5747
}
5848
5949
resource "alis_google_bigtable_gc_policy" "complex_intersection" {
60-
project = var.ALIS_OS_PROJECT
61-
instance = var.ALIS_OS_BIGTABLE_INSTANCE
50+
project = var.GOOGLE_PROJECT
51+
instance = var.BIGTABLE_INSTANCE
6252
table = "tf-test"
6353
column_family = "2"
6454
gc_rules = jsonencode({
@@ -75,6 +65,8 @@ resource "alis_google_bigtable_gc_policy" "complex_intersection" {
7565
}
7666
```
7767

68+
69+
7870
<!-- schema generated by tfplugindocs -->
7971
## Schema
8072

@@ -98,4 +90,5 @@ Setting `ABANDON` allows the resource to be abandoned rather than deleted.
9890
This is useful for GC policy as it cannot be deleted in a replicated instance.
9991
**Note that when set to `ABANDON`, this only removes the `deletion_policy` from terraform state.
10092
Garbage collection still happens on the specified column family.**
101-
Possible values are: `ABANDON`.
93+
Possible values are: `ABANDON`.
94+

docs/resources/google_bigtable_table.md

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,14 @@ This resource provisions and manages tables in a Bigtable instance.
1313

1414
> NOTE: This resource at the moment offers nothing beyond the standard Google provider. It is recommended to use the standard Google provider for now.
1515
16-
## Example Usage
17-
18-
```terraform
19-
terraform {
20-
required_providers {
21-
alis = {
22-
source = "alis-exchange/alis"
23-
version = "1.1.0"
24-
}
25-
}
26-
}
2716

28-
provider "alis" {
2917

30-
}
18+
## Example Usage
3119

20+
```terraform
3221
resource "alis_google_bigtable_table" "test" {
33-
project = var.ALIS_OS_PROJECT
34-
instance = var.ALIS_OS_BIGTABLE_INSTANCE
22+
project = var.GOOGLE_PROJECT
23+
instance = var.BIGTABLE_INSTANCE
3524
name = "tf-test"
3625
column_families = [
3726
{
@@ -41,12 +30,10 @@ resource "alis_google_bigtable_table" "test" {
4130
deletion_protection = false
4231
# change_stream_retention = "86400s"
4332
}
44-
45-
output "test_table" {
46-
value = alis_google_bigtable_table.test
47-
}
4833
```
4934

35+
36+
5037
<!-- schema generated by tfplugindocs -->
5138
## Schema
5239

@@ -69,4 +56,5 @@ If not provided, currently deletion protection will be set to `UNPROTECTED` as i
6956

7057
Required:
7158

72-
- `name` (String) The name of the column family.
59+
- `name` (String) The name of the column family.
60+

0 commit comments

Comments
 (0)