Merge branch 'main' into gmarchetti/shorten-authorship-quickstart

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.85.51](https://github.com/kurtosis-tech/kurtosis/compare/0.85.50...0.85.51) (2023-12-19)
+
+
+### Features
+
+* catalog show run count ([#1975](https://github.com/kurtosis-tech/kurtosis/issues/1975)) ([5f29a12](https://github.com/kurtosis-tech/kurtosis/commit/5f29a12a891a18ddf8a0f48ed806acb125008fc2))
+* update api path and keep alive ([#1976](https://github.com/kurtosis-tech/kurtosis/issues/1976)) ([e026109](https://github.com/kurtosis-tech/kurtosis/commit/e0261098ae7870caa7804a120e7ee408d053854f))
+
+
+### Bug Fixes
+
+* fix nil pointer error when getting reverse proxy from the cluster ([#1980](https://github.com/kurtosis-tech/kurtosis/issues/1980)) ([f20c290](https://github.com/kurtosis-tech/kurtosis/commit/f20c290143e801d3f48fe8f29ea6399ed50ecb48))
+
 ## [0.85.50](https://github.com/kurtosis-tech/kurtosis/compare/0.85.49...0.85.50) (2023-12-18)
 
 

LICENSE.md

@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters
 
 Licensor:             Kurtosis Technologies, Inc.
-Licensed Work:        Kurtosis 0.85.50
+Licensed Work:        Kurtosis 0.85.51
 The Licensed Work is (c) 2023 Kurtosis Technologies, Inc.
 Additional Use Grant: You may make use of the Licensed Work, provided that
 you may not use the Licensed Work for an Environment Orchestration Service.
@@ -12,7 +12,7 @@ you may not use the Licensed Work for an Environment Orchestration Service.
                       allows third parties (other than your employees and
                       contractors) to create distributed system environments.
 
-Change Date:          2027-12-18
+Change Date:          2027-12-19
 
 Change License:       Apache 2.0 (Apache License, Version 2.0)
 

api/golang/kurtosis_version/kurtosis_version.go

@@ -9,6 +9,6 @@ const (
 	// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
 	// This is necessary so that Kurt Core consumers will know if they're compatible with the currently-running
 	//  API container
-	KurtosisVersion = "0.85.50"
+	KurtosisVersion = "0.85.51"
 	// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
 )

api/rust/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kurtosis-sdk"
-version = "0.85.50"
+version = "0.85.51"
 license = "BUSL-1.1"
 description = "Rust SDK for Kurtosis"
 edition = "2021"

api/typescript/package.json

@@ -1,7 +1,7 @@
 {
     "name": "kurtosis-sdk",
     "//": "NOTE: DO NOT UPDATE THIS VERSION MANUALLY - IT WILL BE UPDATED DURING THE RELEASE PROCESS!",
-    "version": "0.85.50",
+    "version": "0.85.51",
     "main": "./build/index",
     "description": "This repo contains a Typescript client for communicating with the Kurtosis Engine server, which is responsible for creating, managing and destroying Kurtosis Enclaves.",
     "types": "./build/index",

api/typescript/src/kurtosis_version/kurtosis_version.ts

@@ -1,5 +1,5 @@
 // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
 // This is necessary so that Kurt Core consumers (e.g. modules) will know if they're compatible with the currently-running
 //  API container
-export const KURTOSIS_VERSION: string = "0.85.50"
+export const KURTOSIS_VERSION: string = "0.85.51"
 // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!

container-engine-lib/lib/backend_impls/docker/docker_kurtosis_backend/backend_creator/backend_creator.go

@@ -240,13 +240,17 @@ func getDockerKurtosisBackend(
 			return nil, stacktrace.Propagate(err, "An error occurred while getting the logs collector object for enclave '%v'; This is a bug in Kurtosis", enclaveUuid)
 		}
 
-		reverseProxy, err := reverse_proxy_functions.GetReverseProxy(ctx, dockerManager)
+		maybeReverseProxy, err := reverse_proxy_functions.GetReverseProxy(ctx, dockerManager)
 		if err != nil {
 			return nil, stacktrace.Propagate(err, "An error occurred while getting the reverse proxy, This is a bug in Kurtosis")
 		}
-		reverseProxyEnclaveNetworkIpAddress, found := reverseProxy.GetEnclaveNetworksIpAddress()[network.GetId()]
+		if maybeReverseProxy == nil {
+			return nil, stacktrace.Propagate(err, "The reverse proxy is not running, This is a bug in Kurtosis")
+		}
+
+		reverseProxyEnclaveNetworkIpAddress, found := maybeReverseProxy.GetEnclaveNetworksIpAddress()[network.GetId()]
 		if !found {
-			return nil, stacktrace.NewError("An error occured while getting the reverse proxy enclave network IP address for enclave '%v', This is a bug in Kurtosis", enclaveUuid)
+			return nil, stacktrace.NewError("An error occurred while getting the reverse proxy enclave network IP address for enclave '%v', This is a bug in Kurtosis", enclaveUuid)
 		}
 
 		alreadyTakenIps := map[string]bool{

enclave-manager/web/lerna.json

@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.85.50",
+  "version": "0.85.51",
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",
   "useNx": false,

enclave-manager/web/packages/app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kurtosis/emui-app",
-  "version": "0.85.50",
+  "version": "0.85.51",
   "private": true,
   "homepage": ".",
   "dependencies": {
@@ -9,7 +9,7 @@
     "html-react-parser": "^4.2.2",
     "js-cookie": "^3.0.5",
     "kurtosis-cloud-indexer-sdk": "^0.0.2",
-    "kurtosis-ui-components": "0.85.50",
+    "kurtosis-ui-components": "0.85.51",
     "react-error-boundary": "^4.0.11",
     "react-hook-form": "^7.47.0",
     "yaml": "^2.3.4"

enclave-manager/web/packages/app/src/emui/catalog/package/Package.tsx

@@ -1,7 +1,7 @@
 import { Box, Flex, Icon, Image, Input, InputGroup, InputRightElement, Text } from "@chakra-ui/react";
 import { DateTime } from "luxon";
 import { useState } from "react";
-import { IoStar } from "react-icons/io5";
+import { IoPlay, IoStar } from "react-icons/io5";
 import { useParams } from "react-router-dom";
 import { useKurtosisClient } from "../../../client/enclaveManager/KurtosisClientContext";
 
@@ -84,7 +84,7 @@ const PackageImpl = ({ kurtosisPackage }: PackageImplProps) => {
             >
               View on Github
             </PackageSourceButton>
-            <Flex borderBottomWidth={"1px"} borderBottomColor={"whiteAlpha.300"} gap={"16px"} p={"16px"}>
+            <Flex borderBottomWidth={"1px"} borderBottomColor={"whiteAlpha.300"} gap={"32px"} p={"16px"}>
               <Flex gap={"16px"} flexDirection={"column"}>
                 <Flex gap={"8px"} color="gray.400" fontWeight={"bold"} alignItems={"center"}>
                   <Icon as={IoStar} w={"12px"} h={"12px"} />
@@ -96,6 +96,17 @@ const PackageImpl = ({ kurtosisPackage }: PackageImplProps) => {
                   {kurtosisPackage.stars.toString()}
                 </Text>
               </Flex>
+              <Flex gap={"16px"} flexDirection={"column"}>
+                <Flex gap={"8px"} color="gray.400" fontWeight={"bold"} alignItems={"center"}>
+                  <Icon as={IoPlay} w={"12px"} h={"12px"} />
+                  <Text as={"span"} textTransform={"uppercase"}>
+                    Run Count
+                  </Text>
+                </Flex>
+                <Text as={"span"} fontWeight={"medium"} fontSize={"xl"}>
+                  {kurtosisPackage.runCount.toString()}
+                </Text>
+              </Flex>
             </Flex>
             <Flex gap={"16px"} flexDirection={"column"} p={"16px"}>
               <Text as={"span"} color="gray.400" fontWeight={"bold"} textTransform={"uppercase"}>

enclave-manager/web/packages/components/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kurtosis-ui-components",
-  "version": "0.85.50",
+  "version": "0.85.51",
   "private": false,
   "main": "build/index",
   "description": "This repo contains components used by Kurtosis UI applications.",

enclave-manager/web/packages/components/src/catalog/KurtosisPackageCard.tsx

@@ -1,6 +1,6 @@
 import { Box, Flex, Icon, Image, Text } from "@chakra-ui/react";
 import { KurtosisPackage } from "kurtosis-cloud-indexer-sdk";
-import { IoStar } from "react-icons/io5";
+import { IoPlay, IoStar } from "react-icons/io5";
 import { Link, useHref } from "react-router-dom";
 import { readablePackageName } from "./utils";
 import { RunKurtosisPackageButton } from "./widgets/RunKurtosisPackageButton";
@@ -57,9 +57,15 @@ export const KurtosisPackageCard = ({ kurtosisPackage, onRunClick }: KurtosisPac
                 <Text as={"span"} textTransform={"capitalize"}>
                   {kurtosisPackage.repositoryMetadata?.owner.replaceAll("-", " ") || "Unknown owner"}
                 </Text>
-                <Flex gap={"4px"} alignItems={"center"}>
-                  <Icon color="gray.  500" as={IoStar} />
-                  <Text as={"span"}>{kurtosisPackage.stars.toString()}</Text>
+                <Flex gap={"16px"}>
+                  <Flex gap={"4px"} alignItems={"center"}>
+                    <Icon color="gray.  500" as={IoStar} />
+                    <Text as={"span"}>{kurtosisPackage.stars.toString()}</Text>
+                  </Flex>
+                  <Flex gap={"4px"} alignItems={"center"}>
+                    <Icon color="gray.  500" as={IoPlay} />
+                    <Text as={"span"}>{kurtosisPackage.runCount.toString()}</Text>
+                  </Flex>
                 </Flex>
               </Flex>
             </Box>

engine/server/webapp/asset-manifest.json

@@ -1,10 +1,10 @@
 {
   "files": {
-    "main.js": "./static/js/main.ff1c776d.js",
+    "main.js": "./static/js/main.345117dd.js",
     "index.html": "./index.html",
-    "main.ff1c776d.js.map": "./static/js/main.ff1c776d.js.map"
+    "main.345117dd.js.map": "./static/js/main.345117dd.js.map"
   },
   "entrypoints": [
-    "static/js/main.ff1c776d.js"
+    "static/js/main.345117dd.js"
   ]
 }

engine/server/webapp/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Kurtosis Enclave Manager"/><title>Kurtosis Enclave Manager</title><script defer="defer" src="./static/js/main.ff1c776d.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="./favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><meta name="description" content="Kurtosis Enclave Manager"/><title>Kurtosis Enclave Manager</title><script defer="defer" src="./static/js/main.345117dd.js"></script></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>

version.txt

@@ -1 +1 @@
-0.85.50
+0.85.51