Skip to content

Commit dac1694

Browse files
npalmnpalm
authored
Merge pull request #1743 from philips-labs/develop
Release
2 parents a275f74 + 0cf2b5d commit dac1694

File tree

14 files changed

+47
-21
lines changed

14 files changed

+47
-21
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,13 +362,13 @@ In case the setup does not work as intended follow the trace of events:
362362
| Name | Version |
363363
|------|---------|
364364
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.1 |
365-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.38 |
365+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.38 |
366366

367367
## Providers
368368

369369
| Name | Version |
370370
|------|---------|
371-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.38 |
371+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.38 |
372372
| <a name="provider_random"></a> [random](#provider\_random) | n/a |
373373

374374
## Modules

‎modules/download-lambda/README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@ module "lambdas" {
2727
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2828
## Requirements
2929

30-
No requirements.
30+
| Name | Version |
31+
|------|---------|
32+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.1 |
33+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.38 |
3134

3235
## Providers
3336

‎modules/download-lambda/versions.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
terraform {
2+
required_version = ">= 0.14.1"
3+
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = "~> 3.38"
8+
}
9+
}
10+
}

‎modules/runner-binaries-syncer/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ yarn run dist
3939
| Name | Version |
4040
|------|---------|
4141
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.1 |
42-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.38 |
42+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.38 |
4343

4444
## Providers
4545

4646
| Name | Version |
4747
|------|---------|
48-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.38 |
48+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.38 |
4949

5050
## Modules
5151

‎modules/runner-binaries-syncer/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.38"
7+
version = "~> 3.38"
88
}
99
}
1010
}

‎modules/runners/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ yarn run dist
5353
| Name | Version |
5454
|------|---------|
5555
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.1 |
56-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.38 |
56+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.38 |
5757

5858
## Providers
5959

6060
| Name | Version |
6161
|------|---------|
62-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.38 |
62+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.38 |
6363

6464
## Modules
6565

‎modules/runners/templates/start-runner.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ echo "Retrieving TOKEN from AWS API"
66
token=$(curl -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 180")
77

88
region=$(curl -f -H "X-aws-ec2-metadata-token: $token" -v http://169.254.169.254/latest/dynamic/instance-identity/document | jq -r .region)
9-
echo "Reteieved REGION from AWS API ($region)"
9+
echo "Retrieved REGION from AWS API ($region)"
1010

1111
instance_id=$(curl -f -H "X-aws-ec2-metadata-token: $token" -v http://169.254.169.254/latest/meta-data/instance-id)
12-
echo "Reteieved INSTANCE_ID from AWS API ($instance_id)"
12+
echo "Retrieved INSTANCE_ID from AWS API ($instance_id)"
1313

1414
tags=$(aws ec2 describe-tags --region "$region" --filters "Name=resource-id,Values=$instance_id")
1515
echo "Retrieved tags from AWS API ($tags)"
1616

1717
environment=$(echo "$tags" | jq -r '.Tags[] | select(.Key == "ghr:environment") | .Value')
18-
echo "Reteieved ghr:environment tag - ($environment)"
18+
echo "Retrieved ghr:environment tag - ($environment)"
1919

2020
parameters=$(aws ssm get-parameters-by-path --path "/$environment/runner" --region "$region" --query "Parameters[*].{Name:Name,Value:Value}")
2121
echo "Retrieved parameters from AWS SSM ($parameters)"
@@ -29,7 +29,7 @@ echo "Retrieved /$environment/runner/enable-cloudwatch parameter - ($enable_clou
2929
agent_mode=$(echo "$parameters" | jq --arg environment "$environment" -r '.[] | select(.Name == "/\($environment)/runner/agent-mode") | .Value')
3030
echo "Retrieved /$environment/runner/agent-mode parameter - ($agent_mode)"
3131

32-
if [[ -n "$enable_cloudwatch_agent" ]]; then
32+
if [[ "$enable_cloudwatch_agent" == "true" ]]; then
3333
echo "Cloudwatch is enabled"
3434
amazon-cloudwatch-agent-ctl -a fetch-config -m ec2 -s -c "ssm:$environment-cloudwatch_agent_config_runner"
3535
fi

‎modules/runners/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.38"
7+
version = "~> 3.38"
88
}
99
}
1010
}

‎modules/setup-iam-permissions/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,16 @@ Next execute the created Terraform code `terraform init && terraform apply` The
3939
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
4040
## Requirements
4141

42-
No requirements.
42+
| Name | Version |
43+
|------|---------|
44+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.1 |
45+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.38 |
4346

4447
## Providers
4548

4649
| Name | Version |
4750
|------|---------|
48-
| <a name="provider_aws"></a> [aws](#provider\_aws) | n/a |
51+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.38 |
4952

5053
## Modules
5154

‎modules/setup-iam-permissions/versions.tf

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
terraform {
2+
required_version = ">= 0.14.1"
3+
4+
required_providers {
5+
aws = {
6+
source = "hashicorp/aws"
7+
version = "~> 3.38"
8+
}
9+
}
10+
}

‎modules/ssm/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.38"
7+
version = "~> 3.38"
88
}
99
}
1010
}

‎modules/webhook/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ yarn run dist
3939
| Name | Version |
4040
|------|---------|
4141
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 0.14.1 |
42-
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 3.38 |
42+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | ~> 3.38 |
4343

4444
## Providers
4545

4646
| Name | Version |
4747
|------|---------|
48-
| <a name="provider_aws"></a> [aws](#provider\_aws) | >= 3.38 |
48+
| <a name="provider_aws"></a> [aws](#provider\_aws) | ~> 3.38 |
4949

5050
## Modules
5151

@@ -87,7 +87,7 @@ No modules.
8787
| <a name="input_repository_white_list"></a> [repository\_white\_list](#input\_repository\_white\_list) | List of repositories allowed to use the github app | `list(string)` | `[]` | no |
8888
| <a name="input_role_path"></a> [role\_path](#input\_role\_path) | The path that will be added to the role; if not set, the environment name will be used. | `string` | `null` | no |
8989
| <a name="input_role_permissions_boundary"></a> [role\_permissions\_boundary](#input\_role\_permissions\_boundary) | Permissions boundary that will be added to the created role for the lambda. | `string` | `null` | no |
90-
| <a name="input_runner_labels"></a> [runner\_labels](#input\_runner\_labels) | Labels for the runners (GitHub). Separate each label by a comma. Labels are used to check events when `runner_enable_workflow_job_labels_check` is set to `true`. | `string` | `""` | no |
90+
| <a name="input_runner_labels"></a> [runner\_labels](#input\_runner\_labels) | Extra (custom) labels for the runners (GitHub). Separate each label by a comma. Labels checks on the webhook can be enforced by setting `enable_workflow_job_labels_check`. GitHub read-only labels should not be provided. | `string` | `""` | no |
9191
| <a name="input_sqs_build_queue"></a> [sqs\_build\_queue](#input\_sqs\_build\_queue) | SQS queue to publish accepted build events. | <pre>object({<br> id = string<br> arn = string<br> })</pre> | n/a | yes |
9292
| <a name="input_sqs_build_queue_fifo"></a> [sqs\_build\_queue\_fifo](#input\_sqs\_build\_queue\_fifo) | Enable a FIFO queue to remain the order of events received by the webhook. Suggest to set to true for repo level runners. | `bool` | `false` | no |
9393
| <a name="input_tags"></a> [tags](#input\_tags) | Map of tags that will be added to created resources. By default resources will be tagged with name and environment. | `map(string)` | `{}` | no |

‎modules/webhook/versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.38"
7+
version = "~> 3.38"
88
}
99
}
1010
}

‎versions.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ terraform {
44
required_providers {
55
aws = {
66
source = "hashicorp/aws"
7-
version = ">= 3.38"
7+
version = "~> 3.38"
88
}
99
}
1010
}

0 commit comments

Comments
 (0)