Skip to content

Commit b2e0ea4

Browse files
Itay-Tsabary-StarkwareItay-Tsabary-Starkware
committed
chore(apollo_deployments): change config overrides consts to fns
1 parent d4fe0d3 commit b2e0ea4

File tree

4 files changed

+89
-64
lines changed

4 files changed

+89
-64
lines changed

‎crates/apollo_deployments/src/deployment_definitions/sepolia_integration.rs

+28-20
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,30 @@ const SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverrid
7070
"0x4",
7171
);
7272

73-
const SEPOLIA_INTEGRATION_NODE_0_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
74-
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
75-
SEPOLIA_INTEGRATION_NODE_0_INSTANCE_CONFIG_OVERRIDE,
76-
);
77-
const SEPOLIA_INTEGRATION_NODE_1_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
78-
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
79-
SEPOLIA_INTEGRATION_NODE_1_INSTANCE_CONFIG_OVERRIDE,
80-
);
81-
const SEPOLIA_INTEGRATION_NODE_2_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
82-
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
83-
SEPOLIA_INTEGRATION_NODE_2_INSTANCE_CONFIG_OVERRIDE,
84-
);
85-
const SEPOLIA_INTEGRATION_NODE_3_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
86-
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
87-
SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE,
88-
);
73+
fn sepolia_integration_node_0_config_override() -> ConfigOverride {
74+
ConfigOverride::new(
75+
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
76+
SEPOLIA_INTEGRATION_NODE_0_INSTANCE_CONFIG_OVERRIDE,
77+
)
78+
}
79+
fn sepolia_integration_node_1_config_override() -> ConfigOverride {
80+
ConfigOverride::new(
81+
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
82+
SEPOLIA_INTEGRATION_NODE_1_INSTANCE_CONFIG_OVERRIDE,
83+
)
84+
}
85+
fn sepolia_integration_node_2_config_override() -> ConfigOverride {
86+
ConfigOverride::new(
87+
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
88+
SEPOLIA_INTEGRATION_NODE_2_INSTANCE_CONFIG_OVERRIDE,
89+
)
90+
}
91+
fn sepolia_integration_node_3_config_override() -> ConfigOverride {
92+
ConfigOverride::new(
93+
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
94+
SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE,
95+
)
96+
}
8997

