Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ publish = false
# Published to crates.io from ontola/atomic-plugins' integration-proxy/.
# Bump this (and run `cargo update -p atomic-integration-proxy`) to deploy a
# new release.
atomic-integration-proxy = "0.2"
atomic-integration-proxy = "0.2.2"
tokio = { version = "1", features = ["rt-multi-thread", "macros"] }

[profile.release]
Expand Down
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,17 @@ What is here:
| File | Purpose |
| --- | --- |
| `src/main.rs` | `atomic_integration_proxy::run().await`, nothing else. |
| `Cargo.toml` | Package/binary `auth-proxy`, depending on `atomic-integration-proxy`. Until the crate is on crates.io this is a git dependency pinned to an `ontola/atomic-plugins` commit (`rev`). |
| `Cargo.toml` | Package/binary `auth-proxy`, depending on `atomic-integration-proxy` from crates.io, with the lowest release this deployment needs as the version requirement. |
| `Cargo.lock` | The exact versions Heroku builds. Commit it with every bump. |
| `Procfile` | `web: target/release/auth-proxy`. |
| `rust-toolchain` | `stable`, read by the `emk/rust` Heroku buildpack. |
| `.env.example` | The environment variables the proxy reads; see the crate's README for what each one does. |

## Deploying a newer proxy

While the dependency is a git pin: set `rev` in `Cargo.toml` to the
`ontola/atomic-plugins` commit to deploy, then
Once the release is on crates.io (`ontola/atomic-plugins` publishes it from
a tag `integration-proxy-v<version>`), set the version requirement in
`Cargo.toml` to it when this deployment depends on its behaviour, then

```sh
cargo update -p atomic-integration-proxy
Expand All @@ -30,10 +31,6 @@ cargo build --release --locked

and commit `Cargo.toml` and `Cargo.lock`. Merging to `main` deploys.

Once `atomic-integration-proxy` is published, replace the git dependency with
`atomic-integration-proxy = "0.1"`, and bump releases with
`cargo update -p atomic-integration-proxy` alone.

## Running locally

```sh
Expand Down
Loading