aboutsummaryrefslogtreecommitdiffstats
path: root/controller-api/src/main/java
Commit message (Collapse)AuthorAgeFilesLines
* Allow no application resourcesValerij Fredriksen2023-10-171-22/+22
|
* Revert "Revert "Set creator as contact when initiating new tenant""Bjørn Christian Seime2023-10-171-1/+6
|
* Add description for enclave item for total spendHarald Musum2023-10-171-12/+20
|
* Merge pull request #28949 from vespa-engine/olaa/billing-verificationOla Aunrønning2023-10-171-1/+2
|\ | | | | Billing mail verification
| * Billing mail verificationOla Aunronning2023-10-161-1/+2
| |
* | Merge pull request #28909 from vespa-engine/maintain-invoicesGjøran Voldengen2023-10-176-5/+78
|\ \ | | | | | | Allow maintaining and updating invoices.
| * | Add test for invoice maintenance done by BillingReportMaintainer.gjoranv2023-10-164-12/+30
| | | | | | | | | | | | | | | - Add a (mock) database client to the mock billing controller. - Improve InvoiceUpdate class.
| * | Add method comment.gjoranv2023-10-161-0/+1
| | |
| * | Wire in invoice maintainancegjoranv2023-10-162-1/+7
| | | | | | | | | | | | .. and move control to BillingReportMaintainer
| * | Allow maintaining and updating invoices.gjoranv2023-10-162-0/+48
| | |
* | | Merge remote-tracking branch 'origin/master' into ogronnesby/additional-items-v2Øyvind Grønnesby2023-10-164-19/+12
|\| |
| * | Stop using name for each applicationHarald Musum2023-10-164-19/+10
| | |
| * | Minor test cleanup and add enclave() method to ApplicationResourcesHarald Musum2023-10-141-0/+2
| |/
* / Add additional items to billing/v2Øyvind Grønnesby2023-10-161-1/+1
|/ | | | This will allow us to remove billing/v1 once console has moved
* Remove support for legacy price calculations from APIHarald Musum2023-10-134-28/+18
|
* Test pricing API with 2 appsHarald Musum2023-10-131-6/+20
|
* Support calculating and presenting prices per applications and in totalHarald Musum2023-10-136-19/+37
|
* Add some convenience methods to PriceInformationHarald Musum2023-10-121-0/+12
|
* Merge pull request #28899 from ↵Harald Musum2023-10-124-6/+71
|\ | | | | | | | | vespa-engine/hmusum/support-price-calculation-with-more-than-1-app Support price calculations with more than 1 app
| * Update ↵Harald Musum2023-10-121-1/+0
| | | | | | | | | | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MockPricingController.java Co-authored-by: Valerij Fredriksen <freva@users.noreply.github.com>
| * Use separate keys for enclave node resourcesHarald Musum2023-10-122-8/+17
| |
| * Support price calculations with more than 1 appHarald Musum2023-10-124-6/+63
| |
* | Merge pull request #28837 from vespa-engine/ogronnesby/enclave-billingOla Aunrønning2023-10-126-19/+62
|\ \ | |/ |/| Add cloudAccount as dimension to bills and resources
| * Add cloudAccount as dimension to bills and resourcesØyvind Grønnesby2023-10-116-19/+62
| |
* | Combine list price and support cost into one price itemHarald Musum2023-10-122-4/+4
| |
* | Merge pull request #28842 from vespa-engine/mpolden/cert-assignmentMartin Polden2023-10-121-0/+23
|\ \ | | | | | | Refactor certificate assignment and migration
| * | Require that endpoint DNS name is matched by SANMartin Polden2023-10-091-0/+23
| | |
* | | Minor: Use committed spend in pricing unit testsHarald Musum2023-10-121-1/+1
| |/ |/|
* | Merge branch 'master' into hmusum/add-support-level-costHarald Musum2023-10-113-2/+39
|\ \
| * \ Merge pull request #28839 from vespa-engine/write-external-ids-to-dbGjøran Voldengen2023-10-113-2/+39
| |\ \ | | | | | | | | Add billing db client methods to set exported invoice/item ids.
| | * | bugfix: set exported id in ctorgjoranv2023-10-101-0/+1
| | | |
| | * | Add exportedId to Bill and Bill.LineItemgjoranv2023-10-091-2/+20
| | | |
| | * | Add billing db client methods to set exported invoice/item ids.gjoranv2023-10-092-0/+18
| | |/
* | / Add support level cost to pricing API responseHarald Musum2023-10-112-4/+9
|/ /
* | Return amounts with 2 decimalsValerij Fredriksen2023-10-111-5/+3
| |
* | Merge pull request #28852 from ↵Jon Marius Venstad2023-10-102-2/+2
|\ \ | | | | | | | | | | | | vespa-engine/jonmv/no-wait-for-initial-aws-lb-checks-in-dev-first-time Avoid wait for health check for first-time dev deployments
| * | Avoid wait for health check for first-time dev deploymentsjonmv2023-10-102-2/+2
| | |
* | | Merge pull request #28832 from vespa-engine/hmusum/add-handler-for-pricing-apiHarald Musum2023-10-104-3/+17
|\ \ \ | |/ / |/| | Add handler for pricing API
| * | Discounts are negativeHarald Musum2023-10-101-2/+2
| | |
| * | Add committedAmountDiscount, enclaveDiscount and totalAmountHarald Musum2023-10-092-9/+14
| | |
| * | Rename support level standard to basicHarald Musum2023-10-091-1/+1
| | |
| * | Update ↵Harald Musum2023-10-081-1/+0
| | | | | | | | | | | | | | | controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/MockPricingController.java Co-authored-by: Valerij Fredriksen <freva@users.noreply.github.com>
| * | Add handler for pricing APIHarald Musum2023-10-072-1/+11
| |/
* / Update copyrightJon Bratseth2023-10-09339-333/+354
|/
* Add volume discount to price information and use BigDecimalHarald Musum2023-10-062-2/+5
|
* Export packageHarald Musum2023-10-061-0/+5
|
* Add pricing controller to service registryHarald Musum2023-10-062-0/+22
|
* Add PriceInformationHarald Musum2023-10-051-0/+5
|
* Merge branch 'master' into hmusum/add-pricing-info-and-controllerHarald Musum2023-10-053-13/+19
|\
| * Merge pull request #28074 from vespa-engine/ogronnesby/make-all-tenants-fasterØyvind Grønnesby2023-10-051-1/+1
| |\ | | | | | | Make the all tenants console view quicker