Skip to content

Commit 26cab3f

Browse files
britt-allenbritt-allen
committed
forgot to pull in updates from main
2 parents 37b05f8 + 18c6884 commit 26cab3f

File tree

13 files changed

+332
-332
lines changed

13 files changed

+332
-332
lines changed

‎.github/workflows/pre-commit.yml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,6 @@ jobs:
2323
- uses: snok/install-poetry@v1
2424
with:
2525
virtualenvs-create: false
26-
- name: Setup terraform
27-
uses: hashicorp/setup-terraform@v2
28-
with:
29-
terraform_version: v1.4.0
30-
- name: Install tflint
31-
run: |
32-
curl -s https://raw.githubusercontent.com/terraform-linters/\
33-
tflint/master/install_linux.sh | bash
3426
- name: Install dependencies
3527
run: |
3628
poetry install

‎.github/workflows/terraform-validation.yml‎

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
name: terraform-validation
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches: [main]
7+
8+
jobs:
9+
terraform-validation:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v3
13+
14+
- name: Setup terraform
15+
uses: hashicorp/setup-terraform@v2
16+
with:
17+
terraform_version: v1.4.0
18+
- name: Install tflint
19+
run: |
20+
curl -s https://raw.githubusercontent.com/terraform-linters/\
21+
tflint/master/install_linux.sh | bash
22+
23+
- name: Run terraform fmt
24+
run: |
25+
terraform fmt
26+
- name: Run terraform validate
27+
run: |
28+
terraform validate
29+
- name: Run terraform tflint
30+
run: |
31+
tflint --chdir=terraform/ --recursive
32+
33+
- name: Document cloud infrastructure remote state in README
34+
uses: terraform-docs/gh-actions@v1.3.0
35+
with:
36+
working-dir: ./terraform/s3-remote-state
37+
- name: Document cloud infrastructure in mkdocs
38+
uses: terraform-docs/gh-actions@v1.3.0
39+
with:
40+
working-dir: ./terraform/aws/modules/infra
41+
output-file: ../../../../docs/code/terraform-local-setup.md
42+
- name: Document Snowflake account infrastructure in mkdocs
43+
uses: terraform-docs/gh-actions@v1.3.0
44+
with:
45+
working-dir: ./terraform/snowflake/modules/elt
46+
output-file: ../../../../docs/infra/snowflake.md
47+
# This shouldn't be necessary but the terraform-docs action has a bug
48+
# preventing it from git-adding files outside of 'working-dir'.
49+
# See: https://github.com/terraform-docs/gh-actions/pull/108
50+
- name: Commit any files changed by terraform-docs
51+
run: |
52+
git add docs/code/terraform-local-setup.md
53+
git add docs/infra/snowflake.md
54+
# Run git commit if changed files are detected
55+
if git status --porcelain | grep -q '[AM ][AM ]\s\+\S\+'; then
56+
git config --global user.name 'github-actions[bot]'
57+
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
58+
set -x
59+
git commit -m "Automated terraform-docs commit"
60+
git push
61+
set +x
62+
fi

‎.pre-commit-config.yaml‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,37 +11,6 @@ repos:
1111
- id: check-merge-conflict
1212
- id: detect-aws-credentials
1313
args: [--allow-missing-credentials]
14-
- repo: https://github.com/antonbabenko/pre-commit-terraform
15-
rev: v1.77.1
16-
hooks:
17-
- id: terraform_fmt
18-
- id: terraform_validate
19-
# Exclude modules to work around
20-
# https://github.com/hashicorp/terraform/issues/28490
21-
exclude: "terraform/[^/]+/modules/[^/]+/[^/]+$"
22-
- id: terraform_tflint
23-
- repo: https://github.com/terraform-docs/terraform-docs
24-
rev: v0.16.0
25-
hooks:
26-
- id: terraform-docs-go
27-
name: Document cloud infrastructure remote state in README
28-
args: ["./terraform/s3-remote-state"]
29-
- id: terraform-docs-go
30-
name: Document cloud infrastructure in mkdocs
31-
args:
32-
[
33-
"./terraform/aws/modules/infra/",
34-
"--output-file",
35-
"../../../../docs/cloud-infrastructure.md",
36-
]
37-
- id: terraform-docs-go
38-
name: Document Snowflake account infrastructure in mkdocs
39-
args:
40-
[
41-
"./terraform/snowflake/modules/elt/",
42-
"--output-file",
43-
"../../../../docs/snowflake.md",
44-
]
4514
- repo: https://github.com/charliermarsh/ruff-pre-commit
4615
rev: v0.1.6
4716
hooks:

