Merge pull request #697 from kate-goldenring/hippo-to-0.19

Author: radu-matei

.github/workflows/build.yml

@@ -31,7 +31,7 @@ jobs:
               nomadUrl: "https://releases.hashicorp.com/nomad/1.3.1/nomad_1.3.1_linux_amd64.zip",
               nomadBinary: "nomad",
               pathInNomadArchive: "nomad",
-              hippoUrl: "https://github.com/deislabs/hippo/releases/download/v0.17.0/hippo-server-linux-x64.tar.gz",
+              hippoUrl: "https://github.com/deislabs/hippo/releases/download/v0.19.0/hippo-server-linux-x64.tar.gz",
               wasmtimeUrl: "https://github.com/bytecodealliance/wasmtime/releases/download/v0.36.0/wasmtime-v0.36.0-x86_64-linux.tar.xz",
               wasmtimeBinary: "wasmtime",
               pathInWasmtimeArchive: "wasmtime-v0.36.0-x86_64-linux/wasmtime",
@@ -47,7 +47,7 @@ jobs:
               nomadUrl: "https://releases.hashicorp.com/nomad/1.3.1/nomad_1.3.1_darwin_amd64.zip",
               nomadBinary: "nomad",
               pathInNomadArchive: "nomad",
-              hippoUrl: "https://github.com/deislabs/hippo/releases/download/v0.17.0/hippo-server-osx-x64.tar.gz",
+              hippoUrl: "https://github.com/deislabs/hippo/releases/download/v0.19.0/hippo-server-osx-x64.tar.gz",
             }
           - {
               os: "windows-latest",
@@ -59,7 +59,7 @@ jobs:
               nomadUrl: "https://releases.hashicorp.com/nomad/1.3.1/nomad_1.3.1_windows_amd64.zip",
               nomadBinary: "nomad.exe",
               pathInNomadArchive: "nomad.exe",
-              hippoUrl: "https://github.com/deislabs/hippo/releases/download/v0.17.0/hippo-server-win-x64.zip",
+              hippoUrl: "https://github.com/deislabs/hippo/releases/download/v0.19.0/hippo-server-win-x64.zip",
             }
     steps:
       - uses: actions/checkout@v2
@@ -87,7 +87,7 @@ jobs:
           name: ${{ matrix.config.nomadBinary }}
           url: ${{ matrix.config.nomadUrl }}
           pathInArchive: ${{ matrix.config.pathInNomadArchive }}
-      
+
       - name: Install hippo
         if: ${{ fromJSON(matrix.config.os != 'windows-latest') }}
         run: |
@@ -105,7 +105,7 @@ jobs:
           Expand-Archive .\hippo-server.zip .\hippo-server-output;
           echo "$((Get-Item .\hippo-server-output).FullName)\win-x64";
           echo "$((Get-Item .\hippo-server-output).FullName)\win-x64" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append;
-      
+
       - uses: Swatinem/rust-cache@v1
 
       - name: Cargo Format

Cargo.lock

@@ -17,8 +17,8 @@ dirs = "4.0"
 dunce = "1.0"
 env_logger = "0.9"
 futures = "0.3"
-hippo-openapi = "0.8"
-hippo = { git = "https://github.com/deislabs/hippo-cli", rev = "67f6368fa39d296c3d1b11a93e43bc4c751cba6b"}
+hippo-openapi = "0.10"
+hippo = { git = "https://github.com/deislabs/hippo-cli", tag = "v0.15.0" }
 lazy_static = "1.4.0"
 nix = { version = "0.24", features = ["signal"] }
 outbound-redis = { path = "crates/outbound-redis" }
@@ -46,6 +46,7 @@ tracing = { version = "0.1", features = [ "log" ] }
 tracing-futures = "0.2"
 tracing-subscriber = { version = "0.3.7", features = [ "env-filter" ] }
 url = "2.2.2"
+uuid = "^1.0"
 wasi-outbound-http = { path = "crates/outbound-http" }
 wasmtime = "0.35.3"
 

Cargo.toml

@@ -14,6 +14,7 @@ use std::fs::File;
 use std::io::copy;
 use std::path::PathBuf;
 use url::Url;
+use uuid::Uuid;
 
 use crate::{opts::*, parse_buildinfo, sloth::warn_if_slow_response};
 
