From b97638014d2e188534a2c1e31775fc921a0a81bb Mon Sep 17 00:00:00 2001
From: pei-mysten <147538877+pei-mysten@users.noreply.github.com>
Date: Thu, 10 Oct 2024 15:57:35 -0700
Subject: [PATCH] [suiop] add --force & image target to suiop image build
 (#19810)

## Description

as title,
1. with `--force`, we don't need to manually delete the k8s pod if we
need to rebuild an image
2. `--image-target` or just `-t` can allow us build image from a
multi-stage dockerfile

## Test plan
tested locally, works as expected. backend code already updated &
redeployed as well

---

## Release notes

Check each box that your changes affect. If none of the boxes relate to
your changes, release notes aren't required.

For each box you select, include information after the relevant heading
that describes the impact of your changes that a user might notice and
any actions they must take to implement updates.

- [ ] Protocol:
- [ ] Nodes (Validators and Full nodes):
- [ ] Indexer:
- [ ] JSON-RPC:
- [ ] GraphQL:
- [ ] CLI:
- [ ] Rust SDK:
- [ ] REST API:
---
 crates/suiop-cli/src/cli/ci/image.rs | 20 ++++++++++++++++++--
 crates/suiop-cli/src/cli/ci/mod.rs   |  2 +-
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/crates/suiop-cli/src/cli/ci/image.rs b/crates/suiop-cli/src/cli/ci/image.rs
index 9486cbfaf4358..a2c1e56563957 100644
--- a/crates/suiop-cli/src/cli/ci/image.rs
+++ b/crates/suiop-cli/src/cli/ci/image.rs
@@ -90,7 +90,7 @@ pub enum ImageAction {
         /// Optional repo region, default to "us-central1"
         #[arg(long)]
         repo_region: Option<RepoRegion>,
-        /// Optional image name, default to "app", only used if multiple images are built within one repo
+        /// Optional image tags, default to ""
         #[arg(long)]
         image_tag: Option<String>,
         /// Optional image name, default to "app", only used if multiple images are built within one repo
@@ -117,6 +117,12 @@ pub enum ImageAction {
         /// Optional build args to pass to the docker build command
         #[arg(long)]
         build_args: Vec<String>,
+        /// Optional flag to force build even if build pod already exists
+        #[arg(short = 'f', long)]
+        force: bool,
+        /// Optional flag to target the image, used for multi-stage builds
+        #[arg(short = 't', long)]
+        image_target: Option<String>,
     },
     #[command(name = "query")]
     Query {
@@ -160,6 +166,8 @@ struct RequestBuildRequest {
     memory: String,
     disk: String,
     build_args: Vec<String>,
+    force: bool,
+    image_target: Option<String>,
 }
 
 #[derive(serde::Serialize)]
@@ -167,7 +175,6 @@ struct QueryBuildsRequest {
     repo_name: String,
     limit: u32,
 }
-
 #[derive(serde::Serialize)]
 struct ImageStatusRequest {
     repo_name: String,
@@ -303,6 +310,8 @@ async fn send_image_request(token: &str, action: &ImageAction) -> Result<()> {
                 memory: _,
                 disk: _,
                 build_args: _,
+                force: _,
+                image_target,
             } => {
                 let ref_type = ref_type.clone().unwrap_or(RefType::Branch);
                 let ref_val = ref_val.clone().unwrap_or("main".to_string());
@@ -313,6 +322,9 @@ async fn send_image_request(token: &str, action: &ImageAction) -> Result<()> {
                 if !image_tag.is_empty() {
                     image_info += &format!(":{}", image_tag);
                 }
+                if !image_target.is_none() {
+                    image_info += &format!("@{}", image_target.as_ref().unwrap());
+                }
                 println!(
                     "Requested built image for repo: {}, ref: {}, dockerfile: {}, image: {}",
                     repo_name.green(),
@@ -454,6 +466,8 @@ fn generate_image_request(token: &str, action: &ImageAction) -> reqwest::Request
             memory,
             disk,
             build_args,
+            force,
+            image_target,
         } => {
             let full_url = format!("{}{}", api_server, ENDPOINT);
             debug!("full_url: {}", full_url);
@@ -500,6 +514,8 @@ fn generate_image_request(token: &str, action: &ImageAction) -> reqwest::Request
                 memory,
                 disk,
                 build_args: build_args.clone(),
+                force: *force,
+                image_target: image_target.clone(),
             };
             debug!("req body: {:?}", body);
             req.json(&body).headers(generate_headers_with_auth(token))
diff --git a/crates/suiop-cli/src/cli/ci/mod.rs b/crates/suiop-cli/src/cli/ci/mod.rs
index ecbae85e75a19..dc8d6e5ccc5a6 100644
--- a/crates/suiop-cli/src/cli/ci/mod.rs
+++ b/crates/suiop-cli/src/cli/ci/mod.rs
@@ -21,7 +21,7 @@ pub(crate) enum CIAction {
     #[clap(aliases = ["k", "key"])]
     Keys(KeyArgs),
     #[clap(aliases = ["i"])]
-    Image(ImageArgs),
+    Image(Box<ImageArgs>),
 }
 
 pub async fn ci_cmd(args: &CIArgs) -> Result<()> {