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

API Automated Billing Calculations #1396

Merged
merged 82 commits into from Dec 3, 2019

Conversation

@justinlevi
Copy link

justinlevi commented Nov 13, 2019

Checklist

  • Affected Issues have been mentioned in the Closing issues section
  • Documentation has been written/updated.
  • Changelog entry has been written

Implements API BillingCost Calculations for lagoon projects.

To run the billing calculations unit tests, on your host machine:

$ cd services/api
$ yarn
$ yarn test billingCalculations

You can run individual tests by filtering via the tags at the end of each test description:

$ yarn test billingCalculations -t "#storage #USD #FC"

To test the billing calculation resolvers:

$ cd services/api && yarn test resolvers -t "#billing"

Changelog Entry

Adding in lagoon billing calculations to the API

@Schnitzel Schnitzel added this to the v1.2.0 milestone Nov 18, 2019
@Schnitzel Schnitzel requested a review from rocketeerbkw Nov 18, 2019
@wintercreative wintercreative force-pushed the wintercreative:feature/billing-project branch 2 times, most recently from ee7791a to 20a278f Nov 20, 2019
@Schnitzel

This comment has been minimized.

Copy link
Member

Schnitzel commented Nov 26, 2019

sorry, another conflict @justinlevi can you check that one as well? thank you.

@wintercreative wintercreative force-pushed the wintercreative:feature/billing-project branch 2 times, most recently from bdc4207 to bc3ee07 Nov 26, 2019
@wintercreative

This comment has been minimized.

Copy link
Contributor

wintercreative commented Nov 26, 2019

sorry, another conflict @justinlevi can you check that one as well? thank you.

np - rebased and pushed.

@Schnitzel

This comment has been minimized.

Copy link
Member

Schnitzel commented Nov 26, 2019

mhh it is failing with

$ tsc --pretty

src/helpers/sync-groups-opendistro-security.ts:14:31 - error TS2349: This expression is not callable.

  Each member of the union type '(<U>(callbackfn: (value: Group, index: number, array: Group[]) => U, thisArg?: any) => U[]) | (<U>(callbackfn: (value: BillingGroup, index: number, array: BillingGroup[]) => U, thisArg?: any) => U[])' has signatures, but none of those signatures are compatible with each other.


14   let groupsQueue = allGroups.map(group => ({ group, retries: 0}));

                                 ~~~



Found 1 error.
@wintercreative wintercreative force-pushed the wintercreative:feature/billing-project branch from 379b28f to 2419c0a Nov 26, 2019
@Schnitzel

This comment has been minimized.

Copy link
Member

Schnitzel commented Nov 26, 2019

tests passed, @rocketeerbkw can you do a last codereview and give your go ahead for a merge?

@Schnitzel

This comment has been minimized.

Copy link
Member

Schnitzel commented Dec 1, 2019

@justinlevi unfortunately there are now more conflicts :( sorry/

@justinlevi

This comment has been minimized.

Copy link
Author

justinlevi commented Dec 1, 2019

ok, I think I have fixed the merge conflict.

@wintercreative wintercreative force-pushed the wintercreative:feature/billing-project branch from bd1514b to b6cd3b1 Dec 2, 2019
@wintercreative wintercreative force-pushed the wintercreative:feature/billing-project branch from b6cd3b1 to 6a6bc8b Dec 2, 2019
@Schnitzel Schnitzel merged commit dd78701 into amazeeio:master Dec 3, 2019
1 check passed
1 check passed
continuous-integration/jenkins/pr-merge This commit looks good
Details
@justinlevi justinlevi mentioned this pull request Dec 19, 2019
2 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.