Python
fix(ows): gate cloud setup on local installer prerequisites
Rohit P662e168d5c5c
diff --git a/deploy/service/up/test-plan.py b/deploy/service/up/test-plan.pyindex fbf2000f..0fcf9b51 100644--- a/deploy/service/up/test-plan.py+++ b/deploy/service/up/test-plan.py@@ -74,10 +74,15 @@ print(json.dumps(v))assert (root/'state/review.json').read_bytes() == firstrun(args+['--accept-plan','wrong'], ok=False)run(args+['--accept-plan',review['digest']], ok=False) # bootstrap still unapproved+ kubectl = tools / 'kubectl'+ kubectl.write_text('#!/usr/bin/python3\nraise SystemExit(1)\n')+ kubectl.chmod(0o700)+ unavailable = run(args+['--accept-plan',review['digest'],'--accept-bootstrap',review['digest']], ok=False)+ assert 'Local prerequisite kubectl unavailable' in unavailable.stderrcalls = (root/'calls.jsonl').read_bytes()(root/'deployment.yaml').write_text(yaml.replace('count: 2', 'count: 3'))result = run(args+['--plan-only'], ok=False)assert 'changed' in result.stderrassert (root/'calls.jsonl').read_bytes() == callsassert all(json.loads(line) in [['sts','get-caller-identity'],['ec2','describe-instance-types'],['ec2','describe-instance-type-offerings'],['pricing','get-products']] for line in calls.splitlines())- print(json.dumps({'readOnlyPlan':True,'stableResume':True,'changedConfigRejected':True,'unapprovedBootstrapBlocked':True,'cloudMutations':0,'installationQualified':False}))+ print(json.dumps({'readOnlyPlan':True,'stableResume':True,'changedConfigRejected':True,'unapprovedBootstrapBlocked':True,'missingLocalToolBlocked':True,'cloudMutations':0,'installationQualified':False}))diff --git a/harness/service-cli/src/deployment_up.rs b/harness/service-cli/src/deployment_up.rsindex 7c41c069..667e852d 100644--- a/harness/service-cli/src/deployment_up.rs+++ b/harness/service-cli/src/deployment_up.rs@@ -155,6 +155,37 @@ pub(super) fn operation_lock(root: &Path, name: &str) -> Result<fs::File> {.context("Another command owns this operation journal")?;Ok(f)}+async fn check_local_tools(c: &Config, package: &package::Snapshot) -> Result<()> {+ let mut tools: Vec<(&str, Vec<&str>)> = vec![+ ("kubectl", vec!["version", "--client", "--output=json"]),+ ("helm", vec!["version", "--short"]),+ ("docker", vec!["version", "--format", "{{.Server.Version}}"]),+ ("openssl", vec!["version"]),+ ];+ if c.cloud.provider() == "azure" {+ tools.push(("kubelogin", vec!["--version"]));+ if package+ .setup+ .infrastructure+ .get("managementAccess")+ .is_some_and(|v| !v.is_null())+ {+ tools.push(("ssh", vec!["-V"]));+ }+ } else if package+ .setup+ .infrastructure+ .get("operatorAccess")+ .is_some_and(|v| !v.is_null())+ {+ tools.push(("session-manager-plugin", vec!["--version"]));+ }+ for (program, args) in tools {+ let args: Vec<String> = args.into_iter().map(str::to_owned).collect();+ super::local::exec(Path::new(program),&args,None).await.with_context(||format!("Local prerequisite {program} unavailable. Install/start it before provisioning; no cloud mutation performed."))?;+ }+ Ok(())+}pub(super) async fn run(provider: &str, o: &Options) -> Result<()> {let config = Config::load(&o.config, provider)?;let package = package::load(&config)?;@@ -271,6 +302,7 @@ pub(super) async fn run(provider: &str, o: &Options) -> Result<()> {"bootstrap",o.accept_bootstrap.as_deref(),)?;+ check_local_tools(&config, &package).await?;resolve::identity(&config).await?;let mut driver = native::Native {root: state.canonicalize()?,