Skip to content

Commit 38128ab

Browse files
mmoutama09mmoutama09
authored
Merge branch 'develop' into add_prometheus_metrics
2 parents 6a3bd66 + 8a504ff commit 38128ab

File tree

13 files changed

+557
-20
lines changed

13 files changed

+557
-20
lines changed

Diff for: ‎.github/workflows/ci.yml

+33-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
container:
1717
image: hashicorp/terraform:${{ matrix.terraform }}
1818
steps:
19-
- uses: actions/checkout@v2
19+
- uses: actions/checkout@v3
2020
- run: terraform init -get -backend=false -input=false
2121
- run: terraform fmt -recursive -check=true -write=false
2222

@@ -41,19 +41,49 @@ jobs:
4141
container:
4242
image: hashicorp/terraform:${{ matrix.terraform }}
4343
steps:
44-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v3
4545
- run: terraform init -get -backend=false -input=false
4646
- if: contains(matrix.terraform, '1.0.')
4747
run: terraform fmt -recursive -check=true -write=false
4848
- run: terraform validate
4949

50+
docs:
51+
name: Auto update terraform docs
52+
needs: [verify_module, verify_examples]
53+
runs-on: ubuntu-latest
54+
steps:
55+
- name: CHeckout branch
56+
if: github.event_name != 'pull_request'
57+
uses: actions/checkout@v3
58+
59+
- name: Checkout PR
60+
if: github.event_name == 'pull_request'
61+
uses: actions/checkout@v3
62+
with:
63+
ref: ${{ github.event.pull_request.head.ref }}
64+
65+
- name: Generate TF docs
66+
uses: terraform-docs/[email protected]
67+
with:
68+
# recursive: true
69+
find-dir: .
70+
git-commit-message: "docs: auto update terraform docs"
71+
git-push: true
72+
73+
# - name: Generate TF docs examples
74+
# uses: terraform-docs/[email protected]
75+
# with:
76+
# find-dir: examples/
77+
# git-commit-message: "docs: auto update terraform docs"
78+
# git-push: true
79+
5080
release:
5181
if: github.event_name != 'pull_request' && contains('refs/heads/main', github.ref)
5282
name: Release
5383
needs: [verify_module, verify_examples]
5484
runs-on: ubuntu-latest
5585
steps:
56-
- uses: actions/checkout@v2
86+
- uses: actions/checkout@v3
5787
with:
5888
fetch-depth: 0
5989
persist-credentials: false

Diff for: ‎.pre-commit-config.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
repos:
22
- repo: http://github.com/antonbabenko/pre-commit-terraform
3-
rev: v1.55.0
3+
rev: v1.64.1
44
hooks:
55
- id: terraform_fmt
66
args:
77
- --args=-recursive
88
- id: terraform_tflint
99
- id: terraform_docs
1010
- repo: http://github.com/pre-commit/pre-commit-hooks
11-
rev: v4.0.1
11+
rev: v4.2.0
1212
hooks:
1313
- id: check-merge-conflict

Diff for: ‎README.md

+207
Large diffs are not rendered by default.

Diff for: ‎examples/runner-default/README.md

