Skip to content

Commit

Permalink
Add canary traffic changing
Browse files Browse the repository at this point in the history
  • Loading branch information
EricGhildyal authored and RobbieMcKinstry committed Nov 26, 2024
1 parent c0f3e26 commit 0dbd4dd
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 7 deletions.
46 changes: 42 additions & 4 deletions src/adapters/ingresses/apig.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
use std::path::PathBuf;

use crate::utils::load_default_aws_config;
use crate::WholePercent;

use super::Ingress;
use async_trait::async_trait;
use aws_sdk_apigateway::types::{Op, PatchOperation};
use miette::miette;
use miette::{IntoDiagnostic, Result};
use tokio::{fs::File, io::AsyncReadExt};
Expand Down Expand Up @@ -84,7 +86,7 @@ impl AwsApiGateway {
stage_name: &str,
lambda_name: &str,
lambda_version: &str,
traffic_percentage: f64,
traffic_percentage: WholePercent,
) -> Result<()> {
// Update the APIG with the new lambda version
self.apig_client
Expand All @@ -105,8 +107,7 @@ impl AwsApiGateway {
.stage_name(stage_name)
.canary_settings(
DeploymentCanarySettings::builder()
.percent_traffic(traffic_percentage)
.use_stage_cache(false)
.percent_traffic(traffic_percentage.into_inner() as f64)
.build(),
)
.send()
Expand All @@ -115,6 +116,30 @@ impl AwsApiGateway {

Ok(())
}

pub async fn update_canary_traffic(
&self,
api_id: &str,
stage_name: &str,
traffic_percentage: WholePercent,
) -> Result<()> {
let patch_op = PatchOperation::builder()
.op(Op::Replace)
.path("/canarySettings/percentTraffic")
.value(traffic_percentage.to_string())
.build();

self.apig_client
.update_stage()
.rest_api_id(api_id)
.stage_name(stage_name)
.patch_operations(patch_op)
.send()
.await
.into_diagnostic()?;

Ok(())
}
}

/// given a path to a file, load it as an array of bytes.
Expand All @@ -134,7 +159,20 @@ impl Ingress for AwsApiGateway {

// Next, we need to create a new deployment, pointing at our
// new lambda version with canary settings
self.create_apig_deployment("Releases", "prod", "releases", &lambda_version, 0.0)
self.create_apig_deployment(
"Releases",
"prod",
"releases",
&lambda_version,
WholePercent::try_new(0).into_diagnostic()?,
)
.await?;

Ok(())
}

async fn set_canary_traffic(&mut self, percent: WholePercent) -> Result<()> {
self.update_canary_traffic("Releases", "prod", percent)
.await?;

Ok(())
Expand Down
7 changes: 6 additions & 1 deletion src/adapters/ingresses/mod.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use async_trait::async_trait;
use miette::Result;

use crate::WholePercent;
pub use apig::AwsApiGateway;

/// Ingresses are responsible for (1) controlling how much traffic the canary
Expand All @@ -14,7 +15,7 @@ pub trait Ingress {
// TODO: define the other methods on this type.
// async fn yank_canary(&mut self) -> Result<()>;
// async fn promote_canary(&mut self) -> Result<()>;
// async fn set_canary_traffic(&mut self, percent: u8);
async fn set_canary_traffic(&mut self, percent: WholePercent) -> Result<()>;
}

pub struct MockIngress;
Expand All @@ -24,6 +25,10 @@ impl Ingress for MockIngress {
async fn deploy(&mut self) -> Result<()> {
todo!()
}

async fn set_canary_traffic(&mut self, _percent: WholePercent) -> Result<()> {
todo!()
}
}

impl From<MockIngress> for BoxIngress {
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
pub use config::Flags;
pub use pipeline::Pipeline;
pub(crate) use pipeline::WholePercent;

/// An adapter connects to some observable resource (like `CloudWatch`) and
/// emits events, like failed and succeeded requests.
Expand Down
2 changes: 2 additions & 0 deletions src/pipeline/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ use crate::{
use bon::bon;
use miette::Result;

pub(crate) use percent::WholePercent;

/// An alias for the Response Code-based monitor.
pub type ResponseMonitor = Box<dyn Monitor<Item = CategoricalObservation<5, ResponseStatusCode>>>;

Expand Down
4 changes: 2 additions & 2 deletions src/pipeline/percent.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ impl DecimalPercent {
validate(less_or_equal = 100),
derive(Debug, Display, Copy, Clone, PartialEq, Eq, TryFrom, Into)
)]
pub(super) struct WholePercent(u8);
pub(crate) struct WholePercent(u8);

impl WholePercent {
/// returns "the rest" of the whole. That is, `100 - this value`.
pub(super) fn inverse(self) -> Self {
pub(crate) fn inverse(self) -> Self {
let val = u8::from(self);
Self::try_from(100 - val).unwrap()
}
Expand Down

0 comments on commit 0dbd4dd

Please sign in to comment.