Skip to content

Commit a1361c2

Browse files
Fix CI to use OIDC (#161)
* Fix CI to use OIDC * Update NPM packages, run lint * Fix up samples to avoid real resource creation
1 parent 732d82b commit a1361c2

20 files changed

+251
-477
lines changed

.github/workflows/ci-workflow.yml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
pull_request:
77
branches: [main]
88
workflow_dispatch:
9+
10+
permissions:
11+
id-token: write
12+
contents: read
913

1014
jobs:
1115
run-tests:
@@ -17,7 +21,9 @@ jobs:
1721

1822
- uses: azure/login@v1
1923
with:
20-
creds: ${{ secrets.AZURE_CREDENTIALS }}
24+
client-id: ${{ secrets.CLIENT_ID }}
25+
tenant-id: ${{ secrets.TENANT_ID }}
26+
subscription-id: ${{ secrets.SUBSCRIPTION_ID }}
2127

2228
- name: Setup Node.js
2329
uses: actions/setup-node@v4
@@ -36,7 +42,7 @@ jobs:
3642
runs-on: ubuntu-latest
3743
steps:
3844
- name: Check out source code
39-
uses: actions/checkout@v1
45+
uses: actions/checkout@v4
4046

4147
- name: Installing Az CLI Edge build
4248
run: |
@@ -54,10 +60,12 @@ jobs:
5460
5561
- uses: azure/login@v1
5662
with:
57-
creds: ${{ secrets.AZURE_CREDENTIALS }}
63+
client-id: ${{ secrets.CLIENT_ID }}
64+
tenant-id: ${{ secrets.TENANT_ID }}
65+
subscription-id: ${{ secrets.SUBSCRIPTION_ID }}
5866

5967
- name: Setup Node.js
60-
uses: actions/setup-node@v1
68+
uses: actions/setup-node@v4
6169
with:
6270
node-version: "20.x"
6371

@@ -85,14 +93,15 @@ jobs:
8593

8694
- uses: azure/login@v1
8795
with:
88-
creds: ${{ secrets.AZURE_CREDENTIALS }}
96+
client-id: ${{ secrets.CLIENT_ID }}
97+
tenant-id: ${{ secrets.TENANT_ID }}
98+
subscription-id: ${{ secrets.SUBSCRIPTION_ID }}
8999

90100
- name: Run Action
91101
uses: ./
92102
with:
93103
scope: resourcegroup
94104
subscriptionId: ${{ secrets.SUBSCRIPTION_ID }}
95-
resourceGroupName: E2eTestResourceGroupForArmAction
96-
template: https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/quickstarts/microsoft.web/webapp-basic-linux/azuredeploy.json
97-
parameters: https://raw.githubusercontent.com/Azure/azure-quickstart-templates/master/quickstarts/microsoft.web/webapp-basic-linux/azuredeploy.parameters.json
105+
resourceGroupName: arm-deploy-e2e
106+
parameters: test/bicep/inputs-outputs.bicepparam
98107
deploymentName: e2e-test-${{ matrix.os }}

dist/index.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4409,7 +4409,9 @@ function getAzCliHelper() {
44094409
exports.getAzCliHelper = getAzCliHelper;
44104410
function setSubscriptionContext(azPath, subscriptionId) {
44114411
return __awaiter(this, void 0, void 0, function* () {
4412-
yield callAzCli(azPath, `account set --subscription ${subscriptionId}`, { silent: true });
4412+
yield callAzCli(azPath, `account set --subscription ${subscriptionId}`, {
4413+
silent: true,
4414+
});
44134415
});
44144416
}
44154417
function resourceGroupExists(azPath, resourceGroupName) {

examples/advanced-example.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
test_action_job:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v1
12+
- uses: actions/checkout@v4
1313

1414
- uses: azure/login@v1
1515
with:

0 commit comments

Comments
 (0)