Skip to content

Commit d4fe0d3

Browse files
chore(apollo_deployments): remove override references
1 parent 5380af7 commit d4fe0d3

File tree

5 files changed

+31
-31
lines changed

5 files changed

+31
-31
lines changed

crates/apollo_deployments/src/deployment.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -175,26 +175,26 @@ impl Deployment {
175175

176176
#[derive(Debug, Serialize)]
177177
pub struct ConfigOverride {
178-
deployment_config_override: &'static DeploymentConfigOverride,
179-
instance_config_override: &'static InstanceConfigOverride,
178+
deployment_config_override: DeploymentConfigOverride,
179+
instance_config_override: InstanceConfigOverride,
180180
}
181181

182182
impl ConfigOverride {
183183
pub const fn new(
184-
deployment_config_override: &'static DeploymentConfigOverride,
185-
instance_config_override: &'static InstanceConfigOverride,
184+
deployment_config_override: DeploymentConfigOverride,
185+
instance_config_override: InstanceConfigOverride,
186186
) -> Self {
187187
Self { deployment_config_override, instance_config_override }
188188
}
189189

190190
pub fn create(&self, application_config_subdir: &Path) -> Vec<String> {
191191
serialize_to_file(
192-
to_value(self.deployment_config_override).unwrap(),
192+
to_value(&self.deployment_config_override).unwrap(),
193193
application_config_subdir.join(DEPLOYMENT_FILE_NAME).to_str().unwrap(),
194194
);
195195

196196
serialize_to_file(
197-
to_value(self.instance_config_override).unwrap(),
197+
to_value(&self.instance_config_override).unwrap(),
198198
application_config_subdir.join(INSTANCE_FILE_NAME).to_str().unwrap(),
199199
);
200200
vec![DEPLOYMENT_FILE_NAME.to_string(), INSTANCE_FILE_NAME.to_string()]

crates/apollo_deployments/src/deployment_definitions/sepolia_integration.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,20 @@ const SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverrid
7171
);
7272

7373
const SEPOLIA_INTEGRATION_NODE_0_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
74-
&SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
75-
&SEPOLIA_INTEGRATION_NODE_0_INSTANCE_CONFIG_OVERRIDE,
74+
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
75+
SEPOLIA_INTEGRATION_NODE_0_INSTANCE_CONFIG_OVERRIDE,
7676
);
7777
const SEPOLIA_INTEGRATION_NODE_1_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
78-
&SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
79-
&SEPOLIA_INTEGRATION_NODE_1_INSTANCE_CONFIG_OVERRIDE,
78+
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
79+
SEPOLIA_INTEGRATION_NODE_1_INSTANCE_CONFIG_OVERRIDE,
8080
);
8181
const SEPOLIA_INTEGRATION_NODE_2_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
82-
&SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
83-
&SEPOLIA_INTEGRATION_NODE_2_INSTANCE_CONFIG_OVERRIDE,
82+
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
83+
SEPOLIA_INTEGRATION_NODE_2_INSTANCE_CONFIG_OVERRIDE,
8484
);
8585
const SEPOLIA_INTEGRATION_NODE_3_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new(
86-
&SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
87-
&SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE,
86+
SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE,
87+
SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE,
8888
);
8989

9090
const SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str =

crates/apollo_deployments/src/deployment_definitions/testing.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const TESTING_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride = InstanceConfigO
3030
);
3131

3232
const TESTING_CONFIG_OVERRIDE: ConfigOverride =
33-
ConfigOverride::new(&TESTING_DEPLOYMENT_CONFIG_OVERRIDE, &TESTING_INSTANCE_CONFIG_OVERRIDE);
33+
ConfigOverride::new(TESTING_DEPLOYMENT_CONFIG_OVERRIDE, TESTING_INSTANCE_CONFIG_OVERRIDE);
3434

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

crates/apollo_deployments/src/deployment_definitions/testing_env_2.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,20 @@ const TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
7171
);
7272

7373
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,
74+
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
75+
TESTING_ENV_2_NODE_0_INSTANCE_CONFIG_OVERRIDE,
7676
);
7777
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,
78+
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
79+
TESTING_ENV_2_NODE_1_INSTANCE_CONFIG_OVERRIDE,
8080
);
8181
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,
82+
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
83+
TESTING_ENV_2_NODE_2_INSTANCE_CONFIG_OVERRIDE,
8484
);
8585
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,
86+
TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE,
87+
TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE,
8888
);
8989

9090
const TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str =

crates/apollo_deployments/src/deployment_definitions/testing_env_3.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -71,20 +71,20 @@ const TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride =
7171
);
7272

7373
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,
74+
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
75+
TESTING_ENV_3_NODE_0_INSTANCE_CONFIG_OVERRIDE,
7676
);
7777
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,
78+
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
79+
TESTING_ENV_3_NODE_1_INSTANCE_CONFIG_OVERRIDE,
8080
);
8181
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,
82+
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
83+
TESTING_ENV_3_NODE_2_INSTANCE_CONFIG_OVERRIDE,
8484
);
8585
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,
86+
TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE,
87+
TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE,
8888
);
8989

9090
const TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str =

0 commit comments

Comments
 (0)