Skip to content
Open
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
42 changes: 42 additions & 0 deletions .github/workflows/terraform-plan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
name: Create terraform plan

on:
pull_request:
branches:
- main

permissions:
contents: read
pull-requests: write

jobs:
plan:
runs-on: ubuntu-latest
environment: production
name: Create a plan for a terraform configuration (and comment on PR for review)
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Checkout
uses: actions/checkout@v4

# - name: Setup environment variables
# run: |
# echo "$ALLMYVARS"
# shell: bash
# env:
# ALLMYVARS: ${{ toJSON(vars) }}

- name: terraform plan
uses: dflook/terraform-plan@v1
env:
TF_VAR_aws_secret_key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
TF_VAR_cloudflare_api_token: ${{ secrets.CLOUDFLARE_API_TOKEN }}
TF_VAR_api_address_domain: ${{ vars.API_ADDRESS_DOMAIN }}
TF_VAR_api_address_subdomain: ${{ vars.API_ADDRESS_SUBDOMAIN }}
TF_VAR_aws_region: ${{ vars.AWS_REGION }}
TF_VAR_aws_access_key: ${{ vars.AWS_ACCESS_KEY_ID }}
TF_VAR_domain_cert_arn: ${{ vars.DOMAIN_CERT_ARN }}
with:
path: terraform

68 changes: 34 additions & 34 deletions terraform/.terraform.lock.hcl

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

2 changes: 1 addition & 1 deletion terraform/api.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
locals {
fqdn = "${var.api_address.subdomain}.${var.api_address.domain}"
fqdn = "${var.api_address_subdomain}.${var.api_address_domain}"
}

module "api_gateway" {
Expand Down
6 changes: 3 additions & 3 deletions terraform/dns.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@ provider "cloudflare" {

data "cloudflare_zones" "skyfenton_com" {
filter {
name = var.api_address.domain
name = var.api_address_domain
}
}

# create a DNS record for the API gateway
resource "cloudflare_record" "api_gateway_record" {
zone_id = data.cloudflare_zones.skyfenton_com.zones[0].id
name = var.api_address.subdomain
name = var.api_address_subdomain
content = module.api_gateway.domain_name_target_domain_name
type = "CNAME"
proxied = true

comment = "CNAME record for the Waller API gateway; Terraform"
}
}
6 changes: 3 additions & 3 deletions terraform/main.tf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
provider "aws" {
shared_config_files = var.aws_config.shared_config_files
shared_credentials_files = var.aws_config.shared_credentials_files
profile = var.aws_config.profile
access_key = var.aws_access_key
secret_key = var.aws_secret_key
region = var.aws_region

default_tags {
tags = {
Expand Down
38 changes: 22 additions & 16 deletions terraform/variables.tf
Original file line number Diff line number Diff line change
@@ -1,26 +1,32 @@
variable "aws_config" {
type = object({
shared_config_files = list(string)
shared_credentials_files = list(string)
profile = string
})
variable "aws_access_key" {
type = string
}

variable "aws_secret_key" {
type = string
}

default = {
shared_config_files = []
shared_credentials_files = []
profile = "default"
}
variable "aws_region" {
type = string
}

variable "cloudflare_api_token" {
type = string
}

variable "api_address" {
type = object({
subdomain = string
domain = string
})
# variable "api_address" {
# type = object({
# subdomain = string
# domain = string
# })
# }

variable "api_address_subdomain" {
type = string
}

variable "api_address_domain" {
type = string
}

variable "domain_cert_arn" {
Expand Down