ci: testdrive: fail on empty input and log number of commands (#22313)

Author: nrainer-materialize

misc/python/materialize/checks/checks.py

@@ -13,6 +13,8 @@
 from materialize.checks.executors import Executor
 from materialize.util import MzVersion
 
+TESTDRIVE_NOP = "$ nop"
+
 
 class Check:
     def __init__(self, base_version: MzVersion, rng: Random | None) -> None:
@@ -23,7 +25,7 @@ def _can_run(self, e: Executor) -> bool:
         return True
 
     def initialize(self) -> Testdrive:
-        return Testdrive("")
+        return Testdrive(TESTDRIVE_NOP)
 
     def manipulate(self) -> list[Testdrive]:
         assert False
@@ -67,7 +69,7 @@ def join_validate(self, e: Executor) -> None:
 
 class CheckDisabled(Check):
     def manipulate(self) -> list[Testdrive]:
-        return [Testdrive(""), Testdrive("")]
+        return [Testdrive(TESTDRIVE_NOP), Testdrive(TESTDRIVE_NOP)]
 
     def validate(self) -> Testdrive:
-        return Testdrive("")
+        return Testdrive(TESTDRIVE_NOP)

misc/python/materialize/checks/replica.py

@@ -9,7 +9,7 @@
 from textwrap import dedent
 
 from materialize.checks.actions import Testdrive
-from materialize.checks.checks import Check
+from materialize.checks.checks import TESTDRIVE_NOP, Check
 from materialize.checks.executors import Executor
 from materialize.util import MzVersion
 
@@ -80,7 +80,7 @@ def validate(self) -> Testdrive:
                 true
                 """
                 if self.base_version < MzVersion.parse("0.66.0-dev")
-                else ""
+                else TESTDRIVE_NOP
             )
         )
 

misc/python/materialize/checks/roles.py

@@ -9,7 +9,7 @@
 from textwrap import dedent
 
 from materialize.checks.actions import Testdrive
-from materialize.checks.checks import Check
+from materialize.checks.checks import TESTDRIVE_NOP, Check
 from materialize.checks.executors import Executor
 from materialize.util import MzVersion
 
@@ -24,7 +24,7 @@ def _if_can_grant_revoke(self, text: str) -> str:
         return ""
 
     def initialize(self) -> Testdrive:
-        return Testdrive("")
+        return Testdrive(TESTDRIVE_NOP)
 
     def manipulate(self) -> list[Testdrive]:
         return [

src/testdrive/src/action.rs

@@ -51,6 +51,7 @@ mod file;
 mod http;
 mod kafka;
 mod mysql;
+mod nop;
 mod persist;
 mod postgres;
 mod protobuf;
@@ -569,6 +570,7 @@ impl Run for PosCommand {
                     "kafka-verify-commit" => kafka::run_verify_commit(builtin, state).await,
                     "mysql-connect" => mysql::run_connect(builtin, state).await,
                     "mysql-execute" => mysql::run_execute(builtin, state).await,
+                    "nop" => nop::run_nop(),
                     "postgres-connect" => postgres::run_connect(builtin, state).await,
                     "postgres-execute" => postgres::run_execute(builtin, state).await,
                     "postgres-verify-slot" => postgres::run_verify_slot(builtin, state).await,

src/testdrive/src/action/nop.rs

@@ -0,0 +1,14 @@
+// Copyright Materialize, Inc. and contributors. All rights reserved.
+//
+// Use of this software is governed by the Business Source License
+// included in the LICENSE file.
+//
+// As of the Change Date specified in that file, in accordance with
+// the Business Source License, use of this software will be governed
+// by the Apache License, Version 2.0.
+
+use crate::action::ControlFlow;
+
+pub fn run_nop() -> Result<ControlFlow, anyhow::Error> {
+    Ok(ControlFlow::Continue)
+}

src/testdrive/src/lib.rs

@@ -86,6 +86,7 @@ use std::path::Path;
 use action::Run;
 use anyhow::{anyhow, Context};
 use mz_ore::error::ErrorExt;
+use tracing::debug;
 
 use crate::action::ControlFlow;
 use crate::error::{ErrorLocation, PosError};
@@ -154,6 +155,12 @@ pub(crate) async fn run_line_reader(
     // connections until after parsing.
     let cmds = parser::parse(line_reader)?;
 
+    if cmds.is_empty() {
+        return Err(PosError::from(anyhow!("No input provided!")));
+    } else {
+        debug!("Received {} commands to run", cmds.len());
+    }
+
     let has_kafka_cmd = cmds.iter().any(|cmd| {
         matches!(
             &cmd.command,

test/legacy-upgrade/check-from-any_version-noop.td

@@ -8,3 +8,5 @@
 # by the Apache License, Version 2.0.
 
 # no-op to keep the upgrade test glob simple
+
+$ nop

test/legacy-upgrade/check-ssl-from-any_version-noop.td

@@ -8,3 +8,5 @@
 # by the Apache License, Version 2.0.
 
 # no-op to keep the upgrade test glob simple
+
+$ nop

test/legacy-upgrade/create-in-any_version-noop.td

@@ -8,3 +8,5 @@
 # by the Apache License, Version 2.0.
 
 # no-op to keep the upgrade test glob simple
+
+$ nop

test/legacy-upgrade/create-ssl-in-any_version-noop.td

@@ -8,3 +8,5 @@
 # by the Apache License, Version 2.0.
 
 # no-op to keep the upgrade test glob simple
+
+$ nop