Merge branch 'main' into anders/public-ports

kurtosis-tech · Dec 6, 2023 · 224c317 · 224c317
2 parents 51537a0 + 9bdf0d0
commit 224c317
Show file tree

Hide file tree

Showing 39 changed files with 331 additions and 137 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # Changelog
 
+## [0.85.42](https://github.com/kurtosis-tech/kurtosis/compare/0.85.41...0.85.42) (2023-12-05)
+
+
+### Bug Fixes
+
+* Rename jwtToken cookie ([#1876](https://github.com/kurtosis-tech/kurtosis/issues/1876)) ([3b13372](https://github.com/kurtosis-tech/kurtosis/commit/3b13372004a0448f5e40154004b2b883e5a5d57a))
+
+## [0.85.41](https://github.com/kurtosis-tech/kurtosis/compare/0.85.40...0.85.41) (2023-12-05)
+
+
+### Features
+
+* emui design improvements ([#1892](https://github.com/kurtosis-tech/kurtosis/issues/1892)) ([9268a24](https://github.com/kurtosis-tech/kurtosis/commit/9268a2450c125ee95721d0c51a401bf68db5d68a))
+* emui handle json/yaml input interchangably ([#1891](https://github.com/kurtosis-tech/kurtosis/issues/1891)) ([cd4263b](https://github.com/kurtosis-tech/kurtosis/commit/cd4263bed4e784eca2dcd9c118e5b69c5d353f06))
+
 ## [0.85.40](https://github.com/kurtosis-tech/kurtosis/compare/0.85.39...0.85.40) (2023-12-02)
 
 

diff --git a/LICENSE.md b/LICENSE.md
@@ -3,7 +3,7 @@ Business Source License 1.1
 Parameters
 
 Licensor:             Kurtosis Technologies, Inc.
-Licensed Work:        Kurtosis 0.85.40
+Licensed Work:        Kurtosis 0.85.42
 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-02
+Change Date:          2027-12-05
 
 Change License:       Apache 2.0 (Apache License, Version 2.0)
 

diff --git a/api/golang/kurtosis_version/kurtosis_version.go b/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.40"
+	KurtosisVersion = "0.85.42"
 	// !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
 )
diff --git a/api/rust/Cargo.toml b/api/rust/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "kurtosis-sdk"
-version = "0.85.40"
+version = "0.85.42"
 license = "BUSL-1.1"
 description = "Rust SDK for Kurtosis"
 edition = "2021"

diff --git a/api/typescript/package.json b/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.40",
+    "version": "0.85.42",
     "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",

diff --git a/api/typescript/src/kurtosis_version/kurtosis_version.ts b/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.40"
+export const KURTOSIS_VERSION: string = "0.85.42"
 // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
diff --git a/docs/docs/api-reference/starlark-reference/index.md b/docs/docs/api-reference/starlark-reference/index.md
@@ -9,6 +9,22 @@ pagination_next: api-reference/starlark-reference/standard-library
 
 This section details the Kurtosis Starlark DSL used to manipulate the contents of enclaves. Feel free to use the [official Kurtosis Starlark VS Code extension][vscode-plugin] when writing Starlark with VSCode for features like syntax highlighting, method signature suggestions, hover preview for functions, and auto-completion for Kurtosis custom types.
 
+Useful tips for using and writing Starlark
+------------------------------------------
+If you're using Visual Studio Code, you may find our [Kurtosis VS Code Extension][vscode-plugin] helpful when writing Starlark.
+
+If you're using Vim, you can add the following to your `.vimrc` to get Starlark syntax highlighting:
+
+```
+" Add syntax highlighting for Starlark files
+autocmd FileType *.star setlocal filetype=python
+```
+
+or if you use Neovim:
+```
+autocmd BufNewFile,BufRead *.star set filetype=python
+```
+
 Parameter Naming Convention
 ---------------------------
 

diff --git a/docs/docs/best-practices.md b/docs/docs/best-practices.md
@@ -48,11 +48,26 @@ Kurtosis service names implements [RFC-1035](https://datatracker.ietf.org/doc/ht
 
 Failure to adhere to the above standards will result in errors when running Kurtosis.
 
+Writing and reading Starlark
+----------------------------
 
+If you're using Visual Studio Code, you may find our [Kurtosis VS Code Extension][vscode-plugin] helpful when writing Starlark.
+
+If you're using Vim, you can add the following to your `.vimrc` to get Starlark syntax highlighting:
+
+```
+" Add syntax highlighting for Starlark files
+autocmd FileType *.star setlocal filetype=python
+```
+
+or if you use Neovim:
+```
+autocmd BufNewFile,BufRead *.star set filetype=python
+```
 
 <!---------------------------------------- ONLY LINKS BELOW HERE!!! ----------------------------------->
 [package-parameterization]: ./advanced-concepts/packages.md#parameterization
-
+[vscode-plugin]: https://marketplace.visualstudio.com/items?itemName=Kurtosis.kurtosis-extension
 [service-config-starlark-reference]: ./api-reference/starlark-reference/service-config.md
 [port-spec-starlark-reference]: ./api-reference/starlark-reference/port-spec.md
 [ready-condition-starlark-reference]: ./api-reference/starlark-reference/ready-condition.md

diff --git a/docs/docs/get-started/write-your-first-package.md b/docs/docs/get-started/write-your-first-package.md
@@ -67,6 +67,10 @@ If you're using Vim, you can add the following to your `.vimrc` to get Starlark
 autocmd FileType *.star setlocal filetype=python
 ```
 
+or if you use Neovim:
+```
+autocmd BufNewFile,BufRead *.star set filetype=python
+```
 :::
 
 Finally, [run][kurtosis-run-reference] the script (we'll explain enclaves in the "Review" section):

diff --git a/docs/docusaurus.config.js b/docs/docusaurus.config.js
@@ -92,6 +92,11 @@ const config = {
 						position: 'left',
 						label: 'Kurtosis for Web3',
 					},
+					{
+						href: 'https://www.kurtosis.com/release-notes',
+						position: 'left',
+						label: 'Release Notes',
+					},
 					{
 						href: 'https://github.com/kurtosis-tech/kurtosis/issues/new?assignees=leeederek&labels=docs&template=docs-issue.yml',
 						position: 'right',

diff --git a/enclave-manager/web/package.json b/enclave-manager/web/package.json
@@ -25,10 +25,10 @@
     "react-icons": "^4.11.0",
     "react-markdown": "^9.0.0",
     "react-router-dom": "^6.17.0",
-    "react-scripts": "5.0.1",
     "react-virtuoso": "^4.6.2",
     "streamsaver": "^2.0.6",
-    "true-myth": "^7.1.0"
+    "true-myth": "^7.1.0",
+    "yaml": "^2.3.4"
   },
   "devDependencies": {
     "@types/js-cookie": "^3.0.6",
@@ -41,6 +41,7 @@
     "monaco-editor": "^0.44.0",
     "prettier": "3.0.3",
     "prettier-plugin-organize-imports": "^3.2.3",
+    "react-scripts": "5.0.1",
     "serve": "^14.2.1",
     "source-map-explorer": "^2.5.3",
     "typescript": "^4.4.2"

diff --git a/enclave-manager/web/src/client/enclaveManager/KurtosisClientContext.tsx b/enclave-manager/web/src/client/enclaveManager/KurtosisClientContext.tsx
@@ -70,7 +70,7 @@ export const KurtosisClientProvider = ({ children }: PropsWithChildren) => {
             throw Error(`Port ${port} is not a number.`);
           }
 
-          const jwtToken = Cookies.get("kurtosis");
+          const jwtToken = Cookies.get("_kurtosis_jwt_token");
 
           if (isDefined(jwtToken)) {
             newClient = new AuthenticatedKurtosisClient(

diff --git a/enclave-manager/web/src/client/packageIndexer/api/kurtosis_package_indexer_pb.ts b/enclave-manager/web/src/client/packageIndexer/api/kurtosis_package_indexer_pb.ts
@@ -1,4 +1,4 @@
-// @generated by protoc-gen-es v1.4.0 with parameter "target=ts"
+// @generated by protoc-gen-es v1.4.1 with parameter "target=ts"
 // @generated from file kurtosis_package_indexer.proto (package kurtosis_package_indexer, syntax proto3)
 /* eslint-disable */
 // @ts-nocheck
@@ -222,6 +222,11 @@ export class KurtosisPackage extends Message<KurtosisPackage> {
    */
   version = "";
 
+  /**
+   * @generated from field: string icon_url = 12;
+   */
+  iconUrl = "";
+
   constructor(data?: PartialMessage<KurtosisPackage>) {
     super();
     proto3.util.initPartial(data, this);
@@ -241,6 +246,7 @@ export class KurtosisPackage extends Message<KurtosisPackage> {
     { no: 9, name: "parsing_result", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 10, name: "parsing_time", kind: "message", T: Timestamp },
     { no: 11, name: "version", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 12, name: "icon_url", kind: "scalar", T: 9 /* ScalarType.STRING */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): KurtosisPackage {
@@ -394,6 +400,16 @@ export class PackageRepository extends Message<PackageRepository> {
    */
   rootPath = "";
 
+  /**
+   * @generated from field: google.protobuf.Timestamp last_commit_time = 5;
+   */
+  lastCommitTime?: Timestamp;
+
+  /**
+   * @generated from field: string default_branch = 6;
+   */
+  defaultBranch = "";
+
   constructor(data?: PartialMessage<PackageRepository>) {
     super();
     proto3.util.initPartial(data, this);
@@ -406,6 +422,8 @@ export class PackageRepository extends Message<PackageRepository> {
     { no: 2, name: "owner", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 3, name: "name", kind: "scalar", T: 9 /* ScalarType.STRING */ },
     { no: 4, name: "root_path", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 5, name: "last_commit_time", kind: "message", T: Timestamp },
+    { no: 6, name: "default_branch", kind: "scalar", T: 9 /* ScalarType.STRING */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): PackageRepository {

diff --git a/enclave-manager/web/src/components/AppLayout.tsx b/enclave-manager/web/src/components/AppLayout.tsx
@@ -1,5 +1,5 @@
-import { Flex } from "@chakra-ui/react";
-import { PropsWithChildren, useRef } from "react";
+import { Box, Flex } from "@chakra-ui/react";
+import { PropsWithChildren } from "react";
 import { Navbar } from "../emui/Navbar";
 import { KurtosisBreadcrumbs } from "./KurtosisBreadcrumbs";
 import {
@@ -14,14 +14,7 @@ export const AppLayout = ({ children }: PropsWithChildren) => {
   return (
     <>
       <Navbar />
-      <Flex
-        as="main"
-        w={"100%"}
-        minH={"100vh"}
-        justifyContent={"flex-start"}
-        flexDirection={"column"}
-        className={"app-container"}
-      >
+      <Flex flexDirection="column" as="main" w={"100%"} minH={"100vh"} className={"app-container"}>
         {children}
       </Flex>
     </>
@@ -33,18 +26,11 @@ type AppPageLayoutProps = PropsWithChildren<{
 }>;
 
 export const AppPageLayout = ({ preventPageScroll, children }: AppPageLayoutProps) => {
-  const headerRef = useRef<HTMLDivElement>(null);
   const numberOfChildren = Array.isArray(children) ? children.length : 1;
 
   if (numberOfChildren === 1) {
     return (
-      <Flex
-        flexDirection={"column"}
-        w={"100%"}
-        h={"100%"}
-        maxHeight={preventPageScroll ? `100vh` : undefined}
-        flex={"1"}
-      >
+      <Box w={"100%"} h={preventPageScroll ? `100vh` : "100%"}>
         <Flex
           flexDirection={"column"}
           flex={"1"}
@@ -55,37 +41,32 @@ export const AppPageLayout = ({ preventPageScroll, children }: AppPageLayoutProp
           pr={MAIN_APP_RIGHT_PADDING}
         >
           <KurtosisBreadcrumbs />
-          <Flex
+          <Box
             w={"100%"}
             h={"100%"}
+            minH={preventPageScroll ? "0" : undefined}
             pt={MAIN_APP_TOP_PADDING}
             pb={MAIN_APP_BOTTOM_PADDING}
             flexDirection={"column"}
             flex={"1"}
           >
             {children}
-          </Flex>
+          </Box>
         </Flex>
-      </Flex>
+      </Box>
     );
   }
 
   // TS cannot infer that children is an array if numberOfChildren === 2
   if (numberOfChildren === 2 && Array.isArray(children)) {
     return (
-      <Flex direction="column" width={"100%"} h={"100%"} flex={"1"}>
-        <Flex ref={headerRef} width={"100%"} bg={"gray.850"}>
-          <Flex
-            flexDirection={"column"}
-            width={"100%"}
-            pl={MAIN_APP_LEFT_PADDING}
-            pr={MAIN_APP_RIGHT_PADDING}
-            maxW={MAIN_APP_MAX_WIDTH}
-          >
+      <Flex flexDirection={"column"} width={"100%"} h={preventPageScroll ? `100vh` : "100%"} flex={"1"}>
+        <Box width={"100%"} bg={"gray.850"}>
+          <Box width={"100%"} pl={MAIN_APP_LEFT_PADDING} pr={MAIN_APP_RIGHT_PADDING} maxW={MAIN_APP_MAX_WIDTH}>
             <KurtosisBreadcrumbs />
             {children[0]}
-          </Flex>
-        </Flex>
+          </Box>
+        </Box>
         <Flex
           maxWidth={MAIN_APP_MAX_WIDTH}
           pl={MAIN_APP_LEFT_PADDING}
@@ -96,7 +77,7 @@ export const AppPageLayout = ({ preventPageScroll, children }: AppPageLayoutProp
           h={"100%"}
           flex={"1"}
           flexDirection={"column"}
-          maxHeight={preventPageScroll ? `calc(100vh - ${headerRef.current?.offsetHeight || 0}px)` : undefined}
+          minH={preventPageScroll ? "0" : undefined}
         >
           {children[1]}
         </Flex>