From b9d360cba13db1d9569986a5e179ec011d499da2 Mon Sep 17 00:00:00 2001 From: aswin-in-philips Date: Thu, 7 Jul 2022 17:44:19 +0530 Subject: [PATCH 1/8] change --- .github/workflows/ci-integrated.yaml | 64 +++++--- .../workflows/deploy-hds-auth-gateway.yaml | 40 +++++ ...update-oauth2-proxy-version-at-api-gw.yaml | 40 +++++ .github/workflows/workflow-call-ci-gated.yml | 144 ------------------ 4 files changed, 121 insertions(+), 167 deletions(-) create mode 100644 .github/workflows/deploy-hds-auth-gateway.yaml create mode 100644 .github/workflows/update-oauth2-proxy-version-at-api-gw.yaml delete mode 100644 .github/workflows/workflow-call-ci-gated.yml diff --git a/.github/workflows/ci-integrated.yaml b/.github/workflows/ci-integrated.yaml index f47ddaaa..83fe8e21 100644 --- a/.github/workflows/ci-integrated.yaml +++ b/.github/workflows/ci-integrated.yaml @@ -108,6 +108,9 @@ jobs: Build: needs: [Init] runs-on: ubuntu-20.04 + outputs: + envoyAlphaTag: ${{ steps.setVariables.outputs.alphaTag }} + ciImage: ${{ steps.setVariables.outputs.ciImage }} steps: - uses: actions/checkout@v2 @@ -133,12 +136,13 @@ jobs: - name: Set env variables run: | new_version=`cat VERSION` + alpha_tag="${new_version}-alpha" echo "New version is: $new_version" echo "VERSION=$new_version" >> "$GITHUB_ENV" - echo "CI_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${new_version}-alpha" >> "$GITHUB_ENV" + echo "CI_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${new_version}-${alpha_tag}" >> "$GITHUB_ENV" + echo "::set-output name=ciImage::${{ env.CI_IMAGE }}" echo "CI_LATEST_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:latest" >> "$GITHUB_ENV" - echo "BRANCH_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${{ steps.branch.outputs.branch_name }}-${new_version}" >> "$GITHUB_ENV" - echo "RC_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${new_version}-rc" >> "$GITHUB_ENV" + echo "::set-output name=alphaTag::${alpha_tag}" - name: Docker Build run: | @@ -150,28 +154,27 @@ jobs: - name: Docker tag run: | - docker tag '${{ secrets.DOCKER_REPO }}'/oauth2-proxy:latest ${{ env.BRANCH_IMAGE }} - docker push ${{ env.BRANCH_IMAGE }} + docker tag '${{ secrets.DOCKER_REPO }}'/oauth2-proxy:latest ${{ env.CI_IMAGE }} + docker tag ${{ env.CI_IMAGE }} ${{ env.CI_LATEST_IMAGE }} + docker push ${{ env.CI_LATEST_IMAGE }} + docker push ${{ env.CI_IMAGE }} - - name: Docker Push - if: github.ref == 'refs/heads/edi-foundation-integration' - run: | - docker tag ${{ env.BRANCH_IMAGE }} ${{ env.CI_IMAGE }} - docker push ${{ env.CI_IMAGE }} - - Deploy_And_GW_Integrated_Test: + Deploy_Test_HDS_AUTH_GATEWAY: needs: [Build, Blackduck, Fortify, unit-test] - if: github.ref == 'refs/heads/edi-foundation-integration' - uses: ./.github/workflows/api-gw-integrated-test.yaml + uses: ./.github/workflows/deploy-hds-auth-gateway.yaml + with: + OAUTH2_PROXY_IMAGE: ${{ needs.Build.outputs.envoyAlphaTag }} secrets: VAULT_HOST: ${{ secrets.VAULT_HOST }} VAULT_ROLE_ID: ${{ secrets.VAULT_ROLE_ID }} VAULT_SECRET_ID: ${{ secrets.VAULT_SECRET_ID }} - Release: - if: github.ref == 'refs/heads/edi-foundation-integration' - needs: Deploy_And_GW_Integrated_Test + Promote_Version: + needs: [Deploy_Test_HDS_AUTH_GATEWAY] + if: github.ref == 'refs/heads/release-version' runs-on: ubuntu-20.04 + outputs: + versionTag: ${{ steps.setVariables.outputs.versionTag }} steps: - uses: actions/checkout@v2 @@ -190,17 +193,32 @@ jobs: devops/data/docker-repos/hsdp-edi password | HSDP_DOCKER_PASSWORD ; - name: Set env variables + id: setVariables run: | new_version=`cat VERSION` + echo "New version is: $new_version" echo "CI_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${new_version}-alpha" >> "$GITHUB_ENV" - echo "CI_LATEST_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:latest" >> "$GITHUB_ENV" - echo "RC_IMAGE=docker.na1.hsdp.io/edisp-releases/edi-foundation-oauth2-proxy:${new_version}-rc" >> "$GITHUB_ENV" + echo "VERSION_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${new_version}" >> "$GITHUB_ENV" + echo "VERSION_TAG=${new_version}" >> "$GITHUB_ENV" + echo "::set-output name=versionTag::${{ env.VERSION_TAG }}" - - name: Login to Docker Repo - run: docker login ${{ env.HSDP_DOCKER_REGISTRY }} --username ${{ env.HSDP_DOCKER_USER }} --password ${{ env.HSDP_DOCKER_PASSWORD }} + - name: Docker login + run: | + docker login --username '${{ secrets.DOCKER_USER }}' --password '${{ secrets.DOCKER_PSWD }}' '${{ secrets.DOCKER_REPO }}' - name: Docker Push run: | docker pull ${{ env.CI_IMAGE }} - docker tag ${{ env.CI_IMAGE }} ${{ env.RC_IMAGE }} - docker push ${{ env.RC_IMAGE }} \ No newline at end of file + docker tag ${{ env.CI_IMAGE }} ${{ env.VERSION_IMAGE }} + docker push ${{ env.VERSION_IMAGE }} + + Replace_OAuth2_Proxy_Tag_in_Terraform_API_Gateway: + needs: [Promote_Version] + if: github.ref == 'refs/heads/release-version' + uses: ./.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml + with: + TOKEN_AUTHENTICATOR_IMAGE: ${{ needs.Promote_Version.outputs.versionTag }} + secrets: + VAULT_HOST: ${{ secrets.VAULT_HOST }} + VAULT_ROLE_ID: ${{ secrets.VAULT_ROLE_ID }} + VAULT_SECRET_ID: ${{ secrets.VAULT_SECRET_ID }} \ No newline at end of file diff --git a/.github/workflows/deploy-hds-auth-gateway.yaml b/.github/workflows/deploy-hds-auth-gateway.yaml new file mode 100644 index 00000000..0f50fb8e --- /dev/null +++ b/.github/workflows/deploy-hds-auth-gateway.yaml @@ -0,0 +1,40 @@ +name: Deploy HDS Auth Gateway with a given Oauth2 Proxy Image Tag + +on: + workflow_call: + inputs: + OAUTH2_PROXY_IMAGE: + type: string + required: true + secrets: + VAULT_HOST: + required: true + VAULT_ROLE_ID: + required: true + VAULT_SECRET_ID: + required: true + +jobs: + Deploy_HDS_Auth_Gateway_With_Token_Authenticator_Image: + runs-on: [self-hosted, research] + steps: + - name: Import Secrets + id: secrets + uses: hashicorp/vault-action@v2.3.1 + with: + url: ${{ secrets.VAULT_HOST }} + method: approle + roleId: ${{ secrets.VAULT_ROLE_ID }} + secretId: ${{ secrets.VAULT_SECRET_ID }} + exportEnv: true + secrets: | + devops/data/github/users/sal-devops token | GITHUB_TOKEN ; + + - uses: convictional/trigger-workflow-and-wait@v1.6.1 + with: + owner: philips-internal + repo: hds-auth-gateway + github_token: ${{ env.GITHUB_TOKEN }} + client_payload: '{"oauth2proxytag": "${{ inputs.OAUTH2_PROXY_IMAGE }}"}' + workflow_file_name: ci.yaml + ref: release-version \ No newline at end of file diff --git a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml new file mode 100644 index 00000000..8d0aa7f8 --- /dev/null +++ b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml @@ -0,0 +1,40 @@ +name: Update OAuth2 Proxy version at API-GW + +on: + workflow_call: + inputs: + OAUTH2_PROXY_IMAGE: + type: string + required: true + secrets: + VAULT_HOST: + required: true + VAULT_ROLE_ID: + required: true + VAULT_SECRET_ID: + required: true + +jobs: + Deploy: + runs-on: [self-hosted, research] + steps: + - name: Import Secrets + id: secrets + uses: hashicorp/vault-action@v2.3.1 + with: + url: ${{ secrets.VAULT_HOST }} + method: approle + roleId: ${{ secrets.VAULT_ROLE_ID }} + secretId: ${{ secrets.VAULT_SECRET_ID }} + exportEnv: true + secrets: | + devops/data/github/users/sal-devops token | GITHUB_TOKEN ; + + - uses: convictional/trigger-workflow-and-wait@v1.6.1 + with: + owner: philips-internal + repo: terraform-api-gateway + github_token: ${{ env.GITHUB_TOKEN }} + client_payload: '{"oauth2proxytag": "${{ inputs.OAUTH2_PROXY_IMAGE }}"}' + workflow_file_name: cd-integrated.yml + ref: release-version \ No newline at end of file diff --git a/.github/workflows/workflow-call-ci-gated.yml b/.github/workflows/workflow-call-ci-gated.yml deleted file mode 100644 index 4acfaa37..00000000 --- a/.github/workflows/workflow-call-ci-gated.yml +++ /dev/null @@ -1,144 +0,0 @@ -name: Deploy CI - -on: - workflow_call: - secrets: - INNER_SOURCE_ACTIONS_APP_ID: - required: true - INNER_SOURCE_ACTIONS_APP_PRIVATE_KEY_BASE64: - required: true - GH_PAT_TOKEN: - required: true - HSDP_DOCKER_USER: - required: true - HSDP_DOCKER_PASSWORD: - required: true - CODESCENE_CI_CD_GITHUB_TOKEN: - required: true - ARM_CLIENT_ID: - required: true - ARM_CLIENT_SECRET: - required: true - -env: - TF_IN_AUTOMATION: true - ARM_SUBSCRIPTION_ID: 74d03f75-4bdb-4666-8095-500178a40764 - ARM_TENANT_ID: 1a407a2d-7675-4d17-8692-b3ac285306e4 -jobs: - terragrunt-workflow-core: - name: Terragrunt - core - runs-on: ubuntu-20.04 - container: alpine/terragrunt:1.0.1 - outputs: - core: ${{ steps.tf_output.outputs.core }} - env: - ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }} - ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} - defaults: - run: - working-directory: ./deploy/ci-gated/core - strategy: - fail-fast: false - steps: - - uses: actions/checkout@v1 - - id: inner-source-action - uses: ./.github/workflows/innersource-action - with: - GH_PAT_TOKEN: ${{ secrets.GH_PAT_TOKEN }} - INNER_SOURCE_ACTIONS_APP_ID: ${{ secrets.INNER_SOURCE_ACTIONS_APP_ID }} - INNER_SOURCE_ACTIONS_APP_PRIVATE_KEY_BASE64: ${{ secrets.INNER_SOURCE_ACTIONS_APP_PRIVATE_KEY_BASE64 }} - - - id: plan - uses: ./../.actions/terragrunt-plan-action - with: - working-directory: ./deploy/ci-gated/core - key: client-test-core-plan - - - id: apply - uses: ./../.actions/terragrunt-apply-action - with: - working-directory: ./deploy/ci-gated/core - key: client-test-core-plan - - - id: output - uses: ./.github/workflows/terragrunt-output-action - with: - working-directory: ./deploy/ci-gated/core - key: client-test-core-output - - terragrunt-workflow-cloudfoundry: - name: Terragrunt - cloudfoundry - runs-on: ubuntu-20.04 - needs: [terragrunt-workflow-core] - container: alpine/terragrunt:1.0.1 - env: - ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }} - ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} - defaults: - run: - working-directory: ./deploy/ci-gated/cloudfoundry - strategy: - fail-fast: false - steps: - - uses: actions/checkout@v1 - - id: inner-source-action - uses: ./.github/workflows/innersource-action - with: - GH_PAT_TOKEN: ${{ secrets.GH_PAT_TOKEN }} - INNER_SOURCE_ACTIONS_APP_ID: ${{ secrets.INNER_SOURCE_ACTIONS_APP_ID }} - INNER_SOURCE_ACTIONS_APP_PRIVATE_KEY_BASE64: ${{ secrets.INNER_SOURCE_ACTIONS_APP_PRIVATE_KEY_BASE64 }} - - - id: plan - uses: ./../.actions/terragrunt-plan-action - with: - working-directory: ./deploy/ci-gated/cloudfoundry - key: client-test-cloudfoundry-plan - - - id: apply - uses: ./../.actions/terragrunt-apply-action - with: - working-directory: ./deploy/ci-gated/cloudfoundry - key: client-test-cloudfoundry-plan - - terragrunt-workflow-api-gateway: - name: Terragrunt - api-gateway - runs-on: ubuntu-20.04 - needs: [terragrunt-workflow-cloudfoundry] - container: alpine/terragrunt:1.0.1 - env: - ARM_CLIENT_ID: ${{ secrets.ARM_CLIENT_ID }} - ARM_CLIENT_SECRET: ${{ secrets.ARM_CLIENT_SECRET }} - CONFIG: ./envoyconfig_without_multitenancy.yml - SOURCE: url - defaults: - run: - working-directory: ./deploy/ci-gated/api-gateway - strategy: - fail-fast: false - steps: - - uses: actions/checkout@v1 - - id: inner-source-action - uses: ./.github/workflows/innersource-action - with: - GH_PAT_TOKEN: ${{ secrets.GH_PAT_TOKEN }} - INNER_SOURCE_ACTIONS_APP_ID: ${{ secrets.INNER_SOURCE_ACTIONS_APP_ID }} - INNER_SOURCE_ACTIONS_APP_PRIVATE_KEY_BASE64: ${{ secrets.INNER_SOURCE_ACTIONS_APP_PRIVATE_KEY_BASE64 }} - - - - id: plan - uses: ./../.actions/terragrunt-plan-action - with: - working-directory: ./deploy/ci-gated/api-gateway - key: client-test-api-gateway-plan - - - id: apply - uses: ./../.actions/terragrunt-apply-action - with: - working-directory: ./deploy/ci-gated/api-gateway - key: client-test-api-gateway-plan - - - id: output - uses: ./.github/workflows/terragrunt-output-action - with: - working-directory: ./deploy/ci-gated/api-gateway - key: client-test-api-gateway-output \ No newline at end of file From 564ebce53854ab6db022762c9b2ea1f426366ffc Mon Sep 17 00:00:00 2001 From: aswin-in-philips Date: Thu, 7 Jul 2022 17:51:24 +0530 Subject: [PATCH 2/8] change --- .github/workflows/ci-integrated.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-integrated.yaml b/.github/workflows/ci-integrated.yaml index 83fe8e21..85046c3b 100644 --- a/.github/workflows/ci-integrated.yaml +++ b/.github/workflows/ci-integrated.yaml @@ -217,7 +217,7 @@ jobs: if: github.ref == 'refs/heads/release-version' uses: ./.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml with: - TOKEN_AUTHENTICATOR_IMAGE: ${{ needs.Promote_Version.outputs.versionTag }} + OAUTH2_PROXY_IMAGE: ${{ needs.Promote_Version.outputs.versionTag }} secrets: VAULT_HOST: ${{ secrets.VAULT_HOST }} VAULT_ROLE_ID: ${{ secrets.VAULT_ROLE_ID }} From dceaf6b295c08f61ff0d7529ac272113de14fcb8 Mon Sep 17 00:00:00 2001 From: aswin-in-philips Date: Fri, 8 Jul 2022 09:24:01 +0530 Subject: [PATCH 3/8] changing workflow call file name --- .github/workflows/update-oauth2-proxy-version-at-api-gw.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml index 8d0aa7f8..e3f53687 100644 --- a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml +++ b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml @@ -36,5 +36,5 @@ jobs: repo: terraform-api-gateway github_token: ${{ env.GITHUB_TOKEN }} client_payload: '{"oauth2proxytag": "${{ inputs.OAUTH2_PROXY_IMAGE }}"}' - workflow_file_name: cd-integrated.yml + workflow_file_name: set-images-version-cd.yml ref: release-version \ No newline at end of file From c6f52f21079c873a7621462112a914afd7d262e4 Mon Sep 17 00:00:00 2001 From: aswin-in-philips <95461541+aswin-in-philips@users.noreply.github.com> Date: Fri, 8 Jul 2022 20:36:08 +0530 Subject: [PATCH 4/8] Update ci-integrated.yaml --- .github/workflows/ci-integrated.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-integrated.yaml b/.github/workflows/ci-integrated.yaml index 85046c3b..071c9702 100644 --- a/.github/workflows/ci-integrated.yaml +++ b/.github/workflows/ci-integrated.yaml @@ -198,9 +198,9 @@ jobs: new_version=`cat VERSION` echo "New version is: $new_version" echo "CI_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${new_version}-alpha" >> "$GITHUB_ENV" - echo "VERSION_IMAGE=${{ env.HSDP_DOCKER_REGISTRY }}/edi-foundation-oauth2-proxy:${new_version}" >> "$GITHUB_ENV" - echo "VERSION_TAG=${new_version}" >> "$GITHUB_ENV" - echo "::set-output name=versionTag::${{ env.VERSION_TAG }}" + echo "RC_IMAGE=docker.na1.hsdp.io/edisp-releases/edi-foundation-oauth2-proxy:${new_version}-rc" >> "$GITHUB_ENV" + echo "::set-output name=versionTag::${new_version}-rc" + echo "${new_version}-rc" - name: Docker login run: | @@ -209,8 +209,8 @@ jobs: - name: Docker Push run: | docker pull ${{ env.CI_IMAGE }} - docker tag ${{ env.CI_IMAGE }} ${{ env.VERSION_IMAGE }} - docker push ${{ env.VERSION_IMAGE }} + docker tag ${{ env.CI_IMAGE }} ${{ env.RC_IMAGE }} + docker push ${{ env.RC_IMAGE }} Replace_OAuth2_Proxy_Tag_in_Terraform_API_Gateway: needs: [Promote_Version] @@ -221,4 +221,4 @@ jobs: secrets: VAULT_HOST: ${{ secrets.VAULT_HOST }} VAULT_ROLE_ID: ${{ secrets.VAULT_ROLE_ID }} - VAULT_SECRET_ID: ${{ secrets.VAULT_SECRET_ID }} \ No newline at end of file + VAULT_SECRET_ID: ${{ secrets.VAULT_SECRET_ID }} From d1e488daaa2fec301a9ca9284271ac6e5da24dbe Mon Sep 17 00:00:00 2001 From: aswin-in-philips Date: Mon, 11 Jul 2022 15:28:38 +0530 Subject: [PATCH 5/8] change --- .../workflows/deploy-hds-auth-gateway.yaml | 2 +- ...update-oauth2-proxy-version-at-api-gw.yaml | 2 +- ...CoreApp,Version=v3.1.AssemblyAttributes.cs | 4 ++++ ....APIGateway.AutomationTest.AssemblyInfo.cs | 22 +++++++++++++++++++ ...ay.AutomationTest.AssemblyInfoInputs.cache | 1 + ....GeneratedMSBuildEditorConfig.editorconfig | 3 +++ 6 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 AutomationTest/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs create mode 100644 AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.AssemblyInfo.cs create mode 100644 AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.AssemblyInfoInputs.cache create mode 100644 AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.GeneratedMSBuildEditorConfig.editorconfig diff --git a/.github/workflows/deploy-hds-auth-gateway.yaml b/.github/workflows/deploy-hds-auth-gateway.yaml index 0f50fb8e..f02bb975 100644 --- a/.github/workflows/deploy-hds-auth-gateway.yaml +++ b/.github/workflows/deploy-hds-auth-gateway.yaml @@ -37,4 +37,4 @@ jobs: github_token: ${{ env.GITHUB_TOKEN }} client_payload: '{"oauth2proxytag": "${{ inputs.OAUTH2_PROXY_IMAGE }}"}' workflow_file_name: ci.yaml - ref: release-version \ No newline at end of file + ref: master \ No newline at end of file diff --git a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml index e3f53687..63f9100a 100644 --- a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml +++ b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml @@ -37,4 +37,4 @@ jobs: github_token: ${{ env.GITHUB_TOKEN }} client_payload: '{"oauth2proxytag": "${{ inputs.OAUTH2_PROXY_IMAGE }}"}' workflow_file_name: set-images-version-cd.yml - ref: release-version \ No newline at end of file + ref: main \ No newline at end of file diff --git a/AutomationTest/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs b/AutomationTest/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs new file mode 100644 index 00000000..ad8dfe1a --- /dev/null +++ b/AutomationTest/obj/Debug/netcoreapp3.1/.NETCoreApp,Version=v3.1.AssemblyAttributes.cs @@ -0,0 +1,4 @@ +// +using System; +using System.Reflection; +[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v3.1", FrameworkDisplayName = "")] diff --git a/AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.AssemblyInfo.cs b/AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.AssemblyInfo.cs new file mode 100644 index 00000000..a9c8bc92 --- /dev/null +++ b/AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.AssemblyInfo.cs @@ -0,0 +1,22 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +using System; +using System.Reflection; + +[assembly: System.Reflection.AssemblyCompanyAttribute("Philips")] +[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] +[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.2.0")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.2")] +[assembly: System.Reflection.AssemblyProductAttribute("Philips.EDI.Foundation.APIGateway.AutomationTest")] +[assembly: System.Reflection.AssemblyTitleAttribute("Philips.EDI.Foundation.APIGateway.AutomationTest")] +[assembly: System.Reflection.AssemblyVersionAttribute("1.0.2.0")] + +// Generated by the MSBuild WriteCodeFragment class. + diff --git a/AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.AssemblyInfoInputs.cache b/AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.AssemblyInfoInputs.cache new file mode 100644 index 00000000..268a0967 --- /dev/null +++ b/AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.AssemblyInfoInputs.cache @@ -0,0 +1 @@ +7d70c0bc511987c3ae105cb98159f5949d6dabfa diff --git a/AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.GeneratedMSBuildEditorConfig.editorconfig b/AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.GeneratedMSBuildEditorConfig.editorconfig new file mode 100644 index 00000000..63458cd0 --- /dev/null +++ b/AutomationTest/obj/Debug/netcoreapp3.1/Philips.EDI.Foundation.APIGateway.AutomationTest.GeneratedMSBuildEditorConfig.editorconfig @@ -0,0 +1,3 @@ +is_global = true +build_property.RootNamespace = Philips.EDI.Foundation.APIGateway.AutomationTest +build_property.ProjectDir = c:\oauth2-proxy\AutomationTest\ From 279a55126c824dd0d7f0e81620e7ce1786144c0c Mon Sep 17 00:00:00 2001 From: aswin-in-philips Date: Mon, 11 Jul 2022 15:30:45 +0530 Subject: [PATCH 6/8] change --- .github/workflows/ci-gated.yaml | 37 ------------------- .../workflows/{ci-integrated.yaml => ci.yaml} | 6 +-- 2 files changed, 3 insertions(+), 40 deletions(-) delete mode 100644 .github/workflows/ci-gated.yaml rename .github/workflows/{ci-integrated.yaml => ci.yaml} (98%) diff --git a/.github/workflows/ci-gated.yaml b/.github/workflows/ci-gated.yaml deleted file mode 100644 index 347f0b70..00000000 --- a/.github/workflows/ci-gated.yaml +++ /dev/null @@ -1,37 +0,0 @@ -name: CI-GATED - -on: - pull_request: - branches: [ edi-foundation-integration ] - workflow_dispatch: - -jobs: - Wokflow-Queue: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: ahmadnassri/action-workflow-queue@v1 - - Gated: - needs: [Wokflow-Queue] - runs-on: ubuntu-20.04 - steps: - - name: Import Secrets - id: secrets - uses: hashicorp/vault-action@v2.3.1 - with: - url: ${{ secrets.VAULT_HOST }} - method: approle - roleId: ${{ secrets.VAULT_ROLE_ID }} - secretId: ${{ secrets.VAULT_SECRET_ID }} - exportEnv: true - secrets: | - devops/data/github/users/sal-devops token | GITHUB_TOKEN ; - - - uses: convictional/trigger-workflow-and-wait@v1.6.1 - with: - owner: philips-internal - repo: hds-auth-gateway - github_token: ${{ env.GITHUB_TOKEN }} - workflow_file_name: ci.yaml - ref: master \ No newline at end of file diff --git a/.github/workflows/ci-integrated.yaml b/.github/workflows/ci.yaml similarity index 98% rename from .github/workflows/ci-integrated.yaml rename to .github/workflows/ci.yaml index 071c9702..773b6ff8 100644 --- a/.github/workflows/ci-integrated.yaml +++ b/.github/workflows/ci.yaml @@ -1,4 +1,4 @@ -name: CI-INTEGRATED +name: CI on: push: @@ -171,7 +171,7 @@ jobs: Promote_Version: needs: [Deploy_Test_HDS_AUTH_GATEWAY] - if: github.ref == 'refs/heads/release-version' + if: github.ref == 'refs/heads/edi-foundation-integration' runs-on: ubuntu-20.04 outputs: versionTag: ${{ steps.setVariables.outputs.versionTag }} @@ -214,7 +214,7 @@ jobs: Replace_OAuth2_Proxy_Tag_in_Terraform_API_Gateway: needs: [Promote_Version] - if: github.ref == 'refs/heads/release-version' + if: github.ref == 'refs/heads/edi-foundation-integration' uses: ./.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml with: OAUTH2_PROXY_IMAGE: ${{ needs.Promote_Version.outputs.versionTag }} From f94d8ebb76595526a07eff14eb140e6ead02ea73 Mon Sep 17 00:00:00 2001 From: aswin-in-philips Date: Mon, 11 Jul 2022 15:37:38 +0530 Subject: [PATCH 7/8] file name change --- .github/workflows/update-oauth2-proxy-version-at-api-gw.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml index 63f9100a..fdaf1a32 100644 --- a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml +++ b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml @@ -36,5 +36,5 @@ jobs: repo: terraform-api-gateway github_token: ${{ env.GITHUB_TOKEN }} client_payload: '{"oauth2proxytag": "${{ inputs.OAUTH2_PROXY_IMAGE }}"}' - workflow_file_name: set-images-version-cd.yml + workflow_file_name: set-images-version.yml ref: main \ No newline at end of file From 252314532e6b0da8e58c44a0c127aa0f3441d565 Mon Sep 17 00:00:00 2001 From: aswin-in-philips Date: Mon, 11 Jul 2022 16:49:22 +0530 Subject: [PATCH 8/8] changing base image --- .github/workflows/deploy-hds-auth-gateway.yaml | 2 +- .github/workflows/update-oauth2-proxy-version-at-api-gw.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy-hds-auth-gateway.yaml b/.github/workflows/deploy-hds-auth-gateway.yaml index f02bb975..632d9bae 100644 --- a/.github/workflows/deploy-hds-auth-gateway.yaml +++ b/.github/workflows/deploy-hds-auth-gateway.yaml @@ -16,7 +16,7 @@ on: jobs: Deploy_HDS_Auth_Gateway_With_Token_Authenticator_Image: - runs-on: [self-hosted, research] + runs-on: ubuntu-20.04 steps: - name: Import Secrets id: secrets diff --git a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml index fdaf1a32..37bce543 100644 --- a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml +++ b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml @@ -16,7 +16,7 @@ on: jobs: Deploy: - runs-on: [self-hosted, research] + runs-on: ubuntu-20.04 steps: - name: Import Secrets id: secrets