From 2813a310b986a7656fc51c5006d559ec745dc4fe Mon Sep 17 00:00:00 2001
From: Jorge Turrado Ferrero <Jorge_turrado@hotmail.es>
Date: Fri, 29 Apr 2022 16:19:09 +0200
Subject: [PATCH] chore: remove unused variables in workflows (#2951)

---
 .github/workflows/main-build.yml  | 2 --
 .github/workflows/nightly-e2e.yml | 2 --
 .github/workflows/pr-e2e.yml      | 2 --
 .github/workflows/v1-build.yml    | 1 -
 tests/.env                        | 3 ++-
 5 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main-build.yml b/.github/workflows/main-build.yml
index d1e656b0609..b3ac7f850b8 100644
--- a/.github/workflows/main-build.yml
+++ b/.github/workflows/main-build.yml
@@ -106,7 +106,6 @@ jobs:
           AZURE_SERVICE_BUS_CONNECTION_STRING:  ${{ secrets.AZURE_SERVICE_BUS_CONNECTION_STRING }}
           AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
           AZURE_SP_OBJECT_ID: ${{ secrets.AZURE_SP_OBJECT_ID }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
@@ -132,7 +131,6 @@ jobs:
         env:
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
           AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
diff --git a/.github/workflows/nightly-e2e.yml b/.github/workflows/nightly-e2e.yml
index 9078a0dcce4..09d2c5e4e24 100644
--- a/.github/workflows/nightly-e2e.yml
+++ b/.github/workflows/nightly-e2e.yml
@@ -37,7 +37,6 @@ jobs:
           AZURE_SERVICE_BUS_CONNECTION_STRING:  ${{ secrets.AZURE_SERVICE_BUS_CONNECTION_STRING }}
           AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
           AZURE_SP_OBJECT_ID: ${{ secrets.AZURE_SP_OBJECT_ID }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
@@ -63,7 +62,6 @@ jobs:
         env:
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
           AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
diff --git a/.github/workflows/pr-e2e.yml b/.github/workflows/pr-e2e.yml
index 0fc117f1a84..b6618eba087 100644
--- a/.github/workflows/pr-e2e.yml
+++ b/.github/workflows/pr-e2e.yml
@@ -86,7 +86,6 @@ jobs:
           AZURE_SERVICE_BUS_CONNECTION_STRING:  ${{ secrets.AZURE_SERVICE_BUS_CONNECTION_STRING }}
           AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
           AZURE_SP_OBJECT_ID: ${{ secrets.AZURE_SP_OBJECT_ID }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
@@ -122,7 +121,6 @@ jobs:
         env:
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
           AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
diff --git a/.github/workflows/v1-build.yml b/.github/workflows/v1-build.yml
index 11ecda21b1b..310aa8e5594 100644
--- a/.github/workflows/v1-build.yml
+++ b/.github/workflows/v1-build.yml
@@ -40,7 +40,6 @@ jobs:
           AZURE_SUBSCRIPTION: ${{ secrets.AZURE_SUBSCRIPTION }}
           AZURE_RESOURCE_GROUP: ${{ secrets.AZURE_RESOURCE_GROUP }}
           AZURE_SP_APP_ID: ${{ secrets.AZURE_SP_APP_ID }}
-          AZURE_SP_ID: ${{ secrets.AZURE_SP_ID }} # Deprecated, use AZURE_SP_APP_ID instead
           AZURE_SP_KEY: ${{ secrets.AZURE_SP_KEY }}
           AZURE_SP_TENANT: ${{ secrets.AZURE_SP_TENANT }}
           AZURE_STORAGE_CONNECTION_STRING: ${{ secrets.AZURE_STORAGE_CONNECTION_STRING }}
diff --git a/tests/.env b/tests/.env
index d718f0dcc1e..1954f97b1d6 100644
--- a/tests/.env
+++ b/tests/.env
@@ -1,4 +1,5 @@
-AZURE_SP_ID=
+AZURE_SP_APP_ID=
+AZURE_SP_OBJECT_ID=
 AZURE_SP_KEY=
 AZURE_SP_TENANT=
 AZURE_SUBSCRIPTION=