Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Internal and Dev Environments #21

Merged
merged 5 commits into from
May 17, 2024
Merged

Add Internal and Dev Environments #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d15e63e
Add internal Terraform environment
halprin May 17, 2024
8b4406c
Add ability to deploy to the internal and dev environments
halprin May 17, 2024
5112c21
Remove the database output from the internal Terraform environment
halprin May 17, 2024
eabf69f
Add terraform format linting to CI
halprin May 17, 2024
438e411
Fix Terraform format
halprin May 17, 2024
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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ jobs:
- name: Go Fmt
run: make formatCheck

- name: Terraform Formatting
working-directory: operations
run: terraform fmt -recursive -check

securityScanAnalyze:
name: CodeQL Security Scan
uses: ./.github/workflows/codeql_reusable.yml
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/dev-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Deploy to Dev Environment

on:
push:
branches:
- dev
workflow_dispatch:

jobs:

terraform-deploy:
name: Dev Infrastructure Deploy
uses: ./.github/workflows/terraform-deploy_reusable.yml
with:
ENVIRONMENT: dev
TERRAFORM_DIRECTORY: operations/environments/dev
secrets:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CDC_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_CDC_TENANT_ID }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_CDC_DMZ_C1_SUBSCRIPTION_ID }}

dev-deploy:
name: Dev Application Deploy
needs: terraform-deploy
uses: ./.github/workflows/deploy_reusable.yml
with:
ENVIRONMENT: dev
REPO: report-stream-sftp-ingest
APP: ${{ needs.terraform-deploy.outputs.APP }}
REGISTRY: ${{ needs.terraform-deploy.outputs.REGISTRY }}
secrets:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CDC_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_CDC_TENANT_ID }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_CDC_DMZ_C1_SUBSCRIPTION_ID }}
34 changes: 34 additions & 0 deletions .github/workflows/internal-deploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: Deploy to Internal Environment

on:
push:
branches:
- internal
workflow_dispatch:

jobs:

terraform-deploy:
name: Internal Infrastructure Deploy
uses: ./.github/workflows/terraform-deploy_reusable.yml
with:
ENVIRONMENT: internal
TERRAFORM_DIRECTORY: operations/environments/internal
secrets:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}

internal-deploy:
name: Internal Application Deploy
needs: terraform-deploy
uses: ./.github/workflows/deploy_reusable.yml
with:
ENVIRONMENT: internal
REPO: report-stream-sftp-ingest
APP: ${{ needs.terraform-deploy.outputs.APP }}
REGISTRY: ${{ needs.terraform-deploy.outputs.REGISTRY }}
secrets:
AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }}
AZURE_TENANT_ID: ${{ secrets.AZURE_TENANT_ID }}
AZURE_SUBSCRIPTION_ID: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
4 changes: 2 additions & 2 deletions operations/environments/dev/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ provider "azurerm" {
module "template" {
source = "../../template/"

environment = "dev"
deployer_id = "f5feabe7-5d37-40ba-94f2-e5c0760b4561" //github app registration in CDC Azure Entra
environment = "dev"
deployer_id = "f5feabe7-5d37-40ba-94f2-e5c0760b4561" //github app registration in CDC Azure Entra
}
32 changes: 32 additions & 0 deletions operations/environments/internal/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
terraform {
required_providers {
azurerm = {
source = "hashicorp/azurerm"
version = "3.103.1"
}
}

# Use a remote Terraform state in Azure Storage
backend "azurerm" {
resource_group_name = "cdcti-terraform"
storage_account_name = "cdctiterraform"
container_name = "tfstate"
key = "rs-sftp-internal.terraform.tfstate"
}
}

# Configure the Microsoft Azure Provider
provider "azurerm" {
features {
key_vault {
purge_soft_deleted_secrets_on_destroy = false
}
}
}

module "template" {
source = "../../template/"

environment = "internal"
deployer_id = "d59c2c86-de5e-41b7-a752-0869a73f5a60" //github app registration in Flexion Azure Entra
}
7 changes: 7 additions & 0 deletions operations/environments/internal/outputs.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
output "registry" {
value = module.template.registry
}

output "publish_app" {
value = module.template.publish_app
}
4 changes: 2 additions & 2 deletions operations/environments/stg/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ provider "azurerm" {
module "template" {
source = "../../template/"

environment = "stg"
deployer_id = "f5feabe7-5d37-40ba-94f2-e5c0760b4561" //github app registration in CDC Azure Entra
environment = "stg"
deployer_id = "f5feabe7-5d37-40ba-94f2-e5c0760b4561" //github app registration in CDC Azure Entra
}
2 changes: 1 addition & 1 deletion operations/template/app.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ resource "azurerm_linux_web_app" "sftp" {

https_only = true

virtual_network_subnet_id = local.cdc_domain_environment ? azurerm_subnet.app.id : null
virtual_network_subnet_id = local.cdc_domain_environment ? azurerm_subnet.app.id : null

site_config {
scm_use_main_ip_restriction = local.cdc_domain_environment ? true : null
Expand Down
Loading