From 46df2e211408d5828419ceaac8fecb0cf7ac4d77 Mon Sep 17 00:00:00 2001 From: Pavel Horak <22235234+pavelhorak@users.noreply.github.com> Date: Fri, 3 Jan 2025 13:50:54 +0100 Subject: [PATCH 1/7] Update AzureDevOps.yml --- .github/workflows/AzureDevOps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/AzureDevOps.yml b/.github/workflows/AzureDevOps.yml index ec1dd85b71..f5e8df9e69 100644 --- a/.github/workflows/AzureDevOps.yml +++ b/.github/workflows/AzureDevOps.yml @@ -27,7 +27,7 @@ jobs: with: client-id: ${{ secrets.ENTRA_APP_CLIENT_ID }} tenant-id: ${{ secrets.ENTRA_APP_TENANT_ID }} - allow-no-subscriptions: true + subscription-id: ${{ secrets.ADO_SUBSCRIPTION_ID }} - name: Get Azure DevOps token id: get_ado_token run: From 2bc41d3b94f6699c2d233c90450e49adc5b5b266 Mon Sep 17 00:00:00 2001 From: Pavel Horak <22235234+pavelhorak@users.noreply.github.com> Date: Fri, 3 Jan 2025 14:41:19 +0100 Subject: [PATCH 2/7] Update AzureDevOps.yml --- .github/workflows/AzureDevOps.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/AzureDevOps.yml b/.github/workflows/AzureDevOps.yml index f5e8df9e69..d851fbd610 100644 --- a/.github/workflows/AzureDevOps.yml +++ b/.github/workflows/AzureDevOps.yml @@ -28,15 +28,15 @@ jobs: client-id: ${{ secrets.ENTRA_APP_CLIENT_ID }} tenant-id: ${{ secrets.ENTRA_APP_TENANT_ID }} subscription-id: ${{ secrets.ADO_SUBSCRIPTION_ID }} - - name: Get Azure DevOps token - id: get_ado_token - run: +# - name: Get Azure DevOps token +# id: get_ado_token +# run: # The resource ID for Azure DevOps is always 499b84ac-1321-427f-aa17-267ca6975798 # https://learn.microsoft.com/azure/devops/integrate/get-started/authentication/service-principal-managed-identity - echo "ado_token=$(az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query "accessToken" --output tsv)" >> $GITHUB_ENV +# echo "ado_token=$(az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query "accessToken" --output tsv)" >> $GITHUB_ENV - uses: pavelhorak/github-actions-issue-to-work-item@main env: - ado_token: "${{ env.ado_token }}" + ado_token: "$(System.AccessToken)" github_token: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}" ado_organization: "${{ secrets.ADO_ORGANIZATION }}" ado_project: "${{ secrets.ADO_PROJECT }}" From cb7c38971c5ca13a552b033de9a4b2c707009d25 Mon Sep 17 00:00:00 2001 From: Pavel Horak <22235234+pavelhorak@users.noreply.github.com> Date: Fri, 3 Jan 2025 14:47:20 +0100 Subject: [PATCH 3/7] Update AzureDevOps.yml --- .github/workflows/AzureDevOps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/AzureDevOps.yml b/.github/workflows/AzureDevOps.yml index d851fbd610..9f6c6c12e0 100644 --- a/.github/workflows/AzureDevOps.yml +++ b/.github/workflows/AzureDevOps.yml @@ -27,7 +27,7 @@ jobs: with: client-id: ${{ secrets.ENTRA_APP_CLIENT_ID }} tenant-id: ${{ secrets.ENTRA_APP_TENANT_ID }} - subscription-id: ${{ secrets.ADO_SUBSCRIPTION_ID }} + allow-no-subscriptions: true # - name: Get Azure DevOps token # id: get_ado_token # run: From 5982bd3365f1a661bfaffa93e51f04230b50c785 Mon Sep 17 00:00:00 2001 From: Pavel Horak <22235234+pavelhorak@users.noreply.github.com> Date: Fri, 3 Jan 2025 14:54:00 +0100 Subject: [PATCH 4/7] Update AzureDevOps.yml --- .github/workflows/AzureDevOps.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/AzureDevOps.yml b/.github/workflows/AzureDevOps.yml index 9f6c6c12e0..ec1dd85b71 100644 --- a/.github/workflows/AzureDevOps.yml +++ b/.github/workflows/AzureDevOps.yml @@ -28,15 +28,15 @@ jobs: client-id: ${{ secrets.ENTRA_APP_CLIENT_ID }} tenant-id: ${{ secrets.ENTRA_APP_TENANT_ID }} allow-no-subscriptions: true -# - name: Get Azure DevOps token -# id: get_ado_token -# run: + - name: Get Azure DevOps token + id: get_ado_token + run: # The resource ID for Azure DevOps is always 499b84ac-1321-427f-aa17-267ca6975798 # https://learn.microsoft.com/azure/devops/integrate/get-started/authentication/service-principal-managed-identity -# echo "ado_token=$(az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query "accessToken" --output tsv)" >> $GITHUB_ENV + echo "ado_token=$(az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query "accessToken" --output tsv)" >> $GITHUB_ENV - uses: pavelhorak/github-actions-issue-to-work-item@main env: - ado_token: "$(System.AccessToken)" + ado_token: "${{ env.ado_token }}" github_token: "${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}" ado_organization: "${{ secrets.ADO_ORGANIZATION }}" ado_project: "${{ secrets.ADO_PROJECT }}" From 615fbc78543569d19c91f80cd8e20e1d477b65c5 Mon Sep 17 00:00:00 2001 From: Pavel Horak <22235234+pavelhorak@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:08:41 +0100 Subject: [PATCH 5/7] Update AzureDevOps.yml --- .github/workflows/AzureDevOps.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/AzureDevOps.yml b/.github/workflows/AzureDevOps.yml index ec1dd85b71..eb5c6ff122 100644 --- a/.github/workflows/AzureDevOps.yml +++ b/.github/workflows/AzureDevOps.yml @@ -33,6 +33,7 @@ jobs: run: # The resource ID for Azure DevOps is always 499b84ac-1321-427f-aa17-267ca6975798 # https://learn.microsoft.com/azure/devops/integrate/get-started/authentication/service-principal-managed-identity + az account set -s $(secrets.ADO_SUBSCRIPTION_ID) echo "ado_token=$(az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query "accessToken" --output tsv)" >> $GITHUB_ENV - uses: pavelhorak/github-actions-issue-to-work-item@main env: From 56fb6fc9d7eeae5e867f7e247e3e6b4ded89dd04 Mon Sep 17 00:00:00 2001 From: Pavel Horak <22235234+pavelhorak@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:13:41 +0100 Subject: [PATCH 6/7] Update AzureDevOps.yml --- .github/workflows/AzureDevOps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/AzureDevOps.yml b/.github/workflows/AzureDevOps.yml index eb5c6ff122..860eb564ae 100644 --- a/.github/workflows/AzureDevOps.yml +++ b/.github/workflows/AzureDevOps.yml @@ -30,7 +30,7 @@ jobs: allow-no-subscriptions: true - name: Get Azure DevOps token id: get_ado_token - run: + run: | # The resource ID for Azure DevOps is always 499b84ac-1321-427f-aa17-267ca6975798 # https://learn.microsoft.com/azure/devops/integrate/get-started/authentication/service-principal-managed-identity az account set -s $(secrets.ADO_SUBSCRIPTION_ID) From 4752b0957626ad7b3ef1a92f3eaaa40002d4b679 Mon Sep 17 00:00:00 2001 From: Pavel Horak <22235234+pavelhorak@users.noreply.github.com> Date: Fri, 3 Jan 2025 15:17:12 +0100 Subject: [PATCH 7/7] Update AzureDevOps.yml --- .github/workflows/AzureDevOps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/AzureDevOps.yml b/.github/workflows/AzureDevOps.yml index 860eb564ae..4ada6f0b84 100644 --- a/.github/workflows/AzureDevOps.yml +++ b/.github/workflows/AzureDevOps.yml @@ -33,7 +33,7 @@ jobs: run: | # The resource ID for Azure DevOps is always 499b84ac-1321-427f-aa17-267ca6975798 # https://learn.microsoft.com/azure/devops/integrate/get-started/authentication/service-principal-managed-identity - az account set -s $(secrets.ADO_SUBSCRIPTION_ID) + # az account set -s $(secrets.ADO_SUBSCRIPTION_ID) echo "ado_token=$(az account get-access-token --resource 499b84ac-1321-427f-aa17-267ca6975798 --query "accessToken" --output tsv)" >> $GITHUB_ENV - uses: pavelhorak/github-actions-issue-to-work-item@main env: