From d4fe0d3806f74bdab0f87c3ecd4a31a6cc163ca4 Mon Sep 17 00:00:00 2001 From: Itay Tsabary Date: Wed, 7 May 2025 10:26:28 +0300 Subject: [PATCH] chore(apollo_deployments): remove override references --- crates/apollo_deployments/src/deployment.rs | 12 ++++++------ .../sepolia_integration.rs | 16 ++++++++-------- .../src/deployment_definitions/testing.rs | 2 +- .../src/deployment_definitions/testing_env_2.rs | 16 ++++++++-------- .../src/deployment_definitions/testing_env_3.rs | 16 ++++++++-------- 5 files changed, 31 insertions(+), 31 deletions(-) diff --git a/crates/apollo_deployments/src/deployment.rs b/crates/apollo_deployments/src/deployment.rs index e4a9038a0d6..af08375dfe6 100644 --- a/crates/apollo_deployments/src/deployment.rs +++ b/crates/apollo_deployments/src/deployment.rs @@ -175,26 +175,26 @@ impl Deployment { #[derive(Debug, Serialize)] pub struct ConfigOverride { - deployment_config_override: &'static DeploymentConfigOverride, - instance_config_override: &'static InstanceConfigOverride, + deployment_config_override: DeploymentConfigOverride, + instance_config_override: InstanceConfigOverride, } impl ConfigOverride { pub const fn new( - deployment_config_override: &'static DeploymentConfigOverride, - instance_config_override: &'static InstanceConfigOverride, + deployment_config_override: DeploymentConfigOverride, + instance_config_override: InstanceConfigOverride, ) -> Self { Self { deployment_config_override, instance_config_override } } pub fn create(&self, application_config_subdir: &Path) -> Vec { serialize_to_file( - to_value(self.deployment_config_override).unwrap(), + to_value(&self.deployment_config_override).unwrap(), application_config_subdir.join(DEPLOYMENT_FILE_NAME).to_str().unwrap(), ); serialize_to_file( - to_value(self.instance_config_override).unwrap(), + to_value(&self.instance_config_override).unwrap(), application_config_subdir.join(INSTANCE_FILE_NAME).to_str().unwrap(), ); vec![DEPLOYMENT_FILE_NAME.to_string(), INSTANCE_FILE_NAME.to_string()] diff --git a/crates/apollo_deployments/src/deployment_definitions/sepolia_integration.rs b/crates/apollo_deployments/src/deployment_definitions/sepolia_integration.rs index 507895e205a..1655563df63 100644 --- a/crates/apollo_deployments/src/deployment_definitions/sepolia_integration.rs +++ b/crates/apollo_deployments/src/deployment_definitions/sepolia_integration.rs @@ -71,20 +71,20 @@ const SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverrid ); const SEPOLIA_INTEGRATION_NODE_0_CONFIG_OVERRIDE: ConfigOverride = ConfigOverride::new( - &SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE, - &SEPOLIA_INTEGRATION_NODE_0_INSTANCE_CONFIG_OVERRIDE, + 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, + 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, + 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, + SEPOLIA_INTEGRATION_DEPLOYMENT_CONFIG_OVERRIDE, + SEPOLIA_INTEGRATION_NODE_3_INSTANCE_CONFIG_OVERRIDE, ); const SEPOLIA_INTEGRATION_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str = diff --git a/crates/apollo_deployments/src/deployment_definitions/testing.rs b/crates/apollo_deployments/src/deployment_definitions/testing.rs index bfb105eb365..17aa9aeb9ea 100644 --- a/crates/apollo_deployments/src/deployment_definitions/testing.rs +++ b/crates/apollo_deployments/src/deployment_definitions/testing.rs @@ -30,7 +30,7 @@ const TESTING_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride = InstanceConfigO ); const TESTING_CONFIG_OVERRIDE: ConfigOverride = - ConfigOverride::new(&TESTING_DEPLOYMENT_CONFIG_OVERRIDE, &TESTING_INSTANCE_CONFIG_OVERRIDE); + ConfigOverride::new(TESTING_DEPLOYMENT_CONFIG_OVERRIDE, TESTING_INSTANCE_CONFIG_OVERRIDE); const TESTING_INGRESS_DOMAIN: &str = "sw-dev.io"; diff --git a/crates/apollo_deployments/src/deployment_definitions/testing_env_2.rs b/crates/apollo_deployments/src/deployment_definitions/testing_env_2.rs index 0bf480a24fa..3c79451b36c 100644 --- a/crates/apollo_deployments/src/deployment_definitions/testing_env_2.rs +++ b/crates/apollo_deployments/src/deployment_definitions/testing_env_2.rs @@ -71,20 +71,20 @@ const TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride = ); 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, + 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, + 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, + 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, + TESTING_ENV_2_DEPLOYMENT_CONFIG_OVERRIDE, + TESTING_ENV_2_NODE_3_INSTANCE_CONFIG_OVERRIDE, ); const TESTING_ENV_2_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str = diff --git a/crates/apollo_deployments/src/deployment_definitions/testing_env_3.rs b/crates/apollo_deployments/src/deployment_definitions/testing_env_3.rs index 904132ed0a3..e179d976800 100644 --- a/crates/apollo_deployments/src/deployment_definitions/testing_env_3.rs +++ b/crates/apollo_deployments/src/deployment_definitions/testing_env_3.rs @@ -71,20 +71,20 @@ const TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE: InstanceConfigOverride = ); 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, + 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, + 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, + 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, + TESTING_ENV_3_DEPLOYMENT_CONFIG_OVERRIDE, + TESTING_ENV_3_NODE_3_INSTANCE_CONFIG_OVERRIDE, ); const TESTING_ENV_3_HTTP_SERVER_INGRESS_ALTERNATIVE_NAME: &str =