Merge branch 'issue-232-aws-zone' of https://github.com/kayma-hl/terr…

…aform-aws-gitlab-runner into develop

CHANGELOG.md

@@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](http:https://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http:https://semver.org/).
 
 ## Unreleased
-
+- Changed: Variable aws_zone no longer needed (#232) by @kayma-hl
 
 ## 4.18.0 - 2020-06-01
 

README.md

@@ -260,7 +260,6 @@ terraform destroy
 | ami\_owners | The list of owners used to select the AMI of Gitlab runner agent instances. | `list(string)` | <pre>[<br> "amazon"<br>]</pre> | no |
 | arn\_format | ARN format to be used. May be changed to support deployment in GovCloud/China regions. | `string` | `"arn:aws"` | no |
 | aws\_region | AWS region. | `string` | n/a | yes |
-| aws\_zone | AWS availability zone (typically 'a', 'b', or 'c'). | `string` | `"a"` | no |
 | cache\_bucket | Configuration to control the creation of the cache bucket. By default the bucket will be created and used as shared cache. To use the same cache across multiple runners disable the creation of the cache and provide a policy and bucket name. See the public runner example for more details. | `map` | <pre>{<br> "bucket": "",<br> "create": true,<br> "policy": ""<br>}</pre> | no |
 | cache\_bucket\_name\_include\_account\_id | Boolean to add current account ID to cache bucket name. | `bool` | `true` | no |
 | cache\_bucket\_prefix | Prefix for s3 cache bucket name. | `string` | `""` | no |
@@ -362,4 +361,4 @@ terraform destroy
 | runner\_role\_name | Name of the role used for the docker machine runners. |
 | runner\_sg\_id | ID of the security group attached to the docker machine runners. |
 
-<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
+<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

main.tf

@@ -1,5 +1,13 @@
 data "aws_caller_identity" "current" {}
 
+data "aws_subnet" "runners" {
+ id = var.subnet_id_runners
+}
+
+data "aws_availability_zone" "runners" {
+ name = data.aws_subnet.runners.availability_zone
+}
+
 # Parameter value is managed by the user-data script of the gitlab runner instance
 resource "aws_ssm_parameter" "runner_registration_token" {
  name = local.secure_parameter_store_runner_token_key
@@ -72,7 +80,7 @@ locals {
  gitlab_url = var.runners_gitlab_url
  runners_vpc_id = var.vpc_id
  runners_subnet_id = var.subnet_id_runners
- runners_aws_zone = var.aws_zone
+ runners_aws_zone = data.aws_availability_zone.runners.name_suffix
  runners_instance_type = var.docker_machine_instance_type
  runners_spot_price_bid = var.docker_machine_spot_price_bid
  runners_ami = data.aws_ami.docker-machine.id

variables.tf

@@ -4,7 +4,7 @@ variable "aws_region" {
 }
 
 variable "aws_zone" {
- description = "AWS availability zone (typically 'a', 'b', or 'c')."
+ description = "Deprecated. Will be removed in the next major release."
  type = string
  default = "a"
 }