Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

Override default RELATIVE_UPSTREAM_DB_* vars for integration tests #457

Merged
merged 1 commit into from
Jan 10, 2022

Conversation

AetherUnbound
Copy link
Contributor

Fixes

Fixes #447 by @AetherUnbound

Description

This PR resolves an issue wherein the integration tests were failing after running just env. It turns out that the decouple library (which is being used to initialize the RELATIVE_UPSTREAM_DB_* variables) was picking up the variables in the .env file created under the ingestion_server directory. Since RELATIVE_UPSTREAM_DB_* is explicitly defined in the env.template file, it was overriding the default, which would normally fall back to the UPSTREAM_DB_* values. Since the services are named differently for integration tests, this would then cause the tests to fail.

There are a few ways to correct this, but the easiest seemed to be just to explicitly define them in the environment file for the service since decouple gives precedence to environment variables over those loaded from a .env file.

Testing Instructions

  1. just env
  2. just ing-testlocal

Checklist

  • My pull request has a descriptive title (not a vague title like Update index.md).
  • My pull request targets the default branch of the repository (main) or a parent feature branch.
  • My commit messages follow best practices.
  • My code follows the established code style of the repository.
  • I added or updated tests for the changes I made (if applicable).
  • I added or updated documentation (if applicable).
  • I tried running the project locally and verified that there are no visible errors.

Developer Certificate of Origin

Developer Certificate of Origin
Developer Certificate of Origin
Version 1.1

Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
1 Letterman Drive
Suite D4700
San Francisco, CA, 94129

Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.


Developer's Certificate of Origin 1.1

By making a contribution to this project, I certify that:

(a) The contribution was created in whole or in part by me and I
    have the right to submit it under the open source license
    indicated in the file; or

(b) The contribution is based upon previous work that, to the best
    of my knowledge, is covered under an appropriate open source
    license and I have the right under that license to submit that
    work with modifications, whether created in whole or in part
    by me, under the same open source license (unless I am
    permitted to submit under a different license), as indicated
    in the file; or

(c) The contribution was provided directly to me by some other
    person who certified (a), (b) or (c) and I have not modified
    it.

(d) I understand and agree that this project and the contribution
    are public and that a record of the contribution (including all
    personal information I submit with it, including my sign-off) is
    maintained indefinitely and may be redistributed consistent with
    this project or the open source license(s) involved.

@AetherUnbound AetherUnbound requested a review from a team as a code owner January 6, 2022 00:26
@AetherUnbound AetherUnbound requested review from rbadillap and sarayourfriend and removed request for a team January 6, 2022 00:26
@AetherUnbound AetherUnbound added 💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix 🟨 priority: medium Not blocking but should be addressed soon labels Jan 6, 2022
@AetherUnbound AetherUnbound requested a review from a team January 6, 2022 00:26
Copy link
Member

@dhruvkb dhruvkb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unexpectedly fairly straightforward!

Copy link
Member

@zackkrida zackkrida left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great!

@AetherUnbound
Copy link
Contributor Author

AetherUnbound commented Jan 6, 2022

Unexpectedly fairly straightforward!

Yet incredibly difficult to debug 😂 Turns out there are at least half a dozen ways to provide environment variables to the ingestion server haha

@AetherUnbound AetherUnbound force-pushed the bugfix/env-ing-test#447 branch from 708e4ce to 69441c2 Compare January 10, 2022 18:48
@AetherUnbound AetherUnbound changed the base branch from hotfix/copy-files-into-image to main January 10, 2022 18:48
@AetherUnbound AetherUnbound merged commit 1e6095b into main Jan 10, 2022
@AetherUnbound AetherUnbound deleted the bugfix/env-ing-test#447 branch January 10, 2022 18:51
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
💻 aspect: code Concerns the software code in the repository 🛠 goal: fix Bug fix 🟨 priority: medium Not blocking but should be addressed soon
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Env file creation recipe breaks integration tests
3 participants