Skip to content
This repository was archived by the owner on Jan 16, 2025. It is now read-only.

Commit 4afc1cb

Browse files
committed
docs: fix lambda_security_group_ids incorrect description #738 (#902)
close #738
1 parent c996f73 commit 4afc1cb

File tree

6 files changed

+59
-12
lines changed

6 files changed

+59
-12
lines changed

Diff for: README.md

+23-4
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,24 @@ No requirements.
318318
| aws | n/a |
319319
| random | n/a |
320320

321+
## Modules
322+
323+
| Name | Source | Version |
324+
|------|--------|---------|
325+
| runner_binaries | ./modules/runner-binaries-syncer | |
326+
| runners | ./modules/runners | |
327+
| webhook | ./modules/webhook | |
328+
329+
## Resources
330+
331+
| Name |
332+
|------|
333+
| [aws_kms_alias](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_alias) |
334+
| [aws_kms_key](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_key) |
335+
| [aws_resourcegroups_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/resourcegroups_group) |
336+
| [aws_sqs_queue](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/sqs_queue) |
337+
| [random_string](https://registry.terraform.io/providers/hashicorp/random/latest/docs/resources/string) |
338+
321339
## Inputs
322340

323341
| Name | Description | Type | Default | Required |
@@ -329,19 +347,20 @@ No requirements.
329347
| cloudwatch\_config | (optional) Replaces the module default cloudwatch log config. See https://docs.aws.amazon.com/AmazonCloudWatch/latest/monitoring/CloudWatch-Agent-Configuration-File-Details.html for details. | `string` | `null` | no |
330348
| create\_service\_linked\_role\_spot | (optional) create the serviced linked role for spot instances that is required by the scale-up lambda. | `bool` | `false` | no |
331349
| enable\_cloudwatch\_agent | Enabling the cloudwatch agent on the ec2 runner instances, the runner contains default config. Configuration can be overridden via `cloudwatch_config`. | `bool` | `true` | no |
332-
| enable\_organization\_runners | n/a | `bool` | n/a | yes |
350+
| enable\_organization\_runners | Register runners to organization, instead of repo level | `bool` | `false` | no |
333351
| enable\_ssm\_on\_runners | Enable to allow access the runner instances for debugging purposes via SSM. Note that this adds additional permissions to the runner instances. | `bool` | `false` | no |
334352
| encrypt\_secrets | Encrypt secret variables for lambda's such as secrets and private keys. | `bool` | `true` | no |
335353
| environment | A name that identifies the environment, used as prefix and for tagging. | `string` | n/a | yes |
336354
| ghes\_url | GitHub Enterprise Server URL. Example: https://github.internal.co - DO NOT SET IF USING PUBLIC GITHUB | `string` | `null` | no |
337355
| github\_app | GitHub app parameters, see your github app. Ensure the key is the base64-encoded `.pem` file (the output of `base64 app.private-key.pem`, not the content of `private-key.pem`). | <pre>object({<br> key_base64 = string<br> id = string<br> client_id = string<br> client_secret = string<br> webhook_secret = string<br> })</pre> | n/a | yes |
338356
| idle\_config | List of time period that can be defined as cron expression to keep a minimum amount of runners active instead of scaling down to 0. By defining this list you can ensure that in time periods that match the cron expression within 5 seconds a runner is kept idle. | <pre>list(object({<br> cron = string<br> timeZone = string<br> idleCount = number<br> }))</pre> | `[]` | no |
339357
| instance\_profile\_path | The path that will be added to the instance\_profile, if not set the environment name will be used. | `string` | `null` | no |
340-
| instance\_type | Instance type for the action runner. | `string` | `"m5.large"` | no |
358+
| instance\_type | [DEPRECATED] See instance\_types. | `string` | `"m5.large"` | no |
359+
| instance\_types | List of instance types for the action runner. | `set(string)` | `null` | no |
341360
| key\_name | Key pair name | `string` | `null` | no |
342361
| kms\_key\_id | Custom KMS key to encrypted lambda secrets, if not provided and `encrypt_secrets` = `true` a KMS key will be created by the module. Secrets will be encrypted with a context `Environment = var.environment`. | `string` | `null` | no |
343362
| lambda\_s3\_bucket | S3 bucket from which to specify lambda functions. This is an alternative to providing local files directly. | `any` | `null` | no |
344-
| lambda\_security\_group\_ids | List of subnets in which the action runners will be launched, the subnets needs to be subnets in the `vpc_id`. | `list(string)` | `[]` | no |
363+
| lambda\_security\_group\_ids | List of security group IDs associated with the Lambda function. | `list(string)` | `[]` | no |
345364
| lambda\_subnet\_ids | List of subnets in which the action runners will be launched, the subnets needs to be subnets in the `vpc_id`. | `list(string)` | `[]` | no |
346365
| logging\_retention\_in\_days | Specifies the number of days you want to retain log events for the lambda log group. Possible values are: 0, 1, 3, 5, 7, 14, 30, 60, 90, 120, 150, 180, 365, 400, 545, 731, 1827, and 3653. | `number` | `180` | no |
347366
| manage\_kms\_key | Let the module manage the KMS key. | `bool` | `true` | no |
@@ -372,6 +391,7 @@ No requirements.
372391
| userdata\_post\_install | Script to be ran after the GitHub Actions runner is installed on the EC2 instances | `string` | `""` | no |
373392
| userdata\_pre\_install | Script to be ran before the GitHub Actions runner is installed on the EC2 instances | `string` | `""` | no |
374393
| userdata\_template | Alternative user-data template, replacing the default template. By providing your own user\_data you have to take care of installing all required software, including the action runner. Variables userdata\_pre/post\_install are ignored. | `string` | `null` | no |
394+
| volume\_size | Size of runner volume | `number` | `30` | no |
375395
| vpc\_id | The VPC for security groups of the action runners. | `string` | n/a | yes |
376396
| webhook\_lambda\_s3\_key | S3 key for webhook lambda function. Required if using S3 bucket to specify lambdas. | `any` | `null` | no |
377397
| webhook\_lambda\_s3\_object\_version | S3 object version for webhook lambda function. Useful if S3 versioning is enabled on source bucket. | `any` | `null` | no |
@@ -385,7 +405,6 @@ No requirements.
385405
| binaries\_syncer | n/a |
386406
| runners | n/a |
387407
| webhook | n/a |
388-
389408
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
390409

391410
## Contribution

Diff for: modules/runner-binaries-syncer/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ No Modules.
7575
| environment | A name that identifies the environment, used as prefix and for tagging. | `string` | n/a | yes |
7676
| lambda\_s3\_bucket | S3 bucket from which to specify lambda functions. This is an alternative to providing local files directly. | `any` | `null` | no |
7777
| lambda\_schedule\_expression | Scheduler expression for action runner binary syncer. | `string` | `"cron(27 * * * ? *)"` | no |
78-
| lambda\_security\_group\_ids | List of subnets in which the action runners will be launched, the subnets needs to be subnets in the `vpc_id`. | `list(string)` | `[]` | no |
78+
| lambda\_security\_group\_ids | List of security group IDs associated with the Lambda function. | `list(string)` | `[]` | no |
7979
| lambda\_subnet\_ids | List of subnets in which the action runners will be launched, the subnets needs to be subnets in the `vpc_id`. | `list(string)` | `[]` | no |
8080
| lambda\_timeout | Time out of the lambda in seconds. | `number` | `300` | no |
8181
| lambda\_zip | File location of the lambda zip file. | `string` | `null` | no |

Diff for: modules/runner-binaries-syncer/variables.tf

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ variable "lambda_subnet_ids" {
8989
}
9090

9191
variable "lambda_security_group_ids" {
92-
description = "List of subnets in which the action runners will be launched, the subnets needs to be subnets in the `vpc_id`."
92+
description = "List of security group IDs associated with the Lambda function."
9393
type = list(string)
9494
default = []
95-
}
95+
}

