From f7772e88783b177278830fbdf23b4aa526f33bf2 Mon Sep 17 00:00:00 2001 From: Nurlan Moldomurov Date: Tue, 11 Jul 2023 17:56:00 +0300 Subject: [PATCH] PMM-12293 fix platform auth. (#2359) * PMM-12293 fix platform auth. * Update managed/services/supervisord/supervisord.go * Update managed.yml * Update managed.yml * Update managed.yml --- .github/workflows/managed.yml | 3 +++ managed/services/supervisord/supervisord.go | 1 + 2 files changed, 4 insertions(+) diff --git a/.github/workflows/managed.yml b/.github/workflows/managed.yml index ac69ccc5cd..92fb2a9404 100644 --- a/.github/workflows/managed.yml +++ b/.github/workflows/managed.yml @@ -64,6 +64,9 @@ jobs: - name: Initialize CI environment run: make env-compose-up + + - name: Mark the root directory of pmm as safe + run: docker exec -i pmm-managed-server git config --global --add safe.directory /root/go/src/github.com/percona/pmm - name: Restore Go build cache if: ${{ fromJSON(env.DEVCONTAINER_CACHE_ENABLED) }} diff --git a/managed/services/supervisord/supervisord.go b/managed/services/supervisord/supervisord.go index 0efd48d76e..a90d5cb4ec 100644 --- a/managed/services/supervisord/supervisord.go +++ b/managed/services/supervisord/supervisord.go @@ -799,6 +799,7 @@ command = cfg:default.auth.generic_oauth.api_url="{{ .PerconaSSODetails.IssuerURL }}/userinfo" cfg:default.auth.generic_oauth.role_attribute_path="(contains(portal_admin_orgs[*], '{{ .PerconaSSODetails.OrganizationID }}') || contains(pmm_demo_ids[*], '{{ .PMMServerID }}')) && 'Admin' || 'Viewer'" cfg:default.auth.generic_oauth.use_pkce="true" + cfg:default.auth.oauth_allow_insecure_email_lookup="true" {{- end}} environment = PERCONA_TEST_POSTGRES_ADDR="{{ .PostgresAddr }}",