Skip to content

chore(apollo_deployments): change config overrides consts to fns #6361

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 7, 2025
Merged

chore(apollo_deployments): change config overrides consts to fns #6361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 28 additions & 20 deletions crates/apollo_deployments/src/deployment_definitions/sepolia_integration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,30 @@ const SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverrid
"0x4",
);

const SEPOLIA_INTEGRATION_NODE_0_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
SEPOLIA_INTEGRATION_NODE_0_INSTANCE_CONFIG_OVERRIDE,
);
const SEPOLIA_INTEGRATION_NODE_1_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
SEPOLIA_INTEGRATION_NODE_1_INSTANCE_CONFIG_OVERRIDE,
);
const SEPOLIA_INTEGRATION_NODE_2_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
SEPOLIA_INTEGRATION_NODE_2_INSTANCE_CONFIG_OVERRIDE,
);
const SEPOLIA_INTEGRATION_NODE_3_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE,
);
fn sepolia_integration_node_0_config_override() -> ConfigOverride {
ConfigOverride::new(
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
SEPOLIA_INTEGRATION_NODE_0_INSTANCE_CONFIG_OVERRIDE,
)
}
fn sepolia_integration_node_1_config_override() -> ConfigOverride {
ConfigOverride::new(
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
SEPOLIA_INTEGRATION_NODE_1_INSTANCE_CONFIG_OVERRIDE,
)
}
fn sepolia_integration_node_2_config_override() -> ConfigOverride {
ConfigOverride::new(
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
SEPOLIA_INTEGRATION_NODE_2_INSTANCE_CONFIG_OVERRIDE,
)
}
fn sepolia_integration_node_3_config_override() -> ConfigOverride {
ConfigOverride::new(
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE,
)
}

const SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str =
"integration-sepolia.starknet.io";
Expand All @@ -102,7 +110,7 @@ pub(crate) fn sepolia_integration_hybrid_deployment_node_0() -> Deployment {
"integration_hybrid_node_0",
Some(ExternalSecret::new("apollo-sepolia-integration-0")),
PathBuf::from(BASE_APP_CONFIG_PATH),
SEPOLIA_INTEGRATION_NODE_0_CONFIG_OVERRIDE,
sepolia_integration_node_0_config_override(),
SEPOLIA_INTEGRATION_INGRESS_DOMAIN.to_string(),
Some(vec![SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand All @@ -116,7 +124,7 @@ pub(crate) fn sepolia_integration_hybrid_deployment_node_1() -> Deployment {
"integration_hybrid_node_1",
Some(ExternalSecret::new("apollo-sepolia-integration-1")),
PathBuf::from(BASE_APP_CONFIG_PATH),
SEPOLIA_INTEGRATION_NODE_1_CONFIG_OVERRIDE,
sepolia_integration_node_1_config_override(),
SEPOLIA_INTEGRATION_INGRESS_DOMAIN.to_string(),
Some(vec![SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand All @@ -130,7 +138,7 @@ pub(crate) fn sepolia_integration_hybrid_deployment_node_2() -> Deployment {
"integration_hybrid_node_2",
Some(ExternalSecret::new("apollo-sepolia-integration-2")),
PathBuf::from(BASE_APP_CONFIG_PATH),
SEPOLIA_INTEGRATION_NODE_2_CONFIG_OVERRIDE,
sepolia_integration_node_2_config_override(),
SEPOLIA_INTEGRATION_INGRESS_DOMAIN.to_string(),
Some(vec![SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand All @@ -144,7 +152,7 @@ pub(crate) fn sepolia_integration_hybrid_deployment_node_3() -> Deployment {
"integration_hybrid_node_3",
Some(ExternalSecret::new("apollo-sepolia-integration-3")),
PathBuf::from(BASE_APP_CONFIG_PATH),
SEPOLIA_INTEGRATION_NODE_3_CONFIG_OVERRIDE,
sepolia_integration_node_3_config_override(),
SEPOLIA_INTEGRATION_INGRESS_DOMAIN.to_string(),
Some(vec![SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand Down
11 changes: 6 additions & 5 deletions crates/apollo_deployments/src/deployment_definitions/testing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ const TESTING_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride = InstanceConfigO
"0x64",
);

const TESTING_CONFIG_OVERRIDE: ConfigOverride =
ConfigOverride::new(TESTING_DEPLOYMENT_CONFIG_OVERRIDE, TESTING_INSTANCE_CONFIG_OVERRIDE);
fn testing_config_override() -> ConfigOverride {
ConfigOverride::new(TESTING_DEPLOYMENT_CONFIG_OVERRIDE, TESTING_INSTANCE_CONFIG_OVERRIDE)
}

const TESTING_INGRESS_DOMAIN: &str = "sw-dev.io";

Expand All @@ -42,7 +43,7 @@ pub(crate) fn system_test_distributed_deployment() -> Deployment {
"deployment_test_distributed",
None,
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_CONFIG_OVERRIDE,
testing_config_override(),
TESTING_INGRESS_DOMAIN.to_string(),
None,
)
Expand All @@ -56,7 +57,7 @@ pub(crate) fn system_test_hybrid_deployment() -> Deployment {
"deployment_test_hybrid",
None,
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_CONFIG_OVERRIDE,
testing_config_override(),
TESTING_INGRESS_DOMAIN.to_string(),
None,
)
Expand All @@ -70,7 +71,7 @@ pub(crate) fn system_test_consolidated_deployment() -> Deployment {
"deployment_test_consolidated",
None,
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_CONFIG_OVERRIDE,
testing_config_override(),
TESTING_INGRESS_DOMAIN.to_string(),
None,
)
Expand Down
48 changes: 28 additions & 20 deletions crates/apollo_deployments/src/deployment_definitions/testing_env_2.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,30 @@ const TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
"0x4",
);

const TESTING_ENV_2_NODE_0_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_2_NODE_0_INSTANCE_CONFIG_OVERRIDE,
);
const TESTING_ENV_2_NODE_1_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_2_NODE_1_INSTANCE_CONFIG_OVERRIDE,
);
const TESTING_ENV_2_NODE_2_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_2_NODE_2_INSTANCE_CONFIG_OVERRIDE,
);
const TESTING_ENV_2_NODE_3_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE,
);
fn testing_env_2_node_0_config_override() -> ConfigOverride {
ConfigOverride::new(
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_2_NODE_0_INSTANCE_CONFIG_OVERRIDE,
)
}
fn testing_env_2_node_1_config_override() -> ConfigOverride {
ConfigOverride::new(
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_2_NODE_1_INSTANCE_CONFIG_OVERRIDE,
)
}
fn testing_env_2_node_2_config_override() -> ConfigOverride {
ConfigOverride::new(
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_2_NODE_2_INSTANCE_CONFIG_OVERRIDE,
)
}
fn testing_env_2_node_3_config_override() -> ConfigOverride {
ConfigOverride::new(
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE,
)
}

const TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str =
"sn-test-sepolia-2-sepolia.gateway-proxy.sw-dev.io";
Expand All @@ -99,7 +107,7 @@ pub(crate) fn testing_env_2_hybrid_deployment_node_0() -> Deployment {
"integration_hybrid_node_0",
Some(ExternalSecret::new("sequencer-test-sepolia-0")),
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_ENV_2_NODE_0_CONFIG_OVERRIDE,
testing_env_2_node_0_config_override(),
TESTING_ENV_2_INGRESS_DOMAIN.to_string(),
Some(vec![TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand All @@ -113,7 +121,7 @@ pub(crate) fn testing_env_2_hybrid_deployment_node_1() -> Deployment {
"integration_hybrid_node_1",
Some(ExternalSecret::new("sequencer-test-sepolia-1")),
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_ENV_2_NODE_1_CONFIG_OVERRIDE,
testing_env_2_node_1_config_override(),
TESTING_ENV_2_INGRESS_DOMAIN.to_string(),
Some(vec![TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand All @@ -127,7 +135,7 @@ pub(crate) fn testing_env_2_hybrid_deployment_node_2() -> Deployment {
"integration_hybrid_node_2",
Some(ExternalSecret::new("sequencer-test-sepolia-2")),
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_ENV_2_NODE_2_CONFIG_OVERRIDE,
testing_env_2_node_2_config_override(),
TESTING_ENV_2_INGRESS_DOMAIN.to_string(),
Some(vec![TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand All @@ -141,7 +149,7 @@ pub(crate) fn testing_env_2_hybrid_deployment_node_3() -> Deployment {
"integration_hybrid_node_3",
Some(ExternalSecret::new("sequencer-test-sepolia-3")),
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_ENV_2_NODE_3_CONFIG_OVERRIDE,
testing_env_2_node_3_config_override(),
TESTING_ENV_2_INGRESS_DOMAIN.to_string(),
Some(vec![TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand Down
48 changes: 28 additions & 20 deletions crates/apollo_deployments/src/deployment_definitions/testing_env_3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,22 +70,30 @@ const TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
"0x4",
);

const TESTING_ENV_3_NODE_0_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_3_NODE_0_INSTANCE_CONFIG_OVERRIDE,
);
const TESTING_ENV_3_NODE_1_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_3_NODE_1_INSTANCE_CONFIG_OVERRIDE,
);
const TESTING_ENV_3_NODE_2_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_3_NODE_2_INSTANCE_CONFIG_OVERRIDE,
);
const TESTING_ENV_3_NODE_3_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE,
);
fn testing_env_3_node_0_config_override() -> ConfigOverride {
ConfigOverride::new(
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_3_NODE_0_INSTANCE_CONFIG_OVERRIDE,
)
}
fn testing_env_3_node_1_config_override() -> ConfigOverride {
ConfigOverride::new(
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_3_NODE_1_INSTANCE_CONFIG_OVERRIDE,
)
}
fn testing_env_3_node_2_config_override() -> ConfigOverride {
ConfigOverride::new(
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_3_NODE_2_INSTANCE_CONFIG_OVERRIDE,
)
}
fn testing_env_3_node_3_config_override() -> ConfigOverride {
ConfigOverride::new(
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE,
)
}

const TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str =
"sn-test-sepolia-3-sepolia.gateway-proxy.sw-dev.io";
Expand All @@ -100,7 +108,7 @@ pub(crate) fn testing_env_3_hybrid_deployment_node_0() -> Deployment {
"integration_hybrid_node_0",
Some(ExternalSecret::new("sequencer-test-3-node-0")),
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_ENV_3_NODE_0_CONFIG_OVERRIDE,
testing_env_3_node_0_config_override(),
TESTING_ENV_3_INGRESS_DOMAIN.to_string(),
Some(vec![TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand All @@ -114,7 +122,7 @@ pub(crate) fn testing_env_3_hybrid_deployment_node_1() -> Deployment {
"integration_hybrid_node_1",
Some(ExternalSecret::new("sequencer-test-3-node-1")),
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_ENV_3_NODE_1_CONFIG_OVERRIDE,
testing_env_3_node_1_config_override(),
TESTING_ENV_3_INGRESS_DOMAIN.to_string(),
Some(vec![TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand All @@ -128,7 +136,7 @@ pub(crate) fn testing_env_3_hybrid_deployment_node_2() -> Deployment {
"integration_hybrid_node_2",
Some(ExternalSecret::new("sequencer-test-3-node-2")),
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_ENV_3_NODE_2_CONFIG_OVERRIDE,
testing_env_3_node_2_config_override(),
TESTING_ENV_3_INGRESS_DOMAIN.to_string(),
Some(vec![TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand All @@ -142,7 +150,7 @@ pub(crate) fn testing_env_3_hybrid_deployment_node_3() -> Deployment {
"integration_hybrid_node_3",
Some(ExternalSecret::new("sequencer-test-3-node-3")),
PathBuf::from(BASE_APP_CONFIG_PATH),
TESTING_ENV_3_NODE_3_CONFIG_OVERRIDE,
testing_env_3_node_3_config_override(),
TESTING_ENV_3_INGRESS_DOMAIN.to_string(),
Some(vec![TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
)
Expand Down