From 3081bec7f59a50e053c4afe2f126fe37bc10221d Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Tue, 7 May 2024 17:08:43 -0300 Subject: [PATCH 01/17] =?UTF-8?q?feat:=20cria=C3=A7=C3=A3o=20de=20nova=20a?= =?UTF-8?q?ction?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- environment-dotnet/action.sh | 62 +++++++++++++++++++++++++++++++++++ environment-dotnet/action.yml | 17 ++++++++++ 2 files changed, 79 insertions(+) create mode 100644 environment-dotnet/action.sh create mode 100644 environment-dotnet/action.yml diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh new file mode 100644 index 0000000..098be23 --- /dev/null +++ b/environment-dotnet/action.sh @@ -0,0 +1,62 @@ +#!/usr/bin/env bash + +if [ "$GITHUB_REF_NAME" = 'main' ]; then + ENVIRONMENT='prd' + ENVIRONMENT_ELK='production' + ELASTIC_APM_SERVER_URL='http://10.56.0.2:8200' + JWT_JWKS_PATH="https://api.dotz.com.br/accounts/api/default/" +elif [ "$GITHUB_REF_NAME" = 'staging' ]; then + ENVIRONMENT='uat' + ENVIRONMENT_ELK='uat' + ELASTIC_APM_SERVER_URL='http://10.55.0.2:8200' + JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" +else + ENVIRONMENT='dev' + ENVIRONMENT_ELK='develop' + ELASTIC_APM_SERVER_URL='http://10.221.0.114:8200' + JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" +fi + +echo $ENVIRONMENT +echo $ENVIRONMENT_ELK +echo $ELASTIC_APM_SERVER_URL +echo $JWT_JWKS_PATH +echo "$APP_NAME" + +# GOOGLE_PROJECTID="${{ inputs.project_id}}" +# MAX_INSTANCES="${{ inputs.max-instances }}" +# JKS_SAFE_IPS="${{ secrets.JKS_SAFE_IPS }}" +# REGION="${{ inputs.gcp-region }}" + +# APPNAME="${{ inputs.app-name }}" +# VPC_CONNECTOR="vpc-connector-$ENVIRONMENT" + +# # Agrega env +# echo >> ./envs/env-$ENVIRONMENT.yaml +# echo JKS_GOOGLE_PROJECTID: \'$GOOGLE_PROJECTID\' >> ./envs/env-$ENVIRONMENT.yaml +# echo ELASTIC_APM_SERVER_URL: \'$ELASTIC_APM_SERVER_URL\' >> ./envs/env-$ENVIRONMENT.yaml + +# if ! grep -q "JKS_SAFE_IPS:"./envs/env-$ENVIRONMENT.yaml; then +# echo JKS_SAFE_IPS: \'$JKS_SAFE_IPS\' >> ./envs/env-$ENVIRONMENT.yaml +# fi + +# if ! [ "$ENVIRONMENT" = "dev" ]; then +# echo ELASTIC_APM_ENABLED: \'true\' >> ./envs/env-$ENVIRONMENT.yaml +# fi + +# if ! grep -q "JWT_JWKS_PATH:"./envs/env-$ENVIRONMENT.yaml; then +# echo JWT_JWKS_PATH: \'$JWT_JWKS_PATH\' >> ./envs/env-$ENVIRONMENT.yaml +# fi +# if ! grep -q "JKS_ALTERNATIVE_HEADER_FORWARDED_FOR:"./envs/env-$ENVIRONMENT.yaml; then +# echo JKS_ALTERNATIVE_HEADER_FORWARDED_FOR: \'X-Forwarded-For\' >> ./envs/env-$ENVIRONMENT.yaml +# fi + +# echo APPNAME: \'$APPNAME\' >> ./envs/env-$ENVIRONMENT.yaml +# echo JKS_USE_ELASTIC_APM: \'false\' >> ./envs/env-$ENVIRONMENT.yaml +# echo ELASTIC_APM_RECORDING: \'true\' >> ./envs/env-$ENVIRONMENT.yaml +# echo ELASTIC_APM_SERVICE_NAME: \'$APPNAME\' >> ./envs/env-$ENVIRONMENT.yaml +# echo ELASTIC_APM_ENVIRONMENT: \'$ENVIRONMENT_ELK\' >> ./envs/env-$ENVIRONMENT.yaml +# echo ELASTIC_APM_CAPTURE_BODY: \'all\' >> ./envs/env-$ENVIRONMENT.yaml +# echo ELASTIC_APM_CAPTURE_BODY_CONTENT_TYPES: \'*\' >> ./envs/env-$ENVIRONMENT.yaml +# echo ELASTIC_APM_CAPTURE_HEADERS: \'true\' >> ./envs/env-$ENVIRONMENT.yaml +# echo JKS_USE_APM: \'true\' >> ./envs/env-$ENVIRONMENT.yaml \ No newline at end of file diff --git a/environment-dotnet/action.yml b/environment-dotnet/action.yml new file mode 100644 index 0000000..d8b312e --- /dev/null +++ b/environment-dotnet/action.yml @@ -0,0 +1,17 @@ +name: Create Env +description: Create Env + +inputs: + app_name: + required: true + description: app_name + +runs: + using: composite + steps: + - name: Create Env + shell: bash + run: ${{ github.action_path }}/action.sh + env: + GITHUB_REF_NAME: develop + APP_NAME: ${{ inputs.app_name }} \ No newline at end of file From 15c8a56a1c43b2c8fa9343caf8eb8146818fd636 Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Tue, 7 May 2024 18:11:59 -0300 Subject: [PATCH 02/17] ajuste na action --- environment-dotnet/action.sh | 77 ++++++++++++++++------------------- environment-dotnet/action.yml | 23 ++++++++++- 2 files changed, 55 insertions(+), 45 deletions(-) diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index 098be23..7a49e4c 100644 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -17,46 +17,37 @@ else JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" fi -echo $ENVIRONMENT -echo $ENVIRONMENT_ELK -echo $ELASTIC_APM_SERVER_URL -echo $JWT_JWKS_PATH -echo "$APP_NAME" - -# GOOGLE_PROJECTID="${{ inputs.project_id}}" -# MAX_INSTANCES="${{ inputs.max-instances }}" -# JKS_SAFE_IPS="${{ secrets.JKS_SAFE_IPS }}" -# REGION="${{ inputs.gcp-region }}" - -# APPNAME="${{ inputs.app-name }}" -# VPC_CONNECTOR="vpc-connector-$ENVIRONMENT" - -# # Agrega env -# echo >> ./envs/env-$ENVIRONMENT.yaml -# echo JKS_GOOGLE_PROJECTID: \'$GOOGLE_PROJECTID\' >> ./envs/env-$ENVIRONMENT.yaml -# echo ELASTIC_APM_SERVER_URL: \'$ELASTIC_APM_SERVER_URL\' >> ./envs/env-$ENVIRONMENT.yaml - -# if ! grep -q "JKS_SAFE_IPS:"./envs/env-$ENVIRONMENT.yaml; then -# echo JKS_SAFE_IPS: \'$JKS_SAFE_IPS\' >> ./envs/env-$ENVIRONMENT.yaml -# fi - -# if ! [ "$ENVIRONMENT" = "dev" ]; then -# echo ELASTIC_APM_ENABLED: \'true\' >> ./envs/env-$ENVIRONMENT.yaml -# fi - -# if ! grep -q "JWT_JWKS_PATH:"./envs/env-$ENVIRONMENT.yaml; then -# echo JWT_JWKS_PATH: \'$JWT_JWKS_PATH\' >> ./envs/env-$ENVIRONMENT.yaml -# fi -# if ! grep -q "JKS_ALTERNATIVE_HEADER_FORWARDED_FOR:"./envs/env-$ENVIRONMENT.yaml; then -# echo JKS_ALTERNATIVE_HEADER_FORWARDED_FOR: \'X-Forwarded-For\' >> ./envs/env-$ENVIRONMENT.yaml -# fi - -# echo APPNAME: \'$APPNAME\' >> ./envs/env-$ENVIRONMENT.yaml -# echo JKS_USE_ELASTIC_APM: \'false\' >> ./envs/env-$ENVIRONMENT.yaml -# echo ELASTIC_APM_RECORDING: \'true\' >> ./envs/env-$ENVIRONMENT.yaml -# echo ELASTIC_APM_SERVICE_NAME: \'$APPNAME\' >> ./envs/env-$ENVIRONMENT.yaml -# echo ELASTIC_APM_ENVIRONMENT: \'$ENVIRONMENT_ELK\' >> ./envs/env-$ENVIRONMENT.yaml -# echo ELASTIC_APM_CAPTURE_BODY: \'all\' >> ./envs/env-$ENVIRONMENT.yaml -# echo ELASTIC_APM_CAPTURE_BODY_CONTENT_TYPES: \'*\' >> ./envs/env-$ENVIRONMENT.yaml -# echo ELASTIC_APM_CAPTURE_HEADERS: \'true\' >> ./envs/env-$ENVIRONMENT.yaml -# echo JKS_USE_APM: \'true\' >> ./envs/env-$ENVIRONMENT.yaml \ No newline at end of file +{ + echo "" + if ! [ "$ENVIRONMENT" = "dev" ]; then + echo ELASTIC_APM_ENABLED: \'true\' + fi + echo JKS_ALTERNATIVE_HEADER_FORWARDED_FOR: \'X-Forwarded-For\' + echo JWT_JWKS_PATH: \'$JWT_JWKS_PATH\' + echo JKS_SAFE_IPS: \'"$JKS_SAFE_IPS"\' + echo JKS_GOOGLE_PROJECTID: \'"$GOOGLE_PROJECTID"\' + echo ELASTIC_APM_SERVER_URL: \'$ELASTIC_APM_SERVER_URL\' + echo APPNAME: \'"$APPNAME"\' + echo JKS_USE_ELASTIC_APM: \'false\' + echo ELASTIC_APM_RECORDING: \'true\' + echo ELASTIC_APM_SERVICE_NAME: \'"$APPNAME"\' + echo ELASTIC_APM_ENVIRONMENT: \'$ENVIRONMENT_ELK\' + echo ELASTIC_APM_CAPTURE_BODY: \'all\' + echo ELASTIC_APM_CAPTURE_BODY_CONTENT_TYPES: \'*\' + echo ELASTIC_APM_CAPTURE_HEADERS: \'true\' + echo JKS_USE_APM: \'true\' + +} > tmpfile + +cat ./envs/env-$ENVIRONMENT.yaml tmpfile > merged_temp.yaml +awk ' + BEGIN { FS=": " } + !/^[[:space:]]*$/ && !/^#/ { + key = $1 + if (!seen[key]) { + print + seen[key] = 1 + } + } +' merged_temp.yaml > ./envs/env-$ENVIRONMENT.yaml +rm tmpfile merged_temp.yaml \ No newline at end of file diff --git a/environment-dotnet/action.yml b/environment-dotnet/action.yml index d8b312e..2a6a086 100644 --- a/environment-dotnet/action.yml +++ b/environment-dotnet/action.yml @@ -5,6 +5,21 @@ inputs: app_name: required: true description: app_name + ref_name: + required: true + description: ref_name + project_id: + required: true + description: project_id + max_instances: + required: true + description: max_instances + safe_ips: + required: true + description: safe_ips + gcp_region: + required: true + description: gcp_region runs: using: composite @@ -13,5 +28,9 @@ runs: shell: bash run: ${{ github.action_path }}/action.sh env: - GITHUB_REF_NAME: develop - APP_NAME: ${{ inputs.app_name }} \ No newline at end of file + GITHUB_REF_NAME: ${{ inputs.ref_name }} + APP_NAME: ${{ inputs.app_name }} + GOOGLE_PROJECTID: ${{ inputs.project_id}} + MAX_INSTANCES: ${{ inputs.max_instances }} + JKS_SAFE_IPS: ${{ inputs.safe_ips }} + REGION: ${{ inputs.gcp_region }} \ No newline at end of file From 3252d2b8e79c1b33eaadcaad35a7fd298bc210b3 Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Tue, 7 May 2024 18:18:12 -0300 Subject: [PATCH 03/17] add permission --- environment-dotnet/action.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 environment-dotnet/action.sh diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh old mode 100644 new mode 100755 From f92e9b9b34073db1092f0d9bdaf6015b434e7ced Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Tue, 7 May 2024 18:34:01 -0300 Subject: [PATCH 04/17] =?UTF-8?q?corre=C3=A7=C3=A3o=20APPNAME?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- environment-dotnet/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment-dotnet/action.yml b/environment-dotnet/action.yml index 2a6a086..21ee44c 100644 --- a/environment-dotnet/action.yml +++ b/environment-dotnet/action.yml @@ -29,7 +29,7 @@ runs: run: ${{ github.action_path }}/action.sh env: GITHUB_REF_NAME: ${{ inputs.ref_name }} - APP_NAME: ${{ inputs.app_name }} + APPNAME: ${{ inputs.app_name }} GOOGLE_PROJECTID: ${{ inputs.project_id}} MAX_INSTANCES: ${{ inputs.max_instances }} JKS_SAFE_IPS: ${{ inputs.safe_ips }} From 05f964e9f64a2cafd09f88132296ee3fcf54ec50 Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Wed, 8 May 2024 10:59:50 -0300 Subject: [PATCH 05/17] add platform --- environment-dotnet/action.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index 7a49e4c..ffaa6bb 100755 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -36,6 +36,7 @@ fi echo ELASTIC_APM_CAPTURE_BODY_CONTENT_TYPES: \'*\' echo ELASTIC_APM_CAPTURE_HEADERS: \'true\' echo JKS_USE_APM: \'true\' + echo PLATFORM: \'Clourun\' } > tmpfile From ec6616ead7a3621d36974ddf4cc039a93416a204 Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Wed, 8 May 2024 12:12:25 -0300 Subject: [PATCH 06/17] ajuste do nome --- environment-dotnet/action.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index ffaa6bb..dd62fb4 100755 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -36,7 +36,7 @@ fi echo ELASTIC_APM_CAPTURE_BODY_CONTENT_TYPES: \'*\' echo ELASTIC_APM_CAPTURE_HEADERS: \'true\' echo JKS_USE_APM: \'true\' - echo PLATFORM: \'Clourun\' + echo PLATFORM: \'Cloudrun\' } > tmpfile From f285d2c1ce11fd7a999b567d950616b7059582a9 Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Wed, 8 May 2024 16:34:07 -0300 Subject: [PATCH 07/17] adicionar environment --- environment-dotnet/action.sh | 2 +- environment-dotnet/action.yml | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index dd62fb4..afe6a40 100755 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -5,7 +5,7 @@ if [ "$GITHUB_REF_NAME" = 'main' ]; then ENVIRONMENT_ELK='production' ELASTIC_APM_SERVER_URL='http://10.56.0.2:8200' JWT_JWKS_PATH="https://api.dotz.com.br/accounts/api/default/" -elif [ "$GITHUB_REF_NAME" = 'staging' ]; then +elif [ "$ENVIRONMENT" = 'staging' ]; then ENVIRONMENT='uat' ENVIRONMENT_ELK='uat' ELASTIC_APM_SERVER_URL='http://10.55.0.2:8200' diff --git a/environment-dotnet/action.yml b/environment-dotnet/action.yml index 21ee44c..e20215c 100644 --- a/environment-dotnet/action.yml +++ b/environment-dotnet/action.yml @@ -8,6 +8,9 @@ inputs: ref_name: required: true description: ref_name + environment: + required: true + description: environment project_id: required: true description: project_id @@ -29,6 +32,7 @@ runs: run: ${{ github.action_path }}/action.sh env: GITHUB_REF_NAME: ${{ inputs.ref_name }} + ENVIRONMENT: ${{ inputs.environment }} APPNAME: ${{ inputs.app_name }} GOOGLE_PROJECTID: ${{ inputs.project_id}} MAX_INSTANCES: ${{ inputs.max_instances }} From 62476a2b606f589a0b9ed42d512923bf0201dda0 Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Wed, 8 May 2024 17:05:10 -0300 Subject: [PATCH 08/17] ajuste nome da variavel --- environment-dotnet/action.sh | 4 ++-- environment-dotnet/action.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index afe6a40..fff4241 100755 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -5,10 +5,10 @@ if [ "$GITHUB_REF_NAME" = 'main' ]; then ENVIRONMENT_ELK='production' ELASTIC_APM_SERVER_URL='http://10.56.0.2:8200' JWT_JWKS_PATH="https://api.dotz.com.br/accounts/api/default/" -elif [ "$ENVIRONMENT" = 'staging' ]; then +elif [ "$ENV" = 'staging' ]; then ENVIRONMENT='uat' ENVIRONMENT_ELK='uat' - ELASTIC_APM_SERVER_URL='http://10.55.0.2:8200' + ELASTIC_APM_SERVER_URL='http://10.221.0.114:8200' JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" else ENVIRONMENT='dev' diff --git a/environment-dotnet/action.yml b/environment-dotnet/action.yml index e20215c..19c1d6b 100644 --- a/environment-dotnet/action.yml +++ b/environment-dotnet/action.yml @@ -32,7 +32,7 @@ runs: run: ${{ github.action_path }}/action.sh env: GITHUB_REF_NAME: ${{ inputs.ref_name }} - ENVIRONMENT: ${{ inputs.environment }} + ENV: ${{ inputs.environment }} APPNAME: ${{ inputs.app_name }} GOOGLE_PROJECTID: ${{ inputs.project_id}} MAX_INSTANCES: ${{ inputs.max_instances }} From b7dfebc13be8598b0fa8e87aed33e9489fafabc8 Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Wed, 8 May 2024 17:52:02 -0300 Subject: [PATCH 09/17] ajuste url elk uat --- environment-dotnet/action.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index fff4241..3228203 100755 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -8,7 +8,7 @@ if [ "$GITHUB_REF_NAME" = 'main' ]; then elif [ "$ENV" = 'staging' ]; then ENVIRONMENT='uat' ENVIRONMENT_ELK='uat' - ELASTIC_APM_SERVER_URL='http://10.221.0.114:8200' + ELASTIC_APM_SERVER_URL='http://10.204.0.112:8200' JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" else ENVIRONMENT='dev' From e81b471fa63c5f5b66ff86762a3ce2893ac7517f Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Wed, 8 May 2024 18:42:57 -0300 Subject: [PATCH 10/17] removendo env --- environment-dotnet/action.sh | 2 +- environment-dotnet/action.yml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index 3228203..fce6c20 100755 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -5,7 +5,7 @@ if [ "$GITHUB_REF_NAME" = 'main' ]; then ENVIRONMENT_ELK='production' ELASTIC_APM_SERVER_URL='http://10.56.0.2:8200' JWT_JWKS_PATH="https://api.dotz.com.br/accounts/api/default/" -elif [ "$ENV" = 'staging' ]; then +elif [ "$GITHUB_REF_NAME" = 'staging' ]; then ENVIRONMENT='uat' ENVIRONMENT_ELK='uat' ELASTIC_APM_SERVER_URL='http://10.204.0.112:8200' diff --git a/environment-dotnet/action.yml b/environment-dotnet/action.yml index 19c1d6b..513c300 100644 --- a/environment-dotnet/action.yml +++ b/environment-dotnet/action.yml @@ -8,9 +8,6 @@ inputs: ref_name: required: true description: ref_name - environment: - required: true - description: environment project_id: required: true description: project_id From 741ee8b4f59897cfa4a7e8f3260c2a5533f0d5bb Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Thu, 9 May 2024 09:28:54 -0300 Subject: [PATCH 11/17] adicionar aspas e remover escapes --- environment-dotnet/action.sh | 34 +++++++++++++++++----------------- environment-dotnet/action.yml | 1 - 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index fce6c20..3667034 100755 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -20,23 +20,23 @@ fi { echo "" if ! [ "$ENVIRONMENT" = "dev" ]; then - echo ELASTIC_APM_ENABLED: \'true\' + echo "ELASTIC_APM_ENABLED: 'true'" fi - echo JKS_ALTERNATIVE_HEADER_FORWARDED_FOR: \'X-Forwarded-For\' - echo JWT_JWKS_PATH: \'$JWT_JWKS_PATH\' - echo JKS_SAFE_IPS: \'"$JKS_SAFE_IPS"\' - echo JKS_GOOGLE_PROJECTID: \'"$GOOGLE_PROJECTID"\' - echo ELASTIC_APM_SERVER_URL: \'$ELASTIC_APM_SERVER_URL\' - echo APPNAME: \'"$APPNAME"\' - echo JKS_USE_ELASTIC_APM: \'false\' - echo ELASTIC_APM_RECORDING: \'true\' - echo ELASTIC_APM_SERVICE_NAME: \'"$APPNAME"\' - echo ELASTIC_APM_ENVIRONMENT: \'$ENVIRONMENT_ELK\' - echo ELASTIC_APM_CAPTURE_BODY: \'all\' - echo ELASTIC_APM_CAPTURE_BODY_CONTENT_TYPES: \'*\' - echo ELASTIC_APM_CAPTURE_HEADERS: \'true\' - echo JKS_USE_APM: \'true\' - echo PLATFORM: \'Cloudrun\' + echo "JKS_ALTERNATIVE_HEADER_FORWARDED_FOR: 'X-Forwarded-For'" + echo "JWT_JWKS_PATH: '$JWT_JWKS_PATH'" + echo "JKS_SAFE_IPS: '$JKS_SAFE_IPS'" + echo "JKS_GOOGLE_PROJECTID: '$GOOGLE_PROJECTID'" + echo "ELASTIC_APM_SERVER_URL: '$ELASTIC_APM_SERVER_URL'" + echo "APPNAME: '$APPNAME'" + echo "JKS_USE_ELASTIC_APM: 'false'" + echo "ELASTIC_APM_RECORDING: 'true'" + echo "ELASTIC_APM_SERVICE_NAME: '$APPNAME'" + echo "ELASTIC_APM_ENVIRONMENT: '$ENVIRONMENT_ELK'" + echo "ELASTIC_APM_CAPTURE_BODY: 'all'" + echo "ELASTIC_APM_CAPTURE_BODY_CONTENT_TYPES: '*'" + echo "ELASTIC_APM_CAPTURE_HEADERS: 'true'" + echo "JKS_USE_APM: 'true'" + echo "PLATFORM: 'Cloudrun'" } > tmpfile @@ -51,4 +51,4 @@ awk ' } } ' merged_temp.yaml > ./envs/env-$ENVIRONMENT.yaml -rm tmpfile merged_temp.yaml \ No newline at end of file +rm tmpfile merged_temp.yaml diff --git a/environment-dotnet/action.yml b/environment-dotnet/action.yml index 513c300..21ee44c 100644 --- a/environment-dotnet/action.yml +++ b/environment-dotnet/action.yml @@ -29,7 +29,6 @@ runs: run: ${{ github.action_path }}/action.sh env: GITHUB_REF_NAME: ${{ inputs.ref_name }} - ENV: ${{ inputs.environment }} APPNAME: ${{ inputs.app_name }} GOOGLE_PROJECTID: ${{ inputs.project_id}} MAX_INSTANCES: ${{ inputs.max_instances }} From eab16c65f0a3c8b6763b264a743606fe2f130915 Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Thu, 9 May 2024 09:31:57 -0300 Subject: [PATCH 12/17] =?UTF-8?q?adicionar=20espa=C3=A7o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- environment-dotnet/action.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/environment-dotnet/action.yml b/environment-dotnet/action.yml index 21ee44c..cf76980 100644 --- a/environment-dotnet/action.yml +++ b/environment-dotnet/action.yml @@ -33,4 +33,5 @@ runs: GOOGLE_PROJECTID: ${{ inputs.project_id}} MAX_INSTANCES: ${{ inputs.max_instances }} JKS_SAFE_IPS: ${{ inputs.safe_ips }} - REGION: ${{ inputs.gcp_region }} \ No newline at end of file + REGION: ${{ inputs.gcp_region }} + \ No newline at end of file From 8d6fef7693d53acca576e4ab612bc19979e44caf Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Thu, 9 May 2024 09:32:27 -0300 Subject: [PATCH 13/17] ajuste --- environment-dotnet/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/environment-dotnet/action.yml b/environment-dotnet/action.yml index cf76980..a270168 100644 --- a/environment-dotnet/action.yml +++ b/environment-dotnet/action.yml @@ -34,4 +34,3 @@ runs: MAX_INSTANCES: ${{ inputs.max_instances }} JKS_SAFE_IPS: ${{ inputs.safe_ips }} REGION: ${{ inputs.gcp_region }} - \ No newline at end of file From 0133787f721fab50e40b54b119ea66f302396a7d Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Thu, 9 May 2024 10:34:31 -0300 Subject: [PATCH 14/17] trazer variaveis para o projeto --- environment-dotnet/action.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index 3667034..1f1ed06 100755 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -2,17 +2,14 @@ if [ "$GITHUB_REF_NAME" = 'main' ]; then ENVIRONMENT='prd' - ENVIRONMENT_ELK='production' ELASTIC_APM_SERVER_URL='http://10.56.0.2:8200' JWT_JWKS_PATH="https://api.dotz.com.br/accounts/api/default/" elif [ "$GITHUB_REF_NAME" = 'staging' ]; then ENVIRONMENT='uat' - ENVIRONMENT_ELK='uat' ELASTIC_APM_SERVER_URL='http://10.204.0.112:8200' JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" else ENVIRONMENT='dev' - ENVIRONMENT_ELK='develop' ELASTIC_APM_SERVER_URL='http://10.221.0.114:8200' JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" fi @@ -21,21 +18,12 @@ fi echo "" if ! [ "$ENVIRONMENT" = "dev" ]; then echo "ELASTIC_APM_ENABLED: 'true'" - fi - echo "JKS_ALTERNATIVE_HEADER_FORWARDED_FOR: 'X-Forwarded-For'" + fi echo "JWT_JWKS_PATH: '$JWT_JWKS_PATH'" echo "JKS_SAFE_IPS: '$JKS_SAFE_IPS'" echo "JKS_GOOGLE_PROJECTID: '$GOOGLE_PROJECTID'" echo "ELASTIC_APM_SERVER_URL: '$ELASTIC_APM_SERVER_URL'" - echo "APPNAME: '$APPNAME'" - echo "JKS_USE_ELASTIC_APM: 'false'" - echo "ELASTIC_APM_RECORDING: 'true'" - echo "ELASTIC_APM_SERVICE_NAME: '$APPNAME'" - echo "ELASTIC_APM_ENVIRONMENT: '$ENVIRONMENT_ELK'" - echo "ELASTIC_APM_CAPTURE_BODY: 'all'" - echo "ELASTIC_APM_CAPTURE_BODY_CONTENT_TYPES: '*'" - echo "ELASTIC_APM_CAPTURE_HEADERS: 'true'" - echo "JKS_USE_APM: 'true'" + echo "PLATFORM: 'Cloudrun'" } > tmpfile From 56f594077172240b07390b8dbb762ccc14484c94 Mon Sep 17 00:00:00 2001 From: Gabriel Vieira Lavor Date: Thu, 9 May 2024 10:40:35 -0300 Subject: [PATCH 15/17] =?UTF-8?q?remover=20entradas=20n=C3=A3o=20usadas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- environment-dotnet/action.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/environment-dotnet/action.yml b/environment-dotnet/action.yml index a270168..0f01772 100644 --- a/environment-dotnet/action.yml +++ b/environment-dotnet/action.yml @@ -2,25 +2,15 @@ name: Create Env description: Create Env inputs: - app_name: - required: true - description: app_name ref_name: required: true description: ref_name project_id: required: true description: project_id - max_instances: - required: true - description: max_instances safe_ips: required: true description: safe_ips - gcp_region: - required: true - description: gcp_region - runs: using: composite steps: @@ -29,8 +19,5 @@ runs: run: ${{ github.action_path }}/action.sh env: GITHUB_REF_NAME: ${{ inputs.ref_name }} - APPNAME: ${{ inputs.app_name }} GOOGLE_PROJECTID: ${{ inputs.project_id}} - MAX_INSTANCES: ${{ inputs.max_instances }} JKS_SAFE_IPS: ${{ inputs.safe_ips }} - REGION: ${{ inputs.gcp_region }} From b164ef83c548e62aac0eb11813d5a87bfe0080c8 Mon Sep 17 00:00:00 2001 From: Gabriel Lavor Date: Thu, 13 Jun 2024 14:33:17 -0300 Subject: [PATCH 16/17] add env qa (#2) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * adicionar action para definir as variáveis de ambiente --------- Co-authored-by: Gabriel Vieira Lavor --- environment-dotnet/action.sh | 15 ++++++++------- environment-test-dotnet/action.sh | 13 +++++++++++++ environment-test-dotnet/action.yml | 9 +++++++++ 3 files changed, 30 insertions(+), 7 deletions(-) create mode 100755 environment-test-dotnet/action.sh create mode 100644 environment-test-dotnet/action.yml diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index 1f1ed06..8afcd8c 100755 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -2,15 +2,19 @@ if [ "$GITHUB_REF_NAME" = 'main' ]; then ENVIRONMENT='prd' - ELASTIC_APM_SERVER_URL='http://10.56.0.2:8200' + ELASTIC_APM_SERVER_URL='http://elastic.noverde.com:8200' JWT_JWKS_PATH="https://api.dotz.com.br/accounts/api/default/" elif [ "$GITHUB_REF_NAME" = 'staging' ]; then ENVIRONMENT='uat' - ELASTIC_APM_SERVER_URL='http://10.204.0.112:8200' + ELASTIC_APM_SERVER_URL='http://elastic.uat.noverde.com:8200' + JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" +elif [ "$GITHUB_REF_NAME" = 'qa' ]; then + ENVIRONMENT='uat' + ELASTIC_APM_SERVER_URL='http://elastic.uat.noverde.com:8200' JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" else ENVIRONMENT='dev' - ELASTIC_APM_SERVER_URL='http://10.221.0.114:8200' + ELASTIC_APM_SERVER_URL='http://elastic.dev.noverde.com:8200' JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" fi @@ -18,14 +22,11 @@ fi echo "" if ! [ "$ENVIRONMENT" = "dev" ]; then echo "ELASTIC_APM_ENABLED: 'true'" - fi + fi echo "JWT_JWKS_PATH: '$JWT_JWKS_PATH'" echo "JKS_SAFE_IPS: '$JKS_SAFE_IPS'" echo "JKS_GOOGLE_PROJECTID: '$GOOGLE_PROJECTID'" echo "ELASTIC_APM_SERVER_URL: '$ELASTIC_APM_SERVER_URL'" - - echo "PLATFORM: 'Cloudrun'" - } > tmpfile cat ./envs/env-$ENVIRONMENT.yaml tmpfile > merged_temp.yaml diff --git a/environment-test-dotnet/action.sh b/environment-test-dotnet/action.sh new file mode 100755 index 0000000..596fb36 --- /dev/null +++ b/environment-test-dotnet/action.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + +FILE=./envs/env-dev.yaml +while IFS= read -r line +do + if [[ ! $line =~ ^# ]] && [[ $line =~ [^[:space:]] ]] + then + IFS=":" read -r key value <<< "$line" + key=$(echo "$key" | xargs) + value=$(echo "$value" | xargs) + echo "$key=$value" >> "$GITHUB_ENV" + fi +done < "$FILE" diff --git a/environment-test-dotnet/action.yml b/environment-test-dotnet/action.yml new file mode 100644 index 0000000..79270da --- /dev/null +++ b/environment-test-dotnet/action.yml @@ -0,0 +1,9 @@ +name: Create Env +description: Create Env + +runs: + using: composite + steps: + - name: Create Env Test + shell: bash + run: ${{ github.action_path }}/action.sh From 15fa2fd92aca24d7683c7acaf11dbc65573e5615 Mon Sep 17 00:00:00 2001 From: JuanOioli Date: Tue, 6 May 2025 15:01:34 -0300 Subject: [PATCH 17/17] Feat: modifying elk url get by workflow input --- environment-dotnet/action.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/environment-dotnet/action.sh b/environment-dotnet/action.sh index 8afcd8c..414919e 100755 --- a/environment-dotnet/action.sh +++ b/environment-dotnet/action.sh @@ -2,19 +2,15 @@ if [ "$GITHUB_REF_NAME" = 'main' ]; then ENVIRONMENT='prd' - ELASTIC_APM_SERVER_URL='http://elastic.noverde.com:8200' JWT_JWKS_PATH="https://api.dotz.com.br/accounts/api/default/" elif [ "$GITHUB_REF_NAME" = 'staging' ]; then ENVIRONMENT='uat' - ELASTIC_APM_SERVER_URL='http://elastic.uat.noverde.com:8200' JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" elif [ "$GITHUB_REF_NAME" = 'qa' ]; then ENVIRONMENT='uat' - ELASTIC_APM_SERVER_URL='http://elastic.uat.noverde.com:8200' JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" else ENVIRONMENT='dev' - ELASTIC_APM_SERVER_URL='http://elastic.dev.noverde.com:8200' JWT_JWKS_PATH="https://uat.dotznext.com/accounts/api/default/" fi