diff --git a/.github/actions/setup-create-base64-config-live-testnets/action.yml b/.github/actions/setup-create-base64-config-live-testnets/action.yml index 5bf83191b59..89d6a5e05d6 100644 --- a/.github/actions/setup-create-base64-config-live-testnets/action.yml +++ b/.github/actions/setup-create-base64-config-live-testnets/action.yml @@ -94,7 +94,7 @@ runs: enabled=$pyroscope_enabled server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" [Logging] run_id="$RUN_ID" @@ -105,7 +105,7 @@ runs: [Logging.Loki] tenant_id="$LOKI_TENANT_ID" endpoint="$LOKI_URL" - basic_auth="$LOKI_BASIC_AUTH" + basic_auth_secret="$LOKI_BASIC_AUTH" [Logging.Grafana] base_url="$GRAFANA_URL" diff --git a/.github/actions/setup-create-base64-config/action.yml b/.github/actions/setup-create-base64-config/action.yml index 55e5924bd76..013221bb41e 100644 --- a/.github/actions/setup-create-base64-config/action.yml +++ b/.github/actions/setup-create-base64-config/action.yml @@ -96,7 +96,7 @@ runs: enabled=$pyroscope_enabled server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" [Logging] test_log_collect=$test_log_collect @@ -108,7 +108,7 @@ runs: [Logging.Loki] tenant_id="$LOKI_TENANT_ID" endpoint="$LOKI_ENDPOINT" - basic_auth="$LOKI_BASIC_AUTH" + basic_auth_secret="$LOKI_BASIC_AUTH" [Logging.Grafana] base_url="$GRAFANA_URL" diff --git a/.github/actions/setup-merge-base64-config/action.yml b/.github/actions/setup-merge-base64-config/action.yml index 9651242f8f1..d7e8d885c4f 100644 --- a/.github/actions/setup-merge-base64-config/action.yml +++ b/.github/actions/setup-merge-base64-config/action.yml @@ -42,9 +42,9 @@ runs: [Logging.Loki] tenant_id="$LOKI_TENANT_ID" endpoint="$LOKI_URL" - basic_auth="$LOKI_BASIC_AUTH" + basic_auth_secret="$LOKI_BASIC_AUTH" # legacy, you only need this to access the cloud version - # bearer_token="bearer_token" + # bearer_token_secret="bearer_token" EOF echo "$decoded_toml" >> final_config.toml diff --git a/.github/workflows/automation-load-tests.yml b/.github/workflows/automation-load-tests.yml index bbdd59f9f5c..82a1bba6d67 100644 --- a/.github/workflows/automation-load-tests.yml +++ b/.github/workflows/automation-load-tests.yml @@ -53,7 +53,7 @@ jobs: cat << EOF > config.toml server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" EOF echo "$decoded_toml" >> final_config.toml diff --git a/.github/workflows/automation-ondemand-tests.yml b/.github/workflows/automation-ondemand-tests.yml index 87952216d2c..b6638960aaf 100644 --- a/.github/workflows/automation-ondemand-tests.yml +++ b/.github/workflows/automation-ondemand-tests.yml @@ -232,7 +232,7 @@ jobs: enabled=$pyroscope_enabled server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" EOF BASE64_CONFIG_OVERRIDE=$(cat config.toml | base64 -w 0) diff --git a/.github/workflows/client-compatibility-tests.yml b/.github/workflows/client-compatibility-tests.yml index 3dbcbe52cdc..214b9ff1490 100644 --- a/.github/workflows/client-compatibility-tests.yml +++ b/.github/workflows/client-compatibility-tests.yml @@ -202,7 +202,7 @@ jobs: enabled=$pyroscope_enabled server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" [PrivateEthereumNetwork] consensus_type="pos" diff --git a/.github/workflows/integration-staging-tests.yml b/.github/workflows/integration-staging-tests.yml index ea0691b7ca5..6851a4ec3f1 100644 --- a/.github/workflows/integration-staging-tests.yml +++ b/.github/workflows/integration-staging-tests.yml @@ -89,7 +89,7 @@ jobs: enabled=$pyroscope_enabled server_url="$PYROSCOPE_SERVER" environment="$PYROSCOPE_ENVIRONMENT" - key="$PYROSCOPE_KEY" + key_secret="$PYROSCOPE_KEY" [Logging] run_id="$RUN_ID" @@ -100,7 +100,7 @@ jobs: [Logging.Loki] tenant_id="$LOKI_TENANT_ID" endpoint="$LOKI_URL" - basic_auth="$LOKI_BASIC_AUTH" + basic_auth_secret="$LOKI_BASIC_AUTH" [Logging.Grafana] base_url="$GRAFANA_URL" diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 955c0bbb1e5..cf3f065d812 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -24,7 +24,7 @@ require ( github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88c9429 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240221153538-1ea85cf3dc6c - github.com/smartcontractkit/chainlink-testing-framework v1.23.6 + github.com/smartcontractkit/chainlink-testing-framework v1.24.1 github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 github.com/smartcontractkit/chainlink/v2 v2.0.0-00010101000000-000000000000 github.com/smartcontractkit/libocr v0.0.0-20240215150045-fe2ba71b2f0a diff --git a/integration-tests/go.sum b/integration-tests/go.sum index e5f34a3d982..05717c79210 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1519,8 +1519,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19e/go.mod h1:JiykN+8W5TA4UD2ClrzQCVvcH3NcyLEVv7RwY0busrw= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0 h1:7m9PVtccb8/pvKTXMaGuyceFno1icRyC2SFH7KG7+70= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0/go.mod h1:SZ899lZYQ0maUulWbZg+SWqabHQ1wTbyk3jT8wJfyo8= -github.com/smartcontractkit/chainlink-testing-framework v1.23.6 h1:krjJswtgQ/J4kBgFpC7Tyh8wSFfWiGGUsADg6BG/EGw= -github.com/smartcontractkit/chainlink-testing-framework v1.23.6/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= +github.com/smartcontractkit/chainlink-testing-framework v1.24.1 h1:a9iBDWI6LayLFu989kt7Hadw5Y0C9K3LU+s+JIamogE= +github.com/smartcontractkit/chainlink-testing-framework v1.24.1/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= github.com/smartcontractkit/go-plugin v0.0.0-20240208201424-b3b91517de16 h1:TFe+FvzxClblt6qRfqEhUfa4kFQx5UobuoFGO2W4mMo= diff --git a/integration-tests/load/go.mod b/integration-tests/load/go.mod index de4360ea4e4..016d8c5c91a 100644 --- a/integration-tests/load/go.mod +++ b/integration-tests/load/go.mod @@ -16,7 +16,7 @@ require ( github.com/slack-go/slack v0.12.2 github.com/smartcontractkit/chainlink-automation v1.0.2-0.20240118014648-1ab6a88c9429 github.com/smartcontractkit/chainlink-common v0.1.7-0.20240221153538-1ea85cf3dc6c - github.com/smartcontractkit/chainlink-testing-framework v1.23.6 + github.com/smartcontractkit/chainlink-testing-framework v1.24.1 github.com/smartcontractkit/chainlink/integration-tests v0.0.0-20240214231432-4ad5eb95178c github.com/smartcontractkit/chainlink/v2 v2.9.0-beta0.0.20240216210048-da02459ddad8 github.com/smartcontractkit/libocr v0.0.0-20240215150045-fe2ba71b2f0a diff --git a/integration-tests/load/go.sum b/integration-tests/load/go.sum index f85521c2f7f..803c56b8d71 100644 --- a/integration-tests/load/go.sum +++ b/integration-tests/load/go.sum @@ -1502,8 +1502,8 @@ github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19 github.com/smartcontractkit/chainlink-solana v1.0.3-0.20240216142700-c5869534c19e/go.mod h1:JiykN+8W5TA4UD2ClrzQCVvcH3NcyLEVv7RwY0busrw= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0 h1:7m9PVtccb8/pvKTXMaGuyceFno1icRyC2SFH7KG7+70= github.com/smartcontractkit/chainlink-starknet/relayer v0.0.1-beta-test.0.20240213121419-1272736c2ac0/go.mod h1:SZ899lZYQ0maUulWbZg+SWqabHQ1wTbyk3jT8wJfyo8= -github.com/smartcontractkit/chainlink-testing-framework v1.23.6 h1:krjJswtgQ/J4kBgFpC7Tyh8wSFfWiGGUsADg6BG/EGw= -github.com/smartcontractkit/chainlink-testing-framework v1.23.6/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= +github.com/smartcontractkit/chainlink-testing-framework v1.24.1 h1:a9iBDWI6LayLFu989kt7Hadw5Y0C9K3LU+s+JIamogE= +github.com/smartcontractkit/chainlink-testing-framework v1.24.1/go.mod h1:lGaqSnCB36n49fZNdTGXMrxhPu9w5+2n3c9V1Fqz1hM= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868 h1:FFdvEzlYwcuVHkdZ8YnZR/XomeMGbz5E2F2HZI3I3w8= github.com/smartcontractkit/chainlink-vrf v0.0.0-20231120191722-fef03814f868/go.mod h1:Kn1Hape05UzFZ7bOUnm3GVsHzP0TNrVmpfXYNHdqGGs= github.com/smartcontractkit/go-plugin v0.0.0-20231003134350-e49dad63b306 h1:ko88+ZznniNJZbZPWAvHQU8SwKAdHngdDZ+pvVgB5ss= diff --git a/integration-tests/testconfig/automation/example.toml b/integration-tests/testconfig/automation/example.toml index a8e0510d83c..7a3d33951ba 100644 --- a/integration-tests/testconfig/automation/example.toml +++ b/integration-tests/testconfig/automation/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/functions/example.toml b/integration-tests/testconfig/functions/example.toml index 7628fbeee32..b96b39b0409 100644 --- a/integration-tests/testconfig/functions/example.toml +++ b/integration-tests/testconfig/functions/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use simulated network [Network] diff --git a/integration-tests/testconfig/keeper/example.toml b/integration-tests/testconfig/keeper/example.toml index 6bdd6537bc3..d76fff343e7 100644 --- a/integration-tests/testconfig/keeper/example.toml +++ b/integration-tests/testconfig/keeper/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/log_poller/example.toml b/integration-tests/testconfig/log_poller/example.toml index 90ec89a3ed1..88922e3fedb 100644 --- a/integration-tests/testconfig/log_poller/example.toml +++ b/integration-tests/testconfig/log_poller/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/node/example.toml b/integration-tests/testconfig/node/example.toml index 55ee1ffccf1..e6777bc8352 100644 --- a/integration-tests/testconfig/node/example.toml +++ b/integration-tests/testconfig/node/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/ocr/example.toml b/integration-tests/testconfig/ocr/example.toml index 6cbdbef1555..b8eb891ba33 100644 --- a/integration-tests/testconfig/ocr/example.toml +++ b/integration-tests/testconfig/ocr/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/ocr2/example.toml b/integration-tests/testconfig/ocr2/example.toml index 6cbdbef1555..b8eb891ba33 100644 --- a/integration-tests/testconfig/ocr2/example.toml +++ b/integration-tests/testconfig/ocr2/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/vrfv2/example.toml b/integration-tests/testconfig/vrfv2/example.toml index 651749486fd..53d0888f6d4 100644 --- a/integration-tests/testconfig/vrfv2/example.toml +++ b/integration-tests/testconfig/vrfv2/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network] diff --git a/integration-tests/testconfig/vrfv2plus/example.toml b/integration-tests/testconfig/vrfv2plus/example.toml index 095bc06520a..2ef1c27d391 100644 --- a/integration-tests/testconfig/vrfv2plus/example.toml +++ b/integration-tests/testconfig/vrfv2plus/example.toml @@ -21,9 +21,9 @@ tenant_id="tenant_id" # full URL of Loki ingest endpoint endpoint="https://loki.url/api/v3/push" # currently only needed when using public instance -basic_auth="loki-basic-auth" +basic_auth_secret="loki-basic-auth" # only needed for cloud grafana -bearer_token="bearer_token" +bearer_token_secret="bearer_token" # LogStream will try to shorten Grafana URLs by default (if all 3 variables are set) [Logging.Grafana] @@ -31,7 +31,7 @@ bearer_token="bearer_token" base_url="http://grafana.url" # url of your grafana dashboard (prefix and suffix "/" are stirpped), example: /d/ad61652-2712-1722/my-dashboard dashboard_url="/d/your-dashboard" -bearer_token="my-awesome-token" +bearer_token_secret="my-awesome-token" # if you want to use polygon_mumbial [Network]