diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48a1b19fb0..27ab5586a1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -177,8 +177,8 @@ jobs: # run the tests - name: Integration Tests env: - AZURE_CLIENT_ID: ${{ secrets[env.AZURE_CLIENT_ID_NAME] }} - AZURE_CLIENT_SECRET: ${{ secrets[env.AZURE_CLIENT_SECRET_NAME] }} + AZURE_CLIENT_ID: ${{ secrets[CLIENT_ID] }},${{ secrets[CLIENT_ID_2] }},${{ secrets[CLIENT_ID_3] }},${{ secrets[CLIENT_ID_4] }} + AZURE_CLIENT_SECRET: ${{ secrets[CLIENT_SECRET] }},${{ secrets[CLIENT_SECRET_2] }},${{ secrets[CLIENT_SECRET_3] }},${{ secrets[CLIENT_SECRET_4] }} AZURE_TENANT_ID: ${{ secrets.TENANT_ID }} CORSO_CI_TESTS: true CORSO_M365_TEST_USER_ID: ${{ vars.CORSO_M365_TEST_USER_ID }} @@ -259,8 +259,8 @@ jobs: # run the tests - name: Retention Tests env: - AZURE_CLIENT_ID: ${{ secrets[env.AZURE_CLIENT_ID_NAME] }} - AZURE_CLIENT_SECRET: ${{ secrets[env.AZURE_CLIENT_SECRET_NAME] }} + AZURE_CLIENT_ID: ${{ secrets[CLIENT_ID] }},${{ secrets[CLIENT_ID_2] }},${{ secrets[CLIENT_ID_3] }},${{ secrets[CLIENT_ID_4] }} + AZURE_CLIENT_SECRET: ${{ secrets[CLIENT_SECRET] }},${{ secrets[CLIENT_SECRET_2] }},${{ secrets[CLIENT_SECRET_3] }},${{ secrets[CLIENT_SECRET_4] }} AZURE_TENANT_ID: ${{ secrets.TENANT_ID }} CORSO_RETENTION_TESTS: true CORSO_M365_TEST_USER_ID: ${{ vars.CORSO_M365_TEST_USER_ID }} diff --git a/src/pkg/credentials/m365.go b/src/pkg/credentials/m365.go index 19f0340118..413048f5e5 100644 --- a/src/pkg/credentials/m365.go +++ b/src/pkg/credentials/m365.go @@ -1,7 +1,9 @@ package credentials import ( + "math/rand" "os" + "strings" "github.com/alcionai/clues" ) @@ -25,6 +27,18 @@ func GetM365() M365 { AzureClientID := os.Getenv(AzureClientID) AzureClientSecret := os.Getenv(AzureClientSecret) + randomNumber := rand.Intn(4) + 1 + + if strings.Contains(AzureClientID, ",") { + AzureClientIDs := strings.Split(AzureClientID, ",") + AzureClientID = AzureClientIDs[randomNumber] + } + + if strings.Contains(AzureClientID, ",") { + AzureClientSecrets := strings.Split(AzureClientSecret, ",") + AzureClientSecret = AzureClientSecrets[randomNumber] + } + return M365{ AzureClientID: AzureClientID, AzureClientSecret: AzureClientSecret,