Skip to content

Commit

Permalink
Merge pull request #6 from UKHomeOffice/terraform-1.1.3
Browse files Browse the repository at this point in the history
terraform 1.1.3
  • Loading branch information
nefischer authored Jan 14, 2022
2 parents adc421c + 38f2d6c commit 91f8522
Show file tree
Hide file tree
Showing 7 changed files with 254 additions and 36 deletions.
30 changes: 23 additions & 7 deletions .drone.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,23 @@
pipeline:
validate:
image: quay.io/ukhomeofficedigital/terraform-toolset:v0.12.6
commands:
- /acp/scripts/tf-validate.sh --no-docs
when:
event: [pull_request, push]
---
kind: pipeline
name: default
type: kubernetes

platform:
os: linux
arch: amd64

steps:
- name: validate
pull: if-not-exists
image: quay.io/ukhomeofficedigital/terraform-toolset:v1.1.3-2
commands:
- mv __providers__._tf_ providers.tf
- /acp/scripts/tf-validate.sh
- mv providers.tf __providers__._tf_
when:
event:
- pull_request
- push

...
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
.terraform
providers.tf
40 changes: 40 additions & 0 deletions .terraform.lock.hcl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

176 changes: 152 additions & 24 deletions README.md

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions provider.tf → __providers__._tf_
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
# Do not delete this file without understanding the consequences
#
# It is required for successfully validating the module
# By acting as a root module specifying the providers to use
# See the Drone pipeline for how this file is used

provider "aws" {
region = "eu-west-2"
}
Expand Down
6 changes: 1 addition & 5 deletions main.tf
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
terraform {
required_version = ">= 0.13"
}

locals {
lambda_filename = "${path.module}/functions/notify_slack.py"
lambda_filename = "${path.module}/functions/notify_slack.py"
lambda_archive_filename = "${path.module}/functions/notify_slack.zip"
}

Expand Down
31 changes: 31 additions & 0 deletions versions.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
terraform {
required_version = ">= 1.0"
required_providers {
aws = {
source = "hashicorp/aws"
version = "~> 3.70"
configuration_aliases = [
aws.eu-west-2,
aws.eu-west-1,
aws.us-east-1,
aws.us-east-2,
aws.us-west-2,
aws.us-west-1,
aws.ap-southeast-1,
aws.ap-southeast-2,
aws.ap-northeast-1,
aws.ap-northeast-2,
aws.ap-south-1,
aws.eu-central-1,
aws.eu-west-3,
aws.sa-east-1,
aws.ca-central-1
]
}
archive = {
source = "hashicorp/archive"
version = "~> 2.2"
}
}
}

0 comments on commit 91f8522

Please sign in to comment.