Merge branch 'main' into kevin/docstring-format

kurtosis-tech · Nov 15, 2023 · 1003c7c · 1003c7c
2 parents 31fe9ec + 1eaf469
commit 1003c7c
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.85.21](https://github.com/kurtosis-tech/kurtosis/compare/0.85.20...0.85.21) (2023-11-14)
+
+
+### Features
+
+* show usage text when CLI cmd fails because of missing a required argument ([#1774](https://github.com/kurtosis-tech/kurtosis/issues/1774)) ([a7df8cf](https://github.com/kurtosis-tech/kurtosis/commit/a7df8cfff3bac270a9fb755ed71a55d1e72f3d5d))
+
 ## [0.85.20](https://github.com/kurtosis-tech/kurtosis/compare/0.85.19...0.85.20) (2023-11-14)
 
 

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.20
+Licensed Work:        Kurtosis 0.85.21
 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.

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.20"
+	KurtosisVersion = "0.85.21"
 	// !!!!!!!!!!! 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.20"
+version = "0.85.21"
 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.20",
+    "version": "0.85.21",
     "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.20"
+export const KURTOSIS_VERSION: string = "0.85.21"
 // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!!
diff --git a/...d_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go b/...d_impls/docker/docker_kurtosis_backend/docker_kurtosis_backend_api_container_functions.go
@@ -43,6 +43,8 @@ func (backend *DockerKurtosisBackend) CreateAPIContainer(
 	ownIpAddressEnvVar string,
 	customEnvVars map[string]string,
 ) (*api_container.APIContainer, error) {
+	logrus.Debugf("Creating the APIC for enclave '%v'", enclaveUuid)
+
 	// Verify no API container already exists in the enclave
 	apiContainersInEnclaveFilters := &api_container.APIContainerFilters{
 		EnclaveIDs: map[enclave.EnclaveUUID]bool{
@@ -203,6 +205,7 @@ func (backend *DockerKurtosisBackend) CreateAPIContainer(
 		return nil, stacktrace.Propagate(err, "An error occurred waiting for the API container's grpc port to become available")
 	}
 
+	logrus.Debugf("Checking for the APIC availability in enclave '%v'...", enclaveUuid)
 	if err := shared_helpers.WaitForPortAvailabilityUsingNetstat(
 		ctx,
 		backend.dockerManager,
@@ -213,6 +216,7 @@ func (backend *DockerKurtosisBackend) CreateAPIContainer(
 	); err != nil {
 		return nil, stacktrace.Propagate(err, "An error occurred waiting for the API container's grpc port to become available")
 	}
+	logrus.Debugf("...APIC is available in enclave '%v'", enclaveUuid)
 
 	bridgeNetworkIpAddress, err := backend.dockerManager.GetContainerIP(ctx, consts.NameOfNetworkToStartEngineAndLogServiceContainersIn, containerId)
 	if err != nil {
@@ -224,6 +228,8 @@ func (backend *DockerKurtosisBackend) CreateAPIContainer(
 		return nil, stacktrace.Propagate(err, "An error occurred creating an API container object from container with ID '%v'", containerId)
 	}
 
+	logrus.Debugf("APIC for enclave '%v' successfully created", enclaveUuid)
+
 	shouldKillContainer = false
 	return result, nil
 }

diff --git a/...nd_impls/docker/docker_kurtosis_backend/logs_collector_functions/create_logs_collector.go b/...nd_impls/docker/docker_kurtosis_backend/logs_collector_functions/create_logs_collector.go
@@ -37,7 +37,7 @@ func CreateLogsCollectorForEnclave(
 	*logs_collector.LogsCollector,
 	error,
 ) {
-
+	logrus.Debugf("Creating logs collector for enclave '%v'", enclaveUuid)
 	preExistingLogsCollectorContainers, err := getLogsCollectorForTheGivenEnclave(ctx, enclaveUuid, dockerManager)
 	if err != nil {
 		return nil, stacktrace.Propagate(err, "An error occurred getting logs collector containers for given enclave '%v'", enclaveUuid)
@@ -118,9 +118,12 @@ func CreateLogsCollectorForEnclave(
 
 	logsCollectorAvailabilityChecker := fluentbit.NewFluentbitAvailabilityChecker(logsCollectorObj.GetBridgeNetworkIpAddress(), logsCollectorObj.GetPrivateHttpPort().GetNumber())
 
+	logrus.Debugf("Checking for logs collector availability in enclave '%v'...", enclaveUuid)
 	if err = logsCollectorAvailabilityChecker.WaitForAvailability(); err != nil {
 		return nil, stacktrace.Propagate(err, "An error occurred while waiting for the log container to become available")
 	}
+	logrus.Debugf("...logs collector is available in enclave '%v'", enclaveUuid)
+	logrus.Debugf("Logs collector successfully created with container ID '%v' for enclave '%v'", containerId, enclaveUuid)
 
 	shouldDisconnectLogsCollectorFromEnclaveNetwork = false
 	shouldRemoveLogsCollectorContainerFunc = false

diff --git a/enclave-manager/server/server.go b/enclave-manager/server/server.go
@@ -520,7 +520,11 @@ func RunEnclaveManagerApiServer(enforceAuth bool) error {
 		handler,
 		apiPath,
 	)
-	if err := apiServer.RunServerUntilInterruptedWithCors(cors.AllowAll()); err != nil {
+
+	emCors := cors.AllowAll()
+	emCors.Log = logrus.StandardLogger()
+
+	if err := apiServer.RunServerUntilInterruptedWithCors(emCors); err != nil {
 		logrus.Error("An error occurred running the server", err)
 	}
 	return nil

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-0.85.20
+0.85.21