Diff for: modules/runners/README.md

+31-3
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,33 @@ No requirements.
5858
|------|---------|
5959
| aws | n/a |
6060

61+
## Modules
62+
63+
No Modules.
64+
65+
## Resources
66+
67+
| Name |
68+
|------|
69+
| [aws_ami](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/ami) |
70+
| [aws_caller_identity](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/caller_identity) |
71+
| [aws_cloudwatch_event_rule](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_event_rule) |
72+
| [aws_cloudwatch_event_target](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_event_target) |
73+
| [aws_cloudwatch_log_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/cloudwatch_log_group) |
74+
| [aws_iam_instance_profile](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_instance_profile) |
75+
| [aws_iam_policy_document](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/data-sources/iam_policy_document) |
76+
| [aws_iam_role](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role) |
77+
| [aws_iam_role_policy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy) |
78+
| [aws_iam_role_policy_attachment](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_role_policy_attachment) |
79+
| [aws_kms_ciphertext](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_ciphertext) |
80+
| [aws_kms_grant](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/kms_grant) |
81+
| [aws_lambda_event_source_mapping](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_event_source_mapping) |
82+
| [aws_lambda_function](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_function) |
83+
| [aws_lambda_permission](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/lambda_permission) |
84+
| [aws_launch_template](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/launch_template) |
85+
| [aws_security_group](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/security_group) |
86+
| [aws_ssm_parameter](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/ssm_parameter) |
87+
6188
## Inputs
6289

