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.

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

Make cdk.context.json valid json #1022

Conversation

mikaylathompson
Copy link
Collaborator

@mikaylathompson mikaylathompson commented Sep 26, 2024

Description

My last PR, #1021, broke the build. Having a not-quite-json cdk.context.json was bad anytime a cdk command was used, even if it specifically specified a different context file.

So first, I just made it valid (if kind of ugly) JSON, but that broke the build in a different way because removing a lot of the default values changed the behavior of the cdk deployments in the CI pipelines. I copied the old values from the defaults into these blocks and have tested redeploying, successfully now.

Issues Resolved

Testing

Check List

  • New functionality includes testing
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: Mikayla Thompson <thomika@amazon.com>
Copy link

codecov bot commented Sep 26, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 80.20%. Comparing base (daaf9b0) to head (871d43d).
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff            @@
##               main    #1022   +/-   ##
=========================================
  Coverage     80.20%   80.20%           
  Complexity     2722     2722           
=========================================
  Files           365      365           
  Lines         13603    13603           
  Branches        941      941           
=========================================
  Hits          10910    10910           
  Misses         2118     2118           
  Partials        575      575           
Flag Coverage Δ
gradle-test 78.21% <ø> (ø)
python-test 89.91% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Mikayla Thompson <thomika@amazon.com>
Copy link
Collaborator

@sumobrian sumobrian left a comment

Choose a reason for hiding this comment

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

Passes CI.

@mikaylathompson mikaylathompson merged commit 03dfed0 into opensearch-project:main Sep 27, 2024
14 checks passed
@mikaylathompson mikaylathompson deleted the make-cdk-context-valid-json branch September 27, 2024 13:36
peternied added a commit to peternied/opensearch-migrations that referenced this pull request Oct 3, 2024
This ensures that our json files are valid and follow common formatting
conventions.

Following up to opensearch-project#1022

Signed-off-by: Peter Nied <peternied@hotmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants