feat(sdk): with _opts methods

Now all opt values enter into a _opts function instead of the original.
This avoids a lot of verbosity for both None in the case opts are
unwanted, and Some() if they actually are.

They are used like so:

```rust
client.container().from("...");
client.container_opts(Some(ContainerOpts{ ... }))
```

Some from opts will be removed in a future commit/pr
This commit is contained in:
2023-02-19 17:43:12 +01:00
committed by Kasper Juul Hermansen
parent 02006d40fc
commit 9762da895a
10 changed files with 447 additions and 99 deletions

View File

@@ -3,7 +3,7 @@ use dagger_sdk::HostDirectoryOpts;
fn main() -> eyre::Result<()> {
let client = dagger_sdk::connect()?;
let host_source_dir = client.host().directory(
let host_source_dir = client.host().directory_opts(
"examples/build-the-application/app",
Some(HostDirectoryOpts {
exclude: Some(vec!["node_modules".into(), "ci/".into()]),
@@ -12,23 +12,23 @@ fn main() -> eyre::Result<()> {
);
let source = client
.container(None)
.container()
.from("node:16")
.with_mounted_directory("/src", host_source_dir.id()?);
let runner = source
.with_workdir("/src")
.with_exec(vec!["npm", "install"], None);
.with_exec(vec!["npm", "install"]);
let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"], None);
let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
let build_dir = test
.with_exec(vec!["npm", "run", "build"], None)
.with_exec(vec!["npm", "run", "build"])
.directory("./build");
let _ = build_dir.export("./build");
let entries = build_dir.entries(None);
let entries = build_dir.entries();
println!("build dir contents: \n {:?}", entries);

View File

@@ -3,7 +3,7 @@ use rand::Rng;
fn main() -> eyre::Result<()> {
let client = dagger_sdk::connect()?;
let host_source_dir = client.host().directory(
let host_source_dir = client.host().directory_opts(
"./examples/caching/app",
Some(
dagger_sdk::HostDirectoryOptsBuilder::default()
@@ -15,31 +15,28 @@ fn main() -> eyre::Result<()> {
let node_cache = client.cache_volume("node").id()?;
let source = client
.container(None)
.container()
.from("node:16")
.with_mounted_directory("/src", host_source_dir.id()?)
.with_mounted_cache("/src/node_modules", node_cache, None);
.with_mounted_cache("/src/node_modules", node_cache);
let runner = source
.with_workdir("/src")
.with_exec(vec!["npm", "install"], None);
.with_exec(vec!["npm", "install"]);
let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"], None);
let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
let build_dir = test
.with_exec(vec!["npm", "run", "build"], None)
.with_exec(vec!["npm", "run", "build"])
.directory("./build");
let mut rng = rand::thread_rng();
let ref_ = client
.container(None)
.container()
.from("nginx")
.with_directory("/usr/share/nginx/html", build_dir.id()?, None)
.publish(
format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
None,
)?;
.with_directory("/usr/share/nginx/html", build_dir.id()?)
.publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))?;
println!("published image to: {}", ref_);

View File

@@ -7,15 +7,12 @@ fn main() -> eyre::Result<()> {
let context_dir = client
.host()
.directory("./examples/existing-dockerfile/app", None);
.directory("./examples/existing-dockerfile/app");
let ref_ = client
.container(None)
.build(context_dir.id()?, None)
.publish(
format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
None,
)?;
.container()
.build(context_dir.id()?)
.publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))?;
println!("published image to: {}", ref_);

View File

@@ -2,9 +2,9 @@ fn main() -> eyre::Result<()> {
let client = dagger_sdk::connect()?;
let version = client
.container(None)
.container()
.from("golang:1.19")
.with_exec(vec!["go", "version".into()], None)
.with_exec(vec!["go", "version".into()])
.stdout()?;
println!("Hello from Dagger and {}", version.trim());

View File

@@ -4,7 +4,7 @@ use rand::Rng;
fn main() -> eyre::Result<()> {
let client = dagger_sdk::connect()?;
let host_source_dir = client.host().directory(
let host_source_dir = client.host().directory_opts(
"examples/publish-the-application/app",
Some(HostDirectoryOpts {
exclude: Some(vec!["node_modules", "ci/"]),
@@ -13,30 +13,27 @@ fn main() -> eyre::Result<()> {
);
let source = client
.container(None)
.container()
.from("node:16")
.with_mounted_directory("/src", host_source_dir.id()?);
let runner = source
.with_workdir("/src")
.with_exec(vec!["npm", "install"], None);
.with_exec(vec!["npm", "install"]);
let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"], None);
let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
let build_dir = test
.with_exec(vec!["npm", "run", "build"], None)
.with_exec(vec!["npm", "run", "build"])
.directory("./build");
let mut rng = rand::thread_rng();
let ref_ = client
.container(None)
.container()
.from("nginx")
.with_directory("/usr/share/nginx/html", build_dir.id()?, None)
.publish(
format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
None,
)?;
.with_directory("/usr/share/nginx/html", build_dir.id()?)
.publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))?;
println!("published image to: {}", ref_);

View File

@@ -5,7 +5,7 @@ fn main() -> eyre::Result<()> {
let client = dagger_sdk::connect()?;
let output = "examples/publish-the-application/app/build";
let host_source_dir = client.host().directory(
let host_source_dir = client.host().directory_opts(
"examples/publish-the-application/app",
Some(HostDirectoryOpts {
exclude: Some(vec!["node_modules", "ci/"]),
@@ -14,35 +14,31 @@ fn main() -> eyre::Result<()> {
);
let source = client
.container(None)
.container()
.from("node:16")
.with_mounted_directory("/src", host_source_dir.id()?);
let runner = source
.with_workdir("/src")
.with_exec(vec!["npm", "install"], None);
.with_exec(vec!["npm", "install"]);
let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"], None);
let test = runner.with_exec(vec!["npm", "test", "--", "--watchAll=false"]);
let _ = test
.with_exec(vec!["npm", "run", "build"], None)
.with_exec(vec!["npm", "run", "build"])
.directory("./build")
.export(output);
let mut rng = rand::thread_rng();
let ref_ = client
.container(None)
.container()
.from("nginx")
.with_directory(
"/usr/share/nginx/html",
client.host().directory(output, None).id()?,
None,
client.host().directory(output).id()?,
)
.publish(
format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()),
None,
)?;
.publish(format!("ttl.sh/hello-dagger-rs-{}:1h", rng.gen::<u64>()))?;
println!("published image to: {}", ref_);

View File

@@ -3,7 +3,7 @@ use dagger_sdk::HostDirectoryOpts;
fn main() -> eyre::Result<()> {
let client = dagger_sdk::connect()?;
let host_source_dir = client.host().directory(
let host_source_dir = client.host().directory_opts(
"examples/test-the-application/app",
Some(HostDirectoryOpts {
exclude: Some(vec!["node_modules", "ci/"]),
@@ -12,16 +12,16 @@ fn main() -> eyre::Result<()> {
);
let source = client
.container(None)
.container()
.from("node:16")
.with_mounted_directory("/src", host_source_dir.id()?);
let runner = source
.with_workdir("/src")
.with_exec(vec!["npm", "install"], None);
.with_exec(vec!["npm", "install"]);
let out = runner
.with_exec(vec!["npm", "test", "--", "--watchAll=false"], None)
.with_exec(vec!["npm", "test", "--", "--watchAll=false"])
.stderr()?;
println!("{}", out);