Open
Conversation
If a property value is prefixed with "clowder.", the ClowderJsonPropertySource is engaged. It examines the cdappconfig.json file and extracts the necessary information for an endpoint. However, if the endpoint is not present in the ClowdApp, there is no corresponding entry in the cdappconfig.json file. The previous behavior was for ClowderJsonPropertySource to throw an exception in this case. When we are doing component testing, we intentionally remove endpoints that would normally be present in order to reduce the deployment footprint. This commit makes ClowderJsonPropertySource tolerate that case and print a warning instead of throwing an exception. This commit also creates a template parameter for the swatch-contracts hostname and sets an appropriate default for it. In a component testing deployment, we'll want to set that hostname to point to the wiremock container. This commit also sets the swatch-contracts certificate truststore to default to the empty string. This value will cause the TlsProperties class to avoid loading a truststore (since there is no truststore in this deployment scenario). Finally, this commit also sets environment variables for several template parameters. The parameters existed previously but were never dereferenced anywhere which made them unusable.
|
⛏️ Workflow Run 🧪 JUnit
Details
|
||||||||||||||
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
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.
Jira issue: SWATCH-4580
Description
If a property value is prefixed with "clowder.", the ClowderJsonPropertySource is engaged. It examines the cdappconfig.json file and extracts the necessary information for an endpoint. However, if the endpoint is not present in the ClowdApp, there is no corresponding entry in the cdappconfig.json file. The previous behavior was for ClowderJsonPropertySource to throw an exception in this case.
When we are doing component testing, we intentionally remove endpoints that would normally be present in order to reduce the deployment footprint. This commit makes ClowderJsonPropertySource tolerate that case and print a warning instead of throwing an exception.
This commit also creates a template parameter for the swatch-contracts hostname and sets an appropriate default for it. In a component testing deployment, we'll want to set that hostname to point to the wiremock container. This commit also sets the swatch-contracts certificate truststore to default to the empty string. This value will cause the TlsProperties class to avoid loading a truststore (since there is no truststore in this deployment scenario).
Finally, this commit also sets environment variables for several template parameters. The parameters existed previously but were never dereferenced anywhere which made them unusable.
Testing
Setup
bin/build-images.sh rhsm-subscriptionsSteps
swatch-contractsis being removed.Verification
oc logs -f $(oc get pods | grep swatch-tally-service | cut -f1 -d' ')to monitor for a successful deployment of swatch-tally-service.