Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: merge main into horizontal scaling branch #974

Conversation

oddgrd
Copy link
Contributor

@oddgrd oddgrd commented Jun 5, 2023

Description of change

This PR merges main. Most of the conflicts were from the old deployer conflicting with the new, which I dismissed, and a lot of Cargo.lock conflicts (the last commit of this PR fixes the Cargo.lock).

See merge commit here: 292b6ec

How has this been tested? (if applicable)

Cargo check with --all-features (after adding deployer-alpha to workspace exclude).

iulianbarbu and others added 30 commits April 27, 2023 12:42
* ci: test prod ci

* ci: restore ci
* chore: v0.15.0

* chore: bump examples submodule
* revert: protoc removal

* ci: test run release jobs

* revert: dockerfile protoc install

* revert: deployer prepare.sh protoc install

* ci: restore ci
* fix: disable docker QA

* ci: keep running QA
* fix: Project filtering is disabled

* remove filter flag

---------

Signed-off-by: jonaro00 <[email protected]>
* docs: document how to generate protofiles

* docs: expand on crate description
* feat: refactor deployer to run locally without auth

* docs: update contributing deployer guide

* refactor: workspace dep

* fix: bump regex to 1.8.1 to fix 1.8.0 bug

* fix: provisioner port for local deployer

* refactor: renaming

* feat: refactor to request token from auth

* refactor: remove claims feature from deployer common

* refactor: use key/cookie from original request

* refactor: implement scopebuilder

* fix: clippy

* refactor: address review

* refactor: auth container command

* refactor: cleanup builder in start fn

* docs: local arg docs
…hq#792)

* shuttle init --template, reorder subcommands, fix bugs

* fix review feedback
* ci: download sccache instead of compiling it

* ci: fix some typos

* chore: more typos
On MacOs, port 5000 is used by AirPlay receiver which will make the 'make up' command described in CONTRIBUTING.md fail for Mac users
…#835)

* feat: ensure API key is valid

* feat: use ApiKey in auth

* refactor: clean up tests

* refactor: don't allocate in parse unless it succeeds

* fix: clippy

* fix: missing anyhow

