Skip to content

Commit 6a0ec41

Browse files
LeoDiazLLeoDiazL
authored
Add VPC handling (#32)
* Initial fixes * Small unnecesary printing fixes * small tweak in bitops incoming * Remove wiping of bitops_extra_env_vars * Fixing env-merger * Initial commit - debugging subnets fetching * Fixing typo * fixing indexes * Testing #2 * Missing id * fixing typo * Forcing subnet for vpc * Clearing out output bugging message * Moving files * Fixes * typo * Outputs deps fix * fixing index * random_int fix * Debugging 1 * Fixes * Fix typo * debugg * trying a failing one * tonumber * +dep * debugging * adding debugg outputs * fixing expected value * Cleanup * Cleanup + moving secret manager get * Fix expected empty value * Code cleanup * Adding lifecycle block to keys in sm * Removing ugly sed command * adding random back again * Missing var * Fixing efs zone issue * Fixing efs zone mapping issue #2 Fixing output prints * Fixing ec2_zone_mapping * Typo in var name * Debug EFS+VPC * Choosing the default subnet for the VPC * adding debugs to main * Missing mapping of values * Debugging summary * Changing VPC logic * Debugging * typo * Debugging 2 * Debugging 3 * fix subnet issues * typo in resource * breaking loop * Fixing cycle * typo fix * typo fix 2 * Adding subnet def'n * wrong conditional location * typos fix * Fixes * Fixing ELB Subnet/VPC/AZ * Fixing VPC Id in security group * Missing file in commit * Chaging attribute name * Commenting out AZ from ELB * Trying to get rid of dep loop * changing conditional order * Changing region per zone * Fixing AZ conditional creation * Changing az logic #2 * Debug #55 * Trying to break loops * Break the look #2 * Fixing zones loop * Missing index * fixing outputs * Playing with EC2 AZ's * commenting out dep * Cross-fixing * changing set substract * slice sort fix * set * Changed az approach again * cleanup * Retrying indexes * Typo in var name * Fixing README * Fixing az index to ec2 * Adding comment in readme, fixing outputs * Output fixing * Fixing summary * Missing " * Deboug outputs cleanup * Debugging EFS DNS URL * Debug 2 * Huge EFS Changes * Fixing some () * Really, another ' * Fixes to vars typos and indexes * cidr != cidr_block * removing breaking unnecesary output * Fixing string to list * Testing different approach * Missing index * Approach #2 * typo * Escaping var * region-namme doesn't exists * Adding a validation * Validation fix * Removing filtering for only one VPC per ZAZ * Adding EFS deps * Fixing and filtering * Cleanup * fix * Changing to ID * Clearer passthrough * Adding try * Adding VPC def'n as target * Making main only a target * Making all vpc's targets * Adding subnets? * removing for_each * Fixing azs * removing count * Fixing unnecesary count * typo * target vpcs and subnets * Cleanups * Adding dep * typo * option 2 * Module VPC to run first * Adding allow-sg to aurora * Adding missing files in commit * dupe cleanup * Adding missing mapping var * fixing data source name * Changing aurora VPC * Fixing SG * Cleanup and vpc target dependant * Adding timeout and lifecycle to aurora sg * Adding aurora db lifecycle tag * Rollback * Cleanup * Cleanup
1 parent b7b5be5 commit 6a0ec41

27 files changed

+801
-335
lines changed

‎README.md‎

Lines changed: 48 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,13 @@ jobs:
5353
1. [AWS Specific](#aws-specific)
5454
1. [Secrets and Environment Variables](#secrets-and-environment-variables-inputs)
5555
1. [EC2](#ec2-inputs)
56+
1. [VPC](#vpc-inputs)
5657
1. [Certificates](#certificate-inputs)
5758
1. [Load Balancer](#load-balancer-inputs)
5859
1. [EFS](#efs-inputs)
5960
1. [Amazon Aurora Inputs](#aurora-inputs)
6061
1. [Docker](#docker-inputs)
62+
1. [EKS](#eks-inputs)
6163
6264
The following inputs can be used as `step.with` keys
6365
<br/>
@@ -146,6 +148,19 @@ The following inputs can be used as `step.with` keys
146148
<hr/>
147149
<br/>
148150

151+
#### **VPC Inputs**
152+
| Name | Type | Description |
153+
|------------------|---------|------------------------------------|
154+
| `aws_vpc_create` | Boolean | Define if a VPC should be created |
155+
| `aws_vpc_name` | String | Define a name for the VPC. Defaults to `VPC for ${aws_resource_identifier}`. |
156+
| `aws_vpc_cidr_block` | String | Define Base CIDR block which is divided into subnet CIDR blocks. Defaults to `10.0.0.0/16`. |
157+
| `aws_vpc_public_subnets` | String | Comma separated list of public subnets. Defaults to `10.10.110.0/24`|
158+
| `aws_vpc_private_subnets` | String | Comma separated list of private subnets. If no input, no private subnet will be created. Defaults to `<none>`. |
159+
| `aws_vpc_availability_zones` | String | Comma separated list of availability zones. Defaults to `aws_default_region+<random>` value. If a list is defined, the first zone will be the one used for the EC2 instance. |
160+
| `aws_vpc_id` | String | AWS VPC ID. Accepts `vpc-###` values. |
161+
| `aws_vpc_subnet_id` | String | AWS VPC Subnet ID. If none provided, will pick one. (Ideal when there's only one) |
162+
<hr/>
163+
<br/>
149164

150165
#### **Certificate Inputs**
151166
| Name | Type | Description |
@@ -179,14 +194,14 @@ The following inputs can be used as `step.with` keys
179194
|------------------|---------|------------------------------------|
180195
| `aws_efs_create` | Boolean | Toggle to indicate whether to create and EFS and mount it to the ec2 as a part of the provisioning. Note: The EFS will be managed by the stack and will be destroyed along with the stack |
181196
| `aws_efs_create_ha` | Boolean | Toggle to indicate whether the EFS resource should be highly available (target mounts in all available zones within region) |
182-
| `aws_efs_mount_id` | String | ID of existing EFS. |
183-
| `aws_efs_mount_security_group_id` | String | ID of the primary security group used by the existing EFS. |
197+
| `aws_efs_fs_id` | String | ID of existing EFS. |
198+
| `aws_efs_vpc_id` | String | ID of the VPC for the EFS mount target. If aws_efs_create_ha is set to true, will create one mount target per subnet available in the VPC. If not, will create one in an automated selected region. |
199+
| `aws_efs_subnet_ids` | String | ID (or ID's) of the subnet for the EFS mount target. (Comma separated string.) |
184200
| `aws_efs_security_group_name` | String | The name of the EFS security group. Defaults to `SG for ${aws_resource_identifier} - EFS`. |
185201
| `aws_efs_create_replica` | Boolean | Toggle to indiciate whether a read-only replica should be created for the EFS primary file system |
202+
| `aws_efs_replication_destination` | String | AWS Region to target for replication. |
186203
| `aws_efs_enable_backup_policy` | Boolean | Toggle to indiciate whether the EFS should have a backup policy |
187-
| `aws_efs_zone_mapping` | JSON | Zone Mapping in the form of `{\"<availabillity zone>\":{\"subnet_id\":\"subnet-abc123\", \"security_groups\":\[\"sg-abc123\"\]} }` |
188204
| `aws_efs_transition_to_inactive` | String | Indicates how long it takes to transition files to the IA storage class. |
189-
| `aws_efs_replication_destination` | String | AWS Region to target for replication. |
190205
| `aws_efs_mount_target` | String | Directory path in efs to mount directory to. Default is `/`. |
191206
| `aws_efs_ec2_mount_point` | String | The aws_efs_ec2_mount_point input represents the folder path within the EC2 instance to the data directory. Default is `/user/ubuntu/<application_repo>/data`. Additionally this value is loaded into the docker-compose `.env` file as `HOST_DIR`. |
192207
<hr/>
@@ -224,6 +239,35 @@ The following inputs can be used as `step.with` keys
224239
| `docker_efs_mount_target` | String | Directory path within docker env to mount directory to. Default is `/data`|
225240
<hr/>
226241
<br/>
242+
243+
#### **EKS Inputs**
244+
| Name | Type | Description |
245+
|------------------|---------|------------------------------------|
246+
| `aws_eks_create` | Boolean | Define if an EKS cluster should be created |
247+
| `aws_eks_region` | String | Define the region where EKS cluster should be created. Defaults to `us-east-1`. |
248+
| `aws_eks_security_group_name_master` | String | Define the security group name master. Defaults to `SG for ${GITHUB_ORG_NAME}-${GITHUB_REPO_NAME}-${GITHUB_BRANCH_NAME} - ${aws_eks_environment} - EKS Master`. |
249+
| `aws_eks_security_group_name_worker` | String | Define the security group name worker. Defaults to `SG for ${GITHUB_ORG_NAME}-${GITHUB_REPO_NAME}-${GITHUB_BRANCH_NAME} - ${aws_eks_environment} - EKS Worker`. |
250+
| `aws_eks_environment` | String | Specify the eks environment name. Defaults to `env` |
251+
| `aws_eks_stackname` | String | Specify the eks stack name for your environment. Defaults to `eks-stack`. |
252+
| `aws_eks_cidr_block` | String | Define Base CIDR block which is divided into subnet CIDR blocks. Defaults to `10.0.0.0/16`. |
253+
| `aws_eks_workstation_cidr` | String | Comma separated list of remote public CIDRs blocks to add it to Worker nodes security groups. |
254+
| `aws_eks_availability_zones` | String | Comma separated list of availability zones. Defaults to `us-east-1a,us-east-1b`. |
255+
| `aws_eks_private_subnets` | String | Comma separated list of private subnets. Defaults to `10.0.1.0/24,10.0.2.0/24`. |
256+
| `aws_eks_public_subnets` | String | Comma separated list of public subnets. Defaults to `10.0.101.0/24,10.0.102.0/24`|
257+
| `aws_eks_cluster_name` | String | Specify the k8s cluster name. Defaults to `${GITHUB_ORG_NAME}-${GITHUB_REPO_NAME}-${GITHUB_BRANCH_NAME}-cluster` |
258+
| `aws_eks_cluster_log_types` | String | Comma separated list of cluster log type. See [this AWS doc](https://docs.aws.amazon.com/eks/latest/userguide/control-plane-logs.html). Defaults to `none`. |
259+
| `aws_eks_cluster_version` | String | Specify the k8s cluster version. Defaults to `1.27` |
260+
| `aws_eks_instance_type` | String | Define the EC2 instance type. See [this list](https://aws.amazon.com/ec2/instance-types/) for reference. Defaults to `t3a.medium`. |
261+
| `aws_eks_instance_ami_id` | String | AWS AMI ID. Will default to the latest Amazon EKS Node image for the cluster version. |
262+
| `aws_eks_instance_user_data_file` | String | Relative path in the repo for a user provided script to be executed with the EC2 Instance creation. See note. |
263+
| `aws_eks_ec2_key_pair` | String | Enter an existing ec2 key pair name for worker nodes. If none, will create one. |
264+
| `aws_eks_store_keypair_sm` | Boolean | If true, will store the newly created keys in Secret Manager. |
265+
| `aws_eks_desired_capacity` | String | Enter the desired capacity for the worker nodes. Defaults to `2`. |
266+
| `aws_eks_max_size` | String | Enter the max_size for the worker nodes. Defaults to `4`. |
267+
| `aws_eks_min_size` | String | Enter the min_size for the worker nodes. Defaults to `2`. |
268+
| `input_helm_charts` | String | Relative path to the folder from project containing Helm charts to be installed. Could be uncompressed or compressed (.tgz) files. |
269+
<hr/>
270+
<br/>
227271
<br/>
228272

229273
## Note about resource identifiers

‎action.yaml‎

Lines changed: 55 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,33 @@ inputs:
165165
aws_ec2_user_data_replace_on_change:
166166
description: 'If user_data file changes, instance will stop and start. Hence public IP will change. Defaults to true.'
167167
required: false
168-
168+
169+
# AWS VPC Inputs
170+
aws_vpc_create:
171+
description: 'Define if a VPC should be created'
172+
required: false
173+
aws_vpc_name:
174+
description: 'Set a specific name for the VPC'
175+
required: false
176+
aws_vpc_cidr_block:
177+
description: 'Define Base CIDR block which is divided into subnet CIDR blocks. Defaults to 10.0.0.0/16.'
178+
required: false
179+
aws_vpc_public_subnets:
180+
description: 'Comma separated list of public subnets. Defaults to 10.10.110.0/24'
181+
required: false
182+
aws_vpc_private_subnets:
183+
description: 'Comma separated list of private subnets. If none, none will be created.'
184+
required: false
185+
aws_vpc_availability_zones:
186+
description: 'Comma separated list of availability zones. Defaults to `aws_default_region.'
187+
required: false
188+
aws_vpc_id:
189+
description: 'AWS VPC ID. Accepts `vpc-###` values.'
190+
required: false
191+
aws_vpc_subnet_id:
192+
description: 'Specify a Subnet to be used with the instance. If none provided, will pick one.'
193+
required: false
194+
169195
# AWS Route53 Domains abd Certificates
170196
aws_r53_enable:
171197
description: 'Enables the usage of Route53 to manage DNS records.'
@@ -221,30 +247,29 @@ inputs:
221247
aws_efs_create_ha:
222248
description: 'Toggle to indicate whether the EFS resource should be highly available (target mounts in all available zones within region)'
223249
required: false
224-
aws_efs_mount_id:
250+
aws_efs_fs_id:
225251
description: 'ID of existing EFS'
226252
required: false
227-
aws_efs_mount_security_group_id:
228-
description: 'ID of the primary security group used by the existing EFS'
253+
aws_efs_vpc_id:
254+
description: 'ID of the VPC for the EFS mount target. If aws_efs_create_ha is set to true, will create one mount target per subnet available in the VPC. If not, will pick one.'
229255
required: false
256+
aws_efs_subnet_ids:
257+
description: 'ID or IDs of the subnet for the EFS mount target.'
230258
aws_efs_security_group_name:
231259
description: 'The name of the EFS security group'
232260
required: false
233261
aws_efs_create_replica:
234262
description: 'Toggle to indiciate whether a read-only replica should be created for the EFS primary file system'
235263
required: false
264+
aws_efs_replication_destination:
265+
description: 'AWS Region to target for replication'
266+
required: false
236267
aws_efs_enable_backup_policy:
237268
description: 'Toggle to indiciate whether the EFS should have a backup policy, default is false'
238269
required: false
239-
aws_efs_zone_mapping:
240-
description: 'Information on Zone Mapping can be found in the [README.md](README.md#efs-zone-mapping)'
241-
required: false
242270
aws_efs_transition_to_inactive:
243271
description: 'Indicates how long it takes to transition files to the IA storage class.'
244272
required: false
245-
aws_efs_replication_destination:
246-
description: 'AWS Region to target for replication'
247-
required: false
248273
aws_efs_mount_target:
249274
description: 'Directory path in the EFS volume to mount directory to. Default is /.'
250275
required: false
@@ -391,6 +416,9 @@ outputs:
391416
vm_url:
392417
description: "The URL of the generated app"
393418
value: ${{ steps.deploy.outputs.vm_url }}
419+
ec2_url:
420+
description: "The URL of the generated ec2 instance"
421+
value: ${{ steps.deploy.outputs.instance_public_dns }}
394422

395423
runs:
396424
using: 'composite'
@@ -466,6 +494,16 @@ runs:
466494
AWS_EC2_USER_DATA_FILE: ${{ inputs.aws_ec2_user_data_file }}
467495
AWS_EC2_USER_DATA_REPLACE_ON_CHANGE: ${{ inputs.aws_ec2_user_data_replace_on_change }}
468496

497+
## AWS VPC
498+
AWS_VPC_CREATE: ${{ inputs.aws_vpc_create }}
499+
AWS_VPC_NAME: ${{ inputs.aws_vpc_name }}
500+
AWS_VPC_CIDR_BLOCK: ${{ inputs.aws_vpc_cidr_block }}
501+
AWS_VPC_PUBLIC_SUBNETS: ${{ inputs.aws_vpc_public_subnets }}
502+
AWS_VPC_PRIVATE_SUBNETS: ${{ inputs.aws_vpc_private_subnets }}
503+
AWS_VPC_AVAILABILITY_ZONES: ${{ inputs.aws_vpc_availability_zones }}
504+
AWS_VPC_ID: ${{ inputs.aws_vpc_id }}
505+
AWS_VPC_SUBNET_ID: ${{ inputs.aws_vpc_subnet_id }}
506+
469507
# AWS Route53 Domains abd Certificates
470508
AWS_R53_ENABLE: ${{ inputs.aws_r53_enable }}
471509
AWS_R53_DOMAIN_NAME: ${{ inputs.aws_r53_domain_name }}
@@ -488,14 +526,14 @@ runs:
488526
# AWS EFS
489527
AWS_EFS_CREATE: ${{ inputs.aws_efs_create }}
490528
AWS_EFS_CREATE_HA: ${{ inputs.aws_efs_create_ha }}
491-
AWS_EFS_MOUNT_ID: ${{ inputs.aws_efs_mount_id }}
492-
AWS_EFS_MOUNT_SECURITY_GROUP_ID: ${{ inputs.aws_efs_mount_security_group_id }}
529+
AWS_EFS_FS_ID: ${{ inputs.aws_efs_fs_id }}
530+
AWS_EFS_VPC_ID: ${{ inputs.aws_efs_vpc_id }}
531+
AWS_EFS_SUBNET_IDS: ${{ inputs.aws_efs_subnet_ids }}
493532
AWS_EFS_SECURITY_GROUP_NAME: ${{ inputs.aws_efs_security_group_name }}
494533
AWS_EFS_CREATE_REPLICA: ${{ inputs.aws_efs_create_replica }}
534+
AWS_EFS_REPLICATION_DESTINATION: ${{ inputs.aws_efs_replication_destination }}
495535
AWS_EFS_ENABLE_BACKUP_POLICY: ${{ inputs.aws_efs_enable_backup_policy }}
496-
AWS_EFS_ZONE_MAPPING: ${{ inputs.aws_efs_zone_mapping }}
497536
AWS_EFS_TRANSITION_TO_INACTIVE: ${{ inputs.aws_efs_transition_to_inactive }}
498-
AWS_EFS_REPLICATION_DESTINATION: ${{ inputs.aws_efs_replication_destination }}
499537
AWS_EFS_MOUNT_TARGET: ${{ inputs.aws_efs_mount_target }}
500538
AWS_EFS_EC2_MOUNT_POINT: ${{ inputs.aws_efs_ec2_mount_point }}
501539

@@ -562,10 +600,13 @@ runs:
562600
env:
563601
SUCCESS: ${{ job.status }} # success, failure, cancelled
564602
URL_OUTPUT: ${{ steps.deploy.outputs.vm_url }}
603+
EC2_URL_OUTPUT: ${{ steps.deploy.outputs.ec2_url }}
565604
BITOPS_CODE_ONLY: ${{ inputs.bitops_code_only }}
566605
BITOPS_CODE_STORE: ${{ inputs.bitops_code_store }}
567606
TF_STACK_DESTROY: ${{ inputs.tf_stack_destroy }}
568607
TF_STATE_BUCKET_DESTROY: ${{ inputs.tf_state_bucket_destroy }}
608+
AWS_EC2_PORT_LIST: ${{ inputs.aws_ec2_port_list }}
609+
AWS_ELB_LISTEN_PORT: ${{ inputs.aws_elb_listen_port }}
569610
run: $GITHUB_ACTION_PATH/operations/_scripts/deploy/summary.sh
570611

571612
# upload generated artifacts to GitHub if enabled

‎operations/_scripts/deploy/summary.sh‎

Lines changed: 43 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
### coming into this we have env vars:
55
# SUCCESS=${{ job.status }} # success, cancelled, failure
66
# URL_OUTPUT=${{ steps.deploy.outputs.vm_url }}
7+
# EC2_URL_OUTPUT=${{ steps.deploy.outputs.ec2_url }}
78
# BITOPS_CODE_ONLY
89
# BITOPS_CODE_STORE
910
# TF_STACK_DESTROY
1011
# TF_STATE_BUCKET_DESTROY
12+
# AWS_EC2_PORT_LIST
13+
# AWS_ELB_LISTEN_PORT
1114

1215
# Create an error code mechanism so we don't have to check the actual static text,
1316
# just which case we fell into
@@ -24,13 +27,42 @@
2427
# 9 - success, destroy infrastructure
2528
# 10 - cancelled
2629

30+
# Function to process and return the result as a string
31+
function process_and_return() {
32+
local url="$1"
33+
local ports="$2"
34+
IFS=',' read -ra port_array <<< "$ports"
35+
result=""
36+
for p in "${port_array[@]}"; do
37+
result+="$url:$p\n"
38+
done
39+
echo -e "$result"
40+
}
41+
42+
# Function to echo each line of a given variable
43+
echo_lines() {
44+
local input="$1"
45+
while IFS= read -r line; do
46+
echo -e "$line" >> $GITHUB_STEP_SUMMARY
47+
done <<< "$input"
48+
}
49+
50+
# Process and store URL_OUTPUT:AWS_ELB_LISTEN_PORT in a variable
51+
output_elb=$(process_and_return "$URL_OUTPUT" "$AWS_ELB_LISTEN_PORT")
52+
# Given the case where there is no port specified for the ELB, pass the URL directly
53+
if [[ -z "$output_elb" ]]; then
54+
output_elb="$URL_OUTPUT"
55+
fi
56+
final_output+="${output_elb}\n"
57+
# Process and store EC2_URL_OUTPUT:AWS_EC2_PORT_LIST in a variable
58+
output_ec2=$(process_and_return "$EC2_URL_OUTPUT" "$AWS_EC2_PORT_LIST")
59+
final_output+="${output_ec2}\n"
60+
2761
SUMMARY_CODE=0
2862

2963
if [[ $SUCCESS == 'success' ]]; then
3064
if [[ $URL_OUTPUT != '' ]]; then
31-
result_string="## Deploy Complete! :rocket:
32-
$URL_OUTPUT"
33-
65+
result_string="## Deploy Complete! :rocket:"
3466
elif [[ $BITOPS_CODE_ONLY == 'true' ]]; then
3567
if [[ $BITOPS_CODE_STORE == 'true' ]]; then
3668
SUMMARY_CODE=6
@@ -72,5 +104,11 @@ else
72104
If you consider this is a bug in the Github Action, please submit an issue to our repo."
73105
fi
74106

75-
echo "$result_string" >> $GITHUB_STEP_SUMMARY
76-
echo "SUMMARY_CODE=$SUMMARY_CODE" >> $GITHUB_OUTPUT
107+
echo -e "$result_string" >> $GITHUB_STEP_SUMMARY
108+
if [[ $SUCCESS == 'success' ]]; then
109+
if [[ $URL_OUTPUT != '' ]]; then
110+
while IFS= read -r line; do
111+
echo -e "$line" >> $GITHUB_STEP_SUMMARY
112+
done <<< "$final_output"
113+
fi
114+
fi

‎operations/_scripts/generate/generate_bitops_config.sh‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,12 @@ if [ -n "$TF_TARGETS" ]; then
7777
fi
7878
# random_integer.az_select needs to be created before the "full stack" to avoid a potential state dependency locks
7979
targets="$targets
80-
- random_integer.az_select"
80+
- module.vpc.random_integer.az_select"
81+
# In the case VPC creation is enabled, as it's a needed resource for the whole stack, will trigger creation first.
82+
if [[ $(alpha_only "$AWS_VPC_CREATE") == true ]]; then
83+
targets="$targets
84+
- module.vpc"
85+
fi
8186
targets_attribute="$targets_attribute $targets"
8287

8388
#Will add the user_data file into the EC2 Terraform folder

‎operations/_scripts/generate/generate_vars_terraform.sh‎

Lines changed: 30 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,18 @@ if [[ $(alpha_only "$AWS_EC2_INSTANCE_CREATE") == true ]]; then
130130
aws_ec2_user_data_replace_on_change=$(generate_var aws_ec2_user_data_replace_on_change $AWS_EC2_USER_DATA_REPLACE_ON_CHANGE)
131131
fi
132132

133+
#-- VPC Handling --#
134+
if [[ $(alpha_only "$AWS_VPC_CREATE") == true ]]; then
135+
aws_vpc_create=$(generate_var aws_vpc_create $AWS_VPC_CREATE)
136+
aws_vpc_name=$(generate_var aws_vpc_name $AWS_VPC_NAME)
137+
aws_vpc_cidr_block=$(generate_var aws_vpc_cidr_block $AWS_VPC_CIDR_BLOCK)
138+
aws_vpc_public_subnets=$(generate_var aws_vpc_public_subnets $AWS_VPC_PUBLIC_SUBNETS)
139+
aws_vpc_private_subnets=$(generate_var aws_vpc_private_subnets $AWS_VPC_PRIVATE_SUBNETS)
140+
aws_vpc_availability_zones=$(generate_var aws_vpc_availability_zones $AWS_VPC_AVAILABILITY_ZONES)
141+
fi
142+
aws_vpc_id=$(generate_var aws_vpc_id $AWS_VPC_ID)
143+
aws_vpc_subnet_id=$(generate_var aws_vpc_subnet_id $AWS_VPC_SUBNET_ID)
144+
133145
#-- AWS Route53 and certs --#
134146
if [[ $(alpha_only "$AWS_R53_ENABLE") == true ]]; then
135147
aws_r53_enable=$(generate_var aws_r53_enable $AWS_R53_ENABLE)
@@ -161,14 +173,14 @@ if [[ $(alpha_only "$AWS_EFS_ENABLE") == true ]]; then
161173
aws_efs_enable=$(generate_var aws_efs_enable $AWS_EFS_ENABLE)
162174
aws_efs_create=$(generate_var aws_efs_create $AWS_EFS_CREATE)
163175
aws_efs_create_ha=$(generate_var aws_efs_create_ha $AWS_EFS_CREATE_HA)
164-
aws_efs_mount_id=$(generate_var aws_efs_mount_id $AWS_EFS_MOUNT_ID)
165-
aws_efs_mount_security_group_id=$(generate_var aws_efs_mount_security_group_id $AWS_EFS_MOUNT_SECURITY_GROUP_ID)
176+
aws_efs_fs_id=$(generate_var aws_efs_fs_id $AWS_EFS_FS_ID)
177+
aws_efs_vpc_id=$(generate_var aws_efs_vpc_id $AWS_EFS_VPC_ID)
178+
aws_efs_subnet_ids=$(generate_var aws_efs_subnet_ids $AWS_EFS_SUBNET_IDS)
166179
aws_efs_security_group_name=$(generate_var aws_efs_security_group_name $AWS_EFS_SECURITY_GROUP_NAME)
167180
aws_efs_create_replica=$(generate_var aws_efs_create_replica $AWS_EFS_CREATE_REPLICA)
181+
aws_efs_replication_destination=$(generate_var aws_efs_replication_destination $AWS_EFS_REPLICATION_DESTINATION)
168182
aws_efs_enable_backup_policy=$(generate_var aws_efs_enable_backup_policy $AWS_EFS_ENABLE_BACKUP_POLICY)
169-
aws_efs_zone_mapping=$(generate_var aws_efs_zone_mapping $AWS_EFS_ZONE_MAPPING)
170183
aws_efs_transition_to_inactive=$(generate_var aws_efs_transition_to_inactive $AWS_EFS_TRANSITION_TO_INACTIVE)
171-
aws_efs_replication_destination=$(generate_var aws_efs_replication_destination $AWS_EFS_REPLICATION_DESTINATION)
172184
aws_efs_mount_target=$(generate_var aws_efs_mount_target $AWS_EFS_MOUNT_TARGET)
173185
aws_efs_ec2_mount_point=$(generate_var aws_efs_ec2_mount_point $AWS_EFS_EC2_MOUNT_POINT)
174186
fi
@@ -265,6 +277,16 @@ $aws_ec2_create_keypair_sm
265277
$aws_ec2_instance_public_ip
266278
$aws_ec2_user_data_replace_on_change
267279
280+
#-- VPC --#
281+
$aws_vpc_create
282+
$aws_vpc_name
283+
$aws_vpc_cidr_block
284+
$aws_vpc_public_subnets
285+
$aws_vpc_private_subnets
286+
$aws_vpc_availability_zones
287+
$aws_vpc_id
288+
$aws_vpc_subnet_id
289+
268290
#-- R53 --#
269291
$aws_r53_enable
270292
$aws_r53_domain_name
@@ -288,14 +310,14 @@ $lb_access_bucket_name
288310
$aws_efs_enable
289311
$aws_efs_create
290312
$aws_efs_create_ha
291-
$aws_efs_mount_id
292-
$aws_efs_mount_security_group_id
313+
$aws_efs_fs_id
314+
$aws_efs_vpc_id
315+
$aws_efs_subnet_ids
293316
$aws_efs_security_group_name
294317
$aws_efs_create_replica
318+
$aws_efs_replication_destination
295319
$aws_efs_enable_backup_policy
296-
$aws_efs_zone_mapping
297320
$aws_efs_transition_to_inactive
298-
$aws_efs_replication_destination
299321
$aws_efs_mount_target
300322
$aws_efs_ec2_mount_point
301323

0 commit comments

Comments
 (0)