Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# the repo. Unless a later match takes precedence,
# these owners will be requested for review when someone
# opens a pull request.
* @dav3r @felddy @jsf9k @mcdonnnj @cisagov/team-ois
* @dav3r @felddy @hillaryj @jsf9k @mcdonnnj @cisagov/team-ois
6 changes: 6 additions & 0 deletions .github/lineage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
version: "1"

lineage:
skeleton:
remote-url: https://github.com/cisagov/skeleton-tf-module.git
15 changes: 8 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
---
name: build

on: [
push,
pull_request
]
on:
push:
pull_request:
repository_dispatch:
types: [apb]

env:
CURL_CACHE_DIR: ~/.cache/curl
Expand All @@ -22,9 +23,9 @@ jobs:
- uses: actions/setup-python@v1
with:
python-version: 3.8
- uses: actions/setup-go@v2-beta
- uses: actions/setup-go@v2
with:
go-version: '1.13.8'
go-version: '1.14.2'
- name: Store installed Python version
run: |
echo "::set-env name=PY_VERSION::"\
Expand Down Expand Up @@ -77,7 +78,7 @@ jobs:
${{ env.CURL_CACHE_DIR }}/"${TERRAFORM_ZIP}"
sudo ln -s /opt/terraform/terraform /usr/bin/terraform
- name: Install Terraform-docs
run: go get github.com/segmentio/terraform-docs
run: GO111MODULE=on go get github.com/segmentio/terraform-docs
- name: Find and initialize Terraform directories
run: |
for path in [[ $(find . -type f -iname "*.tf" -exec dirname "{}" \; \
Expand Down
17 changes: 16 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,22 @@ repos:
rev: v1.29.0
hooks:
- id: terraform_fmt
- id: terraform_validate
# There are ongoing issues with how this command works. This issue
# documents the core issue:
# https://github.com/hashicorp/terraform/issues/21408
# We have seen issues primarily with proxy providers and Terraform code
# that uses remote state. The PR
# https://github.com/hashicorp/terraform/pull/24887
# has been approved and is part of the 0.13 release to resolve the issue
# with remote states.
# The PR
# https://github.com/hashicorp/terraform/pull/24896
# is a proprosed fix to deal with `terraform validate` with proxy
# providers (among other configurations).
# We have decided to disable the terraform_validate hook until the issues
# above have been resolved, which we hope will be with the release of
# Terraform 0.13.
# - id: terraform_validate
- repo: https://github.com/IamTheFij/docker-pre-commit
rev: v1.0.1
hooks:
Expand Down
14 changes: 2 additions & 12 deletions providers.tf
Original file line number Diff line number Diff line change
@@ -1,26 +1,16 @@
# Default AWS region to use for the AWS providers.
# This is needed to supply `terraform validate` with all of the required
# parameters it needs to check the code.
locals {
aws_region = "us-east-1"
}

# This is the default provider that is used to create resources inside
# the Users account
provider "aws" {
region = local.aws_region
}

# This is the provider that is used to create the role and policy that can
# read Parameter Store parameters inside the Images Production account
provider "aws" {
region = local.aws_region
alias = "images-production"
alias = "images-production"
}

# This is the provider that is used to create the role and policy that can
# read Parameter Store parameters inside the Images Staging account
provider "aws" {
region = local.aws_region
alias = "images-staging"
alias = "images-staging"
}