From a184f2045c0f640ea850f82610ffd80f8588f66c Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 18:26:26 +0200 Subject: [PATCH 01/15] merge versions.tf and main.tf --- main.tf | 18 +++++++++++++++++- versions.tf | 13 ------------- 2 files changed, 17 insertions(+), 14 deletions(-) delete mode 100644 versions.tf diff --git a/main.tf b/main.tf index 1c6a2e5..6b5b304 100644 --- a/main.tf +++ b/main.tf @@ -1 +1,17 @@ -# Terraform code goes here +terraform { + required_version = ">= 1.5.5" + required_providers { + # aws = { + # source = "hashicorp/aws" + # version = ">= 5.44.0" + # } + # azurerm = { + # source = "hashicorp/azurerm" + # version = ">= 3.98.0" + # } + # digitalocean = { + # source = "digitalocean/digitalocean" + # version = ">= 2.36.0" + } + } +} diff --git a/versions.tf b/versions.tf deleted file mode 100644 index b7d3369..0000000 --- a/versions.tf +++ /dev/null @@ -1,13 +0,0 @@ -terraform { - required_version = ">= 1.3.1" - required_providers { - # github = { - # source = "integrations/github" - # version = ">= 5.3.0" - # } - # azurerm = { - # source = "hashicorp/azurerm" - # version = ">= 3.22.0" - # } - } -} From dd98da7e3c3cee31523f3ab71c397ea0b9d26b61 Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 18:34:13 +0200 Subject: [PATCH 02/15] adding ghithub provider --- main.tf | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 6b5b304..4c05a99 100644 --- a/main.tf +++ b/main.tf @@ -12,6 +12,10 @@ terraform { # digitalocean = { # source = "digitalocean/digitalocean" # version = ">= 2.36.0" - } + # } + # github = { + # source = "integrations/github" + # version = ">= 6.2.1" + # } } } From bfbd3da99b130b892951b01796642a849f28e1e5 Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 18:43:28 +0200 Subject: [PATCH 03/15] use the same tools --- main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.tf b/main.tf index 4c05a99..1a0ae7b 100644 --- a/main.tf +++ b/main.tf @@ -1,5 +1,5 @@ terraform { - required_version = ">= 1.5.5" + required_version = ">= 1.5.7" required_providers { # aws = { # source = "hashicorp/aws" From 5bd359ab363be36044cf592ff66b7608271ae5f2 Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 18:49:41 +0200 Subject: [PATCH 04/15] update versions --- .github/ISSUE_TEMPLATE/bug_report.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 5a6577c..60dad07 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -38,11 +38,11 @@ body: label: Environment description: | examples: - - **Terraform version**: 1.3.0 - - **Terraform provider version**: 4.0 + - **Terraform version**: 1.5.5 + - **Terraform provider version**:5.44.0 value: | - - Terraform version: 0.0.0 - - Terraform provider version: 0.0 + - Terraform version: X.Y.Z + - Terraform provider version: X.Y.Z render: markdown validations: required: true From 4cf2adbb9fb0c10fbec3fa3ccae36e4b735ef9ce Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 18:50:28 +0200 Subject: [PATCH 05/15] bump pre-commit version --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 6396e99..354f83a 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ terraform 1.5.7 terraform-docs 0.17.0 tflint 0.50.3 -pre-commit 3.6.2 +pre-commit 3.7.0 From 399d20269003a04ebedeefc47a1b09e052828a0a Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 18:53:55 +0200 Subject: [PATCH 06/15] assign by default to OPSdiyBot --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 ++ .github/ISSUE_TEMPLATE/feature_request.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 60dad07..0f93353 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -2,6 +2,8 @@ name: Bug report description: File a bug/issue title: "[BUG]: " labels: ["bug"] +assignees: + - OPSdiyBot body: - type: checkboxes attributes: diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 00ea279..124b97c 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -2,6 +2,8 @@ name: Feature request description: Suggest new functionality title: "[FEATURE]: " labels: ["enhancement"] +assignees: + - OPSdiyBot body: - type: checkboxes attributes: From b524fa58ebb3c0c6ce030e2a1297cf1ddb256b84 Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 18:56:34 +0200 Subject: [PATCH 07/15] set a version module in bug report --- .github/ISSUE_TEMPLATE/bug_report.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 0f93353..562943e 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -42,9 +42,11 @@ body: examples: - **Terraform version**: 1.5.5 - **Terraform provider version**:5.44.0 + - **Terraform module version**: 0.5.1 value: | - Terraform version: X.Y.Z - Terraform provider version: X.Y.Z + - Terraform module version: X.Y.Z render: markdown validations: required: true From dd017ca75ca991d0cdff307b199212caf098b8da Mon Sep 17 00:00:00 2001 From: Piotr Stawarski Date: Tue, 9 Apr 2024 18:56:55 +0200 Subject: [PATCH 08/15] Update main.tf --- main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/main.tf b/main.tf index 1a0ae7b..d2868ef 100644 --- a/main.tf +++ b/main.tf @@ -1,5 +1,6 @@ terraform { required_version = ">= 1.5.7" + required_providers { # aws = { # source = "hashicorp/aws" From 4234af32be0005d43f5d609c9432ba8232ee2bce Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 18:57:36 +0200 Subject: [PATCH 09/15] disable assignees --- .github/ISSUE_TEMPLATE/bug_report.yml | 4 ++-- .github/ISSUE_TEMPLATE/feature_request.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 562943e..c7a1536 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -2,8 +2,8 @@ name: Bug report description: File a bug/issue title: "[BUG]: " labels: ["bug"] -assignees: - - OPSdiyBot +# assignees: +# - OPSdiyBot body: - type: checkboxes attributes: diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 124b97c..546d9cc 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -2,8 +2,8 @@ name: Feature request description: Suggest new functionality title: "[FEATURE]: " labels: ["enhancement"] -assignees: - - OPSdiyBot +# assignees: +# - OPSdiyBot body: - type: checkboxes attributes: From d34384dfe0ecd8435074e89c95839cbe3b42ce09 Mon Sep 17 00:00:00 2001 From: Piotr Stawarski Date: Tue, 9 Apr 2024 18:57:59 +0200 Subject: [PATCH 10/15] Update main.tf --- main.tf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.tf b/main.tf index d2868ef..6c3d215 100644 --- a/main.tf +++ b/main.tf @@ -20,3 +20,5 @@ terraform { # } } } + +# TODO: Add resources here. From 9161fb2ed691429ba36532f0e6fdb77d037fe1f4 Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 19:01:15 +0200 Subject: [PATCH 11/15] set `Anything else` as non mandatory --- .github/ISSUE_TEMPLATE/feature_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 546d9cc..c3b07be 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -29,7 +29,7 @@ body: label: Describe alternatives you've considered description: A clear and concise description of any alternative solutions or features you've considered. validations: - required: true + required: false - type: textarea attributes: label: Anything else? From f58758aa1bf0e38db98e4e8481b1ef2107f23230 Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 19:02:35 +0200 Subject: [PATCH 12/15] `Anything else` section should not be mandatory --- .github/ISSUE_TEMPLATE/feature_request.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index c3b07be..fbbd54e 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -39,4 +39,4 @@ body: **Tip**: You can attach images or log files by clicking this area to highlight it and then dragging files in. **Tip**: You can use GitHub Gist to share your concepts/ideas. validations: - required: true + required: false From 0828c3a7590c817b4b1ccd141632f8b7a9bb0f95 Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 19:12:52 +0200 Subject: [PATCH 13/15] adding python required by the pre-commit --- .tool-versions | 1 + 1 file changed, 1 insertion(+) diff --git a/.tool-versions b/.tool-versions index 354f83a..6b0eec6 100644 --- a/.tool-versions +++ b/.tool-versions @@ -2,3 +2,4 @@ terraform 1.5.7 terraform-docs 0.17.0 tflint 0.50.3 pre-commit 3.7.0 +python 3.11.2 From fa8d588ed4bb4dcfe9cc6d26268de9307189dfaa Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 19:12:58 +0200 Subject: [PATCH 14/15] update docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9c00d3c..5917dc4 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ module "module_name" { | Name | Version | |------|---------| -| [terraform](#requirement\_terraform) | >= 1.3.1 | +| [terraform](#requirement\_terraform) | >= 1.5.7 | ## Providers From b07fecef1f2f98c6e041d421d808b5fc795c180f Mon Sep 17 00:00:00 2001 From: Michal Tomczuk Date: Tue, 9 Apr 2024 19:40:31 +0200 Subject: [PATCH 15/15] remove python from tools --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index 6b0eec6..95ad1f4 100644 --- a/.tool-versions +++ b/.tool-versions @@ -2,4 +2,4 @@ terraform 1.5.7 terraform-docs 0.17.0 tflint 0.50.3 pre-commit 3.7.0 -python 3.11.2 +# python 3.11.2