From d0b4b2745d6a2508240aca693d3fcff076020b61 Mon Sep 17 00:00:00 2001 From: HiteshRepo Date: Mon, 5 Feb 2024 20:39:56 +0530 Subject: [PATCH] get concated M365 creds --- .github/workflows/ci.yml | 6 +++--- src/internal/operations/test/m365/helper.go | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 01612c2d3..7e8fd7142 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -146,8 +146,8 @@ jobs: working-directory: src env: # Resolve the name of the secret that contains the Azure client ID/secret - AZURE_CLIENT_ID_NAME: ${{ needs.SetM365App.outputs.client_id_env }} - AZURE_CLIENT_SECRET_NAME: ${{ needs.SetM365App.outputs.client_secret_env }} + AZURE_CLIENT_ID_NAME: ${{ secrets[CLIENT_ID] }},${{ secrets[CLIENT_ID_2] }},${{ secrets[CLIENT_ID_3] }},${{ secrets[CLIENT_ID_4] }} + AZURE_CLIENT_SECRET_NAME: ${{ secrets[CLIENT_SECRET] }},${{ secrets[CLIENT_SECRET_2] }},${{ secrets[CLIENT_SECRET_3] }},${{ secrets[CLIENT_SECRET_4] }} CLIENT_APP_SLOT: ${{ needs.SetM365App.outputs.client_app_slot }} CORSO_LOG_FILE: /tmp/corso-trusted-testlog/run-ci.log LOG_GRAPH_REQUESTS: true @@ -183,7 +183,7 @@ jobs: # run the tests - name: Integration Tests env: - AZURE_CLIENT_ID: ${{ secrets[env.AZURE_CLIENT_ID_NAME] }} + AZURE_CLIENT_ID: ${{ secrets[CLIENT_ID] }},${{ secrets[CLIENT_ID_2] }},${{ secrets[CLIENT_ID_3] }},${{ secrets[CLIENT_ID_4] }} AZURE_CLIENT_SECRET: ${{ secrets[env.AZURE_CLIENT_SECRET_NAME] }} AZURE_TENANT_ID: ${{ secrets.TENANT_ID }} CORSO_CI_TESTS: true diff --git a/src/internal/operations/test/m365/helper.go b/src/internal/operations/test/m365/helper.go index ece095193..4e31130d2 100644 --- a/src/internal/operations/test/m365/helper.go +++ b/src/internal/operations/test/m365/helper.go @@ -20,6 +20,7 @@ import ( "github.com/alcionai/corso/src/internal/model" "github.com/alcionai/corso/src/internal/operations/inject" "github.com/alcionai/corso/src/internal/tester" + "github.com/alcionai/corso/src/internal/tester/tconfig" "github.com/alcionai/corso/src/pkg/account" "github.com/alcionai/corso/src/pkg/backup" "github.com/alcionai/corso/src/pkg/backup/details" @@ -386,9 +387,10 @@ func NewIntegrationTesterSetup(t *testing.T) IntgTesterSetup { graph.InitializeConcurrencyLimiter(ctx, true, 4) - // a := tconfig.NewM365Account(t) - // creds, err := a.M365Config() - // require.NoError(t, err, clues.ToCore(err)) + a := tconfig.NewM365Account(t) + creds, err := a.M365Config() + require.NoError(t, err, clues.ToCore(err)) + assert.NotEmpty(t, creds) // counter := count.New()