Skip to content

Commit 693565b

Browse files
authored
Merge pull request #55 from posit-dev/feature/startup-environment
Feature: more customizable startup
2 parents 1ccff88 + df17d2b commit 693565b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+6731
-4536
lines changed

Cargo.lock

Lines changed: 565 additions & 780 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
members = [
55
"crates/kcshared",
6-
"crates/kcclient",
6+
# "crates/kcclient", # Excluded by remove-tls-deps.sh (depends on Client)
77
"crates/kcserver",
88
"crates/kallichore_api",
99
]
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[build]
2+
rustflags = [
3+
"-W", "missing_docs", # detects missing documentation for public members
4+
5+
"-W", "trivial_casts", # detects trivial casts which could be removed
6+
7+
"-W", "trivial_numeric_casts", # detects trivial casts of numeric types which could be removed
8+
9+
# unsafe is used in `TokioIo` bridging code copied from `hyper`.
10+
# "-W", "unsafe_code", # usage of `unsafe` code
11+
12+
"-W", "unused_qualifications", # detects unnecessarily qualified names
13+
14+
"-W", "unused_extern_crates", # extern crates that are never used
15+
16+
"-W", "unused_import_braces", # unnecessary braces around an imported item
17+
18+
"-D", "warnings", # all warnings should be denied
19+
]

crates/kallichore_api/.openapi-generator/FILES

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.cargo/config
1+
.cargo/config.toml
22
.gitignore
33
Cargo.toml
44
README.md
@@ -18,6 +18,7 @@ docs/ServerConfigurationLogLevel.md
1818
docs/ServerStatus.md
1919
docs/SessionList.md
2020
docs/SessionMode.md
21+
docs/StartupEnvironment.md
2122
docs/StartupError.md
2223
docs/Status.md
2324
docs/VarAction.md
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.13.0
1+
7.17.0

crates/kallichore_api/Cargo.toml

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,71 +10,77 @@ edition = "2018"
1010
[features]
1111
default = ["client", "server"]
1212
client = [
13-
"hyper", "url"
13+
"hyper", "hyper-util/http1", "hyper-util/http2", "url"
1414
]
1515
server = [
1616
"serde_ignored", "hyper", "regex", "percent-encoding", "url", "lazy_static"
1717
]
1818
cli = [
1919
"dialoguer",
20-
"anyhow", "clap-verbosity-flag", "simple_logger", "structopt", "tokio"
20+
"anyhow", "clap", "clap-verbosity-flag", "simple_logger", "tokio"
2121
]
2222
conversion = ["frunk", "frunk_derives", "frunk_core", "frunk-enum-core", "frunk-enum-derive"]
2323

2424
[dependencies]
2525
# Common
26-
async-trait = "0.1.24"
26+
async-trait = "0.1.88"
2727
chrono = { version = "0.4", features = ["serde"] }
2828
futures = "0.3"
29-
swagger = { version = "6.1", features = ["serdejson", "server", "client", "tcp"] }
30-
log = "0.4.0"
29+
swagger = { version = "7.0.0-rc2", features = ["serdejson", "server", "client"] }
30+
headers = "0.4.0"
31+
log = "0.4.27"
3132
mime = "0.3"
3233

3334
serde = { version = "1.0", features = ["derive"] }
3435
serde_json = "1.0"
35-
validator = { version = "0.16", features = ["derive"] }
36+
validator = { version = "0.20", features = ["derive"] }
3637

3738
# Crates included if required by the API definition
3839

3940
# Common between server and client features
40-
hyper = {version = "0.14", features = ["full"], optional = true}
41-
serde_ignored = {version = "0.1.1", optional = true}
42-
url = {version = "2.1", optional = true}
41+
bytes = "1.10.1"
42+
http-body-util = "0.1.3"
43+
hyper = { version = "1.6", features = ["full"], optional = true }
44+
hyper-util = { version = "0.1.12", features = ["service"] }
45+
serde_ignored = { version = "0.1.12", optional = true }
46+
url = { version = "2.5", optional = true }
4347

4448
# Client-specific
49+
tower-service = "0.3.3"
4550

4651
# Server, and client callback-specific
47-
lazy_static = { version = "1.4", optional = true }
48-
percent-encoding = {version = "2.1.0", optional = true}
49-
regex = {version = "1.3", optional = true}
52+
lazy_static = { version = "1.5", optional = true }
53+
percent-encoding = { version = "2.3.1", optional = true }
54+
regex = { version = "1.11", optional = true }
5055

5156
# CLI-specific
5257
anyhow = { version = "1", optional = true }
53-
clap-verbosity-flag = { version = "0.3", optional = true }
54-
simple_logger = { version = "2.0", features = ["stderr"], optional = true }
55-
structopt = { version = "0.3", optional = true }
56-
tokio = { version = "0.2", features = ["rt-threaded", "macros", "stream"], optional = true }
58+
clap = { version = "4.5", features = ["env"], optional = true }
59+
clap-verbosity-flag = { version = "3.0", optional = true }
60+
simple_logger = { version = "5.0", features = ["stderr"], optional = true }
61+
tokio = { version = "1.45", features = ["rt-multi-thread", "macros"], optional = true }
5762
dialoguer = { version = "0.8", optional = true }
5863

5964
# Conversion
60-
frunk = { version = "0.4.0", optional = true }
61-
frunk_derives = { version = "0.4.0", optional = true }
62-
frunk_core = { version = "0.4.0", optional = true }
65+
frunk = { version = "0.4.3", optional = true }
66+
frunk_derives = { version = "0.4.3", optional = true }
67+
frunk_core = { version = "0.4.3", optional = true }
6368
frunk-enum-derive = { version = "0.3.0", optional = true }
6469
frunk-enum-core = { version = "0.3.0", optional = true }
6570

6671
# Bearer authentication
67-
jsonwebtoken = { version = "9.3.0", optional = false }
72+
jsonwebtoken = { version = "9.3.1", optional = false }
6873

6974
[dev-dependencies]
70-
clap = "2.25"
75+
always_send = "0.1.1"
76+
clap = "4.5"
7177
env_logger = "0.11"
72-
tokio = { version = "1.14", features = ["full"] }
73-
native-tls = "0.2"
78+
tokio = { version = "1.45", features = ["full"] }
79+
pin-project = "1.1.10"
7480

75-
[target.'cfg(not(any(target_os = "macos", target_os = "windows", target_os = "ios")))'.dev-dependencies]
76-
tokio-openssl = "0.6"
77-
openssl = "0.10"
81+
[[example]]
82+
name = "client"
83+
required-features = ["client"]
7884

7985
[[example]]
8086
name = "server"

crates/kallichore_api/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ To see how to make this your own, look here:
1414
[README]((https://openapi-generator.tech))
1515

1616
- API version: 1.0.0
17-
- Build date: 2025-10-24T10:11:06.911877-07:00[America/Los_Angeles]
18-
- Generator version: 7.13.0
17+
- Build date: 2025-11-12T12:51:21.340981-08:00[America/Los_Angeles]
18+
- Generator version: 7.17.0
1919

2020
For more information, please visit [https://posit.co](https://posit.co)
2121

@@ -168,6 +168,7 @@ Method | HTTP request | Description
168168
- [ServerStatus](docs/ServerStatus.md)
169169
- [SessionList](docs/SessionList.md)
170170
- [SessionMode](docs/SessionMode.md)
171+
- [StartupEnvironment](docs/StartupEnvironment.md)
171172
- [StartupError](docs/StartupError.md)
172173
- [Status](docs/Status.md)
173174
- [VarAction](docs/VarAction.md)

0 commit comments

Comments
 (0)