Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add variant override to updog arguments #923

Merged
merged 1 commit into from
May 11, 2020
Merged

Add variant override to updog arguments #923

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions sources/updater/updog/src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,11 +126,6 @@ fn load_repository<'a>(
.context(error::Metadata)
}

fn running_version() -> Result<(Version, String)> {
let br = BottlerocketRelease::new().context(error::ReleaseVersion)?;
Ok((br.version_id, br.variant_id))
}

fn applicable_updates<'a>(manifest: &'a Manifest, variant: &str) -> Vec<&'a Update> {
let mut updates: Vec<&Update> = manifest
.updates
Expand Down Expand Up @@ -201,14 +196,13 @@ fn retrieve_migrations(
transport: &HttpQueryTransport,
manifest: &Manifest,
update: &Update,
current_version: &Version,
) -> Result<()> {
let (version_current, _) = running_version()?;

// the migrations required for foo to bar and bar to foo are
// the same; we can pretend we're always upgrading from foo to
// bar and use the same logic to obtain the migrations
let target = std::cmp::max(&update.version, &version_current);
let start = std::cmp::min(&update.version, &version_current);
let target = std::cmp::max(&update.version, &current_version);
let start = std::cmp::min(&update.version, &current_version);

let dir = Path::new(MIGRATION_PATH);
if !dir.exists() {
Expand Down Expand Up @@ -308,6 +302,7 @@ struct Arguments {
all: bool,
reboot: bool,
timestamp: Option<DateTime<Utc>>,
variant: Option<String>,
}

/// Parse the command line arguments to get the user-specified values
Expand All @@ -320,6 +315,7 @@ fn parse_args(args: std::env::Args) -> Arguments {
let mut all = false;
let mut reboot = false;
let mut timestamp = None;
let mut variant = None;

let mut iter = args.skip(1);
while let Some(arg) = iter.next() {
Expand All @@ -339,6 +335,12 @@ fn parse_args(args: std::env::Args) -> Arguments {
},
_ => usage(),
},
"--variant" => {
variant = Some(
iter.next()
.unwrap_or_else(|| usage_msg("Did not give argument to --variant")),
);
}
"-n" | "--now" | "--ignore-waves" => {
ignore_waves = true;
}
Expand Down Expand Up @@ -378,6 +380,7 @@ fn parse_args(args: std::env::Args) -> Arguments {
all,
reboot,
timestamp,
variant,
}
}

Expand Down Expand Up @@ -437,9 +440,10 @@ fn main_inner() -> Result<()> {
serde_plain::from_str::<Command>(&arguments.subcommand).unwrap_or_else(|_| usage());

let config = load_config()?;
let (current_version, variant) = running_version()?;
let current_release = BottlerocketRelease::new().context(error::ReleaseVersion)?;
let variant = arguments.variant.unwrap_or(current_release.variant_id);
let transport = HttpQueryTransport::new();
set_common_query_params(&transport, &current_version, &config)?;
set_common_query_params(&transport, &current_release.version_id, &config)?;
let repository = load_repository(&transport, &config)?;
let manifest = load_manifest(&repository)?;

Expand All @@ -452,7 +456,7 @@ fn main_inner() -> Result<()> {
let update = update_required(
&config,
&manifest,
&current_version,
&current_release.version_id,
&variant,
arguments.force_version,
)
Expand All @@ -472,7 +476,7 @@ fn main_inner() -> Result<()> {
if let Some(u) = update_required(
&config,
&manifest,
&current_version,
&current_release.version_id,
&variant,
arguments.force_version,
) {
Expand Down Expand Up @@ -501,7 +505,13 @@ fn main_inner() -> Result<()> {
.context(error::TransportBorrow)?
.push((String::from("target"), u.version.to_string()));

retrieve_migrations(&repository, &transport, &manifest, u)?;
retrieve_migrations(
&repository,
&transport,
&manifest,
u,
&current_release.version_id,
)?;
update_image(u, &repository)?;
if command == Command::Update {
update_flags()?;
Expand Down