Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Image substitution #3102

Merged
merged 18 commits into from
Nov 5, 2020
Merged

Image substitution #3102

merged 18 commits into from
Nov 5, 2020

Commits on Oct 29, 2020

  1. Refactor Testcontainers configuration to allow config by env var

    @rnorth
    rnorth committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    0f51dfa View commit details
    Browse the repository at this point in the history

  2. Add Image substitution mechanism 

    Builds upon #3021 and #3411:

* adds a pluggable image substitution mechanism using ServiceLoader, enabling users to perform custom substitution/auditing of images being used by their tests

* provides a default implementation that behaves similarly to legacy `TestcontainersConfiguration` approach (`testcontainers.properties`)

Notes:

* behaviour is similar but not quite identical to `TestcontainersConfiguration`: use of a configured custom image for, e.g. Kafka/Pulsar that does not have a tag specified causes the substitution to take effect for all usages. It seems very unlikely that people would be using a mix of the config file image overrides in some places _and_ specific images specified in code in others.

* Duplication of default image names in modules vs `TestcontainersConfiguration` class is intentional: specifying image overrides in `testcontainers.properties` should be removed in the future.

* ~Add log deprecation warnings when `testcontainers.properties` image overrides are used.~ Defer to a future release?
    @rnorth
    rnorth committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    950af34 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into image-substitutor

    @rnorth
    rnorth committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    51c320e View commit details
    Browse the repository at this point in the history

  4. Remove extraneous change

    @rnorth
    rnorth committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    b02c734 View commit details
    Browse the repository at this point in the history

  5. Un-ignore docs example test by implementing a 'reversing' image name … 

    …substitutor
    @rnorth
    rnorth committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    1924759 View commit details
    Browse the repository at this point in the history

  6. Use configuration, not service loader, to select an ImageNameSubstitutor

    @rnorth
    rnorth committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    f94089b View commit details
    Browse the repository at this point in the history

  7. Add check for order of config setting precedence

    @rnorth
    rnorth committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    3d08669 View commit details
    Browse the repository at this point in the history

  8. Extract classpath scanner and support finding of multiple resources

    @rnorth
    rnorth committed Oct 29, 2020
    Configuration menu
    Copy the full SHA
    f8dabd4 View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2020

  1. Introduce deterministic merging of classpath properties files

    @rnorth
    rnorth committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    23ac394 View commit details
    Browse the repository at this point in the history

  2. Update docs

    @rnorth
    rnorth committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    09e4e7c View commit details
    Browse the repository at this point in the history

  3. Update docs

    @rnorth
    rnorth committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    d197405 View commit details
    Browse the repository at this point in the history

  4. Remove service loader reference

    @rnorth
    rnorth committed Oct 30, 2020
    Configuration menu
    Copy the full SHA
    3cf653b View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2020

  1. Chain substitution through default and configured implementations

    @rnorth
    rnorth committed Nov 1, 2020
    Configuration menu
    Copy the full SHA
    9651ade View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2020

  1. Small tweaks following review

    @rnorth
    rnorth committed Nov 4, 2020
    Configuration menu
    Copy the full SHA
    bcd2f76 View commit details
    Browse the repository at this point in the history

  2. Fix test compile error

    @rnorth
    rnorth committed Nov 4, 2020
    Configuration menu
    Copy the full SHA
    008b036 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2020

  1. Add UnstableAPI annotation

    @rnorth
    rnorth committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    6587210 View commit details
    Browse the repository at this point in the history

  2. Move TestSpecificImageNameSubstitutor back to original package and re… 

    …move duplicate use of default substitutor
    @rnorth
    rnorth committed Nov 5, 2020
    Configuration menu
    Copy the full SHA
    16ef03d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into image-substitutor

    @rnorth
    rnorth authored Nov 5, 2020
    Configuration menu
    Copy the full SHA
    38f2695 View commit details
    Browse the repository at this point in the history