Skip to content

Commit 9657b2e

Browse files
authored
Merge pull request #31 from byu-oit/allow-tf-12
allow tf 12
2 parents 46ab813 + 6dcdc36 commit 9657b2e

File tree

6 files changed

+82
-10
lines changed

6 files changed

+82
-10
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.13.1" # must match value in examples/ci/main.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.29",
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 }}

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ This module retrieves some basic [ACS](https://github.com/byu-oit/aws-acs) infor
1010

1111
```hcl
1212
module "acs" {
13-
source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.0.0"
13+
source = "github.com/byu-oit/terraform-aws-acs-info.git?ref=v3.1.0"
1414
}
1515
```
1616
After defining the module you can then retrieve the information you need (see available [outputs](#output) below) using the interpolation syntax:
@@ -21,7 +21,7 @@ After defining the module you can then retrieve the information you need (see av
2121
```
2222

2323
## Requirements
24-
* Terraform version 0.13.0 or greater
24+
* Terraform version 0.12.17 or greater
2525

2626
## Input
2727

examples/ci-12/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.12.29"
3+
}
4+
5+
provider "aws" {
6+
version = "~> 3.0"
7+
region = "us-west-2"
8+
}
9+
10+
module "acs" {
11+
source = "../../"
12+
}
13+
14+
output "power_user_role" {
15+
value = module.acs.power_user_role
16+
}
17+
output "power_builder_role" {
18+
value = module.acs.power_builder_role
19+
}
20+
output "role_permissions_boundary" {
21+
value = module.acs.role_permissions_boundary
22+
}
23+
output "user_permissions_boundary" {
24+
value = module.acs.user_permissions_boundary
25+
}
26+
output "vpc" {
27+
value = module.acs.vpc
28+
}
29+
output "private_subnet_ids" {
30+
value = module.acs.private_subnet_ids
31+
}
32+
output "public_subnet_ids" {
33+
value = module.acs.public_subnet_ids
34+
}
35+
output "data_subnet_ids" {
36+
value = module.acs.data_subnet_ids
37+
}
38+
output "private_subnets" {
39+
value = module.acs.private_subnets
40+
}
41+
output "public_subnets" {
42+
value = module.acs.public_subnets
43+
}
44+
output "data_subnets" {
45+
value = module.acs.data_subnets
46+
}
47+
output "route53_zone" {
48+
value = module.acs.route53_zone
49+
}
50+
output "certificate" {
51+
value = module.acs.certificate
52+
}
53+
output "certificate_virginia" {
54+
value = module.acs.certificate_virginia
55+
}
56+
output "db_subnet_group_name" {
57+
value = module.acs.db_subnet_group_name
58+
}
59+
output "ssh_rdp_security_group" {
60+
value = module.acs.ssh_rdp_security_group
61+
}
62+
output "oracle_security_group" {
63+
value = module.acs.oracle_security_group
64+
}
65+
output "github_token" {
66+
value = module.acs.github_token
67+
}

examples/ci/ci.tf renamed to examples/ci-13/ci.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = "0.13.1"
2+
required_version = "0.13.2"
33
}
44

55
provider "aws" {

examples/simple/simple.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ provider "aws" {
44

55
module "acs" {
66
// source = "../../"
7-
source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.0.0"
7+
source = "github.com/byu-oit/terraform-aws-acs-info?ref=v3.1.0"
88
}
99

1010
output "vpc_id" {

main.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
terraform {
2-
required_version = ">= 0.13.0"
2+
required_version = ">= 0.12.17"
33
required_providers {
44
aws = "~> 3.0"
55
}

0 commit comments

Comments
 (0)