Skip to content

Commit 96161a8

Browse files
authored
Merge pull request #203 from cloud-gov/pb/omni-credit
Unifies pricing into one file, w/o breaking estimator
2 parents d95afd6 + be8e98a commit 96161a8

2 files changed

Lines changed: 77 additions & 0 deletions

File tree

src/components/CostEstimator.astro

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ const title = forSchema == "credits" ? "Cloud.gov Credit Estimator" : "Cloud.gov
119119
const removeBtn = node.querySelector(".remove-btn");
120120

121121
data.services.forEach((s, i) => {
122+
if (s.product != 'platform' ) return;
122123
const opt = document.createElement("option");
123124
opt.value = i;
124125
opt.textContent = s.name;

src/data/credits.json

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"services": [
33
{
44
"name": "Containerized apps",
5+
"product": "platform",
56
"resource-kind": "cf-app-memory",
67
"multiplier": true,
78
"metered": {
@@ -13,6 +14,7 @@
1314
},
1415
{
1516
"name": "AWS RDS",
17+
"product": "platform",
1618
"plans": [
1719
{
1820
"plan": "micro-psql",
@@ -238,6 +240,7 @@
238240
},
239241
{
240242
"name": "AWS RDS storage",
243+
"product": "platform",
241244
"resource-kind": "rds-storage",
242245
"metered": {
243246
"type": "reserved",
@@ -248,6 +251,7 @@
248251
},
249252
{
250253
"name": "AWS S3 storage",
254+
"product": "platform",
251255
"resource-kind": "s3-storage",
252256
"metered": {
253257
"type": "used",
@@ -258,6 +262,7 @@
258262
},
259263
{
260264
"name": "AWS ElastiCache",
265+
"product": "platform",
261266
"plans": [
262267
{
263268
"plan": "redis-dev",
@@ -288,6 +293,7 @@
288293
},
289294
{
290295
"name": "AWS OpenSearch",
296+
"product": "platform",
291297
"plans": [
292298
{
293299
"plan": "es-dev",
@@ -358,6 +364,7 @@
358364
},
359365
{
360366
"name": "AWS OpenSearch storage",
367+
"product": "platform",
361368
"resource-kind": "aws-opensearch-storage",
362369
"metered": {
363370
"type": "reserved",
@@ -368,6 +375,7 @@
368375
},
369376
{
370377
"name": "AWS SES (Emails)",
378+
"product": "platform",
371379
"resource-kind": "aws-ses-emails-sent",
372380
"metered": {
373381
"type": "used",
@@ -379,6 +387,7 @@
379387
{
380388
"name": "AWS SES (Attachments)",
381389
"resource-kind": "aws-ses-attachment-data",
390+
"product": "platform",
382391
"metered": {
383392
"type": "used",
384393
"unit": "GBs",
@@ -388,6 +397,7 @@
388397
},
389398
{
390399
"name": "App Autoscaler",
400+
"product": "platform",
391401
"plans": [
392402
{
393403
"plan": "autoscaler-free-plan",
@@ -403,6 +413,7 @@
403413
},
404414
{
405415
"name": "External Domain",
416+
"product": "platform",
406417
"plans": [
407418
{
408419
"plan": "domain-with-cdn-dedicated-waf",
@@ -412,9 +423,74 @@
412423
},
413424
{
414425
"name": "UAA Service Account",
426+
"product": "platform",
415427
"resource-kind": "cf-uaa-service-account",
416428
"free": true,
417429
"credits": 0
430+
},
431+
{
432+
"name": "Pages Static Website",
433+
"product": "pages",
434+
"resource-kind": "pages-static-website",
435+
"metered": {
436+
"type": "domain",
437+
"unit": "Website",
438+
"unitsPerCredit": 1,
439+
"credits": 12
440+
}
441+
},
442+
{
443+
"name": "Runner Pools",
444+
"multiplier": true,
445+
"product": "workshop",
446+
"plans": [
447+
{
448+
"plan": "Small Runner Pool",
449+
"instanceClass": "Up to 10 parallel jobs",
450+
"resource-kind": "runner-pool-small",
451+
"credits": 0
452+
},
453+
{
454+
"plan": "Medium Runner Pool",
455+
"instanceClass": "Up to 20 parallel jobs",
456+
"resource-kind": "runner-pool-medium",
457+
"credits": 5
458+
},
459+
{
460+
"plan": "Large Runner Pool",
461+
"instanceClass": "Up to 40 parallel jobs",
462+
"resource-kind": "runner-pool-large",
463+
"credits": 10
464+
},
465+
{
466+
"plan": "Extra Large Runner Pool",
467+
"instanceClass": "Up to 80 parallel jobs",
468+
"resource-kind": "runner-pool-extra-large",
469+
"credits": 20
470+
}
471+
]
472+
},
473+
{
474+
"name": "Standard Users",
475+
"resource-kind": "workshop-standard-user",
476+
"product": "workshop",
477+
"metered": {
478+
"type": "reserved",
479+
"unit": "seats",
480+
"unitsPerCredit": 1,
481+
"credits": 5
482+
}
483+
},
484+
{
485+
"name": "Additional Storage",
486+
"resource-kind": "workshop-additional-storage",
487+
"product": "workshop",
488+
"metered": {
489+
"type": "reserved",
490+
"unit": "steps of 10GiBs",
491+
"unitsPerCredit": 1,
492+
"credits": 0.5
493+
}
418494
}
419495
]
420496
}

0 commit comments

Comments
 (0)