Skip to content

Commit b974704

Browse files
authored
Merge pull request #12 from byu-oit/ci-13
ci TF 12 and 13
2 parents c2c2592 + bb81061 commit b974704

File tree

5 files changed

+77
-5
lines changed

5 files changed

+77
-5
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ on:
44
pull_request:
55
branches: [master]
66
types: [opened, reopened, synchronize, edited]
7-
env:
8-
tf_version: "0.12.26" # must match value in examples/ci/ci.tf
97

108
jobs:
119
env:
@@ -18,7 +16,14 @@ jobs:
1816
matrix='{
1917
"env":[
2018
{
21-
"tf_working_dir":"./examples/ci",
19+
"tf_version":"0.13.2",
20+
"tf_working_dir":"./examples/ci-13",
21+
"aws_key_name":"byu_oit_terraform_dev_key",
22+
"aws_secret_name":"byu_oit_terraform_dev_secret"
23+
},
24+
{
25+
"tf_version":"0.12.26",
26+
"tf_working_dir":"./examples/ci-12",
2227
"aws_key_name":"byu_oit_terraform_dev_key",
2328
"aws_secret_name":"byu_oit_terraform_dev_secret"
2429
}
@@ -41,7 +46,7 @@ jobs:
4146
- name: Terraform Setup
4247
uses: hashicorp/setup-terraform@v1
4348
with:
44-
terraform_version: ${{ env.tf_version }}
49+
terraform_version: ${{ matrix.env.tf_version }}
4550

4651
- name: Terraform Format
4752
working-directory: "./"
@@ -66,7 +71,7 @@ jobs:
6671
- name: Terraform Setup
6772
uses: hashicorp/setup-terraform@v1
6873
with:
69-
terraform_version: ${{ env.tf_version }}
74+
terraform_version: ${{ matrix.env.tf_version }}
7075

7176
- name: Terraform Init
7277
working-directory: ${{ matrix.env.tf_working_dir }}
File renamed without changes.
File renamed without changes.

examples/ci-13/ci.tf

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
terraform {
2+
required_version = "0.13.2"
3+
}
4+
5+
provider "aws" {
6+
version = "~> 3.0"
7+
region = "us-west-2"
8+
}
9+
10+
module "acs" {
11+
source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.1.0"
12+
}
13+
14+
module "lambda_api" {
15+
source = "../../"
16+
app_name = "my-lambda"
17+
env = "dev"
18+
lambda_zip_file = "./lambda.zip"
19+
handler = "index.handler"
20+
runtime = "nodejs12.x"
21+
hosted_zone = module.acs.route53_zone
22+
https_certificate_arn = module.acs.certificate.arn
23+
vpc_id = module.acs.vpc.id
24+
public_subnet_ids = module.acs.public_subnet_ids
25+
role_permissions_boundary_arn = module.acs.role_permissions_boundary.arn
26+
27+
lambda_vpc_config = {
28+
subnet_ids = module.acs.private_subnet_ids
29+
security_group_ids = []
30+
}
31+
}
32+
33+
output "lambda" {
34+
value = module.lambda_api.lambda
35+
}
36+
37+
output "lambda_security_group" {
38+
value = module.lambda_api.lambda_security_group
39+
}
40+
41+
output "lambda_live_alias" {
42+
value = module.lambda_api.lambda_live_alias
43+
}
44+
45+
output "codedeploy_deployment_group" {
46+
value = module.lambda_api.codedeploy_deployment_group
47+
}
48+
49+
output "codedeploy_appspec_json_file" {
50+
value = module.lambda_api.codedeploy_appspec_json_file
51+
}
52+
53+
output "alb" {
54+
value = module.lambda_api.alb
55+
}
56+
57+
output "alb_security_group" {
58+
value = module.lambda_api.alb_security_group
59+
}
60+
61+
output "dns_record" {
62+
value = module.lambda_api.dns_record
63+
}
64+
65+
output "cloudwatch_log_group" {
66+
value = module.lambda_api.cloudwatch_log_group
67+
}

examples/ci-13/lambda.zip

Whitespace-only changes.

0 commit comments

Comments
 (0)