‎docs/infra/snowflake.md‎

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,15 @@ The **elt** module has the following configuration:
161161
| Name | Version |
162162
|------|---------|
163163
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0 |
164-
| <a name="requirement_snowflake"></a> [snowflake](#requirement\_snowflake) | ~> 0.61 |
164+
| <a name="requirement_snowflake"></a> [snowflake](#requirement\_snowflake) | ~> 0.88 |
165165

166166
## Providers
167167

168168
| Name | Version |
169169
|------|---------|
170-
| <a name="provider_snowflake.accountadmin"></a> [snowflake.accountadmin](#provider\_snowflake.accountadmin) | ~> 0.61 |
171-
| <a name="provider_snowflake.useradmin"></a> [snowflake.useradmin](#provider\_snowflake.useradmin) | ~> 0.61 |
170+
| <a name="provider_snowflake"></a> [snowflake](#provider\_snowflake) | ~> 0.88 |
171+
| <a name="provider_snowflake.accountadmin"></a> [snowflake.accountadmin](#provider\_snowflake.accountadmin) | ~> 0.88 |
172+
| <a name="provider_snowflake.useradmin"></a> [snowflake.useradmin](#provider\_snowflake.useradmin) | ~> 0.88 |
172173

173174
## Modules
174175

@@ -186,35 +187,35 @@ The **elt** module has the following configuration:
186187

187188
| Name | Type |
188189
|------|------|
189-
| [snowflake_database_grant.this](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/database_grant) | resource |
190+
| [snowflake_grant_account_role.analytics_r_to_reader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
191+
| [snowflake_grant_account_role.analytics_r_to_reporter](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
192+
| [snowflake_grant_account_role.analytics_rwc_to_transformer](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
193+
| [snowflake_grant_account_role.loader_to_airflow](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
194+
| [snowflake_grant_account_role.loader_to_fivetran](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
195+
| [snowflake_grant_account_role.loader_to_sysadmin](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
196+
| [snowflake_grant_account_role.loading_to_loader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
197+
| [snowflake_grant_account_role.logger_to_accountadmin](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
198+
| [snowflake_grant_account_role.logger_to_sentinel](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
199+
| [snowflake_grant_account_role.logging_to_logger](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
200+
| [snowflake_grant_account_role.raw_r_to_reader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
201+
| [snowflake_grant_account_role.raw_r_to_transformer](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
202+
| [snowflake_grant_account_role.raw_rwc_to_loader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
203+
| [snowflake_grant_account_role.reader_to_github_ci](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
204+
| [snowflake_grant_account_role.reader_to_sysadmin](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
205+
| [snowflake_grant_account_role.reporter_to_sysadmin](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
206+
| [snowflake_grant_account_role.reporting_to_reader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
207+
| [snowflake_grant_account_role.reporting_to_reporter](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
208+
| [snowflake_grant_account_role.transform_r_to_reader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
209+
| [snowflake_grant_account_role.transform_rwc_to_transformer](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
210+
| [snowflake_grant_account_role.transformer_to_dbt](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
211+
| [snowflake_grant_account_role.transformer_to_sysadmin](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
212+
| [snowflake_grant_account_role.transforming_to_transformer](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_account_role) | resource |
213+
| [snowflake_grant_privileges_to_account_role.imported_privileges_to_logger](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/grant_privileges_to_account_role) | resource |
190214
| [snowflake_role.loader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role) | resource |
191215
| [snowflake_role.logger](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role) | resource |
192216
| [snowflake_role.reader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role) | resource |
193217
| [snowflake_role.reporter](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role) | resource |
194218
| [snowflake_role.transformer](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role) | resource |
195-
| [snowflake_role_grants.analytics_r_to_reader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
196-
| [snowflake_role_grants.analytics_r_to_reporter](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
197-
| [snowflake_role_grants.analytics_rwc_to_transformer](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
198-
| [snowflake_role_grants.loader_to_airflow](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
199-
| [snowflake_role_grants.loader_to_fivetran](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
200-
| [snowflake_role_grants.loader_to_sysadmin](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
201-
| [snowflake_role_grants.loading_to_loader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
202-
| [snowflake_role_grants.logger_to_accountadmin](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
203-
| [snowflake_role_grants.logger_to_sentinel](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
204-
| [snowflake_role_grants.logging_to_logger](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
205-
| [snowflake_role_grants.raw_r_to_reader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
206-
| [snowflake_role_grants.raw_r_to_transformer](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
207-
| [snowflake_role_grants.raw_rwc_to_loader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
208-
| [snowflake_role_grants.reader_to_github_ci](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
209-
| [snowflake_role_grants.reader_to_sysadmin](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
210-
| [snowflake_role_grants.reporter_to_sysadmin](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
211-
| [snowflake_role_grants.reporting_to_reader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
212-
| [snowflake_role_grants.reporting_to_reporter](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
213-
| [snowflake_role_grants.transform_r_to_reader](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
214-
| [snowflake_role_grants.transform_rwc_to_transformer](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
215-
| [snowflake_role_grants.transformer_to_dbt](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
216-
| [snowflake_role_grants.transformer_to_sysadmin](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
217-
| [snowflake_role_grants.transforming_to_transformer](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/role_grants) | resource |
218219
| [snowflake_user.airflow](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/user) | resource |
219220
| [snowflake_user.dbt](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/user) | resource |
220221
| [snowflake_user.fivetran](https://registry.terraform.io/providers/Snowflake-Labs/snowflake/latest/docs/resources/user) | resource |

‎terraform/snowflake/environments/dev/.terraform.lock.hcl‎

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎terraform/snowflake/environments/dev/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ terraform {
2020
required_providers {
2121
snowflake = {
2222
source = "Snowflake-Labs/snowflake"
23-
version = "0.70.1"
23+
version = "0.92"
2424
}
2525
}
2626
required_version = ">= 1.0"

‎terraform/snowflake/environments/prd/.terraform.lock.hcl‎

Lines changed: 16 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎terraform/snowflake/environments/prd/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ terraform {
2020
required_providers {
2121
snowflake = {
2222
source = "Snowflake-Labs/snowflake"
23-
version = "0.70.1"
23+
version = "0.92"
2424
}
2525
}
2626
required_version = ">= 1.0"

0 commit comments

Comments
 (0)