Skip to content
Closed
Show file tree
Hide file tree
Changes from 30 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
79b26c9
adding additional settings
rodolfoIOET May 26, 2022
1b9c874
fixing syntax
rodolfoIOET May 26, 2022
50c58a4
fixing syntax v2
rodolfoIOET May 26, 2022
b679c5e
fixing syntax v3
rodolfoIOET May 26, 2022
8a9cad1
fixing syntax v4
rodolfoIOET May 26, 2022
1a4ddb7
fixing syntax v5
rodolfoIOET May 26, 2022
0bf15bc
fixing syntax v6
rodolfoIOET May 26, 2022
e55a3b7
fixing syntax v7
rodolfoIOET May 27, 2022
b4f414e
Add -lock flag to avoid locks
sbateca May 27, 2022
35e304e
create secrets.tfvars
rodolfoIOET Jun 1, 2022
d825c36
merge from master
rodolfoIOET Jun 1, 2022
0daf904
secrets created in right folder
rodolfoIOET Jun 1, 2022
ed52721
locking false
rodolfoIOET Jun 1, 2022
64d98ec
ci/cd only on push
rodolfoIOET Jun 1, 2022
ee1adc2
auto-load secrets in terraform plan
rodolfoIOET Jun 1, 2022
3b5b7a4
locking true in terraform plan
rodolfoIOET Jun 1, 2022
92635fb
try to run again
rodolfoIOET Jun 2, 2022
87fb408
adding image_tag
rodolfoIOET Jun 2, 2022
584951e
just trigger
rodolfoIOET Jun 7, 2022
2b6255c
test_writting
rodolfoIOET Jun 8, 2022
95365aa
test_test2
rodolfoIOET Jun 8, 2022
62aa6be
Merge branch 'master' into TT-656-configure-time-tracker-ui-through-c…
rodolfoIOET Jun 9, 2022
3883d52
adding script for creating secret file
rodolfoIOET Jun 9, 2022
00b32f4
fix typ0
rodolfoIOET Jun 9, 2022
e4d39e8
adding quotes
rodolfoIOET Jun 9, 2022
dd64707
going to original
rodolfoIOET Jun 9, 2022
f1ba747
secrets are needed for test only
rodolfoIOET Jun 9, 2022
47ebc88
adding commits
rodolfoIOET Jun 9, 2022
bcd7c9a
uncommenting based on fausto request
rodolfoIOET Jun 10, 2022
654a756
fixing identifier
rodolfoIOET Jun 10, 2022
61a9d09
Merge branch 'master' into TT-656-configure-time-tracker-ui-through-c…
rodolfoIOET Jun 14, 2022
c6591ef
deleting .env file, secrets are sent by terraform
rodolfoIOET Jun 14, 2022
ec026e3
fix tag name to latest
rodolfoIOET Jun 14, 2022
a3afc0b
fixing make file
rodolfoIOET Jun 15, 2022
c8e572a
injecting env files
rodolfoIOET Jun 16, 2022
2e720a5
use STAGE env variables
rodolfoIOET Jun 16, 2022
8434f59
adding CLIENT_URL(GOOGLE) and API_URL(target_backend) as env-vars
rodolfoIOET Jun 16, 2022
1a9920e
additional settings not needed
rodolfoIOET Jun 16, 2022
97b3d0a
additional settings not needed , back to version 13
rodolfoIOET Jun 16, 2022
26c9fe2
additional settings not needed , back to version 13 without test
rodolfoIOET Jun 16, 2022
452b6a3
passing as env-var
rodolfoIOET Jun 16, 2022
c1ad7a8
another approach
rodolfoIOET Jun 16, 2022
74b9221
another approach V2
rodolfoIOET Jun 16, 2022
06bb711
working in local prod
rodolfoIOET Jun 16, 2022
755e056
fix substitution
rodolfoIOET Jun 16, 2022
64b29b6
docker requires one argument
rodolfoIOET Jun 16, 2022
5443de1
docker requires one argument v2
rodolfoIOET Jun 16, 2022
4ed4c68
adding args and make file
rodolfoIOET Jun 16, 2022
3f2fe61
adding support for timetracker pointing to v2
rodolfoIOET Jun 20, 2022
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
12 changes: 12 additions & 0 deletions .github/workflows/time-tracker-ui-cd-stage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,18 @@ jobs:
with:
ssh-private-key: ${{ secrets.INFRA_TERRAFORM_MODULES_SSH_PRIV_KEY }}

