Merge branch 'main' into tedi/granularetention

kurtosis-tech · Aug 14, 2024 · 9ca8d22 · 9ca8d22
2 parents 01fb441 + 926de23
commit 9ca8d22
Show file tree

Hide file tree

Showing 27 changed files with 24 additions and 33 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1474,18 +1474,6 @@ workflows:
           all_architectures: true
           name: "Check if CLI builds for all os and arch pairs"
           <<: *filters_ignore_main
-#      08/10/2024, tedi: turning these CI tests off for now as they depend on the package indexer for catalog.kurtosis.com which was shut down with
-#      the Kurtosis Cloud wind down
-#      - test_enclave_manager_web_ui:
-#          name: "Test Basic Web UI Functionality in Docker"
-#          context:
-#            - docker-user
-#          requires:
-#            - build_cli
-#            - build_api_container_server
-#            - build_engine_server
-#            - build_files_artifacts_expander
-#          <<: *filters_ignore_main
 
       - test_basic_cli_functionality:
           name: "Test Basic CLI Functionality in Docker"

diff --git a/cli/cli/scripts/build.sh b/cli/cli/scripts/build.sh
@@ -97,7 +97,8 @@ fi
         exit 1
     fi
     # Executing goreleaser v1.26.2 without needing to install it
-    if ! curl -sfL https://goreleaser.com/static/run | VERSION=v1.26.2 DISTRIBUTION=oss bash -s -- ${goreleaser_verb_and_flags}; then
+#    if ! curl -sfL https://goreleaser.com/static/run | VERSION=v1.26.2 DISTRIBUTION=oss bash -s -- ${goreleaser_verb_and_flags}; then
+#    if ! curl -sfL https://goreleaser.com/static/run | VERSION=v1.26.2 DISTRIBUTION=oss bash -s -- ${goreleaser_verb_and_flags}; then
         echo "Error: Couldn't build the CLI binary for the current OS/arch" >&2
         exit 1
     fi

diff --git a/connect-server/go.mod b/connect-server/go.mod
@@ -4,7 +4,7 @@ go 1.20
 
 require (
 	github.com/kurtosis-tech/stacktrace v0.0.0-20211028211901-1c67a77b5409
-	github.com/rs/cors v1.9.0
+	github.com/rs/cors v1.11.0
 	github.com/sirupsen/logrus v1.9.3
 	golang.org/x/net v0.19.0
 )

diff --git a/connect-server/go.sum b/connect-server/go.sum
@@ -5,8 +5,8 @@ github.com/kurtosis-tech/stacktrace v0.0.0-20211028211901-1c67a77b5409 h1:YQTATi
 github.com/kurtosis-tech/stacktrace v0.0.0-20211028211901-1c67a77b5409/go.mod h1:y5weVs5d9wXXHcDA1awRxkIhhHC1xxYJN8a7aXnE6S8=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rs/cors v1.9.0 h1:l9HGsTsHJcvW14Nk7J9KFz8bzeAWXn3CG6bgt7LsrAE=
-github.com/rs/cors v1.9.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po=
+github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

diff --git a/enclave-manager/api/typescript/yarn.lock b/enclave-manager/api/typescript/yarn.lock
@@ -1512,11 +1512,11 @@ brace-expansion@^1.1.7:
     concat-map "0.0.1"
 
 braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.22.2:
   version "4.22.2"
@@ -1791,10 +1791,10 @@ fb-watchman@^2.0.0:
   dependencies:
     bser "2.1.1"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 