+50
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,53 @@ The Terraform version is managed using [tfenv](https://github.com/Zordrak/tfenv)
3737
## Outputs
3838

3939
No output.
40+
41+
<!-- BEGIN_TF_DOCS -->
42+
## Requirements
43+
44+
| Name | Version |
45+
|------|---------|
46+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
47+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.35 |
48+
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 1.4 |
49+
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.0 |
50+
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.0 |
51+
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | ~> 2.2 |
52+
53+
## Providers
54+
55+
| Name | Version |
56+
|------|---------|
57+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.35 |
58+
| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.0 |
59+
60+
## Modules
61+
62+
| Name | Source | Version |
63+
|------|--------|---------|
64+
| <a name="module_runner"></a> [runner](#module\_runner) | ../../ | n/a |
65+
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 2.70 |
66+
67+
## Resources
68+
69+
| Name | Type |
70+
|------|------|
71+
| [null_resource.cancel_spot_requests](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
72+
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
73+
| [aws_security_group.default](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/security_group) | data source |
74+
75+
## Inputs
76+
77+
| Name | Description | Type | Default | Required |
78+
|------|-------------|------|---------|:--------:|
79+
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS region. | `string` | `"eu-west-1"` | no |
80+
| <a name="input_environment"></a> [environment](#input\_environment) | A name that identifies the environment, will used as prefix and for tagging. | `string` | `"runners-default"` | no |
81+
| <a name="input_gitlab_url"></a> [gitlab\_url](#input\_gitlab\_url) | URL of the gitlab instance to connect to. | `string` | `"https://gitlab.com"` | no |
82+
| <a name="input_registration_token"></a> [registration\_token](#input\_registration\_token) | n/a | `any` | n/a | yes |
83+
| <a name="input_runner_name"></a> [runner\_name](#input\_runner\_name) | Name of the runner, will be used in the runner config.toml | `string` | `"default-auto"` | no |
84+
| <a name="input_timezone"></a> [timezone](#input\_timezone) | Name of the timezone that the runner will be used in. | `string` | `"Europe/Amsterdam"` | no |
85+
86+
## Outputs
87+
88+
No outputs.
89+
<!-- END_TF_DOCS -->

Diff for: ‎examples/runner-docker/README.md

+46
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,49 @@ The terraform version is managed using [tfenv](https://github.com/Zordrak/tfenv)
4040
## Outputs
4141

4242
No output.
43+
44+
<!-- BEGIN_TF_DOCS -->
45+
## Requirements
46+
47+
| Name | Version |
48+
|------|---------|
49+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
50+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.35 |
51+
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 1.4 |
52+
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.0 |
53+
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.0 |
54+
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | ~> 2.2 |
55+
56+
## Providers
57+
58+
| Name | Version |
59+
|------|---------|
60+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.35 |
61+
62+
## Modules
63+
64+
| Name | Source | Version |
65+
|------|--------|---------|
66+
| <a name="module_runner"></a> [runner](#module\_runner) | ../../ | n/a |
67+
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 2.70 |
68+
69+
## Resources
70+
71+
| Name | Type |
72+
|------|------|
73+
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
74+
75+
## Inputs
76+
77+
| Name | Description | Type | Default | Required |
78+
|------|-------------|------|---------|:--------:|
79+
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS region. | `string` | `"eu-west-1"` | no |
80+
| <a name="input_environment"></a> [environment](#input\_environment) | A name that identifies the environment, will used as prefix and for tagging. | `string` | `"runners-docker"` | no |
81+
| <a name="input_gitlab_url"></a> [gitlab\_url](#input\_gitlab\_url) | URL of the gitlab instance to connect to. | `string` | `"https://gitlab.com"` | no |
82+
| <a name="input_registration_token"></a> [registration\_token](#input\_registration\_token) | n/a | `any` | n/a | yes |
83+
| <a name="input_runner_name"></a> [runner\_name](#input\_runner\_name) | Name of the runner, will be used in the runner config.toml | `string` | `"docker"` | no |
84+
85+
## Outputs
86+
87+
No outputs.
88+
<!-- END_TF_DOCS -->

Diff for: ‎examples/runner-multi-region/README.md

+49
Original file line numberDiff line numberDiff line change
@@ -82,3 +82,52 @@ The Terraform version is managed using [tfenv](https://github.com/Zordrak/tfenv)
8282
## Outputs
8383

8484
No output.
85+
86+
<!-- BEGIN_TF_DOCS -->
87+
## Requirements
88+
89+
| Name | Version |
90+
|------|---------|
91+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
92+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.35 |
93+
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 1.4 |
94+
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.0 |
95+
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.0 |
96+
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | ~> 2.2 |
97+
98+
## Providers
99+
100+
| Name | Version |
101+
|------|---------|
102+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.35 |
103+
104+
## Modules
105+
106+
| Name | Source | Version |
107+
|------|--------|---------|
108+
| <a name="module_runner_alternate_region"></a> [runner\_alternate\_region](#module\_runner\_alternate\_region) | ../../ | n/a |
109+
| <a name="module_runner_main_region"></a> [runner\_main\_region](#module\_runner\_main\_region) | ../../ | n/a |
110+
| <a name="module_vpc_alternate_region"></a> [vpc\_alternate\_region](#module\_vpc\_alternate\_region) | terraform-aws-modules/vpc/aws | 2.70 |
111+
| <a name="module_vpc_main_region"></a> [vpc\_main\_region](#module\_vpc\_main\_region) | terraform-aws-modules/vpc/aws | 2.70 |
112+
113+
## Resources
114+
115+
| Name | Type |
116+
|------|------|
117+
| [aws_availability_zones.available_main_region](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
118+
119+
## Inputs
120+
121+
| Name | Description | Type | Default | Required |
122+
|------|-------------|------|---------|:--------:|
123+
| <a name="input_aws_alternate_region"></a> [aws\_alternate\_region](#input\_aws\_alternate\_region) | Alternate AWS region to deploy to. | `string` | `"eu-central-1"` | no |
124+
| <a name="input_aws_main_region"></a> [aws\_main\_region](#input\_aws\_main\_region) | Main AWS region to deploy to. | `string` | `"eu-west-1"` | no |
125+
| <a name="input_environment"></a> [environment](#input\_environment) | A name that identifies the environment, will used as prefix and for tagging. | `string` | `"runner-public"` | no |
126+
| <a name="input_gitlab_url"></a> [gitlab\_url](#input\_gitlab\_url) | URL of the gitlab instance to connect to. | `string` | `"https://gitlab.com"` | no |
127+
| <a name="input_registration_token"></a> [registration\_token](#input\_registration\_token) | n/a | `any` | n/a | yes |
128+
| <a name="input_runner_name"></a> [runner\_name](#input\_runner\_name) | Name of the runner, will be used in the runner config.toml | `string` | `"public-auto"` | no |
129+
130+
## Outputs
131+
132+
No outputs.
133+
<!-- END_TF_DOCS -->

Diff for: ‎examples/runner-pre-registered/README.md

+47
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,50 @@ The terraform version is managed using [tfenv](https://github.com/Zordrak/tfenv)
2626
## Outputs
2727

2828
No output.
29+
30+
<!-- BEGIN_TF_DOCS -->
31+
## Requirements
32+
33+
| Name | Version |
34+
|------|---------|
35+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
36+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.35 |
37+
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 1.4 |
38+
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.0 |
39+
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.0 |
40+
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | ~> 2.2 |
41+
42+
## Providers
43+
44+
| Name | Version |
45+
|------|---------|
46+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.35 |
47+
48+
## Modules
49+
50+
| Name | Source | Version |
51+
|------|--------|---------|
52+
| <a name="module_runner"></a> [runner](#module\_runner) | ../../ | n/a |
53+
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 2.70 |
54+
55+
## Resources
56+
57+
| Name | Type |
58+
|------|------|
59+
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
60+
61+
## Inputs
62+
63+
| Name | Description | Type | Default | Required |
64+
|------|-------------|------|---------|:--------:|
65+
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS region. | `string` | `"eu-west-1"` | no |
66+
| <a name="input_environment"></a> [environment](#input\_environment) | A name that identifies the environment, will used as prefix and for tagging. | `string` | `"ci-runners"` | no |
67+
| <a name="input_gitlab_url"></a> [gitlab\_url](#input\_gitlab\_url) | URL of the gitlab instance to connect to. | `string` | n/a | yes |
68+
| <a name="input_runner_name"></a> [runner\_name](#input\_runner\_name) | Name of the runner, will be used in the runner config.toml | `string` | n/a | yes |
69+
| <a name="input_runner_token"></a> [runner\_token](#input\_runner\_token) | Token for the runner, will be used in the runner config.toml | `string` | n/a | yes |
70+
| <a name="input_timezone"></a> [timezone](#input\_timezone) | Timezone that will be set for the runner. | `string` | `"Europe/Amsterdam"` | no |
71+
72+
## Outputs
73+
74+
No outputs.
75+
<!-- END_TF_DOCS -->

Diff for: ‎examples/runner-pre-registered/variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ variable "runner_token" {
2626
}
2727

2828
variable "timezone" {
29-
description = "Name of the timezone that the runner will be used in."
29+
description = "Timezone that will be set for the runner."
3030
type = string
3131
default = "Europe/Amsterdam"
3232
}

Diff for: ‎examples/runner-public/README.md

+50
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,53 @@ The Terraform version is managed using [tfenv](https://github.com/Zordrak/tfenv)
3939
## Outputs
4040

4141
No output.
42+
43+
<!-- BEGIN_TF_DOCS -->
44+
## Requirements
45+
46+
| Name | Version |
47+
|------|---------|
48+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.13 |
49+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.35 |
50+
| <a name="requirement_local"></a> [local](#requirement\_local) | ~> 1.4 |
51+
| <a name="requirement_null"></a> [null](#requirement\_null) | ~> 3.0 |
52+
| <a name="requirement_random"></a> [random](#requirement\_random) | ~> 3.0 |
53+
| <a name="requirement_tls"></a> [tls](#requirement\_tls) | ~> 2.2 |
54+
55+
## Providers
56+
57+
| Name | Version |
58+
|------|---------|
59+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.35 |
60+
| <a name="provider_null"></a> [null](#provider\_null) | ~> 3.0 |
61+
62+
## Modules
63+
64+
| Name | Source | Version |
65+
|------|--------|---------|
66+
| <a name="module_cache"></a> [cache](#module\_cache) | ../../modules/cache | n/a |
67+
| <a name="module_runner"></a> [runner](#module\_runner) | ../../ | n/a |
68+
| <a name="module_runner2"></a> [runner2](#module\_runner2) | ../../ | n/a |
69+
| <a name="module_vpc"></a> [vpc](#module\_vpc) | terraform-aws-modules/vpc/aws | 2.70 |
70+
71+
## Resources
72+
73+
| Name | Type |
74+
|------|------|
75+
| [null_resource.cancel_spot_requests](https://registry.terraform.io/providers/hashicorp/null/latest/docs/resources/resource) | resource |
76+
| [aws_availability_zones.available](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/availability_zones) | data source |
77+
78+
## Inputs
79+
80+
| Name | Description | Type | Default | Required |
81+
|------|-------------|------|---------|:--------:|
82+
| <a name="input_aws_region"></a> [aws\_region](#input\_aws\_region) | AWS region. | `string` | `"eu-west-1"` | no |
83+
| <a name="input_environment"></a> [environment](#input\_environment) | A name that identifies the environment, will used as prefix and for tagging. | `string` | `"runner-public"` | no |
84+
| <a name="input_gitlab_url"></a> [gitlab\_url](#input\_gitlab\_url) | URL of the gitlab instance to connect to. | `string` | `"https://gitlab.com"` | no |
85+
| <a name="input_registration_token"></a> [registration\_token](#input\_registration\_token) | n/a | `any` | n/a | yes |
86+
| <a name="input_runner_name"></a> [runner\_name](#input\_runner\_name) | Name of the runner, will be used in the runner config.toml | `string` | `"public-auto"` | no |
87+
88+
## Outputs
89+
90+
No outputs.
91+
<!-- END_TF_DOCS -->

0 commit comments

Comments
 (0)