From b6cf1c89d54f242bff994516d0ad27131e654961 Mon Sep 17 00:00:00 2001 From: Ben Gazzard Date: Mon, 23 Oct 2023 17:57:50 +0100 Subject: [PATCH 1/3] docs: include steps for dev in ubuntu (#1578) ## Description: Small change to the setup docs to build Kurtosis in Ubuntu. ## Is this change user facing? YES ## References (if applicable): N/A --- README.md | 42 +++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 2695031970..59fad62c10 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ echo "${BREW_PREFIX}/bin/bash" | sudo tee -a /etc/shells # Optional: make bash your default shell chsh -s "${BREW_PREFIX}/bin/bash" ``` - + #### Git On MacOS: @@ -149,7 +149,7 @@ On MacOS: # Install modern version of git, the one that ships on MacOS can be too old brew install git ``` - + #### Docker On MacOS: @@ -168,6 +168,14 @@ PATH="${BREW_PREFIX}/opt/go@1.19/bin:$PATH" PATH="${HOME}/go/bin:$PATH" ``` +On Ubuntu: +```bash +wget https://go.dev/dl/go1.19.13.linux-amd64.tar.gz +tar -C /usr/local -zxf go1.19.13.linux-amd64.tar.gz +# Add the following to your bashrc or equivalent. +export PATH=$PATH:/usr/local/go/bin +``` + #### Goreleaser On MacOS: @@ -175,6 +183,13 @@ On MacOS: brew install goreleaser/tap/goreleaser ``` +On Ubuntu: +```bash +echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | sudo tee /etc/apt/sources.list.d/goreleaser.list +sudo apt update +sudo apt install goreleaser +``` + #### Node (16.14 or above) and Yarn On MacOS, using `NVM`: @@ -185,9 +200,17 @@ nvm install 16.14.0 npm install -g yarn ``` +On Ubuntu, using `NVM`: +```bash +curl https://raw.githubusercontent.com/creationix/nvm/master/install.sh | bash +source ~/.bashrc +nvm install 16.14.0 +npm install -g yarn +``` + #### Rust -On MacOS: +On MacOS, Ubuntu: ```bash curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh ``` @@ -199,8 +222,17 @@ On MacOS: brew install protoc-gen-go brew install protoc-gen-go-grpc go install connectrpc.com/connect/cmd/protoc-gen-connect-go@latest -npm install -g ts-protoc-gen -npm install -g grpc-tools +yarn global add ts-protoc-gen +yarn global add grpc-tools +``` + +On Ubuntu: +```bash +go install google.golang.org/grpc/cmd/protoc-gen-go@latest +go install google.golang.org/grpc/cmd/protoc-gen-go-grpc@latest +go install connectrpc.com/connect/cmd/protoc-gen-connect-go@latest +yarn global add ts-protoc-gen +yarn global add grpc-tools ``` Build Instructions From a4bb8a8cb3119ae8f5f8861c2cf92566f453c945 Mon Sep 17 00:00:00 2001 From: leoporoli Date: Mon, 23 Oct 2023 15:24:42 -0300 Subject: [PATCH 2/3] refactor: update kurtosis package init cmd (#1588) ## Description: - package name is optional - remove flag - for validation errors, link docs + show an example ## Is this change user-facing? NO ## References (if applicable): --------- Co-authored-by: Gyanendra Mishra --- cli/cli/commands/package/init_cmd/init_cmd.go | 29 +++++++------------ docs/docs/cli-reference/package-init.md | 3 -- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/cli/cli/commands/package/init_cmd/init_cmd.go b/cli/cli/commands/package/init_cmd/init_cmd.go index 7adbdd6c49..c1493b94eb 100644 --- a/cli/cli/commands/package/init_cmd/init_cmd.go +++ b/cli/cli/commands/package/init_cmd/init_cmd.go @@ -8,20 +8,24 @@ import ( "github.com/kurtosis-tech/kurtosis/cli/cli/command_framework/lowlevel/flags" "github.com/kurtosis-tech/kurtosis/cli/cli/command_str_consts" "github.com/kurtosis-tech/kurtosis/cli/cli/kurtosis_package" + "github.com/kurtosis-tech/kurtosis/cli/cli/user_support_constants" "github.com/kurtosis-tech/stacktrace" "os" ) const ( packageNameArgKey = "package-name" - packageNameArgDefaultValue = "" - packageNameArgIsOptional = false + packageNameArgDefaultValue = "github.com/example-org/example-package" + packageNameArgIsOptional = true packageNameArgIsGreedy = false - executablePackageFlagKey = "main" - executablePackageFlagDefaultValue = "false" + alwaysCreateExecutablePackage = true + + validPackageNameExample = "github.com/kurtosis-tech/ethereum-package" ) +// InitCmd we only fill in the required struct fields, hence the others remain nil +// nolint: exhaustruct var InitCmd = &lowlevel.LowlevelKurtosisCommand{ CommandStr: command_str_consts.InitCmdStr, ShortDescription: "Creates a new Kurtosis package", @@ -35,14 +39,6 @@ var InitCmd = &lowlevel.LowlevelKurtosisCommand{ ValidationFunc: validatePackageNameArg, }, }, - Flags: []*flags.FlagConfig{ - { - Key: executablePackageFlagKey, - Usage: "indicates that the created package is an executable package, and generates a 'main.star' if one does not already exist.", - Type: flags.FlagType_Bool, - Default: executablePackageFlagDefaultValue, - }, - }, PreValidationAndRunFunc: nil, RunFunc: run, PostValidationAndRunFunc: nil, @@ -54,17 +50,12 @@ func run(ctx context.Context, flags *flags.ParsedFlags, args *args.ParsedArgs) e return stacktrace.Propagate(err, "an error occurred getting the value of argument with key '%v'", packageNameArgKey) } - executablePackageFlag, err := flags.GetBool(executablePackageFlagKey) - if err != nil { - return stacktrace.Propagate(err, "an error occurred getting the value of flag '%v'", executablePackageFlagKey) - } - packageDestinationDirpath, err := os.Getwd() if err != nil { return stacktrace.Propagate(err, "An error occurred getting the current working directory for creating the Kurtosis package") } - if err := kurtosis_package.InitializeKurtosisPackage(packageDestinationDirpath, packageNameArg, executablePackageFlag); err != nil { + if err := kurtosis_package.InitializeKurtosisPackage(packageDestinationDirpath, packageNameArg, alwaysCreateExecutablePackage); err != nil { return stacktrace.Propagate(err, "An error occurred initializing the Kurtosis package '%s' in '%s'", packageNameArg, packageDestinationDirpath) } @@ -78,7 +69,7 @@ func validatePackageNameArg(_ context.Context, _ *flags.ParsedFlags, args *args. } if _, err := shared_utils.ParseGitURL(packageNameArg); err != nil { - return stacktrace.Propagate(err, "An erro occurred validating package name '%v', invalid GitHub URL", packageNameArg) + return stacktrace.Propagate(err, "An error occurred validating package name '%v', invalid GitHub URL, the package name has to be a valid GitHub URL like '%s'. You can see more here: '%s' ", packageNameArg, validPackageNameExample, user_support_constants.StarlarkPackagesReferenceURL) } return nil diff --git a/docs/docs/cli-reference/package-init.md b/docs/docs/cli-reference/package-init.md index eab35e63cd..cd19daa9c8 100644 --- a/docs/docs/cli-reference/package-init.md +++ b/docs/docs/cli-reference/package-init.md @@ -8,9 +8,6 @@ Usage: The `package_name` argument is the [locator][locators]to the package, in the format `github.com/USER/REPO`. -This command accepts the following flags: -- `--main`: indicates that the created package is an [executable package][executable-package], and generates a `main.star` if one does not already exist. If a `main.star` already exists, does nothing. - [package]: ../concepts-reference/packages.md [kurtosis-yml]: ../concepts-reference/kurtosis-yml.md [locators]: ../concepts-reference/locators.md From be1e51e69d92de6d16e7288fe9d757ce2b866f69 Mon Sep 17 00:00:00 2001 From: kurtosisbot <89932784+kurtosisbot@users.noreply.github.com> Date: Mon, 23 Oct 2023 21:59:18 +0200 Subject: [PATCH 3/3] chore(main): release 0.84.10 (#1599) :robot: I have created a release *beep* *boop* --- ## [0.84.10](https://github.com/kurtosis-tech/kurtosis/compare/0.84.9...0.84.10) (2023-10-23) ### Bug Fixes * bug in portal forwarding via run ([#1598](https://github.com/kurtosis-tech/kurtosis/issues/1598)) ([bf534c3](https://github.com/kurtosis-tech/kurtosis/commit/bf534c35055f4ec3e19cc1f1e2e32e8d29e61b5a)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --------- Co-authored-by: kurtosisbot Co-authored-by: leoporoli --- CHANGELOG.md | 7 +++++++ LICENSE.md | 4 ++-- api/golang/kurtosis_version/kurtosis_version.go | 2 +- api/rust/Cargo.toml | 2 +- api/typescript/package.json | 2 +- api/typescript/src/kurtosis_version/kurtosis_version.ts | 2 +- version.txt | 2 +- 7 files changed, 14 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c3f08e535..8c778955da 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [0.84.10](https://github.com/kurtosis-tech/kurtosis/compare/0.84.9...0.84.10) (2023-10-23) + + +### Bug Fixes + +* bug in portal forwarding via run ([#1598](https://github.com/kurtosis-tech/kurtosis/issues/1598)) ([bf534c3](https://github.com/kurtosis-tech/kurtosis/commit/bf534c35055f4ec3e19cc1f1e2e32e8d29e61b5a)) + ## [0.84.9](https://github.com/kurtosis-tech/kurtosis/compare/0.84.8...0.84.9) (2023-10-19) diff --git a/LICENSE.md b/LICENSE.md index a50dd7a3bf..72015553c9 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -3,7 +3,7 @@ Business Source License 1.1 Parameters Licensor: Kurtosis Technologies, Inc. -Licensed Work: Kurtosis 0.84.9 +Licensed Work: Kurtosis 0.84.10 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-10-19 +Change Date: 2027-10-23 Change License: AGPLv3 (GNU Affero General Public License Version 3) diff --git a/api/golang/kurtosis_version/kurtosis_version.go b/api/golang/kurtosis_version/kurtosis_version.go index 79d32d752d..3362607bc1 100644 --- 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.84.9" + KurtosisVersion = "0.84.10" // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!! ) diff --git a/api/rust/Cargo.toml b/api/rust/Cargo.toml index b360b97d78..09ef70b04d 100644 --- a/api/rust/Cargo.toml +++ b/api/rust/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "kurtosis-sdk" -version = "0.84.9" +version = "0.84.10" license = "BUSL-1.1" description = "Rust SDK for Kurtosis" edition = "2021" diff --git a/api/typescript/package.json b/api/typescript/package.json index 2d78b1cf44..9b9bc69be9 100644 --- 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.84.9", + "version": "0.84.10", "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 index b9aeb2886d..c0b2a8e211 100644 --- 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.84.9" +export const KURTOSIS_VERSION: string = "0.84.10" // !!!!!!!!!!! DO NOT UPDATE! WILL BE MANUALLY UPDATED DURING THE RELEASE PROCESS !!!!!!!!!!!!!!!!!!!!!! diff --git a/version.txt b/version.txt index d2e94ef18a..3829df72a5 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -0.84.9 +0.84.10