Read the connection URI from the environment. #325
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When running normally, the environment is the process' environment variables, but we can replace it with a `HashMap` or an `EmptyEnvironment` for testing.
Let's start to reduce the hard-codedness, now we can.
We no longer need to do any splicing, so the script is a one-liner.
This means your Aurora connection URI variable must change too.
This enum will never have more than one case.
plcplc
approved these changes
Feb 26, 2024
| ./scripts/generate-configuration.sh 'ndc-postgres' '{{POSTGRESQL_CONNECTION_STRING}}' '{{POSTGRES_V3_CHINOOK_NDC_METADATA}}/configuration.json' | ||
| ./scripts/generate-configuration.sh 'ndc-postgres' '{{CITUS_CONNECTION_STRING}}' '{{CITUS_V3_CHINOOK_NDC_METADATA}}/configuration.json' | ||
| ./scripts/generate-configuration.sh 'ndc-postgres' '{{COCKROACH_CONNECTION_STRING}}' '{{COCKROACH_V3_CHINOOK_NDC_METADATA}}/configuration.json' | ||
| CONNECTION_URI='{{POSTGRESQL_CONNECTION_URI}}' cargo run --bin ndc-postgres-cli -- --context='{{POSTGRES_V3_CHINOOK_NDC_METADATA}}' update |
There was a problem hiding this comment.
It's quite nice how this bit of internal test infrastructure is now powered by a component that's part of the actual workflow of users!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
The connection URI can now be provided from the environment, using
"uri": {"variable": "..."}.This means that we can use the same configuration in development and production, and enables the CLI or Cloud build infrastructure to fill it in with e.g. a region-specific URL.
How
We replace the
ResolvedSecretfrom the NDC SDK (which has also been removed from the SDK) with our ownSecrettype, which can bePlainorFromEnvironment. We then handle the case appropriately, whereas before, we would panic if we ever received a non-resolved secret.I have introduced the
Environmenttrait to supply environment variables. During normal execution, this is a wrapper aroundsys::env::var. In tests, however, we can useEmptyEnvironment, or aHashMapcontaining test data.This also simplified a couple of pieces of test infrastructure.
ndc-postgres-cli update.