use divviup-api-client in in-cluster tests #1697
Conversation
integration_tests/Cargo.toml
Outdated
| @@ -35,6 +35,11 @@ serde_json = "1.0.103" | |||
| testcontainers = "0.14.0" | |||
| tokio.workspace = true | |||
| url = { version = "2.4.0", features = ["serde"] } | |||
| divviup-client = { git = "https://github.com/divviup/divviup-api", features = [ | |||
| "admin", | |||
| ] } # , tag = "0.0.19" } | |||
There was a problem hiding this comment.
eventually we'll want to use versions from crates.io
There was a problem hiding this comment.
We should pin this to a particular commit with rev for the time being. A fresh working directory with this would fail now, since incompatible changes have been pushed to main.
| min_batch_size: task.min_batch_size(), | ||
| max_batch_size: match task.query_type() { | ||
| QueryType::TimeInterval => None, | ||
| QueryType::FixedSize { max_batch_size, .. } => Some(*max_batch_size), | ||
| }, | ||
| expiration: "3000-01-01T00:00:00Z".to_owned(), | ||
| expiration: None, |
There was a problem hiding this comment.
this is the only known functional change here, and i don't know if it'll break anything. it was easier to type "None" than parse an OffsetDateTime
jbr
force-pushed
the
use-divviup-api-client
branch
from
2d4fbad
to
0257363
Compare
jbr
force-pushed
the
use-divviup-api-client
branch
from
9084632
to
5df767f
Compare
jbr
changed the title
jbr
force-pushed
the
use-divviup-api-client
branch
from
5df767f
to
1d206b2
Compare
integration_tests/Cargo.toml
Outdated
| @@ -35,6 +35,11 @@ serde_json = "1.0.103" | |||
| testcontainers = "0.14.0" | |||
| tokio.workspace = true | |||
| url = { version = "2.4.0", features = ["serde"] } | |||
| divviup-client = { git = "https://github.com/divviup/divviup-api", features = [ | |||
| "admin", | |||
| ] } # , tag = "0.0.19" } | |||
There was a problem hiding this comment.
We should pin this to a particular commit with rev for the time being. A fresh working directory with this would fail now, since incompatible changes have been pushed to main.
jbr
force-pushed
the
use-divviup-api-client
branch
5 times, most recently
from
a85bb07
to
387438f
Compare
There was a problem hiding this comment.
I tested this prior to a recent rebase with some previously-discussed fixes and it worked against the cluster. At this point, the main branch is now using prio 0.14, which implements VDAF-06, and thus the integration test can no longer talk with the container images running in the cluster. I think we should fix the remaining compilation issues and land this, then backport the changes to the release/0.5 branch, which will still be run in the janus-ops CI, at least for the next few weeks.
jbr
force-pushed
the
use-divviup-api-client
branch
5 times, most recently
from
873d3d1
to
e6eb815
Compare
tgeoghegan
force-pushed
the
use-divviup-api-client
branch
from
e6eb815
to
41ce05b
Compare
integration_tests/Cargo.toml
Outdated
| @@ -15,6 +15,7 @@ in-cluster = ["dep:k8s-openapi", "dep:kube"] | |||
| anyhow.workspace = true | |||
| backoff = { version = "0.4", features = ["tokio"] } | |||
| base64.workspace = true | |||
| divviup-client = { git = "https://github.com/divviup/divviup-api", features = ["admin"], tag = "0.0.24" } | |||
There was a problem hiding this comment.
This won't work until we have divviup-api:0.0.25 that incorporates divviup/divviup-api#512
There was a problem hiding this comment.
Could always branch=main ¯\_(ツ)_/¯
There was a problem hiding this comment.
Yeah, or pin a commit on main. But it's nicer to use a tag and releases aren't hard to do.
tgeoghegan
force-pushed
the
use-divviup-api-client
branch
from
41ce05b
to
298a288
Compare
Re-enables the in-cluster Prio3Histogram test
tgeoghegan
force-pushed
the
use-divviup-api-client
branch
from
298a288
to
923f7d6
Compare
No description provided.