Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/run-e2e-tests-on-operator.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,8 +105,8 @@ on:

jobs:
e2e-test:
name: E2E Test
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@v3
name: E2E Test attempt 2
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-run-e2e-tests.yaml@main
with:
operator_type: ${{ inputs.operator_type }}
operator_image_version: ${{ inputs.operator_image_version }}
Expand Down
20 changes: 11 additions & 9 deletions conf/docker-config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"service_verbose": true,
"service_instances": 1,
"storage_mock": true,
"storage_mock": false,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
"refresh_token_v3": false,
Expand All @@ -23,14 +23,16 @@
"cloud_download_threads": 8,
"cloud_upload_threads": 2,
"cloud_refresh_interval": 60,
"sites_metadata_path": "/com.uid2.core/test/sites/metadata.json",
"clients_metadata_path": "/com.uid2.core/test/clients/metadata.json",
"keysets_metadata_path": "/com.uid2.core/test/keysets/metadata.json",
"keyset_keys_metadata_path": "/com.uid2.core/test/keyset_keys/metadata.json",
"client_side_keypairs_metadata_path": "/com.uid2.core/test/client_side_keypairs/metadata.json",
"salts_metadata_path": "/com.uid2.core/test/salts/metadata.json",
"services_metadata_path": "/com.uid2.core/test/services/metadata.json",
"service_links_metadata_path": "/com.uid2.core/test/service_links/metadata.json",
"sites_metadata_path": "https://core.test.uidapi.com/sites/refresh",
"clients_metadata_path": "https://core.test.uidapi.com/clients/refresh",
"keysets_metadata_path": "https://core.test.uidapi.com/key/keyset/refresh",
"keyset_keys_metadata_path": "https://core.test.uidapi.com/key/keyset-keys/refresh",
"client_side_keypairs_metadata_path": "https://core.test.uidapi.com/client_side_keypairs/refresh",
"salts_metadata_path": "https://core.test.uidapi.com/salt/refresh",
"services_metadata_path": "https://core.test.uidapi.com/services/refresh",
"service_links_metadata_path": "https://core.test.uidapi.com/service_links/refresh",
"core_attest_url": "https://core.test.uidapi.com/attest",
"core_api_token": "UID2-O-L-999-dp9Dt0.JVoGpynN4J8nMA7FxmzsavxJa8B9H74y9xdEE=",
"identity_token_expires_after_seconds": 3600,
"optout_metadata_path": null,
"optout_inmem_cache": false,
Expand Down
20 changes: 10 additions & 10 deletions conf/integ-config.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"service_instances": 1,
"sites_metadata_path": "http://localhost:8088/sites/refresh",
"clients_metadata_path": "http://localhost:8088/clients/refresh",
"keysets_metadata_path": "http://localhost:8088/key/keyset/refresh",
"keyset_keys_metadata_path": "http://localhost:8088/key/keyset-keys/refresh",
"client_side_keypairs_metadata_path": "http://localhost:8088/client_side_keypairs/refresh",
"salts_metadata_path": "http://localhost:8088/salt/refresh",
"services_metadata_path": "http://localhost:8088/services/refresh",
"service_links_metadata_path": "http://localhost:8088/service_links/refresh",
"sites_metadata_path": "https://core.test.uidapi.com//sites/refresh",
"clients_metadata_path": "https://core.test.uidapi.com//clients/refresh",
"keysets_metadata_path": "https://core.test.uidapi.com//key/keyset/refresh",
"keyset_keys_metadata_path": "https://core.test.uidapi.com//key/keyset-keys/refresh",
"client_side_keypairs_metadata_path": "https://core.test.uidapi.com//client_side_keypairs/refresh",
"salts_metadata_path": "https://core.test.uidapi.com//salt/refresh",
"services_metadata_path": "https://core.test.uidapi.com//services/refresh",
"service_links_metadata_path": "https://core.test.uidapi.com//service_links/refresh",
"core_attest_url": "https://core.test.uidapi.com//attest",
"optout_metadata_path": "http://localhost:8081/optout/refresh",
"core_attest_url": "http://localhost:8088/attest",
"core_api_token": "trusted-partner-key",
"core_api_token": "UID2-O-L-999-dp9Dt0.JVoGpynN4J8nMA7FxmzsavxJa8B9H74y9xdEE=",
"optout_api_token": "test-operator-key",
"optout_api_uri": "http://localhost:8081/optout/replicate",
"salts_expired_shutdown_hours": 12,
Expand Down
20 changes: 11 additions & 9 deletions conf/local-config.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
{
"service_instances": 4,
"storage_mock": true,
"sites_metadata_path": "/com.uid2.core/test/sites/metadata.json",
"clients_metadata_path": "/com.uid2.core/test/clients/metadata.json",
"keysets_metadata_path": "/com.uid2.core/test/keysets/metadata.json",
"keyset_keys_metadata_path": "/com.uid2.core/test/keyset_keys/metadata.json",
"client_side_keypairs_metadata_path": "/com.uid2.core/test/client_side_keypairs/metadata.json",
"salts_metadata_path": "/com.uid2.core/test/salts/metadata.json",
"services_metadata_path": "/com.uid2.core/test/services/metadata.json",
"service_links_metadata_path": "/com.uid2.core/test/service_links/metadata.json",
"storage_mock": false,
"sites_metadata_path": "https://core.test.uidapi.com//sites/refresh",
"clients_metadata_path": "https://core.test.uidapi.com//clients/refresh",
"keysets_metadata_path": "https://core.test.uidapi.com//key/keyset/refresh",
"keyset_keys_metadata_path": "https://core.test.uidapi.com//key/keyset-keys/refresh",
"client_side_keypairs_metadata_path": "https://core.test.uidapi.com//client_side_keypairs/refresh",
"salts_metadata_path": "https://core.test.uidapi.com//salt/refresh",
"services_metadata_path": "https://core.test.uidapi.com//services/refresh",
"service_links_metadata_path": "https://core.test.uidapi.com//service_links/refresh",
"core_attest_url": "https://core.test.uidapi.com//attest",
"core_api_token": "UID2-O-L-999-dp9Dt0.JVoGpynN4J8nMA7FxmzsavxJa8B9H74y9xdEE=",
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
Expand Down
22 changes: 11 additions & 11 deletions conf/local-e2e-private-config.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"service_instances": 1,
"storage_mock": true,
"core_attest_url": "http://localhost:8088/attest",
"core_attest_url": "https://core.test.uidapi.com//attest",
"core_api_token": "OPLCLAjLRWcVlCDl9+BbwR38gzxYdiWFa751ynWLuI7JU4iA=",
"sites_metadata_path": "http://localhost:8088/sites/refresh",
"clients_metadata_path": "http://localhost:8088/clients/refresh",
"client_side_keypairs_metadata_path": "http://localhost:8088/client_side_keypairs/refresh",
"keys_metadata_path": "http://localhost:8088/key/refresh",
"keys_acl_metadata_path": "http://localhost:8088/key/acl/refresh",
"keysets_metadata_path": "http://localhost:8088/key/keyset/refresh",
"keyset_keys_metadata_path": "http://localhost:8088/key/keyset-keys/refresh",
"salts_metadata_path": "http://localhost:8088/salt/refresh",
"services_metadata_path": "http://localhost:8088/services/refresh",
"service_links_metadata_path": "http://localhost:8088/service_links/refresh",
"sites_metadata_path": "https://core.test.uidapi.com//sites/refresh",
"clients_metadata_path": "https://core.test.uidapi.com//clients/refresh",
"client_side_keypairs_metadata_path": "https://core.test.uidapi.com//client_side_keypairs/refresh",
"keys_metadata_path": "https://core.test.uidapi.com//key/refresh",
"keys_acl_metadata_path": "https://core.test.uidapi.com//key/acl/refresh",
"keysets_metadata_path": "https://core.test.uidapi.com//key/keyset/refresh",
"keyset_keys_metadata_path": "https://core.test.uidapi.com//key/keyset-keys/refresh",
"salts_metadata_path": "https://core.test.uidapi.com//salt/refresh",
"services_metadata_path": "https://core.test.uidapi.com//services/refresh",
"service_links_metadata_path": "https://core.test.uidapi.com//service_links/refresh",
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
Expand Down
22 changes: 11 additions & 11 deletions conf/local-e2e-public-config.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"service_instances": 1,
"storage_mock": true,
"core_attest_url": "http://localhost:8088/attest",
"core_attest_url": "https://core.test.uidapi.com//attest",
"core_api_token": "UID2-O-L-999-dp9Dt0.JVoGpynN4J8nMA7FxmzsavxJa8B9H74y9xdEE=",
"sites_metadata_path": "http://localhost:8088/sites/refresh",
"clients_metadata_path": "http://localhost:8088/clients/refresh",
"client_side_keypairs_metadata_path": "http://localhost:8088/client_side_keypairs/refresh",
"keys_metadata_path": "http://localhost:8088/key/refresh",
"keys_acl_metadata_path": "http://localhost:8088/key/acl/refresh",
"keysets_metadata_path": "http://localhost:8088/key/keyset/refresh",
"keyset_keys_metadata_path": "http://localhost:8088/key/keyset-keys/refresh",
"salts_metadata_path": "http://localhost:8088/salt/refresh",
"services_metadata_path": "http://localhost:8088/services/refresh",
"service_links_metadata_path": "http://localhost:8088/service_links/refresh",
"sites_metadata_path": "https://core.test.uidapi.com//sites/refresh",
"clients_metadata_path": "https://core.test.uidapi.com//clients/refresh",
"client_side_keypairs_metadata_path": "https://core.test.uidapi.com//client_side_keypairs/refresh",
"keys_metadata_path": "https://core.test.uidapi.com//key/refresh",
"keys_acl_metadata_path": "https://core.test.uidapi.com//key/acl/refresh",
"keysets_metadata_path": "https://core.test.uidapi.com//key/keyset/refresh",
"keyset_keys_metadata_path": "https://core.test.uidapi.com//key/keyset-keys/refresh",
"salts_metadata_path": "https://core.test.uidapi.com//salt/refresh",
"services_metadata_path": "https://core.test.uidapi.com//services/refresh",
"service_links_metadata_path": "https://core.test.uidapi.com//service_links/refresh",
"identity_token_expires_after_seconds": 3600,
"refresh_token_expires_after_seconds": 86400,
"refresh_identity_token_after_seconds": 900,
Expand Down
Loading