Skip to content

Commit ab30e7a

Browse files
shamimice03shamimice03
authored
Merge pull request #8 from shamimice03/main
Update
2 parents fa7b5ba + 2533888 commit ab30e7a

File tree

7 files changed

+102
-35
lines changed

7 files changed

+102
-35
lines changed

‎.github/workflows/validate.yaml

+45-27
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,27 @@ on:
88
- master
99

1010
jobs:
11+
collectInputs:
12+
name: collect workflow inputs
13+
runs-on: ubuntu-latest
14+
outputs:
15+
directories: ${{steps.dirs.outputs.directories}}
16+
steps:
17+
- uses: actions/checkout@v3
18+
- name: list of directories that contain a versions.tf
19+
id: dirs
20+
uses: clowdhaus/terraform-composite-actions/[email protected]
21+
1122
versionExtract:
23+
needs: collectInputs
1224
name: Extract min/max Terraform versions
13-
runs-on: ubuntu-20.04
14-
25+
runs-on: ubuntu-latest
26+
outputs:
27+
minVersion: ${{ steps.minMax.outputs.minVersion }}
28+
maxVersion: ${{ steps.minMax.outputs.maxVersion }}
29+
strategy:
30+
matrix:
31+
directory: ${{ fromJson(needs.collectInputs.outputs.directories) }}
1532
steps:
1633
- name: Checkout
1734
uses: actions/checkout@v2
@@ -20,30 +37,31 @@ jobs:
2037
id: minMax
2138
uses: clowdhaus/terraform-min-max@main
2239
with:
23-
directory: .
24-
outputs:
25-
minVersion: ${{ steps.minMax.outputs.minVersion }}
26-
maxVersion: ${{ steps.minMax.outputs.maxVersion }}
40+
directory: ${{ matrix.directory }}
41+
- name: view
42+
run: |
43+
echo "${{ steps.minMax.outputs.minVersion }}"
44+
echo "${{ steps.minMax.outputs.maxVersion }}"
2745
28-
terraform-validate:
29-
runs-on: ubuntu-20.04
30-
needs: versionExtract
31-
strategy:
32-
matrix:
33-
tf_ver:
34-
- ${{ needs.versionExtract.outputs.minVersion }}
35-
- ${{ needs.versionExtract.outputs.maxVersion }}
46+
# terraform-validate:
47+
# runs-on: ubuntu-20.04
48+
# needs: versionExtract
49+
# strategy:
50+
# matrix:
51+
# tf_ver:
52+
# - ${{ needs.versionExtract.outputs.minVersion }}
53+
# - ${{ needs.versionExtract.outputs.maxVersion }}
3654

37-
steps:
38-
- uses: actions/checkout@v2
39-
- uses: hashicorp/setup-terraform@v2
40-
with:
41-
terraform_version: ${{ matrix.tf_ver }}
42-
43-
- name: Terraform Init
44-
id: init
45-
run: terraform init
46-
47-
- name: Terraform Validate
48-
id: validate
49-
run: terraform validate
55+
# steps:
56+
# - uses: actions/checkout@v2
57+
# - uses: hashicorp/setup-terraform@v2
58+
# with:
59+
# terraform_version: ${{ matrix.tf_ver }}
60+
61+
# - name: Terraform Init
62+
# id: init
63+
# run: terraform init
64+
65+
# - name: Terraform Validate
66+
# id: validate
67+
# run: terraform validate

‎modules/alb-route53/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
| Name | Version |
1212
|------|---------|
13-
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.13.1 |
13+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.14.0 |
1414

1515
## Modules
1616

‎modules/efs/README.md

+43
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,45 @@
11
<!-- BEGINNING OF PRE-COMMIT-TERRAFORM DOCS HOOK -->
2+
## Requirements
3+
4+
| Name | Version |
5+
|------|---------|
6+
| <a name="requirement_terraform"></a> [terraform](#requirement\_terraform) | >= 1.0.0 |
7+
| <a name="requirement_aws"></a> [aws](#requirement\_aws) | >= 5.0.0 |
8+
9+
## Providers
10+
11+
| Name | Version |
12+
|------|---------|
13+
| <a name="provider_aws"></a> [aws](#provider\_aws) | 5.14.0 |
14+
15+
## Modules
16+
17+
No modules.
18+
19+
## Resources
20+
21+
| Name | Type |
22+
|------|------|
23+
| [aws_efs_file_system.this](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/efs_file_system) | resource |
24+
| [aws_efs_mount_target.efs_mount](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/efs_mount_target) | resource |
25+
26+
## Inputs
27+
28+
| Name | Description | Type | Default | Required |
29+
|------|-------------|------|---------|:--------:|
30+
| <a name="input_efs_encrypted"></a> [efs\_encrypted](#input\_efs\_encrypted) | Whether EFS should be encrypted | `bool` | `true` | no |
31+
| <a name="input_efs_performance_mode"></a> [efs\_performance\_mode](#input\_efs\_performance\_mode) | EFS performance mode (e.g., 'generalPurpose', 'maxIO') | `string` | `"generalPurpose"` | no |
32+
| <a name="input_efs_subnet_ids"></a> [efs\_subnet\_ids](#input\_efs\_subnet\_ids) | List of private subnet IDs | `list(string)` | `[]` | no |
33+
| <a name="input_efs_tags"></a> [efs\_tags](#input\_efs\_tags) | Tags for the EFS file system | `map(string)` | `{}` | no |
34+
| <a name="input_efs_throughput_mode"></a> [efs\_throughput\_mode](#input\_efs\_throughput\_mode) | EFS throughput mode (e.g., 'provisioned', 'bursting','elastic) | `string` | `"bursting"` | no |
35+
| <a name="input_efs_transition_to_ia"></a> [efs\_transition\_to\_ia](#input\_efs\_transition\_to\_ia) | Indicates how long it takes to transition files to the IA storage class. Valid values: AFTER\_1\_DAY, AFTER\_7\_DAYS, AFTER\_14\_DAYS, AFTER\_30\_DAYS, AFTER\_60\_DAYS, or AFTER\_90\_DAYS | `string` | `"AFTER_30_DAYS"` | no |
36+
| <a name="input_name"></a> [name](#input\_name) | A unique name used as reference when creating the Elastic File System to ensure idempotent file system creation | `string` | `""` | no |
37+
| <a name="input_security_group_ids"></a> [security\_group\_ids](#input\_security\_group\_ids) | IDs of the security group for EFS | `list(string)` | `[]` | no |
38+
39+
## Outputs
40+
41+
| Name | Description |
42+
|------|-------------|
43+
| <a name="output_id"></a> [id](#output\_id) | ID of the EFS file system |
44+
| <a name="output_mount_target_ids"></a> [mount\_target\_ids](#output\_mount\_target\_ids) | List of IDs of EFS mount targets |
245
<!-- END OF PRE-COMMIT-TERRAFORM DOCS HOOK -->

‎modules/efs/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ resource "aws_efs_mount_target" "efs_mount" {
1616
file_system_id = aws_efs_file_system.this.id
1717
subnet_id = var.efs_subnet_ids[count.index]
1818
security_groups = var.security_group_ids
19-
}
19+
}

‎modules/efs/variables.tf

+5-5
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ variable "efs_encrypted" {
2222
default = true
2323
}
2424

25-
variable "kms_key_id" {
26-
description = "The ARN for the KMS encryption key. When specifying kms_key_id, encrypted needs to be set to true"
27-
type = string
28-
default = ""
29-
}
25+
# variable "kms_key_id" {
26+
# description = "The ARN for the KMS encryption key. When specifying kms_key_id, encrypted needs to be set to true"
27+
# type = string
28+
# default = ""
29+
# }
3030

3131
variable "efs_throughput_mode" {
3232
description = "EFS throughput mode (e.g., 'provisioned', 'bursting','elastic)"

‎userdata.sh

+6
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,9 @@
44
sudo yum -y update
55
sudo yum -y upgrade
66

7+
# Install Webserver
8+
sudo yum install -y httpd
9+
10+
# Start and enable Webserver
11+
sudo systemctl enable httpd
12+
sudo systemctl start httpd

‎versions.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 1.0.0"
2+
required_version = ">= 1.1.0"
33

44
required_providers {
55
aws = {

0 commit comments

Comments
 (0)