9098
const SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str =
9199
"integration-sepolia.starknet.io";
@@ -102,7 +110,7 @@ pub(crate) fn sepolia_integration_hybrid_deployment_node_0() -> Deployment {
102110
"integration_hybrid_node_0",
103111
Some(ExternalSecret::new("apollo-sepolia-integration-0")),
104112
PathBuf::from(BASE_APP_CONFIG_PATH),
105-
SEPOLIA_INTEGRATION_NODE_0_CONFIG_OVERRIDE,
113+
sepolia_integration_node_0_config_override(),
106114
SEPOLIA_INTEGRATION_INGRESS_DOMAIN.to_string(),
107115
Some(vec![SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
108116
)
@@ -116,7 +124,7 @@ pub(crate) fn sepolia_integration_hybrid_deployment_node_1() -> Deployment {
116124
"integration_hybrid_node_1",
117125
Some(ExternalSecret::new("apollo-sepolia-integration-1")),
118126
PathBuf::from(BASE_APP_CONFIG_PATH),
119-
SEPOLIA_INTEGRATION_NODE_1_CONFIG_OVERRIDE,
127+
sepolia_integration_node_1_config_override(),
120128
SEPOLIA_INTEGRATION_INGRESS_DOMAIN.to_string(),
121129
Some(vec![SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
122130
)
@@ -130,7 +138,7 @@ pub(crate) fn sepolia_integration_hybrid_deployment_node_2() -> Deployment {
130138
"integration_hybrid_node_2",
131139
Some(ExternalSecret::new("apollo-sepolia-integration-2")),
132140
PathBuf::from(BASE_APP_CONFIG_PATH),
133-
SEPOLIA_INTEGRATION_NODE_2_CONFIG_OVERRIDE,
141+
sepolia_integration_node_2_config_override(),
134142
SEPOLIA_INTEGRATION_INGRESS_DOMAIN.to_string(),
135143
Some(vec![SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
136144
)
@@ -144,7 +152,7 @@ pub(crate) fn sepolia_integration_hybrid_deployment_node_3() -> Deployment {
144152
"integration_hybrid_node_3",
145153
Some(ExternalSecret::new("apollo-sepolia-integration-3")),
146154
PathBuf::from(BASE_APP_CONFIG_PATH),
147-
SEPOLIA_INTEGRATION_NODE_3_CONFIG_OVERRIDE,
155+
sepolia_integration_node_3_config_override(),
148156
SEPOLIA_INTEGRATION_INGRESS_DOMAIN.to_string(),
149157
Some(vec![SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
150158
)

‎crates/apollo_deployments/src/deployment_definitions/testing.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ const TESTING_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride = InstanceConfigO
2929
"0x64",
3030
);
3131

32-
const TESTING_CONFIG_OVERRIDE: ConfigOverride =
33-
ConfigOverride::new(TESTING_DEPLOYMENT_CONFIG_OVERRIDE, TESTING_INSTANCE_CONFIG_OVERRIDE);
32+
fn testing_config_override() -> ConfigOverride {
33+
ConfigOverride::new(TESTING_DEPLOYMENT_CONFIG_OVERRIDE, TESTING_INSTANCE_CONFIG_OVERRIDE)
34+
}
3435

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

@@ -42,7 +43,7 @@ pub(crate) fn system_test_distributed_deployment() -> Deployment {
4243
"deployment_test_distributed",
4344
None,
4445
PathBuf::from(BASE_APP_CONFIG_PATH),
45-
TESTING_CONFIG_OVERRIDE,
46+
testing_config_override(),
4647
TESTING_INGRESS_DOMAIN.to_string(),
4748
None,
4849
)
@@ -56,7 +57,7 @@ pub(crate) fn system_test_consolidated_deployment() -> Deployment {
5657
"deployment_test_consolidated",
5758
None,
5859
PathBuf::from(BASE_APP_CONFIG_PATH),
59-
TESTING_CONFIG_OVERRIDE,
60+
testing_config_override(),
6061
TESTING_INGRESS_DOMAIN.to_string(),
6162
None,
6263
)

‎crates/apollo_deployments/src/deployment_definitions/testing_env_2.rs

+28-20
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,30 @@ const TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
7070
"0x4",
7171
);
7272

73-
const TESTING_ENV_2_NODE_0_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
74-
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
75-
TESTING_ENV_2_NODE_0_INSTANCE_CONFIG_OVERRIDE,
76-
);
77-
const TESTING_ENV_2_NODE_1_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
78-
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
79-
TESTING_ENV_2_NODE_1_INSTANCE_CONFIG_OVERRIDE,
80-
);
81-
const TESTING_ENV_2_NODE_2_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
82-
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
83-
TESTING_ENV_2_NODE_2_INSTANCE_CONFIG_OVERRIDE,
84-
);
85-
const TESTING_ENV_2_NODE_3_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
86-
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
87-
TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE,
88-
);
73+
fn testing_env_2_node_0_config_override() -> ConfigOverride {
74+
ConfigOverride::new(
75+
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
76+
TESTING_ENV_2_NODE_0_INSTANCE_CONFIG_OVERRIDE,
77+
)
78+
}
79+
fn testing_env_2_node_1_config_override() -> ConfigOverride {
80+
ConfigOverride::new(
81+
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
82+
TESTING_ENV_2_NODE_1_INSTANCE_CONFIG_OVERRIDE,
83+
)
84+
}
85+
fn testing_env_2_node_2_config_override() -> ConfigOverride {
86+
ConfigOverride::new(
87+
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
88+
TESTING_ENV_2_NODE_2_INSTANCE_CONFIG_OVERRIDE,
89+
)
90+
}
91+
fn testing_env_2_node_3_config_override() -> ConfigOverride {
92+
ConfigOverride::new(
93+
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
94+
TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE,
95+
)
96+
}
8997

9098
const TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str =
9199
"sn-test-sepolia-2-sepolia.gateway-proxy.sw-dev.io";
@@ -99,7 +107,7 @@ pub(crate) fn testing_env_2_hybrid_deployment_node_0() -> Deployment {
99107
"integration_hybrid_node_0",
100108
Some(ExternalSecret::new("sequencer-test-sepolia-0")),
101109
PathBuf::from(BASE_APP_CONFIG_PATH),
102-
TESTING_ENV_2_NODE_0_CONFIG_OVERRIDE,
110+
testing_env_2_node_0_config_override(),
103111
TESTING_ENV_2_INGRESS_DOMAIN.to_string(),
104112
Some(vec![TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
105113
)
@@ -113,7 +121,7 @@ pub(crate) fn testing_env_2_hybrid_deployment_node_1() -> Deployment {
113121
"integration_hybrid_node_1",
114122
Some(ExternalSecret::new("sequencer-test-sepolia-1")),
115123
PathBuf::from(BASE_APP_CONFIG_PATH),
116-
TESTING_ENV_2_NODE_1_CONFIG_OVERRIDE,
124+
testing_env_2_node_1_config_override(),
117125
TESTING_ENV_2_INGRESS_DOMAIN.to_string(),
118126
Some(vec![TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
119127
)
@@ -127,7 +135,7 @@ pub(crate) fn testing_env_2_hybrid_deployment_node_2() -> Deployment {
127135
"integration_hybrid_node_2",
128136
Some(ExternalSecret::new("sequencer-test-sepolia-2")),
129137
PathBuf::from(BASE_APP_CONFIG_PATH),
130-
TESTING_ENV_2_NODE_2_CONFIG_OVERRIDE,
138+
testing_env_2_node_2_config_override(),
131139
TESTING_ENV_2_INGRESS_DOMAIN.to_string(),
132140
Some(vec![TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
133141
)
@@ -141,7 +149,7 @@ pub(crate) fn testing_env_2_hybrid_deployment_node_3() -> Deployment {
141149
"integration_hybrid_node_3",
142150
Some(ExternalSecret::new("sequencer-test-sepolia-3")),
143151
PathBuf::from(BASE_APP_CONFIG_PATH),
144-
TESTING_ENV_2_NODE_3_CONFIG_OVERRIDE,
152+
testing_env_2_node_3_config_override(),
145153
TESTING_ENV_2_INGRESS_DOMAIN.to_string(),
146154
Some(vec![TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
147155
)

‎crates/apollo_deployments/src/deployment_definitions/testing_env_3.rs

+28-20
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,30 @@ const TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
7070
"0x4",
7171
);
7272

73-
const TESTING_ENV_3_NODE_0_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
74-
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
75-
TESTING_ENV_3_NODE_0_INSTANCE_CONFIG_OVERRIDE,
76-
);
77-
const TESTING_ENV_3_NODE_1_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
78-
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
79-
TESTING_ENV_3_NODE_1_INSTANCE_CONFIG_OVERRIDE,
80-
);
81-
const TESTING_ENV_3_NODE_2_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
82-
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
83-
TESTING_ENV_3_NODE_2_INSTANCE_CONFIG_OVERRIDE,
84-
);
85-
const TESTING_ENV_3_NODE_3_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
86-
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
87-
TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE,
88-
);
73+
fn testing_env_3_node_0_config_override() -> ConfigOverride {
74+
ConfigOverride::new(
75+
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
76+
TESTING_ENV_3_NODE_0_INSTANCE_CONFIG_OVERRIDE,
77+
)
78+
}
79+
fn testing_env_3_node_1_config_override() -> ConfigOverride {
80+
ConfigOverride::new(
81+
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
82+
TESTING_ENV_3_NODE_1_INSTANCE_CONFIG_OVERRIDE,
83+
)
84+
}
85+
fn testing_env_3_node_2_config_override() -> ConfigOverride {
86+
ConfigOverride::new(
87+
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
88+
TESTING_ENV_3_NODE_2_INSTANCE_CONFIG_OVERRIDE,
89+
)
90+
}
91+
fn testing_env_3_node_3_config_override() -> ConfigOverride {
92+
ConfigOverride::new(
93+
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
94+
TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE,
95+
)
96+
}
8997

9098
const TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str =
9199
"sn-test-sepolia-3-sepolia.gateway-proxy.sw-dev.io";
@@ -100,7 +108,7 @@ pub(crate) fn testing_env_3_hybrid_deployment_node_0() -> Deployment {
100108
"integration_hybrid_node_0",
101109
Some(ExternalSecret::new("sequencer-test-3-node-0")),
102110
PathBuf::from(BASE_APP_CONFIG_PATH),
103-
TESTING_ENV_3_NODE_0_CONFIG_OVERRIDE,
111+
testing_env_3_node_0_config_override(),
104112
TESTING_ENV_3_INGRESS_DOMAIN.to_string(),
105113
Some(vec![TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
106114
)
@@ -114,7 +122,7 @@ pub(crate) fn testing_env_3_hybrid_deployment_node_1() -> Deployment {
114122
"integration_hybrid_node_1",
115123
Some(ExternalSecret::new("sequencer-test-3-node-1")),
116124
PathBuf::from(BASE_APP_CONFIG_PATH),
117-
TESTING_ENV_3_NODE_1_CONFIG_OVERRIDE,
125+
testing_env_3_node_1_config_override(),
118126
TESTING_ENV_3_INGRESS_DOMAIN.to_string(),
119127
Some(vec![TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
120128
)
@@ -128,7 +136,7 @@ pub(crate) fn testing_env_3_hybrid_deployment_node_2() -> Deployment {
128136
"integration_hybrid_node_2",
129137
Some(ExternalSecret::new("sequencer-test-3-node-2")),
130138
PathBuf::from(BASE_APP_CONFIG_PATH),
131-
TESTING_ENV_3_NODE_2_CONFIG_OVERRIDE,
139+
testing_env_3_node_2_config_override(),
132140
TESTING_ENV_3_INGRESS_DOMAIN.to_string(),
133141
Some(vec![TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
134142
)
@@ -142,7 +150,7 @@ pub(crate) fn testing_env_3_hybrid_deployment_node_3() -> Deployment {
142150
"integration_hybrid_node_3",
143151
Some(ExternalSecret::new("sequencer-test-3-node-3")),
144152
PathBuf::from(BASE_APP_CONFIG_PATH),
145-
TESTING_ENV_3_NODE_3_CONFIG_OVERRIDE,
153+
testing_env_3_node_3_config_override(),
146154
TESTING_ENV_3_INGRESS_DOMAIN.to_string(),
147155
Some(vec![TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME.into()]),
148156
)

0 commit comments

Comments
 (0)