- name: append secret to secret.auto.tfvars
working-directory: ./${{ env.WORKING_DIR }}
run: |
./append_secret.py CHROME_BIN /opt/google/chrome/google-chrome
./append_secret.py AUTHORITY "${{ secrets.AUTHORITY }}"
./append_secret.py CLIENT_ID "${{ secrets.CLIENT_ID }}"
./append_secret.py SCOPES "${{ secrets.SCOPES }}"
./append_secret.py STACK_EXCHANGE_ID "${{ secrets.STACK_EXCHANGE_ID }}"
./append_secret.py STACK_EXCHANGE_ACCESS_TOKEN "${{ secrets.STACK_EXCHANGE_ACCESS_TOKEN }}"
./append_secret.py AZURE_APP_CONFIGURATION_CONNECTION_STRING "${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}"


- name: Terraform Init
working-directory: ${{ env.WORKING_DIR }}
run: terraform init
Expand Down
15 changes: 14 additions & 1 deletion .github/workflows/time-tracker-ui-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,17 @@ jobs:
chmod +x ./scripts/populate-keys.sh
sh ./scripts/populate-keys.sh

- name: append secret to secret.auto.tfvars
working-directory: ./${{ env.WORKING_DIR }}
run: |
./append_secret.py CHROME_BIN /opt/google/chrome/google-chrome
./append_secret.py AUTHORITY "${{ secrets.AUTHORITY }}"
./append_secret.py CLIENT_ID "${{ secrets.CLIENT_ID }}"
./append_secret.py SCOPES "${{ secrets.SCOPES }}"
./append_secret.py STACK_EXCHANGE_ID "${{ secrets.STACK_EXCHANGE_ID }}"
./append_secret.py STACK_EXCHANGE_ACCESS_TOKEN "${{ secrets.STACK_EXCHANGE_ACCESS_TOKEN }}"
./append_secret.py AZURE_APP_CONFIGURATION_CONNECTION_STRING "${{ secrets.AZURE_APP_CONFIGURATION_CONNECTION_STRING }}"

- name: Running tests
run: |
chmod -R 777 ./$home
Expand Down Expand Up @@ -79,7 +90,8 @@ jobs:

- name: Terraform Plan Prod
id: plan-prod
run: terraform plan -var-file=${{ env.TF_WORKSPACE }}.tfvars -var image_tag=latest -no-color
# run: terraform plan -var-file=${{ env.TF_WORKSPACE }}.tfvars -var image_tag=latest -no-color
run: echo "Disabled until restructuring infrastructure tiers"
continue-on-error: true
working-directory: ./${{ env.WORKING_DIR }}
env:
Expand Down Expand Up @@ -130,6 +142,7 @@ jobs:
repo: context.repo.repo,
body: output
})

- name: Terraform Plan Stage Status
if: steps.plan-stage.outcome == 'failure'
run: exit 1
Expand Down
27 changes: 27 additions & 0 deletions infrastructure/append_secret.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/usr/bin/python3
import sys
from os.path import exists

FILE_NAME = 'secret.auto.tfvars'


def append_secret_to_file(key, value):
with open(FILE_NAME, 'r') as file:
text = file.readlines()
with open(FILE_NAME, 'w') as file:
text[-1] = f'"{key}" = "{value}"'
file.writelines(text)
file.write('\n}')


if __name__ == '__main__':
key = sys.argv[1]
value = sys.argv[2]

if not exists(FILE_NAME):
with open(FILE_NAME, 'w') as file:
file.write('additional_settings = {\n')
file.write('}')
append_secret_to_file(key, value)
else:
append_secret_to_file(key, value)
3 changes: 2 additions & 1 deletion infrastructure/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ locals {

module "ui" {
#source = "../../infra-terraform-modules/azure-app-service"
source = "[email protected]:ioet/infra-terraform-modules.git//azure-app-service?ref=tags/v0.0.13"
source = "[email protected]:ioet/infra-terraform-modules.git//azure-app-service?ref=tags/v0.0.14"
app_service_name = local.service_name
create_app_service_plan = local.create_app_service_plan
docker_image_name = "${local.image_name}:${var.image_tag}"
Expand All @@ -56,6 +56,7 @@ module "ui" {
service_plan_name = local.service_name
service_plan_size = var.service_plan_size
service_plan_tier = var.service_plan_tier
additional_settings = var.additional_settings
hostname = "ui"
dns_zone_name = data.terraform_remote_state.service.outputs.subdomain
}
6 changes: 6 additions & 0 deletions infrastructure/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,9 @@ variable "service_plan_tier" {
type = string
description = "Specifies the tier of the service plan. Tier is the pricing plan of the service plan resource."
}

variable "additional_settings" {
type = map(string)
description = "Aditional settings, you should put a pair values"
sensitive = true
}