From d6970241afdf09a94cb13f5f03c846cd9ea26069 Mon Sep 17 00:00:00 2001 From: arthurngatatpems <109543594+arthurngatatpems@users.noreply.github.com> Date: Tue, 2 Aug 2022 10:04:57 -0500 Subject: [PATCH 1/4] Create terraform.yml --- .github/workflows/terraform.yml | 94 +++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) create mode 100644 .github/workflows/terraform.yml diff --git a/.github/workflows/terraform.yml b/.github/workflows/terraform.yml new file mode 100644 index 0000000..a25d175 --- /dev/null +++ b/.github/workflows/terraform.yml @@ -0,0 +1,94 @@ +# This workflow installs the latest version of Terraform CLI and configures the Terraform CLI configuration file +# with an API token for Terraform Cloud (app.terraform.io). On pull request events, this workflow will run +# `terraform init`, `terraform fmt`, and `terraform plan` (speculative plan via Terraform Cloud). On push events +# to the "master" branch, `terraform apply` will be executed. +# +# Documentation for `hashicorp/setup-terraform` is located here: https://github.com/hashicorp/setup-terraform +# +# To use this workflow, you will need to complete the following setup steps. +# +# 1. Create a `main.tf` file in the root of this repository with the `remote` backend and one or more resources defined. +# Example `main.tf`: +# # The configuration for the `remote` backend. +# terraform { +# backend "remote" { +# # The name of your Terraform Cloud organization. +# organization = "example-organization" +# +# # The name of the Terraform Cloud workspace to store Terraform state files in. +# workspaces { +# name = "example-workspace" +# } +# } +# } +# +# # An example resource that does nothing. +# resource "null_resource" "example" { +# triggers = { +# value = "A example resource that does nothing!" +# } +# } +# +# +# 2. Generate a Terraform Cloud user API token and store it as a GitHub secret (e.g. TF_API_TOKEN) on this repository. +# Documentation: +# - https://www.terraform.io/docs/cloud/users-teams-organizations/api-tokens.html +# - https://help.github.com/en/actions/configuring-and-managing-workflows/creating-and-storing-encrypted-secrets +# +# 3. Reference the GitHub secret in step using the `hashicorp/setup-terraform` GitHub Action. +# Example: +# - name: Setup Terraform +# uses: hashicorp/setup-terraform@v1 +# with: +# cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} + +name: 'Terraform' + +on: + push: + branches: + - "master" + pull_request: + +permissions: + contents: read + +jobs: + terraform: + name: 'Terraform' + runs-on: ubuntu-latest + environment: production + + # Use the Bash shell regardless whether the GitHub Actions runner is ubuntu-latest, macos-latest, or windows-latest + defaults: + run: + shell: bash + + steps: + # Checkout the repository to the GitHub Actions runner + - name: Checkout + uses: actions/checkout@v3 + + # Install the latest version of Terraform CLI and configure the Terraform CLI configuration file with a Terraform Cloud user API token + - name: Setup Terraform + uses: hashicorp/setup-terraform@v1 + with: + cli_config_credentials_token: ${{ secrets.TF_API_TOKEN }} + + # Initialize a new or existing Terraform working directory by creating initial files, loading any remote state, downloading modules, etc. + - name: Terraform Init + run: terraform init + + # Checks that all Terraform configuration files adhere to a canonical format + - name: Terraform Format + run: terraform fmt -check + + # Generates an execution plan for Terraform + - name: Terraform Plan + run: terraform plan -input=false + + # On push to "master", build or change infrastructure according to Terraform configuration files + # Note: It is recommended to set up a required "strict" status check in your repository for "Terraform Cloud". See the documentation on "strict" required status checks for more information: https://help.github.com/en/github/administering-a-repository/types-of-required-status-checks + - name: Terraform Apply + if: github.ref == 'refs/heads/"master"' && github.event_name == 'push' + run: terraform apply -auto-approve -input=false From b59fafe46b6af6b5c7cb0918f454b07087058469 Mon Sep 17 00:00:00 2001 From: PAUL Date: Thu, 4 Aug 2022 15:30:16 -0500 Subject: [PATCH 2/4] env addes --- aws-refarch-wordpress | 1 + env/backend-config | 0 env/provider.tf | 0 3 files changed, 1 insertion(+) create mode 160000 aws-refarch-wordpress create mode 100644 env/backend-config create mode 100644 env/provider.tf diff --git a/aws-refarch-wordpress b/aws-refarch-wordpress new file mode 160000 index 0000000..406b413 --- /dev/null +++ b/aws-refarch-wordpress @@ -0,0 +1 @@ +Subproject commit 406b4138f02f0a32c8e3427e674503ee182f333b diff --git a/env/backend-config b/env/backend-config new file mode 100644 index 0000000..e69de29 diff --git a/env/provider.tf b/env/provider.tf new file mode 100644 index 0000000..e69de29 From ac2c2670820d355a843bb6092b60f7d6035dd3fc Mon Sep 17 00:00:00 2001 From: PAUL Date: Thu, 4 Aug 2022 15:35:12 -0500 Subject: [PATCH 3/4] env addes --- env/backend-config | 7 +++++++ env/provider.tf | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/env/backend-config b/env/backend-config index e69de29..1734d0f 100644 --- a/env/backend-config +++ b/env/backend-config @@ -0,0 +1,7 @@ +backend "s3" { + bucket = "live-streaming-bucket" + + key = "live-streaming-key" + region = "us-east-1" + profile = "saml" + } \ No newline at end of file diff --git a/env/provider.tf b/env/provider.tf index e69de29..c217c21 100644 --- a/env/provider.tf +++ b/env/provider.tf @@ -0,0 +1,12 @@ +terraform { + required_providers { + aws = { + source = "hashicorp/aws" + version = "~> 4.0" + } + } +} + +provider "aws" { + region = "us-east-1" +} \ No newline at end of file From 9f82e5acd9993cf592a6164d7f1ce6616d8c3008 Mon Sep 17 00:00:00 2001 From: arthurngatatpems <109543594+arthurngatatpems@users.noreply.github.com> Date: Wed, 24 Aug 2022 10:24:05 -0500 Subject: [PATCH 4/4] Update aws-refarch-wordpress-03-efsfilesystem.yaml --- templates/aws-refarch-wordpress-03-efsfilesystem.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/aws-refarch-wordpress-03-efsfilesystem.yaml b/templates/aws-refarch-wordpress-03-efsfilesystem.yaml index 2e86458..e84bbdd 100644 --- a/templates/aws-refarch-wordpress-03-efsfilesystem.yaml +++ b/templates/aws-refarch-wordpress-03-efsfilesystem.yaml @@ -573,7 +573,7 @@ Resources: FunctionName: !Join [ '', [ 'efs-', !Ref ElasticFileSystem, '-size-monitor' ] ] Handler: index.handler Role: !GetAtt LambdaRole.Arn - Runtime: python2.7 + Runtime: python3.9 Timeout: 60 LambdaRole: Type: AWS::IAM::Role