diff --git a/.ci/tests/integration-oauth2/cases/batch-source/manifests.yaml b/.ci/tests/integration-oauth2/cases/batch-source/manifests.yaml index b52e93d16..f395ac97d 100644 --- a/.ci/tests/integration-oauth2/cases/batch-source/manifests.yaml +++ b/.ci/tests/integration-oauth2/cases/batch-source/manifests.yaml @@ -37,16 +37,14 @@ spec: certSecretKey: "" authConfig: oauth2Config: - audience: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default - issuerUrl: https://sts.windows.net/06a8a086-ae6e-45b5-a22e-ad90de23013e/v2.0 - scope: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default + audience: urn:sn:pulsar:sndev:test + issuerUrl: https://auth.sncloud-stg.dev/ keySecretName: sn-platform-oauth2-private-key keySecretKey: auth.json cleanupAuthConfig: oauth2Config: - audience: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default - issuerUrl: https://sts.windows.net/06a8a086-ae6e-45b5-a22e-ad90de23013e/v2.0 - scope: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default + audience: urn:sn:pulsar:sndev:test + issuerUrl: https://auth.sncloud-stg.dev/ keySecretName: sn-platform-oauth2-private-key keySecretKey: auth.json image: streamnative/pulsar-io-batch-data-generator:3.2.2.1 diff --git a/.ci/tests/integration-oauth2/cases/java-download-function-generic-auth/manifests.yaml b/.ci/tests/integration-oauth2/cases/java-download-function-generic-auth/manifests.yaml index 8e4623ddc..fc69aa96f 100644 --- a/.ci/tests/integration-oauth2/cases/java-download-function-generic-auth/manifests.yaml +++ b/.ci/tests/integration-oauth2/cases/java-download-function-generic-auth/manifests.yaml @@ -42,7 +42,7 @@ spec: certSecretKey: "" authConfig: genericAuth: - clientAuthenticationParameters: '{"audience":"api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default","issuerUrl":"https://sts.windows.net/06a8a086-ae6e-45b5-a22e-ad90de23013e/v2.0","privateKey":"/mnt/secrets/auth.json","type":"client_credentials","scope":"api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default","issuer_url":"https://sts.windows.net/06a8a086-ae6e-45b5-a22e-ad90de23013e/v2.0","private_key":"/mnt/secrets/auth.json"}' + clientAuthenticationParameters: '{"audience":"urn:sn:pulsar:sndev:test","issuerUrl":"https://auth.sncloud-stg.dev/","privateKey":"/mnt/secrets/auth.json","type":"client_credentials","issuer_url":"https://auth.sncloud-stg.dev/","private_key":"/mnt/secrets/auth.json"}' clientAuthenticationPlugin: org.apache.pulsar.client.impl.auth.oauth2.AuthenticationOAuth2 java: jar: pulsar-functions-api-examples.jar diff --git a/.ci/tests/integration-oauth2/cases/java-download-function/manifests.yaml b/.ci/tests/integration-oauth2/cases/java-download-function/manifests.yaml index 4fb16887f..c8fab06b3 100644 --- a/.ci/tests/integration-oauth2/cases/java-download-function/manifests.yaml +++ b/.ci/tests/integration-oauth2/cases/java-download-function/manifests.yaml @@ -45,9 +45,8 @@ spec: certSecretKey: "" authConfig: oauth2Config: - audience: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default - issuerUrl: https://sts.windows.net/06a8a086-ae6e-45b5-a22e-ad90de23013e/v2.0 - scope: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default + audience: urn:sn:pulsar:sndev:test + issuerUrl: https://auth.sncloud-stg.dev/ keySecretName: sn-platform-oauth2-private-key keySecretKey: auth.json java: diff --git a/.ci/tests/integration-oauth2/cases/java-function/manifests.yaml b/.ci/tests/integration-oauth2/cases/java-function/manifests.yaml index 4950c0bf2..4c1079c26 100644 --- a/.ci/tests/integration-oauth2/cases/java-function/manifests.yaml +++ b/.ci/tests/integration-oauth2/cases/java-function/manifests.yaml @@ -42,9 +42,8 @@ spec: certSecretKey: "" authConfig: oauth2Config: - audience: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default - issuerUrl: https://sts.windows.net/06a8a086-ae6e-45b5-a22e-ad90de23013e/v2.0 - scope: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default + audience: urn:sn:pulsar:sndev:test + issuerUrl: https://auth.sncloud-stg.dev/ keySecretName: sn-platform-oauth2-private-key keySecretKey: auth.json java: diff --git a/.ci/tests/integration-oauth2/cases/py-download-from-http-function/manifests.yaml b/.ci/tests/integration-oauth2/cases/py-download-from-http-function/manifests.yaml index 0dbe98663..cfd39e97d 100644 --- a/.ci/tests/integration-oauth2/cases/py-download-from-http-function/manifests.yaml +++ b/.ci/tests/integration-oauth2/cases/py-download-from-http-function/manifests.yaml @@ -39,9 +39,8 @@ spec: hostnameVerification: true authConfig: oauth2Config: - audience: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default - issuerUrl: https://sts.windows.net/06a8a086-ae6e-45b5-a22e-ad90de23013e/v2.0 - scope: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default + audience: urn:sn:pulsar:sndev:test + issuerUrl: https://auth.sncloud-stg.dev/ keySecretName: sn-platform-oauth2-private-key keySecretKey: auth.json python: diff --git a/.ci/tests/integration-oauth2/cases/py-download-function-legacy/manifests.yaml b/.ci/tests/integration-oauth2/cases/py-download-function-legacy/manifests.yaml index e82384550..2964b828c 100644 --- a/.ci/tests/integration-oauth2/cases/py-download-function-legacy/manifests.yaml +++ b/.ci/tests/integration-oauth2/cases/py-download-function-legacy/manifests.yaml @@ -52,7 +52,7 @@ data: --- apiVersion: v1 data: - clientAuthenticationParameters: eyJhdWRpZW5jZSI6ImFwaTovLzU2YzFiZDE0LTNiYTctNDgwNC1iNDdiLWQ0NmRlNmRjZTMzZS8uZGVmYXVsdCIsImlzc3VlclVybCI6Imh0dHBzOi8vc3RzLndpbmRvd3MubmV0LzA2YThhMDg2LWFlNmUtNDViNS1hMjJlLWFkOTBkZTIzMDEzZS92Mi4wIiwicHJpdmF0ZUtleSI6Ii9tbnQvc2VjcmV0cy9hdXRoLmpzb24iLCJ0eXBlIjoiY2xpZW50X2NyZWRlbnRpYWxzIiwic2NvcGUiOiJhcGk6Ly81NmMxYmQxNC0zYmE3LTQ4MDQtYjQ3Yi1kNDZkZTZkY2UzM2UvLmRlZmF1bHQiLCJpc3N1ZXJfdXJsIjoiaHR0cHM6Ly9zdHMud2luZG93cy5uZXQvMDZhOGEwODYtYWU2ZS00NWI1LWEyMmUtYWQ5MGRlMjMwMTNlL3YyLjAiLCJwcml2YXRlX2tleSI6Ii9tbnQvc2VjcmV0cy9hdXRoLmpzb24ifQo= + clientAuthenticationParameters: eyJhdWRpZW5jZSI6InVybjpzbjpwdWxzYXI6c25kZXY6dGVzdCIsImlzc3VlclVybCI6Imh0dHBzOi8vYXV0aC5zbmNsb3VkLXN0Zy5kZXYvIiwicHJpdmF0ZUtleSI6Ii9tbnQvc2VjcmV0cy9hdXRoLmpzb24iLCJ0eXBlIjoiY2xpZW50X2NyZWRlbnRpYWxzIiwiaXNzdWVyX3VybCI6Imh0dHBzOi8vYXV0aC5zbmNsb3VkLXN0Zy5kZXYvIiwicHJpdmF0ZV9rZXkiOiIvbW50L3NlY3JldHMvYXV0aC5qc29uIn0= clientAuthenticationPlugin: b3JnLmFwYWNoZS5wdWxzYXIuY2xpZW50LmltcGwuYXV0aC5vYXV0aDIuQXV0aGVudGljYXRpb25PQXV0aDI= kind: Secret metadata: diff --git a/.ci/tests/integration-oauth2/cases/py-download-function/manifests.yaml b/.ci/tests/integration-oauth2/cases/py-download-function/manifests.yaml index 9d0d88351..4f6fbb3a5 100644 --- a/.ci/tests/integration-oauth2/cases/py-download-function/manifests.yaml +++ b/.ci/tests/integration-oauth2/cases/py-download-function/manifests.yaml @@ -39,9 +39,8 @@ spec: hostnameVerification: true authConfig: oauth2Config: - audience: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default - issuerUrl: https://sts.windows.net/06a8a086-ae6e-45b5-a22e-ad90de23013e/v2.0 - scope: api://56c1bd14-3ba7-4804-b47b-d46de6dce33e/.default + audience: urn:sn:pulsar:sndev:test + issuerUrl: https://auth.sncloud-stg.dev/ keySecretName: sn-platform-oauth2-private-key keySecretKey: auth.json python: diff --git a/.ci/tests/integration-oauth2/e2e_with_downloader.yaml b/.ci/tests/integration-oauth2/e2e_with_downloader.yaml index b909e5402..7888e3427 100644 --- a/.ci/tests/integration-oauth2/e2e_with_downloader.yaml +++ b/.ci/tests/integration-oauth2/e2e_with_downloader.yaml @@ -26,8 +26,8 @@ setup: - name: Update values file command: | - sed -i "s/CLIENT_SECRET/${OAUTH_CLIENT_SECRET}/g" .ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml - sed -i "s/CLIENT_ID/${OAUTH_CLIENT_ID}/g" .ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml + sed -i "s/CLIENT_SECRET/${AZURE_CLIENT_SECRET}/g" .ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml + sed -i "s/CLIENT_ID/${AZURE_CLIENT_ID}/g" .ci/clusters/values_skywalking_e2e_cluster_with_oauth.yaml - name: install pulsar cluster command: | diff --git a/.github/workflows/test-integration-skywalking-e2e.yml b/.github/workflows/test-integration-skywalking-e2e.yml index c28ca9ddd..6a42c5bff 100644 --- a/.github/workflows/test-integration-skywalking-e2e.yml +++ b/.github/workflows/test-integration-skywalking-e2e.yml @@ -11,13 +11,19 @@ on: - 'LICENSE' - 'mesh-worker-service/README.md' - 'tools/README.md' + +# cancel old workflow if new one is triggered +concurrency: + group: ${{ github.workflow }}-${{ github.ref }} + cancel-in-progress: true + permissions: read-all jobs: integration: runs-on: ubuntu-latest env: - OAUTH_CLIENT_SECRET: ${{ secrets.OAUTH_CLIENT_SECRET }} - OAUTH_CLIENT_ID: ${{ secrets.OAUTH_CLIENT_ID }} + AZURE_CLIENT_SECRET: ${{ secrets.AZURE_CLIENT_SECRET }} + AZURE_CLIENT_ID: ${{ secrets.AZURE_CLIENT_ID }} timeout-minutes: 80 strategy: matrix: