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
Feat: Devops 202 Migrate remaining tf state time tracker ui
  • Loading branch information
rouderz committed Mar 1, 2023
commit 96bc7a0faf39016f6c4fc3dc2075a7a8854dbad2
4 changes: 3 additions & 1 deletion .github/workflows/time-tracker-ui-cd-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ jobs:
ARM_CLIENT_SECRET: ${{secrets.TF_ARM_CLIENT_SECRET}}
ARM_SUBSCRIPTION_ID: ${{secrets.TF_ARM_SUBSCRIPTION_ID}}
ARM_TENANT_ID: ${{secrets.TF_ARM_TENANT_ID}}

AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}

steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/time-tracker-ui-cd-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ jobs:
ARM_CLIENT_SECRET: ${{secrets.TF_ARM_CLIENT_SECRET}}
ARM_SUBSCRIPTION_ID: ${{secrets.TF_ARM_SUBSCRIPTION_ID}}
ARM_TENANT_ID: ${{secrets.TF_ARM_TENANT_ID}}
AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}

steps:
- name: Checkout
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/time-tracker-ui-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ jobs:
ARM_CLIENT_SECRET: ${{secrets.TF_ARM_CLIENT_SECRET}}
ARM_SUBSCRIPTION_ID: ${{secrets.TF_ARM_SUBSCRIPTION_ID}}
ARM_TENANT_ID: ${{secrets.TF_ARM_TENANT_ID}}
AWS_ACCESS_KEY_ID: ${{secrets.AWS_ACCESS_KEY_ID}}
AWS_SECRET_ACCESS_KEY: ${{secrets.AWS_SECRET_ACCESS_KEY}}

strategy:
max-parallel: 5
steps:
Expand Down
27 changes: 16 additions & 11 deletions infrastructure/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,22 @@ terraform {
source = "hashicorp/azurerm"
version = "~> 2.90"
}
aws = {
source = "hashicorp/aws"
version = "~> 4.9.0"
}
}

backend "azurerm" {
resource_group_name = "ioet-infra-tf-state"
storage_account_name = "timetrackertfstate"
container_name = "time-tracker-tf-state"
key = "time-tracker-ui.tfstate"
backend "s3" {
bucket = "time-tracker-service"
key = "ioet-time-tracker-ui/terraform.tfstate"
region = "us-east-1"
encrypt = true
}
}

provider "aws" {
region = "us-east-1"
}

provider "azurerm" {
Expand All @@ -22,13 +29,11 @@ provider "azurerm" {
}

data "terraform_remote_state" "service" {
backend = "azurerm"
workspace = terraform.workspace
backend = "s3"
config = {
resource_group_name = "ioet-infra-tf-state"
storage_account_name = "timetrackertfstate"
container_name = "time-tracker-tf-state"
key = "this.tfstate"
bucket = "time-tracker-service"
key = "env://${local.environment}/time-tracker-service/terraform.tfstate"
region = "us-east-1"
}
}

Expand Down