[COST-5024] Avoid custom JSON parsing for GCP credits field #5103
Conversation
This file contains 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
samdoran
added
the
gcp-smoke-tests
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## main #5103 +/- ##
=====================================
Coverage 94.2% 94.2%
=====================================
Files 378 378
Lines 31581 31583 +2
Branches 3754 3754
=====================================
+ Hits 29735 29739 +4
+ Misses 1176 1175 -1
+ Partials 670 669 -1 |
samdoran
force-pushed
the
COST-5024/gcp-credits-converter
branch
from
97c262e to
2e0206b
Compare
maskarb
reviewed
May 14, 2024
Comment on lines
140
to
143
| rollup_frame["daily_credits"] = 0.0 | ||
| for i, credit_dict in enumerate(rollup_frame["credits"]): | ||
| # FIXME: Remove chained assignment | ||
| rollup_frame["daily_credits"][i] = credit_dict.get("amount", 0.0) |
There was a problem hiding this comment.
Instead of adding a FIXME, we could just fix this:
Suggested change
| rollup_frame["daily_credits"] = 0.0 | |
| for i, credit_dict in enumerate(rollup_frame["credits"]): | |
| # FIXME: Remove chained assignment | |
| rollup_frame["daily_credits"][i] = credit_dict.get("amount", 0.0) | |
| rollup_frame["daily_credits"] = rollup_frame["credits"].apply(lambda x: x.get("amount", 0.0)) |
myersCody
approved these changes
May 16, 2024
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 Ticket
COST-5024
Description
Do not modify a valid JSON string in the GCP credits field. Fall back to custom conversion if the string is invalid JSON. Finally, warn if there is still an error.
Testing
tox -e py39 -- masu.test.util.gcp.test_gcp_post_processorRelease Notes