fix: move ubuntu ssm ami key into const + fmt

FyraLabs · Jan 21, 2024 · e537568 · e537568
1 parent 7d08986
commit e537568
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/cloud/aws.rs b/src/cloud/aws.rs
@@ -13,7 +13,10 @@ use k8s_openapi::api::core::v1::Secret;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, info, warn};
+
 const DEFAULT_SIZE: &str = "t2.micro";
+const UBUNTU_AMI_SSM_KEY: &str =
+    "/aws/service/canonical/ubuntu/server/22.04/stable/current/amd64/hvm/ebs-gp2/ami-id";
 
 fn default_size() -> String {
     String::from(DEFAULT_SIZE)
@@ -131,7 +134,7 @@ impl Provisioner for AWSProvisioner {
         let ssm_client = aws_sdk_ssm::Client::new(&aws_api);
         let parameter_response = ssm_client
             .get_parameter()
-            .name("/aws/service/canonical/ubuntu/server/22.04/stable/current/amd64/hvm/ebs-gp2/ami-id")
+            .name(UBUNTU_AMI_SSM_KEY)
             .send()
             .await?;
         let ami = parameter_response.parameter.unwrap().value.unwrap();

diff --git a/src/cloud/digitalocean.rs b/src/cloud/digitalocean.rs
@@ -7,12 +7,12 @@ use k8s_openapi::api::core::v1::Secret;
 use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, info, warn};
+
 const DROPLET_SIZE: &str = "s-1vcpu-1gb";
 const DROPLET_IMAGE: &str = "ubuntu-23-04-x64";
 
 const TOKEN_KEY: &str = "DIGITALOCEAN_TOKEN";
 
-
 #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
 pub struct DigitalOceanProvisioner {
     /// Region ID of the DigitalOcean datacenter to provision the exit node in
@@ -126,7 +126,7 @@ impl Provisioner for DigitalOceanProvisioner {
             ip: droplet_ip.clone(),
             id: Some(droplet.id.to_string()),
             provider: provisioner.clone(),
-            service_binding: None
+            service_binding: None,
         };
 
         Ok(exit_node)