Skip to content

Commit 774a1b8

Browse files
renovate[bot]cloudpossebotnitrocode
authored
chore(deps): update terraform cloudposse/elastic-beanstalk-environment/aws to v0.46.0 (#87)
* chore(deps): update terraform cloudposse/elastic-beanstalk-environment/aws to v0.46.0 * Auto Format * Update README.yaml * Auto Format * Update variables.tf * Update main.tf * Update main.tf * Auto Format Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: cloudpossebot <[email protected]> Co-authored-by: nitrocode <[email protected]>
1 parent 53f8437 commit 774a1b8

File tree

5 files changed

+18
-11
lines changed

5 files changed

+18
-11
lines changed

README.md

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ Available targets:
249249
| <a name="module_efs"></a> [efs](#module\_efs) | cloudposse/efs/aws | 0.32.7 |
250250
| <a name="module_efs_backup"></a> [efs\_backup](#module\_efs\_backup) | cloudposse/backup/aws | 0.13.1 |
251251
| <a name="module_elastic_beanstalk_application"></a> [elastic\_beanstalk\_application](#module\_elastic\_beanstalk\_application) | cloudposse/elastic-beanstalk-application/aws | 0.11.1 |
252-
| <a name="module_elastic_beanstalk_environment"></a> [elastic\_beanstalk\_environment](#module\_elastic\_beanstalk\_environment) | cloudposse/elastic-beanstalk-environment/aws | 0.36.1 |
252+
| <a name="module_elastic_beanstalk_environment"></a> [elastic\_beanstalk\_environment](#module\_elastic\_beanstalk\_environment) | cloudposse/elastic-beanstalk-environment/aws | 0.46.0 |
253253
| <a name="module_label_slaves"></a> [label\_slaves](#module\_label\_slaves) | cloudposse/label/null | 0.25.0 |
254254
| <a name="module_this"></a> [this](#module\_this) | cloudposse/label/null | 0.25.0 |
255255

@@ -267,8 +267,8 @@ Available targets:
267267
| Name | Description | Type | Default | Required |
268268
|------|-------------|------|---------|:--------:|
269269
| <a name="input_additional_tag_map"></a> [additional\_tag\_map](#input\_additional\_tag\_map) | Additional key-value pairs to add to each map in `tags_as_list_of_maps`. Not added to `tags` or `id`.<br>This is for some rare cases where resources want additional configuration of tags<br>and therefore take a list of maps with tag key, value, and additional configuration. | `map(string)` | `{}` | no |
270-
| <a name="input_allowed_security_groups"></a> [allowed\_security\_groups](#input\_allowed\_security\_groups) | List of security groups to be allowed to connect to Jenkins master EC2 instances | `list(string)` | `[]` | no |
271270
| <a name="input_application_subnets"></a> [application\_subnets](#input\_application\_subnets) | List of subnets to place EC2 instances and EFS | `list(string)` | n/a | yes |
271+
| <a name="input_associated_security_group_ids"></a> [associated\_security\_group\_ids](#input\_associated\_security\_group\_ids) | List of security groups to be allowed to connect to Jenkins master EC2 instances | `list(string)` | `[]` | no |
272272
| <a name="input_attributes"></a> [attributes](#input\_attributes) | ID element. Additional attributes (e.g. `workers` or `cluster`) to add to `id`,<br>in the order they appear in the list. New attributes are appended to the<br>end of the list. The elements of the list are joined by the `delimiter`<br>and treated as a single ID element. | `list(string)` | `[]` | no |
273273
| <a name="input_availability_zone_selector"></a> [availability\_zone\_selector](#input\_availability\_zone\_selector) | Availability Zone selector | `string` | `"Any"` | no |
274274
| <a name="input_availability_zones"></a> [availability\_zones](#input\_availability\_zones) | List of Availability Zones for EFS | `list(string)` | n/a | yes |
@@ -520,8 +520,8 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply
520520
### Contributors
521521

522522
<!-- markdownlint-disable -->
523-
| [![Erik Osterman][osterman_avatar]][osterman_homepage]<br/>[Erik Osterman][osterman_homepage] | [![Andriy Knysh][aknysh_avatar]][aknysh_homepage]<br/>[Andriy Knysh][aknysh_homepage] | [![Igor Rodionov][goruha_avatar]][goruha_homepage]<br/>[Igor Rodionov][goruha_homepage] | [![Ivan Pinatti][ivan-pinatti_avatar]][ivan-pinatti_homepage]<br/>[Ivan Pinatti][ivan-pinatti_homepage] | [![Sergey Vasilyev][s2504s_avatar]][s2504s_homepage]<br/>[Sergey Vasilyev][s2504s_homepage] |
524-
|---|---|---|---|---|
523+
| [![Erik Osterman][osterman_avatar]][osterman_homepage]<br/>[Erik Osterman][osterman_homepage] | [![Andriy Knysh][aknysh_avatar]][aknysh_homepage]<br/>[Andriy Knysh][aknysh_homepage] | [![Igor Rodionov][goruha_avatar]][goruha_homepage]<br/>[Igor Rodionov][goruha_homepage] | [![Ivan Pinatti][ivan-pinatti_avatar]][ivan-pinatti_homepage]<br/>[Ivan Pinatti][ivan-pinatti_homepage] | [![Sergey Vasilyev][s2504s_avatar]][s2504s_homepage]<br/>[Sergey Vasilyev][s2504s_homepage] | [![RB][nitrocode_avatar]][nitrocode_homepage]<br/>[RB][nitrocode_homepage] |
524+
|---|---|---|---|---|---|
525525
<!-- markdownlint-restore -->
526526

527527

@@ -540,6 +540,9 @@ Check out [our other projects][github], [follow us on twitter][twitter], [apply
540540
[s2504s_homepage]: https://github.com/s2504s/
541541
[s2504s_avatar]: https://img.cloudposse.com/150x150/https://github.com/s2504s.png
542542

543+
[nitrocode_homepage]: https://github.com/nitrocode/
544+
[nitrocode_avatar]: https://img.cloudposse.com/150x150/https://github.com/nitrocode.png
545+
543546
[![README Footer][readme_footer_img]][readme_footer_link]
544547
[![Beacon][beacon]][website]
545548

README.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,3 +205,6 @@ contributors:
205205
- name: "Sergey Vasilyev"
206206
homepage: "https://github.com/s2504s/"
207207
github: "s2504s"
208+
- name: "RB"
209+
homepage: "https://github.com/nitrocode/"
210+
github: "nitrocode"

docs/terraform.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
| <a name="module_efs"></a> [efs](#module\_efs) | cloudposse/efs/aws | 0.32.7 |
2222
| <a name="module_efs_backup"></a> [efs\_backup](#module\_efs\_backup) | cloudposse/backup/aws | 0.13.1 |
2323
| <a name="module_elastic_beanstalk_application"></a> [elastic\_beanstalk\_application](#module\_elastic\_beanstalk\_application) | cloudposse/elastic-beanstalk-application/aws | 0.11.1 |
24-
| <a name="module_elastic_beanstalk_environment"></a> [elastic\_beanstalk\_environment](#module\_elastic\_beanstalk\_environment) | cloudposse/elastic-beanstalk-environment/aws | 0.36.1 |
24+
| <a name="module_elastic_beanstalk_environment"></a> [elastic\_beanstalk\_environment](#module\_elastic\_beanstalk\_environment) | cloudposse/elastic-beanstalk-environment/aws | 0.46.0 |
2525
| <a name="module_label_slaves"></a> [label\_slaves](#module\_label\_slaves) | cloudposse/label/null | 0.25.0 |
2626
| <a name="module_this"></a> [this](#module\_this) | cloudposse/label/null | 0.25.0 |
2727

@@ -39,8 +39,8 @@
3939
| Name | Description | Type | Default | Required |
4040
|------|-------------|------|---------|:--------:|
4141
| <a name="input_additional_tag_map"></a> [additional\_tag\_map](#input\_additional\_tag\_map) | Additional key-value pairs to add to each map in `tags_as_list_of_maps`. Not added to `tags` or `id`.<br>This is for some rare cases where resources want additional configuration of tags<br>and therefore take a list of maps with tag key, value, and additional configuration. | `map(string)` | `{}` | no |
42-
| <a name="input_allowed_security_groups"></a> [allowed\_security\_groups](#input\_allowed\_security\_groups) | List of security groups to be allowed to connect to Jenkins master EC2 instances | `list(string)` | `[]` | no |
4342
| <a name="input_application_subnets"></a> [application\_subnets](#input\_application\_subnets) | List of subnets to place EC2 instances and EFS | `list(string)` | n/a | yes |
43+
| <a name="input_associated_security_group_ids"></a> [associated\_security\_group\_ids](#input\_associated\_security\_group\_ids) | List of security groups to be allowed to connect to Jenkins master EC2 instances | `list(string)` | `[]` | no |
4444
| <a name="input_attributes"></a> [attributes](#input\_attributes) | ID element. Additional attributes (e.g. `workers` or `cluster`) to add to `id`,<br>in the order they appear in the list. New attributes are appended to the<br>end of the list. The elements of the list are joined by the `delimiter`<br>and treated as a single ID element. | `list(string)` | `[]` | no |
4545
| <a name="input_availability_zone_selector"></a> [availability\_zone\_selector](#input\_availability\_zone\_selector) | Availability Zone selector | `string` | `"Any"` | no |
4646
| <a name="input_availability_zones"></a> [availability\_zones](#input\_availability\_zones) | List of Availability Zones for EFS | `list(string)` | n/a | yes |

main.tf

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module "elastic_beanstalk_application" {
1111
# Elastic Beanstalk Environment
1212
module "elastic_beanstalk_environment" {
1313
source = "cloudposse/elastic-beanstalk-environment/aws"
14-
version = "0.36.1"
14+
version = "0.46.0"
1515
attributes = ["env"]
1616

1717
region = var.region
@@ -42,12 +42,13 @@ module "elastic_beanstalk_environment" {
4242
vpc_id = var.vpc_id
4343
loadbalancer_subnets = var.loadbalancer_subnets
4444
application_subnets = var.application_subnets
45-
allowed_security_groups = var.allowed_security_groups
4645
keypair = var.ssh_key_pair
4746
solution_stack_name = var.solution_stack_name
4847
force_destroy = var.loadbalancer_logs_bucket_force_destroy
4948
loadbalancer_ssl_policy = var.loadbalancer_ssl_policy
5049

50+
associated_security_group_ids = var.associated_security_group_ids
51+
5152
# Provide EFS DNS name to EB in the `EFS_HOST` ENV var. EC2 instance will mount to the EFS filesystem and use it to store Jenkins state
5253
# Add slaves Security Group `JENKINS_SLAVE_SECURITY_GROUPS` (comma-separated if more than one). Will be used by Jenkins to init the EC2 plugin to launch slaves inside the Security Group
5354
env_vars = merge(
@@ -146,7 +147,7 @@ resource "aws_security_group" "slaves" {
146147
from_port = 0
147148
to_port = 0
148149
protocol = -1
149-
security_groups = var.allowed_security_groups
150+
security_groups = var.associated_security_group_ids
150151
}
151152

152153
# Allow Jenkins master instance to communicate with Jenkins slave instances on SSH port 22

variables.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ variable "loadbalancer_certificate_arn" {
5252
}
5353

5454
variable "loadbalancer_ssl_policy" {
55-
type = "string"
55+
type = string
5656
default = ""
5757
description = "Specify a security policy to apply to the listener. This option is only applicable to environments with an application load balancer"
5858
}
@@ -72,7 +72,7 @@ variable "dns_zone_id" {
7272
description = "Route53 parent zone ID. The module will create sub-domain DNS records in the parent zone for the EB environment and EFS"
7373
}
7474

75-
variable "allowed_security_groups" {
75+
variable "associated_security_group_ids" {
7676
type = list(string)
7777
default = []
7878
description = "List of security groups to be allowed to connect to Jenkins master EC2 instances"

0 commit comments

Comments
 (0)