* feat: impl debug/display for apikey
This adds a simple `.editorconfig` file to the root of the repository so
that different editors/IDEs may pick up the settings. This makes it
easier to have consistent formatting while editing, not just after
running `cargo fmt`. See [here](https://editorconfig.org) for more details.

Co-authored-by: AlphaKeks <[email protected]>
* fix: `make test`

* fix: update api-key
* fix: some panic messages get lost

* feat: tests for loader and bind panics

---------

Co-authored-by: Thomas Grimm <[email protected]>
* feat: change "/hello" routes to "/"

* feat: use updated examples

* fix: clippy complaining about format!{"{url}") being useless post '/hello' removal

* chore: run cargo fmt

* chore: update examples

---------

Co-authored-by: Paul Otten <[email protected]>
Co-authored-by: Paul Otten <[email protected]>
* feat: add on_new_span impl to runtime Logger

* PR suggestion

Co-authored-by: Pieter <[email protected]>

---------

Co-authored-by: Vlad Stepanov <[email protected]>
Co-authored-by: Pieter <[email protected]>
* misc: rename examples to shuttle-examples

* misc: update examples repo
* chore: v0.16.0

* chore: bump examples
…#878)

* feat(Makefile): add option to disable --detach on make up

* fix: minor formatting changes
* fix: revert addition of apikey to auth

* fix: display impl is needed for key.to_string()
* Revert "fix: revert addition of apikey to auth (shuttle-hq#886)"

This reverts commit 7054e6a.

* feat: add debug call for malformed api key
…shuttle-hq#870)

* add option to use rustls instead of native-tls in `shuttle-shared-db`

* Update CircleCI config

Allow specifying features by one for a specific crates.
Test `shuttle-shared-db` features one by one.

* more readable CI job name

* Add comment to CircleCI config
* match doc links with current url

* missing test error comparisons
* update syn to 2.0

* feat: codegen upgraded to use syn v2 (close shuttle-hq#875)

---
Co-Authored-by: John Vandenberg <[email protected]>
Co-Authored-by: Yatin Maan

* fix: appropriate expect statement (shuttle-hq#875)
oddgrd and others added 24 commits May 22, 2023 10:41
* ci: production deployment automation initial commit

* ci: incorrect requirement

* ci: fix production ssh config

* ci: test deduplicated deploy-images workflow

* ci: test deduplicated deploy workflow for prod

* ci: test deploying to unstable with envs in params

* ci: try using $ for env vars in params

* ci: fix password types

* release(prod): test dry run

* release(prod): enable unstable and prod image build/push...

...and deploy

* release(prod): test cargo publish dry run

* release(prod): cargo-shuttle publish crates conflicts with platform-test

* release(prod): improved with speed ups

---------

Co-authored-by: Iulian Barbu <[email protected]>
* chore: release 0.17.0

* chore: updated deps versions

* examples: updated to latest shuttle-examples/main
* update docs etc

* remove comment
* Add helpful error if port cannot be used

* Don't println on success

* cargo format
…q#929)

* fix: --name was ignored when not running from cargo folder

* fix: remove custom error message to fix tests

* Use `unwrap_or` instead of explicit match statement

Co-authored-by: jonaro00 <[email protected]>

* Fix cargo fmt

---------

Co-authored-by: jonaro00 <[email protected]>
* fix: log files packed in archive

* fix: change log level to debug
…huttle-hq#862)

* feat(gateway, cargo-shuttle): implement pagination for `project list`

This change adds query parameters to the `/projects` endpoint that allow
specifying an `offset` and a `limit` to allow for pagination. The
`cargo-shuttle` CLI has also been updated to take those as optional
parameters for the `project list` subcommand with default values of `0`
for `offset` and `10` for `limit`.

refactor(deployer, cargo-shuttle): implement pagination for `deployment list`

This adds pagination functionality to `cargo shuttle deployment list`
just like `cargo shuttle project list` and allows the same parameters.

* feat(deployer, cargo-shuttle): implement pagination for `deployment list`

This adds the same pagination functionality to `cargo shuttle deployment
list` as `cargo shuttle project list`.

* Updated from PR suggestions

fix(cargo-shuttle): remove long name in page param

fix(cargo-shuttle): reorder params in get_deployments path

fix(cargo-shuttle): check it limit is 0 in deployments_list to prevent useless code

fix(deployer, gateway): Move PaginationDetails struct to common

fix(gateway): Chain query builder params

* fix(cargo-shuttle, deployer): get rid of warnings

Reorders arguments to be consistent between `get_projects_list` and
`get_deployments`, and gets rid of an unused import.

* feat(deployer): add missing pagination params to get_deployments utoipa

* test: add test for out of bound pagination of deploy and projects list

* feat(gateway): add order by clause for paginated endpoint

* ref: revert having PaginationDetails in common

* feat(cargo): improve error message when page == 1 vs page > 1

* feat(common): add message that more page might be available for projects

* feat(cargo, deployment): update pagination message for deployment list

* style(deployer): reformat perstistence/mod.rs file

* feat(deployer): return the deployments starting from the latest updated

* feat(cargo-shuttle): update next page message

* feat(gateway): add created_at field on projects, use it to sort projects

* style(cargo-shuttle): reformat files

* test(deployer): fix test with new get_deployments ordering

---------

Co-authored-by: AlphaKeks <[email protected]>
Co-authored-by: Jocelyn Boullier <[email protected]>
Co-authored-by: 73nko <[email protected]>
* fix: crossterm/comfytable conflict

* ci: remove unused protoc installs
* feat: pre-installed build environment in deployer

* Edit list
* refactor: un-tangle crossterm/comfytable

* chore: bump crossterm

* docs: comment typo
* fix: Ignore span logs below WARN

* modify test

* fmt

* move to before JsonVisitor, fix test

* Convert later

* fmt

* Flip the comparison like a burger
* chore: v0.18.0

* chore: bump examples
@oddgrd oddgrd requested review from iulianbarbu and chesedo and removed request for iulianbarbu June 5, 2023 18:26
Copy link
Contributor

@iulianbarbu iulianbarbu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@iulianbarbu iulianbarbu merged commit 240986f into shuttle-hq:feat/shuttle-runtime-scaling Jun 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.