@@ -183,7 +184,7 @@ impl DeployCommand {
                 let existing_channel_id = self
                     .get_channel_id(&hippo_client, SPIN_DEPLOY_CHANNEL_NAME.to_string())
                     .await?;
-                Client::remove_channel(&hippo_client, existing_channel_id).await?;
+                Client::remove_channel(&hippo_client, existing_channel_id.to_string()).await?;
                 active_revision_id = Some(
                     self.get_revision_id(&hippo_client, bindle_id.version_string().clone())
                         .await?,
@@ -213,7 +214,12 @@ impl DeployCommand {
         .await
         .context("Problem creating a channel in Hippo")?;
 
-        let channel = Client::get_channel_by_id(&hippo_client, &channel_id)
+        println!(
+            "Deployed {} version {}",
+            name.clone(),
+            bindle_id.version_string()
+        );
+        let channel = Client::get_channel_by_id(&hippo_client, &channel_id.to_string())
             .await
             .context("Problem getting channel by id")?;
         if let Ok(http_config) = HttpTriggerConfiguration::try_from(cfg.info.trigger.clone()) {
@@ -273,39 +279,31 @@ impl DeployCommand {
         Ok(buildinfo)
     }
 
-    async fn get_app_id(&self, hippo_client: &Client, name: String) -> Result<String> {
+    async fn get_app_id(&self, hippo_client: &Client, name: String) -> Result<Uuid> {
         let apps_vm = Client::list_apps(hippo_client).await?;
-        let app = apps_vm.apps.iter().find(|&x| x.name == name.clone());
+        let app = apps_vm.items.iter().find(|&x| x.name == name.clone());
         match app {
-            Some(a) => Ok(a.id.clone()),
+            Some(a) => Ok(a.id),
             None => anyhow::bail!("No app with name: {}", name),
         }
     }
 
-    async fn get_revision_id(
-        &self,
-        hippo_client: &Client,
-        bindle_version: String,
-    ) -> Result<String> {
+    async fn get_revision_id(&self, hippo_client: &Client, bindle_version: String) -> Result<Uuid> {
         let revisions = Client::list_revisions(hippo_client).await?;
         let revision = revisions
-            .revisions
+            .items
             .iter()
             .find(|&x| x.revision_number == bindle_version);
         Ok(revision
             .ok_or_else(|| anyhow::anyhow!("No revision with version {}", bindle_version))?
-            .id
-            .clone())
+            .id)
     }
 
-    async fn get_channel_id(&self, hippo_client: &Client, name: String) -> Result<String> {
+    async fn get_channel_id(&self, hippo_client: &Client, name: String) -> Result<Uuid> {
         let channels_vm = Client::list_channels(hippo_client).await?;
-        let channel = channels_vm
-            .channels
-            .iter()
-            .find(|&x| x.name == name.clone());
+        let channel = channels_vm.items.iter().find(|&x| x.name == name.clone());
         match channel {
-            Some(c) => Ok(c.id.clone()),
+            Some(c) => Ok(c.id),
             None => anyhow::bail!("No channel with name: {}", name),
         }
     }
@@ -369,14 +367,10 @@ impl DeployCommand {
     async fn check_hippo_healthz(&self) -> Result<()> {
         let hippo_base_url = url::Url::parse(&self.hippo_server_url)?;
         let hippo_healthz_url = hippo_base_url.join("/healthz")?;
-        let result = reqwest::get(hippo_healthz_url.to_string())
+        reqwest::get(hippo_healthz_url.to_string())
             .await?
-            .error_for_status()?
-            .text()
-            .await?;
-        if result != "Healthy" {
-            return Err(anyhow!("Hippo server {} is unhealthy", hippo_base_url));
-        }
+            .error_for_status()
+            .with_context(|| format!("Hippo server {} is unhealthy", hippo_base_url))?;
         Ok(())
     }
 }

src/commands/deploy.rs

@@ -316,7 +316,7 @@ mod integration_tests {
             )?;
 
             let apps_vm = hippo.client.list_apps().await?;
-            assert_eq!(apps_vm.apps.len(), 1, "hippo apps: {apps_vm:?}");
+            assert_eq!(apps_vm.items.len(), 1, "hippo apps: {apps_vm:?}");
 
             Ok(())
         }
@@ -544,10 +544,8 @@ mod integration_tests {
                 }
 
                 if let Ok(rsp) = reqwest::get(format!("{url}/healthz")).await {
-                    if let Ok(result) = rsp.text().await {
-                        if result == "Healthy" {
-                            break;
-                        }
+                    if rsp.status().is_success() {
+                        break;
                     }
                 }