kjuulh/dagger-rs
1
0
Fork 0
mirror of https://github.com/kjuulh/dagger-rs.git synced 2024-11-12 20:21:52 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat(sdk): update to dagger v0.3.12

Browse Source
This commit is contained in:
Kasper Juul Hermansen 2023-02-19 12:16:48 +01:00 committed by Kasper Juul Hermansen
parent 3cb83bb79c
commit 6e5f407432
4 changed files with 89 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yaml vendored
View File

@ -20,9 +20,9 @@ jobs:
uses: actions/cache@v3 uses: actions/cache@v3
continue-on-error: false continue-on-error: false
with: with:
path: "~/.cargo/bin/\n~/.cargo/registry/index/\n~/.cargo/registry/cache/\n~/.cargo/git/db/\ntarget/ " path: "~/.cargo/bin/\n~/.cargo/registry/index/\n~/.cargo/registry/cache/\n~/.cargo/git/db/\ntarget/"
key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo- restore-keys: ${{ runner.os }}-cargo
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v2 uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx - name: Set up Docker Buildx

5
crates/dagger-codegen/src/rust/templates/enum_tmpl.rs
View File

@ -10,7 +10,7 @@ fn render_enum_values(values: &FullType) -> Option<rust::Tokens> {
.map(|values| { .map(|values| {
values values
.into_iter() .into_iter()
.map(|val| quote! { $(val.name.as_ref()) }) .map(|val| quote! { $(val.name.as_ref()), })
}) })
.flatten() .flatten()
.collect::<Vec<_>>(); .collect::<Vec<_>>();
@ -25,7 +25,10 @@ fn render_enum_values(values: &FullType) -> Option<rust::Tokens> {
} }
pub fn render_enum(t: &FullType) -> eyre::Result<rust::Tokens> { pub fn render_enum(t: &FullType) -> eyre::Result<rust::Tokens> {
let serialize = rust::import("serde", "Serialize");
Ok(quote! { Ok(quote! {
#[derive($serialize)]
pub enum $(t.name.as_ref()) { pub enum $(t.name.as_ref()) {
$(render_enum_values(t)) $(render_enum_values(t))
} }

2
crates/dagger-core/src/engine.rs
View File

@ -12,7 +12,7 @@ impl Engine {
} }
fn from_cli(&self, cfg: &Config) -> eyre::Result<(ConnectParams, Child)> { fn from_cli(&self, cfg: &Config) -> eyre::Result<(ConnectParams, Child)> {
let cli = Downloader::new("0.3.10".into())?.get_cli()?; let cli = Downloader::new("0.3.12".into())?.get_cli()?;
let cli_session = CliSession::new(); let cli_session = CliSession::new();

127
crates/dagger-sdk/src/gen.rs
View File

@ -21,8 +21,8 @@ pub struct SecretId(String);
pub struct SocketId(String); pub struct SocketId(String);
#[derive(Serialize, Deserialize)] #[derive(Serialize, Deserialize)]
pub struct BuildArg { pub struct BuildArg {
pub value: String,
pub name: String, pub name: String,
pub value: String,
} }
pub struct CacheVolume { pub struct CacheVolume {
pub proc: Arc<Child>, pub proc: Arc<Child>,
@ -32,7 +32,7 @@ pub struct CacheVolume {
impl CacheVolume { impl CacheVolume {
pub fn id(&self) -> CacheId { pub fn id(&self) -> CacheId {
let query = self.selection.select("id"); let mut query = self.selection.select("id");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -67,10 +67,7 @@ pub struct ContainerPublishOpts {
pub struct ContainerWithDefaultArgsOpts { pub struct ContainerWithDefaultArgsOpts {
pub args: Option<Vec<String>>, pub args: Option<Vec<String>>,
} }
pub struct ContainerWithDirectoryOpts { pub struct ContainerWithDirectoryOpts {}
pub exclude: Option<Vec<String>>,
pub include: Option<Vec<String>>,
}
pub struct ContainerWithExecOpts { pub struct ContainerWithExecOpts {
pub stdin: Option<String>, pub stdin: Option<String>,
pub redirect_stdout: Option<String>, pub redirect_stdout: Option<String>,
@ -82,6 +79,7 @@ pub struct ContainerWithFileOpts {
} }
pub struct ContainerWithMountedCacheOpts { pub struct ContainerWithMountedCacheOpts {
pub source: Option<DirectoryId>, pub source: Option<DirectoryId>,
pub sharing: Option<CacheSharingMode>,
} }
pub struct ContainerWithNewFileOpts { pub struct ContainerWithNewFileOpts {
pub contents: Option<String>, pub contents: Option<String>,
@ -112,7 +110,7 @@ impl Container {
}; };
} }
pub fn default_args(&self) -> Vec<String> { pub fn default_args(&self) -> Vec<String> {
let query = self.selection.select("defaultArgs"); let mut query = self.selection.select("defaultArgs");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -128,7 +126,7 @@ impl Container {
}; };
} }
pub fn entrypoint(&self) -> Vec<String> { pub fn entrypoint(&self) -> Vec<String> {
let query = self.selection.select("entrypoint"); let mut query = self.selection.select("entrypoint");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -140,7 +138,7 @@ impl Container {
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn env_variables(&self) -> Vec<EnvVariable> { pub fn env_variables(&self) -> Vec<EnvVariable> {
let query = self.selection.select("envVariables"); let mut query = self.selection.select("envVariables");
return vec![EnvVariable { return vec![EnvVariable {
proc: self.proc.clone(), proc: self.proc.clone(),
@ -181,7 +179,7 @@ impl Container {
}; };
} }
pub fn exit_code(&self) -> isize { pub fn exit_code(&self) -> isize {
let query = self.selection.select("exitCode"); let mut query = self.selection.select("exitCode");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -220,7 +218,7 @@ impl Container {
}; };
} }
pub fn fs(&self) -> Directory { pub fn fs(&self) -> Directory {
let query = self.selection.select("fs"); let mut query = self.selection.select("fs");
return Directory { return Directory {
proc: self.proc.clone(), proc: self.proc.clone(),
@ -229,7 +227,7 @@ impl Container {
}; };
} }
pub fn id(&self) -> ContainerId { pub fn id(&self) -> ContainerId {
let query = self.selection.select("id"); let mut query = self.selection.select("id");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -241,7 +239,7 @@ impl Container {
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn labels(&self) -> Vec<Label> { pub fn labels(&self) -> Vec<Label> {
let query = self.selection.select("labels"); let mut query = self.selection.select("labels");
return vec![Label { return vec![Label {
proc: self.proc.clone(), proc: self.proc.clone(),
@ -250,7 +248,7 @@ impl Container {
}]; }];
} }
pub fn mounts(&self) -> Vec<String> { pub fn mounts(&self) -> Vec<String> {
let query = self.selection.select("mounts"); let mut query = self.selection.select("mounts");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -271,7 +269,7 @@ impl Container {
}; };
} }
pub fn platform(&self) -> Platform { pub fn platform(&self) -> Platform {
let query = self.selection.select("platform"); let mut query = self.selection.select("platform");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -288,7 +286,7 @@ impl Container {
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn rootfs(&self) -> Directory { pub fn rootfs(&self) -> Directory {
let query = self.selection.select("rootfs"); let mut query = self.selection.select("rootfs");
return Directory { return Directory {
proc: self.proc.clone(), proc: self.proc.clone(),
@ -297,17 +295,17 @@ impl Container {
}; };
} }
pub fn stderr(&self) -> String { pub fn stderr(&self) -> String {
let query = self.selection.select("stderr"); let mut query = self.selection.select("stderr");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn stdout(&self) -> String { pub fn stdout(&self) -> String {
let query = self.selection.select("stdout"); let mut query = self.selection.select("stdout");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn user(&self) -> String { pub fn user(&self) -> String {
let query = self.selection.select("user"); let mut query = self.selection.select("user");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -463,6 +461,9 @@ impl Container {
if let Some(source) = opts.source { if let Some(source) = opts.source {
query = query.arg("source", source).unwrap(); query = query.arg("source", source).unwrap();
} }
if let Some(sharing) = opts.sharing {
query = query.arg("sharing", sharing).unwrap();
}
} }
return Container { return Container {
@ -537,6 +538,24 @@ impl Container {
conn: self.conn.clone(), conn: self.conn.clone(),
}; };
} }
pub fn with_registry_auth(
&self,
address: String,
username: String,
secret: SecretId,
) -> Container {
let mut query = self.selection.select("withRegistryAuth");
query = query.arg("address", address).unwrap();
query = query.arg("username", username).unwrap();
query = query.arg("secret", secret).unwrap();
return Container {
proc: self.proc.clone(),
selection: query,
conn: self.conn.clone(),
};
}
pub fn with_rootfs(&self, id: DirectoryId) -> Container { pub fn with_rootfs(&self, id: DirectoryId) -> Container {
let mut query = self.selection.select("withRootfs"); let mut query = self.selection.select("withRootfs");
@ -627,6 +646,17 @@ impl Container {
conn: self.conn.clone(), conn: self.conn.clone(),
}; };
} }
pub fn without_registry_auth(&self, address: String) -> Container {
let mut query = self.selection.select("withoutRegistryAuth");
query = query.arg("address", address).unwrap();
return Container {
proc: self.proc.clone(),
selection: query,
conn: self.conn.clone(),
};
}
pub fn without_unix_socket(&self, path: String) -> Container { pub fn without_unix_socket(&self, path: String) -> Container {
let mut query = self.selection.select("withoutUnixSocket"); let mut query = self.selection.select("withoutUnixSocket");
@ -639,7 +669,7 @@ impl Container {
}; };
} }
pub fn workdir(&self) -> String { pub fn workdir(&self) -> String {
let query = self.selection.select("workdir"); let mut query = self.selection.select("workdir");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -753,7 +783,7 @@ impl Directory {
}; };
} }
pub fn id(&self) -> DirectoryId { pub fn id(&self) -> DirectoryId {
let query = self.selection.select("id"); let mut query = self.selection.select("id");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -915,12 +945,12 @@ pub struct EnvVariable {
impl EnvVariable { impl EnvVariable {
pub fn name(&self) -> String { pub fn name(&self) -> String {
let query = self.selection.select("name"); let mut query = self.selection.select("name");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn value(&self) -> String { pub fn value(&self) -> String {
let query = self.selection.select("value"); let mut query = self.selection.select("value");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -933,7 +963,7 @@ pub struct File {
impl File { impl File {
pub fn contents(&self) -> String { pub fn contents(&self) -> String {
let query = self.selection.select("contents"); let mut query = self.selection.select("contents");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -945,12 +975,12 @@ impl File {
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn id(&self) -> FileId { pub fn id(&self) -> FileId {
let query = self.selection.select("id"); let mut query = self.selection.select("id");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn secret(&self) -> Secret { pub fn secret(&self) -> Secret {
let query = self.selection.select("secret"); let mut query = self.selection.select("secret");
return Secret { return Secret {
proc: self.proc.clone(), proc: self.proc.clone(),
@ -959,7 +989,7 @@ impl File {
}; };
} }
pub fn size(&self) -> isize { pub fn size(&self) -> isize {
let query = self.selection.select("size"); let mut query = self.selection.select("size");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -988,7 +1018,7 @@ pub struct GitRefTreeOpts {
impl GitRef { impl GitRef {
pub fn digest(&self) -> String { pub fn digest(&self) -> String {
let query = self.selection.select("digest"); let mut query = self.selection.select("digest");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -1030,7 +1060,7 @@ impl GitRepository {
}; };
} }
pub fn branches(&self) -> Vec<String> { pub fn branches(&self) -> Vec<String> {
let query = self.selection.select("branches"); let mut query = self.selection.select("branches");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -1057,7 +1087,7 @@ impl GitRepository {
}; };
} }
pub fn tags(&self) -> Vec<String> { pub fn tags(&self) -> Vec<String> {
let query = self.selection.select("tags"); let mut query = self.selection.select("tags");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -1146,7 +1176,7 @@ pub struct HostVariable {
impl HostVariable { impl HostVariable {
pub fn secret(&self) -> Secret { pub fn secret(&self) -> Secret {
let query = self.selection.select("secret"); let mut query = self.selection.select("secret");
return Secret { return Secret {
proc: self.proc.clone(), proc: self.proc.clone(),
@ -1155,7 +1185,7 @@ impl HostVariable {
}; };
} }
pub fn value(&self) -> String { pub fn value(&self) -> String {
let query = self.selection.select("value"); let mut query = self.selection.select("value");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -1168,12 +1198,12 @@ pub struct Label {
impl Label { impl Label {
pub fn name(&self) -> String { pub fn name(&self) -> String {
let query = self.selection.select("name"); let mut query = self.selection.select("name");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn value(&self) -> String { pub fn value(&self) -> String {
let query = self.selection.select("value"); let mut query = self.selection.select("value");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -1186,7 +1216,7 @@ pub struct Project {
impl Project { impl Project {
pub fn extensions(&self) -> Vec<Project> { pub fn extensions(&self) -> Vec<Project> {
let query = self.selection.select("extensions"); let mut query = self.selection.select("extensions");
return vec![Project { return vec![Project {
proc: self.proc.clone(), proc: self.proc.clone(),
@ -1195,7 +1225,7 @@ impl Project {
}]; }];
} }
pub fn generated_code(&self) -> Directory { pub fn generated_code(&self) -> Directory {
let query = self.selection.select("generatedCode"); let mut query = self.selection.select("generatedCode");
return Directory { return Directory {
proc: self.proc.clone(), proc: self.proc.clone(),
@ -1204,22 +1234,22 @@ impl Project {
}; };
} }
pub fn install(&self) -> bool { pub fn install(&self) -> bool {
let query = self.selection.select("install"); let mut query = self.selection.select("install");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn name(&self) -> String { pub fn name(&self) -> String {
let query = self.selection.select("name"); let mut query = self.selection.select("name");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn schema(&self) -> String { pub fn schema(&self) -> String {
let query = self.selection.select("schema"); let mut query = self.selection.select("schema");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn sdk(&self) -> String { pub fn sdk(&self) -> String {
let query = self.selection.select("sdk"); let mut query = self.selection.select("sdk");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -1278,7 +1308,7 @@ impl Query {
}; };
} }
pub fn default_platform(&self) -> Platform { pub fn default_platform(&self) -> Platform {
let query = self.selection.select("defaultPlatform"); let mut query = self.selection.select("defaultPlatform");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -1325,7 +1355,7 @@ impl Query {
}; };
} }
pub fn host(&self) -> Host { pub fn host(&self) -> Host {
let query = self.selection.select("host"); let mut query = self.selection.select("host");
return Host { return Host {
proc: self.proc.clone(), proc: self.proc.clone(),
@ -1406,12 +1436,12 @@ pub struct Secret {
impl Secret { impl Secret {
pub fn id(&self) -> SecretId { pub fn id(&self) -> SecretId {
let query = self.selection.select("id"); let mut query = self.selection.select("id");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
pub fn plaintext(&self) -> String { pub fn plaintext(&self) -> String {
let query = self.selection.select("plaintext"); let mut query = self.selection.select("plaintext");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
@ -1424,8 +1454,15 @@ pub struct Socket {
impl Socket { impl Socket {
pub fn id(&self) -> SocketId { pub fn id(&self) -> SocketId {
let query = self.selection.select("id"); let mut query = self.selection.select("id");
query.execute(&graphql_client(&self.conn)).unwrap().unwrap() query.execute(&graphql_client(&self.conn)).unwrap().unwrap()
} }
} }
#[derive(Serialize)]
pub enum CacheSharingMode {
SHARED,
PRIVATE,
LOCKED,
}