Merge pull request #10042 from microsoft/dev/bhavyau/classifier

Use AzureLogin task for classifier
microsoft · Jul 9, 2024 · b6cb7f4 · b6cb7f4
2 parents a36f3a6 + bed1b9d
commit b6cb7f4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/.github/workflows/classifier-runner.yml b/.github/workflows/classifier-runner.yml
@@ -1,4 +1,9 @@
 name: "Classifier: Runner"
+
+permissions:
+  id-token: write
+  contents: read
+
 on:
   schedule:
     - cron: 0 * * * *
@@ -8,7 +13,13 @@ on:
 jobs:
   main:
     runs-on: ubuntu-latest
+    environment: main
     steps:
+      - uses: azure/login@v2
+        with:
+          client-id: ${{ vars.AZURE_CLIENT_ID }}
+          tenant-id: ${{ vars.AZURE_TENANT_ID }}
+          allow-no-subscriptions: true
       - name: Checkout Actions
         uses: actions/checkout@v2
         with:
@@ -27,7 +38,6 @@ jobs:
           from: 130
           until: 5
           blobContainerName: vscode-remote-release-models
-          blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}
       - name: Set up Python 3.7
         uses: actions/setup-python@v1
         with:
@@ -41,6 +51,5 @@ jobs:
       - name: "Run Classifier: Labeler"
         uses: ./actions/classifier/apply/apply-labels
         with:
-          appInsightsKey: ${{secrets.TRIAGE_ACTIONS_APP_INSIGHTS}}
           token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
           config-path: classifier
diff --git a/.github/workflows/classifier-trainer.yml b/.github/workflows/classifier-trainer.yml
@@ -1,4 +1,9 @@
 name: "Classifier: Trainer"
+
+permissions:
+  id-token: write
+  contents: read
+
 on:
   schedule:
     - cron: 0 0 5 * *
@@ -9,6 +14,7 @@ on:
 jobs:
   main:
     runs-on: ubuntu-latest
+    environment: main
     steps:
       - name: Checkout Actions
         uses: actions/checkout@v2
@@ -41,4 +47,3 @@ jobs:
         with:
           token: ${{secrets.VSCODE_ISSUE_TRIAGE_BOT_PAT}}
           blobContainerName: vscode-remote-release-models
-          blobStorageKey: ${{secrets.AZURE_BLOB_STORAGE_CONNECTION_STRING}}