diff --git a/operator/src/network/cas.rs b/operator/src/network/cas.rs index b655051b..9dc7306d 100644 --- a/operator/src/network/cas.rs +++ b/operator/src/network/cas.rs @@ -32,7 +32,7 @@ use crate::{ resource_limits::ResourceLimitsConfig, CasApiSpec, CasSpec, }, - utils::override_env_vars, + utils::override_and_sort_env_vars, }; const CAS_IPFS_INFO_SUFFIX: &str = "cas"; @@ -309,7 +309,7 @@ pub fn cas_stateful_set_spec( datadog.inject_env(&mut cas_api_env); // Apply the CAS API env overrides, if specified. - override_env_vars(&mut cas_api_env, &config.api.env); + override_and_sort_env_vars(&mut cas_api_env, &config.api.env); StatefulSetSpec { replicas: Some(1), diff --git a/operator/src/network/ceramic.rs b/operator/src/network/ceramic.rs index 6ebc3047..879ecb70 100644 --- a/operator/src/network/ceramic.rs +++ b/operator/src/network/ceramic.rs @@ -31,7 +31,7 @@ use crate::{ resource_limits::ResourceLimitsConfig, CeramicSpec, NetworkSpec, NetworkType, }, - utils::override_env_vars, + utils::override_and_sort_env_vars, }; use super::debug_mode_security_context; @@ -402,7 +402,7 @@ pub fn stateful_set_spec(ns: &str, bundle: &CeramicBundle<'_>) -> StatefulSetSpe } // Apply env overrides, if specified. - override_env_vars(&mut ceramic_env, &bundle.config.env); + override_and_sort_env_vars(&mut ceramic_env, &bundle.config.env); let mut init_env = vec![EnvVar { name: "CERAMIC_ADMIN_PRIVATE_KEY".to_owned(), diff --git a/operator/src/network/controller.rs b/operator/src/network/controller.rs index 34cd60dd..44d41537 100644 --- a/operator/src/network/controller.rs +++ b/operator/src/network/controller.rs @@ -2270,40 +2270,40 @@ mod tests { { - "env": [ - { - - "name": "RUST_LOG", - - "value": "info,ceramic_one=debug,multipart=error" - - }, - - { - "name": "CERAMIC_ONE_BIND_ADDRESS", - "value": "0.0.0.0:5001" - }, - { - - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - - "value": "0.0.0.0:9465" + - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + - "value": "1" - }, - { - - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - - "value": "/ip4/0.0.0.0/tcp/4001" + - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + - "value": "6" - }, - { - - "name": "CERAMIC_ONE_STORE_DIR", - - "value": "/data/ipfs" + - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + - "value": "0" + - }, + - { + - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + - "value": "0.0.0.0:9465" - }, - { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" - }, - { - - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - - "value": "0" + - "name": "CERAMIC_ONE_STORE_DIR", + - "value": "/data/ipfs" - }, - { - - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - - "value": "6" + - "name": "CERAMIC_ONE_SWARM_ADDRESSES", + - "value": "/ip4/0.0.0.0/tcp/4001" - }, - { - - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - - "value": "1" + - "name": "RUST_LOG", + - "value": "info,ceramic_one=debug,multipart=error" - } - ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -2399,40 +2399,40 @@ mod tests { { - "env": [ - { - - "name": "RUST_LOG", - - "value": "info,ceramic_one=debug,multipart=error" - - }, - - { - "name": "CERAMIC_ONE_BIND_ADDRESS", - "value": "0.0.0.0:5001" - }, - { - - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - - "value": "0.0.0.0:9465" + - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + - "value": "1" - }, - { - - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - - "value": "/ip4/0.0.0.0/tcp/4001" + - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + - "value": "6" - }, - { - - "name": "CERAMIC_ONE_STORE_DIR", - - "value": "/data/ipfs" + - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + - "value": "0" + - }, + - { + - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + - "value": "0.0.0.0:9465" - }, - { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" - }, - { - - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - - "value": "0" + - "name": "CERAMIC_ONE_STORE_DIR", + - "value": "/data/ipfs" - }, - { - - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - - "value": "6" + - "name": "CERAMIC_ONE_SWARM_ADDRESSES", + - "value": "/ip4/0.0.0.0/tcp/4001" - }, - { - - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - - "value": "1" + - "name": "RUST_LOG", + - "value": "info,ceramic_one=debug,multipart=error" - } - ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -2547,40 +2547,40 @@ mod tests { { - "env": [ - { - - "name": "RUST_LOG", - - "value": "info,ceramic_one=debug,multipart=error" - - }, - - { - "name": "CERAMIC_ONE_BIND_ADDRESS", - "value": "0.0.0.0:5001" - }, - { - - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - - "value": "0.0.0.0:9465" + - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + - "value": "1" - }, - { - - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - - "value": "/ip4/0.0.0.0/tcp/4001" + - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + - "value": "6" - }, - { - - "name": "CERAMIC_ONE_STORE_DIR", - - "value": "/data/ipfs" + - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + - "value": "0" + - }, + - { + - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + - "value": "0.0.0.0:9465" - }, - { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" - }, - { - - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - - "value": "0" + - "name": "CERAMIC_ONE_STORE_DIR", + - "value": "/data/ipfs" - }, - { - - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - - "value": "6" + - "name": "CERAMIC_ONE_SWARM_ADDRESSES", + - "value": "/ip4/0.0.0.0/tcp/4001" - }, - { - - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - - "value": "1" + - "name": "RUST_LOG", + - "value": "info,ceramic_one=debug,multipart=error" - } - ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -2678,30 +2678,10 @@ mod tests { stub.ceramics[0].stateful_set.patch(expect![[r#" --- original +++ modified - @@ -220,20 +220,32 @@ - { - "env": [ - { - - "name": "RUST_LOG", - - "value": "info,ceramic_one=debug,multipart=error" - + "name": "CERAMIC_ONE_BIND_ADDRESS", - + "value": "0.0.0.0:5001" - + }, - + { - + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - + "value": "1" - }, - { - - "name": "CERAMIC_ONE_BIND_ADDRESS", - - "value": "0.0.0.0:5001" - + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - + "value": "6" + @@ -236,6 +236,10 @@ + "value": "0" }, { - + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - + "value": "0" - + }, - + { + "name": "CERAMIC_ONE_METRICS", + "value": "false" + }, @@ -2709,40 +2689,20 @@ mod tests { "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", "value": "0.0.0.0:9465" }, - { - - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - - "value": "/ip4/0.0.0.0/tcp/4001" - + "name": "CERAMIC_ONE_NETWORK", - + "value": "local" + @@ -252,11 +256,19 @@ + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_STORE_DIR", - @@ -240,23 +252,23 @@ - "value": "/data/ipfs" - }, - { - - "name": "CERAMIC_ONE_NETWORK", - - "value": "local" - + "name": "CERAMIC_ONE_SWARM_ADDRESSES", - + "value": "/ip4/0.0.0.0/tcp/4001" - }, - { - - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - - "value": "0" + "name": "ENV_KEY_A", + "value": "ENV_VALUE_A" - }, - { - - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - - "value": "6" + + }, + + { + "name": "ENV_KEY_B", + "value": "ENV_VALUE_B" - }, - { - - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - - "value": "1" - + "name": "RUST_LOG", - + "value": "info,ceramic_one=debug,multipart=error" + + }, + + { + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -2816,7 +2776,7 @@ mod tests { --- original +++ modified @@ -134,8 +134,8 @@ - "value": "9464" + "value": "http://localstack:4566/000000000000/cas-anchor-dev-" } ], - "image": "ceramicnetwork/ceramic-anchor-service:latest", @@ -3274,56 +3234,47 @@ mod tests { stub.ceramics[0].stateful_set.patch(expect![[r#" --- original +++ modified - @@ -47,15 +47,15 @@ + @@ -47,7 +47,7 @@ "env": [ - { - "name": "CERAMIC_NETWORK", - - "value": "local" - + "value": "dev-unstable" - }, - { - "name": "ETH_RPC_URL", - - "value": "http://ganache:8545" - + "value": "" - }, { "name": "CAS_API_URL", - "value": "http://cas:8081" + "value": "https://some-external-cas.com:8080" }, { - "name": "CERAMIC_SQLITE_PATH", - @@ -98,10 +98,6 @@ - "name": "ceramic-postgres-auth" - } - } + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + @@ -63,11 +63,7 @@ + }, + { + "name": "CERAMIC_NETWORK", + - "value": "local" - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" - } - ], - "image": "ceramicnetwork/composedb:latest", - @@ -241,7 +237,7 @@ + + "value": "dev-unstable" }, { - "name": "CERAMIC_ONE_NETWORK", - - "value": "local" - + "value": "dev-unstable" + "name": "CERAMIC_SQLITE_PATH", + @@ -79,7 +75,7 @@ }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - @@ -315,15 +311,15 @@ + "name": "ETH_RPC_URL", + - "value": "http://ganache:8545" + + "value": "" }, { - "name": "CERAMIC_NETWORK", + "name": "POSTGRES_DB", + @@ -241,7 +237,7 @@ + }, + { + "name": "CERAMIC_ONE_NETWORK", - "value": "local" + "value": "dev-unstable" }, { - "name": "ETH_RPC_URL", - - "value": "http://ganache:8545" - + "value": "" + "name": "CERAMIC_ONE_STORE_DIR", + @@ -315,7 +311,7 @@ }, { "name": "CAS_API_URL", @@ -3331,18 +3282,29 @@ mod tests { + "value": "https://some-external-cas.com:8080" }, { - "name": "CERAMIC_SQLITE_PATH", - @@ -366,10 +362,6 @@ - "name": "ceramic-postgres-auth" - } - } + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + @@ -331,11 +327,7 @@ + }, + { + "name": "CERAMIC_NETWORK", + - "value": "local" - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" - } - ], - "image": "ceramicnetwork/composedb-cli:latest", + + "value": "dev-unstable" + }, + { + "name": "CERAMIC_SQLITE_PATH", + @@ -347,7 +339,7 @@ + }, + { + "name": "ETH_RPC_URL", + - "value": "http://ganache:8545" + + "value": "" + }, + { + "name": "POSTGRES_DB", "#]]); let (testctx, api_handle) = Context::test(mock_rpc_client); let fakeserver = ApiServerVerifier::new(api_handle); @@ -3369,7 +3331,7 @@ mod tests { --- original +++ modified @@ -104,8 +104,8 @@ - "value": "/ceramic/local-0" + } } ], - "image": "ceramicnetwork/composedb:latest", @@ -3432,9 +3394,9 @@ mod tests { }, "spec": { @@ -102,6 +107,22 @@ - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" + "name": "ceramic-postgres-auth" + } + } + }, + { + "name": "DD_AGENT_HOST", @@ -3477,12 +3439,10 @@ mod tests { } }, "spec": { - @@ -132,6 +138,22 @@ + @@ -86,6 +92,22 @@ + } + }, { - "name": "METRICS_PORT", - "value": "9464" - + }, - + { + "name": "DD_AGENT_HOST", + "valueFrom": { + "fieldRef": { @@ -3491,15 +3451,17 @@ mod tests { + } + }, + { - + "name": "DD_RUNTIME_METRICS_ENABLED", + + "name": "DD_PROFILING_ENABLED", + "value": "true" + }, + { - + "name": "DD_PROFILING_ENABLED", + + "name": "DD_RUNTIME_METRICS_ENABLED", + "value": "true" - } - ], - "image": "ceramicnetwork/ceramic-anchor-service:latest", + + }, + + { + "name": "ETH_CONTRACT_ADDRESS", + "value": "0x231055A0852D67C7107Ad0d0DFeab60278fE6AdC" + }, "#]]); let (testctx, api_handle) = Context::test(mock_rpc_client); let fakeserver = ApiServerVerifier::new(api_handle); @@ -3783,175 +3745,23 @@ mod tests { stub.ceramics[0].stateful_set.patch(expect![[r#" --- original +++ modified - @@ -46,16 +46,28 @@ - ], - "env": [ - { - + "name": "CAS_API_URL", - + "value": "http://cas:8081" - + }, - + { - + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - + "value": ".*" - + }, - + { - + "name": "CERAMIC_IPFS_HOST", - + "value": "http://localhost:5001" - + }, - + { - + "name": "CERAMIC_LOG_LEVEL", - + "value": "2" - + }, - + { - "name": "CERAMIC_NETWORK", - "value": "local" - }, - { - - "name": "ETH_RPC_URL", - - "value": "http://ganache:8545" - - }, - - { - - "name": "CAS_API_URL", - - "value": "http://cas:8081" - + "name": "CERAMIC_NETWORK_TOPIC", - + "value": "/ceramic/local-0" - }, - { - "name": "CERAMIC_SQLITE_PATH", - @@ -66,16 +78,8 @@ - "value": "/ceramic-data/statestore" - }, - { - - "name": "CERAMIC_IPFS_HOST", - - "value": "http://localhost:5001" - - }, - - { - - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - - "value": ".*" - - }, - - { - - "name": "CERAMIC_LOG_LEVEL", - - "value": "2" - + "name": "ETH_RPC_URL", - + "value": "http://ganache:8545" - }, - { - "name": "POSTGRES_DB", - @@ -82,26 +86,26 @@ - "value": "ceramic" - }, - { - - "name": "POSTGRES_USER", - + "name": "POSTGRES_PASSWORD", - "valueFrom": { - "secretKeyRef": { - - "key": "username", - + "key": "password", - "name": "ceramic-postgres-auth" - } - } - }, - { - - "name": "POSTGRES_PASSWORD", - + "name": "POSTGRES_USER", - "valueFrom": { - "secretKeyRef": { - - "key": "password", - + "key": "username", + @@ -102,6 +102,10 @@ "name": "ceramic-postgres-auth" } } - }, - { - - "name": "CERAMIC_NETWORK_TOPIC", - - "value": "/ceramic/local-0" + + }, + + { + "name": "SOME_ENV_VAR", + "value": "SOME_ENV_VALUE" } ], "image": "ceramicnetwork/composedb:latest", - @@ -314,16 +318,28 @@ - } - }, - { - + "name": "CAS_API_URL", - + "value": "http://cas:8081" - + }, - + { - + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - + "value": ".*" - + }, - + { - + "name": "CERAMIC_IPFS_HOST", - + "value": "http://localhost:5001" - + }, - + { - + "name": "CERAMIC_LOG_LEVEL", - + "value": "2" - + }, - + { - "name": "CERAMIC_NETWORK", - "value": "local" - }, - { - - "name": "ETH_RPC_URL", - - "value": "http://ganache:8545" - - }, - - { - - "name": "CAS_API_URL", - - "value": "http://cas:8081" - + "name": "CERAMIC_NETWORK_TOPIC", - + "value": "/ceramic/local-0" - }, - { - "name": "CERAMIC_SQLITE_PATH", - @@ -334,16 +350,8 @@ - "value": "/ceramic-data/statestore" - }, - { - - "name": "CERAMIC_IPFS_HOST", - - "value": "http://localhost:5001" - - }, - - { - - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - - "value": ".*" - - }, - - { - - "name": "CERAMIC_LOG_LEVEL", - - "value": "2" - + "name": "ETH_RPC_URL", - + "value": "http://ganache:8545" - }, - { - "name": "POSTGRES_DB", - @@ -350,26 +358,26 @@ - "value": "ceramic" - }, - { - - "name": "POSTGRES_USER", - + "name": "POSTGRES_PASSWORD", - "valueFrom": { - "secretKeyRef": { - - "key": "username", - + "key": "password", - "name": "ceramic-postgres-auth" - } - } - }, - { - - "name": "POSTGRES_PASSWORD", - + "name": "POSTGRES_USER", - "valueFrom": { - "secretKeyRef": { - - "key": "password", - + "key": "username", + @@ -370,6 +374,10 @@ "name": "ceramic-postgres-auth" } } - }, - { - - "name": "CERAMIC_NETWORK_TOPIC", - - "value": "/ceramic/local-0" + + }, + + { + "name": "SOME_ENV_VAR", + "value": "SOME_ENV_VALUE" } @@ -4229,40 +4039,40 @@ mod tests { { - "env": [ - { - - "name": "RUST_LOG", - - "value": "info,ceramic_one=debug,multipart=error" - - }, - - { - "name": "CERAMIC_ONE_BIND_ADDRESS", - "value": "0.0.0.0:5001" - }, - { - - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - - "value": "0.0.0.0:9465" + - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + - "value": "1" - }, - { - - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - - "value": "/ip4/0.0.0.0/tcp/4001" + - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + - "value": "6" - }, - { - - "name": "CERAMIC_ONE_STORE_DIR", - - "value": "/data/ipfs" + - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + - "value": "0" + - }, + - { + - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + - "value": "0.0.0.0:9465" - }, - { - "name": "CERAMIC_ONE_NETWORK", - "value": "local" - }, - { - - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - - "value": "0" + - "name": "CERAMIC_ONE_STORE_DIR", + - "value": "/data/ipfs" - }, - { - - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - - "value": "6" + - "name": "CERAMIC_ONE_SWARM_ADDRESSES", + - "value": "/ip4/0.0.0.0/tcp/4001" - }, - { - - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - - "value": "1" + - "name": "RUST_LOG", + - "value": "info,ceramic_one=debug,multipart=error" - } - ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -4549,17 +4359,17 @@ mod tests { "volumeMounts": [ { "mountPath": "/config", - @@ -254,6 +261,10 @@ + @@ -252,6 +259,10 @@ + "value": "/ip4/0.0.0.0/tcp/4001" + }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" - + }, - + { + "name": "CERAMIC_ONE_TOKIO_CONSOLE", + "value": "true" + + }, + + { + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } - ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -274,6 +285,11 @@ "containerPort": 9465, "name": "metrics", @@ -4590,17 +4400,17 @@ mod tests { stub.cas_ipfs_stateful_set.patch(expect![[r#" --- original +++ modified - @@ -71,6 +71,10 @@ + @@ -69,6 +69,10 @@ + "value": "/ip4/0.0.0.0/tcp/4001" + }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" - + }, - + { + "name": "CERAMIC_ONE_TOKIO_CONSOLE", + "value": "true" + + }, + + { + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } - ], - "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -91,6 +95,11 @@ "containerPort": 9465, "name": "metrics", @@ -4660,142 +4470,30 @@ mod tests { stub.cas_stateful_set.patch(expect![[r#" --- original +++ modified - @@ -36,8 +36,28 @@ - { - "env": [ - { - - "name": "DB_NAME", - - "value": "anchor_db" - + "name": "APP_MODE", - + "value": "server" - + }, - + { - + "name": "APP_PORT", - + "value": "8080" - + }, - + { - + "name": "AWS_ACCESS_KEY_ID", - + "value": "." - + }, - + { - + "name": "AWS_ACCOUNT_ID", - + "value": "000000000000" - + }, - + { - + "name": "AWS_REGION", - + "value": "us-east-1" - + }, - + { - + "name": "AWS_SECRET_ACCESS_KEY", - + "value": "." - }, - { - "name": "DB_HOST", - @@ -44,42 +64,38 @@ - "value": "cas-postgres" + @@ -41,7 +41,7 @@ }, { - - "name": "DB_USERNAME", - + "name": "DB_NAME", - + "value": "anchor_db" - + }, - + { - + "name": "DB_PASSWORD", - "valueFrom": { - "secretKeyRef": { - - "key": "username", - + "key": "password", - "name": "postgres-auth" - } - } + "name": "APP_PORT", + - "value": "8081" + + "value": "8080" }, { - - "name": "DB_PASSWORD", - + "name": "DB_USERNAME", - "valueFrom": { - "secretKeyRef": { - - "key": "password", - + "key": "username", - "name": "postgres-auth" - } + "name": "AWS_ACCESS_KEY_ID", + @@ -86,6 +86,14 @@ } }, { - - "name": "AWS_ACCOUNT_ID", - - "value": "000000000000" + "name": "ENV_KEY_A", + "value": "ENV_VALUE_A" - }, - { - - "name": "AWS_REGION", - - "value": "us-east-1" - - }, - - { - - "name": "AWS_ACCESS_KEY_ID", - - "value": "." + + }, + + { + "name": "ENV_KEY_B", + "value": "ENV_VALUE_B" + + }, + + { + "name": "ETH_CONTRACT_ADDRESS", + "value": "0x231055A0852D67C7107Ad0d0DFeab60278fE6AdC" }, - { - - "name": "AWS_SECRET_ACCESS_KEY", - - "value": "." - - }, - - { - - "name": "SQS_QUEUE_URL", - - "value": "http://localstack:4566/000000000000/cas-anchor-dev-" - + "name": "ETH_CONTRACT_ADDRESS", - + "value": "0x231055A0852D67C7107Ad0d0DFeab60278fE6AdC" - }, - { - "name": "ETH_GAS_LIMIT", - @@ -98,20 +114,20 @@ - "value": "0x06dd0990d19001c57eeea6d32e8fdeee40d3945962caf18c18c3930baa5a6ec9" - }, - { - - "name": "ETH_CONTRACT_ADDRESS", - - "value": "0x231055A0852D67C7107Ad0d0DFeab60278fE6AdC" - + "name": "LOG_LEVEL", - + "value": "debug" - }, - { - - "name": "NODE_ENV", - - "value": "dev" - + "name": "MERKLE_CAR_STORAGE_MODE", - + "value": "s3" - }, - { - - "name": "LOG_LEVEL", - - "value": "debug" - + "name": "METRICS_PORT", - + "value": "9464" - }, - { - - "name": "MERKLE_CAR_STORAGE_MODE", - - "value": "s3" - + "name": "NODE_ENV", - + "value": "dev" - }, - { - "name": "S3_BUCKET_NAME", - @@ -122,16 +138,8 @@ - "value": "http://localstack:4566" - }, - { - - "name": "APP_MODE", - - "value": "server" - - }, - - { - - "name": "APP_PORT", - - "value": "8081" - - }, - - { - - "name": "METRICS_PORT", - - "value": "9464" - + "name": "SQS_QUEUE_URL", - + "value": "http://localstack:4566/000000000000/cas-anchor-dev-" - } - ], - "image": "ceramicnetwork/ceramic-anchor-service:latest", "#]]); let (testctx, api_handle) = Context::test(mock_rpc_client); let fakeserver = ApiServerVerifier::new(api_handle); diff --git a/operator/src/network/ipfs.rs b/operator/src/network/ipfs.rs index 87a37b3b..15dd2dfc 100644 --- a/operator/src/network/ipfs.rs +++ b/operator/src/network/ipfs.rs @@ -18,7 +18,7 @@ use crate::{ resource_limits::ResourceLimitsConfig, GoIpfsSpec, IpfsSpec, RustIpfsSpec, NETWORK_LOCAL_ID, }, - utils::override_env_vars, + utils::override_and_sort_env_vars, }; use super::debug_mode_security_context; @@ -203,7 +203,7 @@ impl RustIpfsConfig { } // Apply env overrides, if specified. - override_env_vars(&mut env, &self.env); + override_and_sort_env_vars(&mut env, &self.env); // Construct the set of ports let mut ports = vec![ diff --git a/operator/src/network/testdata/ceramic_go_ss_1 b/operator/src/network/testdata/ceramic_go_ss_1 index 6aec95a1..81a7d4cc 100644 --- a/operator/src/network/testdata/ceramic_go_ss_1 +++ b/operator/src/network/testdata/ceramic_go_ss_1 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -281,62 +281,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_1 b/operator/src/network/testdata/ceramic_ss_1 index fec46ed5..5f3fd25e 100644 --- a/operator/src/network/testdata/ceramic_ss_1 +++ b/operator/src/network/testdata/ceramic_ss_1 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_0 b/operator/src/network/testdata/ceramic_ss_weighted_0 index 030d0d0f..c090d6f4 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_0 +++ b/operator/src/network/testdata/ceramic_ss_weighted_0 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_1 b/operator/src/network/testdata/ceramic_ss_weighted_1 index 32d2bd96..0e053195 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_1 +++ b/operator/src/network/testdata/ceramic_ss_weighted_1 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_2 b/operator/src/network/testdata/ceramic_ss_weighted_2 index 0008f30d..f7a490aa 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_2 +++ b/operator/src/network/testdata/ceramic_ss_weighted_2 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_3 b/operator/src/network/testdata/ceramic_ss_weighted_3 index fe2f8a69..593f0697 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_3 +++ b/operator/src/network/testdata/ceramic_ss_weighted_3 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_4 b/operator/src/network/testdata/ceramic_ss_weighted_4 index 96f20b94..c866b2b5 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_4 +++ b/operator/src/network/testdata/ceramic_ss_weighted_4 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_5 b/operator/src/network/testdata/ceramic_ss_weighted_5 index a75c7aa2..7f05b6b5 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_5 +++ b/operator/src/network/testdata/ceramic_ss_weighted_5 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_6 b/operator/src/network/testdata/ceramic_ss_weighted_6 index 8a14905f..24fb2663 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_6 +++ b/operator/src/network/testdata/ceramic_ss_weighted_6 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_7 b/operator/src/network/testdata/ceramic_ss_weighted_7 index ccc0476c..db3e7c7d 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_7 +++ b/operator/src/network/testdata/ceramic_ss_weighted_7 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_8 b/operator/src/network/testdata/ceramic_ss_weighted_8 index 637c6b16..6f6231eb 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_8 +++ b/operator/src/network/testdata/ceramic_ss_weighted_8 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/ceramic_ss_weighted_9 b/operator/src/network/testdata/ceramic_ss_weighted_9 index 858a6ec5..c9232296 100644 --- a/operator/src/network/testdata/ceramic_ss_weighted_9 +++ b/operator/src/network/testdata/ceramic_ss_weighted_9 @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/network/testdata/default_stubs/cas_ipfs_stateful_set b/operator/src/network/testdata/default_stubs/cas_ipfs_stateful_set index fc4f54f1..5e33c1ff 100644 --- a/operator/src/network/testdata/default_stubs/cas_ipfs_stateful_set +++ b/operator/src/network/testdata/default_stubs/cas_ipfs_stateful_set @@ -36,41 +36,41 @@ Request { "containers": [ { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", diff --git a/operator/src/network/testdata/default_stubs/cas_stateful_set b/operator/src/network/testdata/default_stubs/cas_stateful_set index fce7081b..4be87b22 100644 --- a/operator/src/network/testdata/default_stubs/cas_stateful_set +++ b/operator/src/network/testdata/default_stubs/cas_stateful_set @@ -36,50 +36,58 @@ Request { { "env": [ { - "name": "DB_NAME", - "value": "anchor_db" + "name": "APP_MODE", + "value": "server" + }, + { + "name": "APP_PORT", + "value": "8081" + }, + { + "name": "AWS_ACCESS_KEY_ID", + "value": "." + }, + { + "name": "AWS_ACCOUNT_ID", + "value": "000000000000" + }, + { + "name": "AWS_REGION", + "value": "us-east-1" + }, + { + "name": "AWS_SECRET_ACCESS_KEY", + "value": "." }, { "name": "DB_HOST", "value": "cas-postgres" }, { - "name": "DB_USERNAME", + "name": "DB_NAME", + "value": "anchor_db" + }, + { + "name": "DB_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "postgres-auth" } } }, { - "name": "DB_PASSWORD", + "name": "DB_USERNAME", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "postgres-auth" } } }, { - "name": "AWS_ACCOUNT_ID", - "value": "000000000000" - }, - { - "name": "AWS_REGION", - "value": "us-east-1" - }, - { - "name": "AWS_ACCESS_KEY_ID", - "value": "." - }, - { - "name": "AWS_SECRET_ACCESS_KEY", - "value": "." - }, - { - "name": "SQS_QUEUE_URL", - "value": "http://localstack:4566/000000000000/cas-anchor-dev-" + "name": "ETH_CONTRACT_ADDRESS", + "value": "0x231055A0852D67C7107Ad0d0DFeab60278fE6AdC" }, { "name": "ETH_GAS_LIMIT", @@ -97,14 +105,6 @@ Request { "name": "ETH_WALLET_PK", "value": "0x06dd0990d19001c57eeea6d32e8fdeee40d3945962caf18c18c3930baa5a6ec9" }, - { - "name": "ETH_CONTRACT_ADDRESS", - "value": "0x231055A0852D67C7107Ad0d0DFeab60278fE6AdC" - }, - { - "name": "NODE_ENV", - "value": "dev" - }, { "name": "LOG_LEVEL", "value": "debug" @@ -114,24 +114,24 @@ Request { "value": "s3" }, { - "name": "S3_BUCKET_NAME", - "value": "merkle-car" + "name": "METRICS_PORT", + "value": "9464" }, { - "name": "S3_ENDPOINT", - "value": "http://localstack:4566" + "name": "NODE_ENV", + "value": "dev" }, { - "name": "APP_MODE", - "value": "server" + "name": "S3_BUCKET_NAME", + "value": "merkle-car" }, { - "name": "APP_PORT", - "value": "8081" + "name": "S3_ENDPOINT", + "value": "http://localstack:4566" }, { - "name": "METRICS_PORT", - "value": "9464" + "name": "SQS_QUEUE_URL", + "value": "http://localstack:4566/000000000000/cas-anchor-dev-" } ], "image": "ceramicnetwork/ceramic-anchor-service:latest", diff --git a/operator/src/network/testdata/default_stubs/ceramic_stateful_set b/operator/src/network/testdata/default_stubs/ceramic_stateful_set index 9e1c9b68..9fefd827 100644 --- a/operator/src/network/testdata/default_stubs/ceramic_stateful_set +++ b/operator/src/network/testdata/default_stubs/ceramic_stateful_set @@ -46,62 +46,62 @@ Request { ], "env": [ { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb:latest", @@ -219,41 +219,41 @@ Request { }, { "env": [ - { - "name": "RUST_LOG", - "value": "info,ceramic_one=debug,multipart=error" - }, { "name": "CERAMIC_ONE_BIND_ADDRESS", "value": "0.0.0.0:5001" }, { - "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", - "value": "0.0.0.0:9465" + "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", + "value": "1" }, { - "name": "CERAMIC_ONE_SWARM_ADDRESSES", - "value": "/ip4/0.0.0.0/tcp/4001" + "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", + "value": "6" }, { - "name": "CERAMIC_ONE_STORE_DIR", - "value": "/data/ipfs" + "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", + "value": "0" + }, + { + "name": "CERAMIC_ONE_METRICS_BIND_ADDRESS", + "value": "0.0.0.0:9465" }, { "name": "CERAMIC_ONE_NETWORK", "value": "local" }, { - "name": "CERAMIC_ONE_LOCAL_NETWORK_ID", - "value": "0" + "name": "CERAMIC_ONE_STORE_DIR", + "value": "/data/ipfs" }, { - "name": "CERAMIC_ONE_KADEMLIA_REPLICATION", - "value": "6" + "name": "CERAMIC_ONE_SWARM_ADDRESSES", + "value": "/ip4/0.0.0.0/tcp/4001" }, { - "name": "CERAMIC_ONE_KADEMLIA_PARALLELISM", - "value": "1" + "name": "RUST_LOG", + "value": "info,ceramic_one=debug,multipart=error" } ], "image": "public.ecr.aws/r5b3e0r5/3box/ceramic-one:latest", @@ -314,62 +314,62 @@ Request { } }, { - "name": "CERAMIC_NETWORK", - "value": "local" + "name": "CAS_API_URL", + "value": "http://cas:8081" }, { - "name": "ETH_RPC_URL", - "value": "http://ganache:8545" + "name": "CERAMIC_CORS_ALLOWED_ORIGINS", + "value": ".*" }, { - "name": "CAS_API_URL", - "value": "http://cas:8081" + "name": "CERAMIC_IPFS_HOST", + "value": "http://localhost:5001" }, { - "name": "CERAMIC_SQLITE_PATH", - "value": "/ceramic-data/ceramic.db" + "name": "CERAMIC_LOG_LEVEL", + "value": "2" }, { - "name": "CERAMIC_STATE_STORE_PATH", - "value": "/ceramic-data/statestore" + "name": "CERAMIC_NETWORK", + "value": "local" }, { - "name": "CERAMIC_IPFS_HOST", - "value": "http://localhost:5001" + "name": "CERAMIC_NETWORK_TOPIC", + "value": "/ceramic/local-0" }, { - "name": "CERAMIC_CORS_ALLOWED_ORIGINS", - "value": ".*" + "name": "CERAMIC_SQLITE_PATH", + "value": "/ceramic-data/ceramic.db" }, { - "name": "CERAMIC_LOG_LEVEL", - "value": "2" + "name": "CERAMIC_STATE_STORE_PATH", + "value": "/ceramic-data/statestore" + }, + { + "name": "ETH_RPC_URL", + "value": "http://ganache:8545" }, { "name": "POSTGRES_DB", "value": "ceramic" }, { - "name": "POSTGRES_USER", + "name": "POSTGRES_PASSWORD", "valueFrom": { "secretKeyRef": { - "key": "username", + "key": "password", "name": "ceramic-postgres-auth" } } }, { - "name": "POSTGRES_PASSWORD", + "name": "POSTGRES_USER", "valueFrom": { "secretKeyRef": { - "key": "password", + "key": "username", "name": "ceramic-postgres-auth" } } - }, - { - "name": "CERAMIC_NETWORK_TOPIC", - "value": "/ceramic/local-0" } ], "image": "ceramicnetwork/composedb-cli:latest", diff --git a/operator/src/utils/mod.rs b/operator/src/utils/mod.rs index a1749fdd..ca52b5ad 100644 --- a/operator/src/utils/mod.rs +++ b/operator/src/utils/mod.rs @@ -320,7 +320,10 @@ pub fn generate_random_secret( } /// Apply override env vars to an existing env var list -pub fn override_env_vars(env: &mut Vec, overrides: &Option>) { +pub fn override_and_sort_env_vars( + env: &mut Vec, + overrides: &Option>, +) { if let Some(override_env) = &overrides { override_env.iter().for_each(|(key, value)| { if let Some((pos, _)) = env.iter().enumerate().find(|(_, var)| &var.name == key) { @@ -332,7 +335,7 @@ pub fn override_env_vars(env: &mut Vec, overrides: &Option; trait MetricsCollection: std::fmt::Debug { /// Collects a counter metric from the given host. None if metric not found. async fn collect_counter(&self, addr: Url, metric_name: &str) -> Result>; - fn boxed(&self) -> MetricsCollector; } #[derive(Clone, Debug)] @@ -251,9 +250,6 @@ impl MetricsCollection for PromMetricCollector { Ok(None) } } - fn boxed(&self) -> MetricsCollector { - Box::new(self.clone()) - } } #[derive(Debug, Clone)] @@ -881,24 +877,24 @@ impl ScenarioState { config.manager = true; config.manager_bind_port = 5115; config.expect_workers = Some(self.topo.total_workers); - config.startup_time = "10s".to_owned(); - config.run_time = self.run_time.clone(); + config.startup_time = "10s".to_string(); + config.run_time = self.run_time.to_string(); config } else { let mut config = GooseConfiguration::default(); // we could set `config.verbose` which is for stdout, but for now we just use files as it doesn't seem to do anything on workers if let Some(ref log_level) = self.log_level { config.log_level = log_level.as_goose_log_level(); - config.scenario_log = "scenario.log".to_owned(); - config.transaction_log = "transaction.log".to_owned(); - config.request_log = "request.log".to_owned(); - config.error_log = "error.log".to_owned(); + config.scenario_log = "scenario.log".to_string(); + config.transaction_log = "transaction.log".to_string(); + config.request_log = "request.log".to_string(); + config.error_log = "error.log".to_string(); } config.worker = true; config.host = self.target_peer_addr()?; // We are leveraging k8s dns search path so we do not have to specify the fully qualified // domain name explicitly. - config.manager_host = "manager.goose".to_owned(); + config.manager_host = "manager.goose".to_string(); config.manager_port = 5115; if let Some(throttle_requests) = self.throttle_requests { config.throttle_requests = throttle_requests @@ -1276,9 +1272,6 @@ mod test { tracing::debug!(?self.host_queries, "collecting metric {:?} for host {} got {:?}", metric_name, host, res); Ok(res) } - fn boxed(&self) -> MetricsCollector { - Box::new(self.clone()) - } } fn get_opts(scenario: Scenario, manager: bool, target_request_rate: Option) -> Opts { @@ -1328,9 +1321,10 @@ mod test { let peers = get_peers(); let metrics_collector = MockMetricsCollector::new(metric_start_value, metric_end_value); - let mut state = ScenarioState::try_from_opts(opts, metrics_collector.boxed(), Some(peers)) - .await - .unwrap(); + let mut state = + ScenarioState::try_from_opts(opts, Box::new(metrics_collector), Some(peers)) + .await + .unwrap(); state.collect_before_metrics().await.unwrap(); state.validate_recon_scenario_success(run_time).await.0