Skip to content

Commit 3b1b530

Browse files
bonclay7bonclay7
authored
Pre-commit fixes (#44)
* Pre-commit fixes * Restrict terraform version to < 1.3.0 * fixup! Restrict terraform version to < 1.3.0 * fixup! Restrict terraform version to < 1.3.0 * Pinned min version to 1.1.0, support for nullable * Update README.md
1 parent 9f0b90a commit 3b1b530

File tree

27 files changed

+128
-145
lines changed

27 files changed

+128
-145
lines changed

‎.github/workflows/pre-commit.yaml

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,13 @@ jobs:
4141
matrix:
4242
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
4343
steps:
44+
- name: Remove default Terraform
45+
run: rm -rf $(which terraform)
46+
47+
- name: Should fail
48+
continue-on-error: true
49+
run: terraform version
50+
4451
- name: Checkout
4552
uses: actions/checkout@v3
4653

@@ -73,27 +80,37 @@ jobs:
7380
with:
7481
directory: ${{ matrix.directory }}
7582

76-
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
83+
- name: Pre-commit Terraform 1.1.0 #${{ steps.minMax.outputs.minVersion }}
7784
uses: clowdhaus/terraform-composite-actions/[email protected]
7885
# Run only validate pre-commit check on min version supported
7986
if: ${{ matrix.directory != '.' && steps.changes.outputs.src== 'true' }}
8087
with:
81-
terraform-version: ${{ steps.minMax.outputs.minVersion }}
88+
terraform-version: 1.1.0 # ${{ steps.minMax.outputs.minVersion }}
8289
args: 'terraform_validate --color=always --show-diff-on-failure --files ${{ matrix.directory }}/*'
8390

84-
- name: Pre-commit Terraform ${{ steps.minMax.outputs.minVersion }}
91+
- name: Pre-commit Terraform 1.1.0 #${{ steps.minMax.outputs.minVersion }}
8592
uses: clowdhaus/terraform-composite-actions/[email protected]
8693
# Run only validate pre-commit check on min version supported
8794
if: ${{ matrix.directory == '.' && steps.changes.outputs.src== 'true' }}
8895
with:
89-
terraform-version: ${{ steps.minMax.outputs.minVersion }}
96+
terraform-version: 1.1.0 #${{ steps.minMax.outputs.minVersion }}
9097
args: 'terraform_validate --color=always --show-diff-on-failure --files $(ls *.tf)'
9198

99+
- if: steps.changes.outputs.src== 'true'
100+
run: terraform version
101+
92102
preCommitMaxVersion:
93103
name: Max TF pre-commit
94104
runs-on: ubuntu-latest
95105
needs: collectInputs
96106
steps:
107+
- name: Remove default Terraform
108+
run: rm -rf $(which terraform)
109+
110+
- name: Should fail
111+
continue-on-error: true
112+
run: terraform version
113+
97114
- name: Checkout
98115
uses: actions/checkout@v3
99116

@@ -125,10 +142,14 @@ jobs:
125142
uses: clowdhaus/[email protected]
126143
if: steps.changes.outputs.src== 'true'
127144

128-
- name: Pre-commit Terraform ${{ steps.minMax.outputs.maxVersion }}
145+
# TODO - remove hardcoded version once optional attributes are resolved/removed
146+
- name: Pre-commit Terraform 1.2.9 # ${{ steps.minMax.outputs.maxVersion }}
129147
uses: clowdhaus/terraform-composite-actions/[email protected]
130148
if: steps.changes.outputs.src== 'true'
131149
with:
132-
terraform-version: ${{ steps.minMax.outputs.maxVersion }}
150+
terraform-version: 1.2.9 # ${{ steps.minMax.outputs.maxVersion }}
133151
terraform-docs-version: ${{ env.TERRAFORM_DOCS_VERSION }}
134152
tflint-version: ${{ env.TFLINT_VERSION }}
153+
154+
- if: steps.changes.outputs.src== 'true'
155+
run: terraform version

‎README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# AWS Observability Accelerator for Terraform
22

3-
<!-- [![pre-commit](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/pre-commit.yaml/badge.svg)](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/pre-commit.yaml)
4-
-->
3+
[![pre-commit](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/pre-commit.yaml/badge.svg)](https://github.com/aws-observability/terraform-aws-observability-accelerator/actions/workflows/pre-commit.yaml)
4+
55
Welcome to the AWS Observability Accelerator for Terraform!
66

77
The AWS Observability accelerator for Terraform is a set of modules to help you
@@ -114,7 +114,7 @@ If you are interested in contributing to EKS Blueprints, see the [Contribution g
114114

115115
| Name | Version |
116116
|------|---------|
117-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.0 |
117+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 |
118118
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0.0 |
119119
| <a name="requirement_awscc"></a> [awscc](#requirement\_awscc) | >= 0.24.0 |
120120
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | 1.25.0 |

‎examples/eks-cluster-with-vpc/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.0.0"
2+
required_version = ">= 1.1.0, < 1.3.0"
33

44
required_providers {
55
aws = {

‎examples/existing-cluster-nginx/README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,9 @@ add this `managed_prometheus_region=xxx` and `managed_prometheus_workspace_id=ws
191191

192192
| Name | Version |
193193
|------|---------|
194-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
194+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 |
195195
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0.0 |
196196
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | >= 1.25.0 |
197-
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | >= 1.25.0 |
198197
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.4.1 |
199198
| <a name="requirement_kubectl"></a> [kubectl](#requirement\_kubectl) | >= 1.14 |
200199
| <a name="requirement_kubernetes"></a> [kubernetes](#requirement\_kubernetes) | >= 2.10 |
@@ -224,10 +223,10 @@ add this `managed_prometheus_region=xxx` and `managed_prometheus_workspace_id=ws
224223
| Name | Description | Type | Default | Required |
225224
|------|-------------|------|---------|:--------:|
226225
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS Region | `string` | n/a | yes |
227-
| <a name="input_eks_cluster_id"></a> [eks\_cluster\_id](#input\_eks\_cluster\_id) | Name of the EKS cluster | `string` | n/a | yes |
226+
| <a name="input_eks_cluster_id"></a> [eks\_cluster\_id](#input\_eks\_cluster\_id) | EKS Cluster Id | `string` | n/a | yes |
228227
| <a name="input_grafana_api_key"></a> [grafana\_api\_key](#input\_grafana\_api\_key) | API key for authorizing the Grafana provider to make changes to Amazon Managed Grafana | `string` | `""` | no |
229-
| <a name="input_managed_grafana_workspace_id"></a> [managed\_grafana\_workspace\_id](#input\_managed\_grafana\_workspace\_id) | Amazon Managed Grafana Workspace ID | `string` | `""` | no |
230-
| <a name="input_managed_prometheus_workspace_id"></a> [managed\_prometheus\_workspace\_id](#input\_managed\_prometheus\_workspace\_id) | Amazon Managed Service for Prometheus Workspace ID | `string` | `""` | no |
228+
| <a name="input_managed_grafana_workspace_id"></a> [managed\_grafana\_workspace\_id](#input\_managed\_grafana\_workspace\_id) | Amazon Managed Grafana (AMG) workspace ID | `string` | `""` | no |
229+
| <a name="input_managed_prometheus_workspace_id"></a> [managed\_prometheus\_workspace\_id](#input\_managed\_prometheus\_workspace\_id) | Amazon Managed Service for Prometheus (AMP) workspace ID | `string` | `""` | no |
231230

232231
## Outputs
233232

‎examples/existing-cluster-nginx/main.tf

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,10 @@ provider "helm" {
2424
}
2525
}
2626

27-
terraform {
28-
required_providers {
29-
grafana = {
30-
source = "grafana/grafana"
31-
version = ">= 1.25.0"
32-
}
33-
}
34-
}
35-
3627
locals {
37-
name = basename(path.cwd)
3828
region = var.aws_region
3929

40-
eks_oidc_issuer_url = replace(data.aws_eks_cluster.this.identity[0].oidc[0].issuer, "https://", "")
4130
eks_cluster_endpoint = data.aws_eks_cluster.this.endpoint
42-
eks_cluster_version = data.aws_eks_cluster.this.version
43-
4431
create_new_workspace = var.managed_prometheus_workspace_id == "" ? true : false
4532

4633
tags = {
@@ -84,7 +71,6 @@ provider "grafana" {
8471
auth = var.grafana_api_key
8572
}
8673

87-
//*
8874
module "workloads_nginx" {
8975
source = "../../modules/workloads/nginx"
9076

@@ -102,4 +88,3 @@ module "workloads_nginx" {
10288
module.eks_observability_accelerator
10389
]
10490
}
105-
//*/

‎examples/existing-cluster-nginx/outputs.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ output "managed_prometheus_workspace_endpoint" {
2121
output "managed_prometheus_workspace_id" {
2222
description = "Amazon Managed Prometheus workspace ID"
2323
value = module.eks_observability_accelerator.managed_prometheus_workspace_id
24-
}
24+
}

‎examples/existing-cluster-nginx/variables.tf

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,14 @@ variable "managed_prometheus_workspace_id" {
1111
type = string
1212
default = ""
1313
}
14-
variable "managed_prometheus_endpoint" {
15-
description = "AMP workspace ID"
16-
type = string
17-
default = ""
18-
}
19-
variable "managed_prometheus_region" {
20-
description = "Region where AMP is deployed"
21-
type = string
22-
default = ""
23-
}
2414
variable "managed_grafana_workspace_id" {
2515
description = "Amazon Managed Grafana (AMG) workspace ID"
2616
type = string
2717
default = ""
2818
}
29-
variable "grafana_endpoint" {
30-
description = "AMG endpoint"
31-
type = string
32-
default = null
33-
}
3419
variable "grafana_api_key" {
3520
description = "API key for authorizing the Grafana provider to make changes to Amazon Managed Grafana"
3621
type = string
3722
default = ""
3823
sensitive = true
39-
}
24+
}

‎examples/existing-cluster-nginx/versions.tf

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
terraform {
2+
required_version = ">= 1.1.0, < 1.3.0"
3+
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = ">= 4.0.0"
8+
}
9+
kubernetes = {
10+
source = "hashicorp/kubernetes"
11+
version = ">= 2.10"
12+
}
13+
kubectl = {
14+
source = "gavinbunney/kubectl"
15+
version = ">= 1.14"
16+
}
17+
helm = {
18+
source = "hashicorp/helm"
19+
version = ">= 2.4.1"
20+
}
21+
grafana = {
22+
source = "grafana/grafana"
23+
version = ">= 1.25.0"
24+
}
25+
}
26+
27+
# ## Used for end-to-end testing on project; update to suit your needs
28+
# backend "s3" {
29+
# bucket = "observability-accelerator-terraform-states"
30+
# region = "us-west-2"
31+
# key = "e2e/existing-cluster-with-base-and-infra/terraform.tfstate"
32+
# }
33+
34+
}

‎examples/existing-cluster-with-base-and-infra/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ terraform destroy -var-file=terraform.tfvars
136136

137137
| Name | Version |
138138
|------|---------|
139-
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
139+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.1.0, < 1.3.0 |
140140
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 4.0.0 |
141141
| <a name="requirement_grafana"></a> [grafana](#requirement\_grafana) | >= 1.25.0 |
142142
| <a name="requirement_helm"></a> [helm](#requirement\_helm) | >= 2.4.1 |

‎examples/existing-cluster-with-base-and-infra/main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ module "workloads_infra" {
8686
managed_prometheus_workspace_region = module.eks_observability_accelerator.managed_prometheus_workspace_region
8787

8888
tags = local.tags
89-
89+
9090
depends_on = [
9191
module.eks_observability_accelerator
9292
]

0 commit comments

Comments
 (0)