diff --git a/...screenshots/catalog.cy.ts/Catalog -- Can save packages (failed) (attempt 2).png b/...screenshots/catalog.cy.ts/Catalog -- Can save packages (failed) (attempt 2).png
diff --git a/...screenshots/catalog.cy.ts/Catalog -- Can save packages (failed) (attempt 3).png b/...screenshots/catalog.cy.ts/Catalog -- Can save packages (failed) (attempt 3).png
diff --git a/...web/cypress/screenshots/catalog.cy.ts/Catalog -- Can save packages (failed).png b/...web/cypress/screenshots/catalog.cy.ts/Catalog -- Can save packages (failed).png
diff --git a/...cypress/screenshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (1).png b/...cypress/screenshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (1).png
diff --git a/...cypress/screenshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (2).png b/...cypress/screenshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (2).png
diff --git a/...enshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (attempt 2) (1).png b/...enshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (attempt 2) (1).png
diff --git a/...screenshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (attempt 2).png b/...screenshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (attempt 2).png
diff --git a/...enshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (attempt 3) (1).png b/...enshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (attempt 3) (1).png
diff --git a/...screenshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (attempt 3).png b/...screenshots/catalog.cy.ts/Catalog -- Lists the catalog (failed) (attempt 3).png
diff --git a/...web/cypress/screenshots/catalog.cy.ts/Catalog -- Lists the catalog (failed).png b/...web/cypress/screenshots/catalog.cy.ts/Catalog -- Lists the catalog (failed).png
diff --git a/...nshots/catalog.cy.ts/Catalog -- Opens packages details (failed) (attempt 2).png b/...nshots/catalog.cy.ts/Catalog -- Opens packages details (failed) (attempt 2).png
diff --git a/...nshots/catalog.cy.ts/Catalog -- Opens packages details (failed) (attempt 3).png b/...nshots/catalog.cy.ts/Catalog -- Opens packages details (failed) (attempt 3).png
diff --git a/...ypress/screenshots/catalog.cy.ts/Catalog -- Opens packages details (failed).png b/...ypress/screenshots/catalog.cy.ts/Catalog -- Opens packages details (failed).png
diff --git a/...eenshots/catalog.cy.ts/Catalog -- Searches with ctrl+f (failed) (attempt 2).png b/...eenshots/catalog.cy.ts/Catalog -- Searches with ctrl+f (failed) (attempt 2).png
diff --git a/...eenshots/catalog.cy.ts/Catalog -- Searches with ctrl+f (failed) (attempt 3).png b/...eenshots/catalog.cy.ts/Catalog -- Searches with ctrl+f (failed) (attempt 3).png
diff --git a/.../cypress/screenshots/catalog.cy.ts/Catalog -- Searches with ctrl+f (failed).png b/.../cypress/screenshots/catalog.cy.ts/Catalog -- Searches with ctrl+f (failed).png
diff --git a/...cy.ts/Enclave List -- Can create and update an enclave (failed) (attempt 2).png b/...cy.ts/Enclave List -- Can create and update an enclave (failed) (attempt 2).png
diff --git a/...enclaveList.cy.ts/Enclave List -- Can create and update an enclave (failed).png b/...enclaveList.cy.ts/Enclave List -- Can create and update an enclave (failed).png
diff --git a/...-- Can create and update an enclave -- after each hook (failed) (attempt 2).png b/...-- Can create and update an enclave -- after each hook (failed) (attempt 2).png
diff --git a/...nclave List -- Can create and update an enclave -- after each hook (failed).png b/...nclave List -- Can create and update an enclave -- after each hook (failed).png
diff --git a/enclave-manager/web/lerna.json b/enclave-manager/web/lerna.json
@@ -1,5 +1,7 @@
 {
-  "packages": ["packages/*"],
+  "packages": [
+    "packages/*"
+  ],
   "version": "1.0.0",
   "npmClient": "yarn",
   "$schema": "node_modules/lerna/schemas/lerna-schema.json",

diff --git a/enclave-manager/web/yarn.lock b/enclave-manager/web/yarn.lock
@@ -5727,11 +5727,11 @@ brace-expansion@^2.0.1:
     balanced-match "^1.0.0"
 
 braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browser-process-hrtime@^1.0.0:
   version "1.0.0"
@@ -8099,10 +8099,10 @@ filesize@^8.0.6:
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-8.0.7.tgz#695e70d80f4e47012c132d57a059e80c6b580bd8"
   integrity sha512-pjmC+bkIF8XI7fWaH8KxHcZL3DPybs1roSKP4rKDvy20tAWwIObE4+JIseG2byfGKhud5ZnM4YSGKBz7Sh0ndQ==
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"