6390
| Name | Description | Type | Default | Required |
@@ -77,10 +104,11 @@ No requirements.
77104
| github\_app | GitHub app parameters, see your github app. Ensure the key is the base64-encoded `.pem` file (the output of `base64 app.private-key.pem`, not the content of `private-key.pem`). | <pre>object({<br> key_base64 = string<br> id = string<br> client_id = string<br> client_secret = string<br> })</pre> | n/a | yes |
78105
| idle\_config | List of time period that can be defined as cron expression to keep a minimum amount of runners active instead of scaling down to 0. By defining this list you can ensure that in time periods that match the cron expression within 5 seconds a runner is kept idle. | <pre>list(object({<br> cron = string<br> timeZone = string<br> idleCount = number<br> }))</pre> | `[]` | no |
79106
| instance\_profile\_path | The path that will be added to the instance\_profile, if not set the environment name will be used. | `string` | `null` | no |
80-
| instance\_type | Default instance type for the action runner. | `string` | `"m5.large"` | no |
107+
| instance\_type | [DEPRECATED] See instance\_types. | `string` | `"m5.large"` | no |
108+
| instance\_types | List of instance types for the action runner. | `set(string)` | `null` | no |
81109
| key\_name | Key pair name | `string` | `null` | no |
82110
| lambda\_s3\_bucket | S3 bucket from which to specify lambda functions. This is an alternative to providing local files directly. | `any` | `null` | no |
83-
| lambda\_security\_group\_ids | List of subnets in which the lambda will be launched, the subnets needs to be subnets in the `vpc_id`. | `list(string)` | `[]` | no |
111+
| lambda\_security\_group\_ids | List of security group IDs associated with the Lambda function. | `list(string)` | `[]` | no |
84112
| lambda\_subnet\_ids | List of subnets in which the lambda will be launched, the subnets needs to be subnets in the `vpc_id`. | `list(string)` | `[]` | no |
85113
| lambda\_timeout\_scale\_down | Time out for the scale down lambda in seconds. | `number` | `60` | no |
86114
| lambda\_timeout\_scale\_up | Time out for the scale up lambda in seconds. | `number` | `60` | no |
@@ -110,6 +138,7 @@ No requirements.
110138
| userdata\_post\_install | User-data script snippet to insert after GitHub acton runner install | `string` | `""` | no |
111139
| userdata\_pre\_install | User-data script snippet to insert before GitHub acton runner install | `string` | `""` | no |
112140
| userdata\_template | Alternative user-data template, replacing the default template. By providing your own user\_data you have to take care of installing all required software, including the action runner. Variables userdata\_pre/post\_install are ignored. | `string` | `null` | no |
141+
| volume\_size | Size of runner volume | `number` | `30` | no |
113142
| vpc\_id | The VPC for the security groups. | `string` | n/a | yes |
114143

115144
## Outputs
@@ -122,7 +151,6 @@ No requirements.
122151
| role\_runner | n/a |
123152
| role\_scale\_down | n/a |
124153
| role\_scale\_up | n/a |
125-
126154
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
127155

128156
## Philips Forest

Diff for: modules/runners/variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ variable "lambda_subnet_ids" {
312312
}
313313

314314
variable "lambda_security_group_ids" {
315-
description = "List of subnets in which the lambda will be launched, the subnets needs to be subnets in the `vpc_id`."
315+
description = "List of security group IDs associated with the Lambda function."
316316
type = list(string)
317317
default = []
318318
}

Diff for: variables.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ variable "lambda_subnet_ids" {
326326
}
327327

328328
variable "lambda_security_group_ids" {
329-
description = "List of subnets in which the action runners will be launched, the subnets needs to be subnets in the `vpc_id`."
329+
description = "List of security group IDs associated with the Lambda function."
330330
type = list(string)
331331
default = []
332332
}

0 commit comments

Comments
 (0)