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.

Sign up for GitHub

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

Add support for elasticsearch #179

Merged
merged 10 commits into from
Jul 29, 2024
Merged

Add support for elasticsearch #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4686ecc
Add support for elasticsearch
May 7, 2024
0947ced
Fix errors, separate usage variables
May 8, 2024
53941a2
update infracost usage example
May 8, 2024
d1d89b0
fix database core variable
May 8, 2024
445c591
Merge branch 'master' into feat/db-for-es-support
YuChinKoo May 8, 2024
3c4f946
Update variable to begin with a capital
May 8, 2024
e00ba78
Removed plan for ES and updated variable names to be consistent
May 8, 2024
e187f1b
Remove commented code
May 8, 2024
b0ad8e9
Refactor files, added test for platinum plan for elasticsearch
Jun 4, 2024
d331cdb
Merge branch 'master' into feat/db-for-es-support
hiltol Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 18 additions & 8 deletions infracost-usage-example.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,14 @@ resource_type_default_usage:
data_transfer_global: 1000
data_transfer_local: 1000
ibm_database:
database_ram_mb: 12288
database_disk_mb: 131072
database_core: 3
database_members: 4
postgresql_database_ram_mb: 12288
postgresql_database_disk_mb: 131072
postgresql_database_core: 3
postgresql_database_members: 4
elasticsearch_database_ram_mb: 12288
elasticsearch_database_disk_mb: 131072
elasticsearch_database_core: 3
elasticsearch_database_members: 4

resource_usage:
#
Expand Down Expand Up @@ -1404,7 +1408,13 @@ resource_usage:
data_transfer_global: 2500 # Monthly global traffic through the gateway in GB

ibm_database.postgres:
database_ram_mb: 12288 # Allocated memory in MB per-member
database_disk_mb: 131072 # Allocated disk in MB per-member
database_core: 3 # Allocated dedicated CPU per-member
database_members: 4 # Allocated number of members in the cluster
postgresql_database_ram_mb: 12288 # Allocated memory in MB per-member
postgresql_database_disk_mb: 131072 # Allocated disk in MB per-member
postgresql_database_core: 3 # Allocated dedicated CPU per-member
postgresql_database_members: 4 # Allocated number of members in the cluster

ibm_database.elasticsearch:
elasticsearch_database_ram_mb: 12288 # Allocated memory in MB per-member
elasticsearch_database_disk_mb: 131072 # Allocated disk in MB per-member
elasticsearch_database_core: 3 # Allocated dedicated CPU per-member
elasticsearch_database_members: 4 # Allocated number of members in the cluster
1 change: 1 addition & 0 deletions internal/providers/terraform/ibm/ibm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ var globalCatalogServiceId = map[string]catalogMetadata{
"sysdig-secure": {"e831e900-82d6-11ec-95c5-c12c5a5d9687", []string{}, nil, "https://cloud.ibm.com/workload-protection/catalog/security-and-compliance-center-workload-protection"},
"logdna": {"e13e1860-959c-11e8-871e-ad157af61ad7", []string{}, nil, "https://cloud.ibm.com/catalog/services/logdna"},
"databases-for-postgresql": {"databases-for-postgresql", []string{}, nil, "https://cloud.ibm.com/databases/databases-for-postgresql/create"},
"databases-for-elasticsearch": {"databases-for-elasticsearch", []string{}, nil, "https://cloud.ibm.com/databases/databases-for-elasticsearch/create"},
"secrets-manager": {"ebc0cdb0-af2a-11ea-98c7-29e5db822649", []string{}, nil, "https://cloud.ibm.com/catalog/services/secrets-manager"},
"appid": {"AdvancedMobileAccess-d6aece47-d840-45b0-8ab9-ad15354deeea", []string{}, nil, "https://cloud.ibm.com/catalog/services/appid"},
"appconnect": {"96a0ebf2-2a02-4e32-815f-7c09a1268c78", []string{}, nil, "https://www.ibm.com/products/app-connect/pricing"},
Expand Down
29 changes: 26 additions & 3 deletions internal/providers/terraform/ibm/testdata/database_test/database_test.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,30 @@
└─ Disk (first 1 GB-DISK) 1 GB-DISK $0.61
└─ Disk (over 0 GB-DISK) 1 GB-DISK $0.63

OVERALL TOTAL $87.45
ibm_database.test_es_enterprise_db1
├─ RAM (first 1 GB-RAM) 1 GB-RAM $15.70
├─ RAM (over 0 GB-RAM) 1 GB-RAM $16.17
├─ Disk (first 1 GB-DISK) 1 GB-DISK $0.61
├─ Disk (over 0 GB-DISK) 1 GB-DISK $0.63
└─ Core (first 1 Virtual Processor Core) 1 Virtual Processor Core $31.40
└─ Core (over 0 Virtual Processor Core) 1 Virtual Processor Core $32.34

ibm_database.test_es_enterprise_db2
├─ RAM (first 1 GB-RAM) 1 GB-RAM $15.70
├─ RAM (over 0 GB-RAM) 1 GB-RAM $16.17
└─ Disk (first 1 GB-DISK) 1 GB-DISK $0.61
└─ Disk (over 0 GB-DISK) 1 GB-DISK $0.63

ibm_database.test_es_platinum_db1
├─ RAM 36 GB-RAM $939.60
├─ Disk 384 GB-DISK $234.24
└─ Core 9 Virtual Processor Core $282.60

ibm_database.test_es_platinum_db2
├─ RAM 4 GB-RAM $104.40
└─ Disk 20 GB-DISK $12.20

OVERALL TOTAL $1,790.45
──────────────────────────────────
2 cloud resources were detected:
∙ 2 were estimated, all of which include usage-based costs, see https://infracost.io/usage-file
4 cloud resources were detected:
∙ 4 were estimated, all of which include usage-based costs, see https://infracost.io/usage-file
75 changes: 74 additions & 1 deletion internal/providers/terraform/ibm/testdata/database_test/database_test.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

terraform {
required_providers {
ibm = {
Expand Down Expand Up @@ -58,3 +57,77 @@ resource "ibm_database" "test_db2" {
}
CONFIGURATION
}

resource "ibm_database" "test_es_enterprise_db1" {
name = "demo-es-enterprise"
service = "databases-for-elasticsearch"
plan = "enterprise"
location = "eu-gb"

group {
group_id = "member"
memory {
allocation_mb = 12288
}
disk {
allocation_mb = 131072
}
cpu {
allocation_count = 3
}
}
}

resource "ibm_database" "test_es_enterprise_db2" {
name = "demo-es-enterprise2"
service = "databases-for-elasticsearch"
plan = "enterprise"
location = "eu-gb"

group {
group_id = "member"
members {
allocation_count = 4
}
memory {
allocation_mb = 15360
}
}
}

resource "ibm_database" "test_es_platinum_db1" {
name = "demo-es-platinum"
service = "databases-for-elasticsearch"
plan = "platinum"
location = "eu-gb"

group {
group_id = "member"
memory {
allocation_mb = 12288
}
disk {
allocation_mb = 131072
}
cpu {
allocation_count = 3
}
}
}

resource "ibm_database" "test_es_platinum_db2" {
name = "demo-es-platinum2"
service = "databases-for-elasticsearch"
plan = "platinum"
location = "eu-gb"

group {
group_id = "member"
members {
allocation_count = 4
}
memory {
allocation_mb = 1024
}
}
}
24 changes: 19 additions & 5 deletions internal/providers/terraform/ibm/testdata/database_test/database_test.usage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
version: 0.1
resource_usage:
ibm_database.test_db1:
database_ram_mb: 12288
database_disk_mb: 131072
database_core: 3
postgresql_database_ram_mb: 12288
postgresql_database_disk_mb: 131072
postgresql_database_core: 3
ibm_database.test_db2:
database_ram_mb: 15360
database_members: 4
postgresql_database_ram_mb: 15360
postgresql_database_members: 4
ibm_database.test_es_enterprise_db1:
elasticsearch_database_ram_mb: 12288
elasticsearch_database_disk_mb: 131072
elasticsearch_database_core: 3
ibm_database.test_es_enterprise_db2:
elasticsearch_database_ram_mb: 15360
elasticsearch_database_members: 4
ibm_database.test_es_platinum_db1:
elasticsearch_database_ram_mb: 12288
elasticsearch_database_disk_mb: 131072
elasticsearch_database_core: 3
ibm_database.test_es_platinum_db2:
elasticsearch_database_ram_mb: 1024
elasticsearch_database_members: 4
54 changes: 33 additions & 21 deletions internal/resources/ibm/database.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,18 @@ type Database struct {
// Databases For PostgreSQL
// Catalog Link: https://cloud.ibm.com/catalog/services/databases-for-postgresql
// Pricing Link: https://cloud.ibm.com/docs/databases-for-postgresql?topic=databases-for-postgresql-pricing
RAM *int64 `infracost_usage:"database_ram_mb"`
Disk *int64 `infracost_usage:"database_disk_mb"`
Core *int64 `infracost_usage:"database_core"`
Members *int64 `infracost_usage:"database_members"`
PostgreSQL_Ram *int64 `infracost_usage:"postgresql_database_ram_mb"`
PostgreSQL_Disk *int64 `infracost_usage:"postgresql_database_disk_mb"`
PostgreSQL_Core *int64 `infracost_usage:"postgresql_database_core"`
PostgreSQL_Members *int64 `infracost_usage:"postgresql_database_members"`

// Databases For ElasticSearch
// Catalog Link: https://cloud.ibm.com/catalog/services/databases-for-elasticsearch
// Pricing Link: https://cloud.ibm.com/docs/databases-for-elasticsearch?topic=databases-for-elasticsearch-pricing
ElasticSearch_Ram *int64 `infracost_usage:"elasticsearch_database_ram_mb"`
ElasticSearch_Disk *int64 `infracost_usage:"elasticsearch_database_disk_mb"`
ElasticSearch_Core *int64 `infracost_usage:"elasticsearch_database_core"`
ElasticSearch_Members *int64 `infracost_usage:"elasticsearch_database_members"`
}

type DatabaseCostComponentsFunc func(*Database) []*schema.CostComponent
Expand All @@ -37,17 +45,21 @@ func (r *Database) PopulateUsage(u *schema.UsageData) {

// DatabaseUsageSchema defines a list which represents the usage schema of Database.
var DatabaseUsageSchema = []*schema.UsageItem{
{Key: "database_ram_mb", DefaultValue: 0, ValueType: schema.Int64},
{Key: "database_disk_mb", DefaultValue: 0, ValueType: schema.Int64},
{Key: "database_core", DefaultValue: 0, ValueType: schema.Int64},
{Key: "database_members", DefaultValue: 0, ValueType: schema.Int64},
{Key: "postgresql_database_ram_mb", DefaultValue: 0, ValueType: schema.Int64},
{Key: "postgresql_database_disk_mb", DefaultValue: 0, ValueType: schema.Int64},
{Key: "postgresql_database_core", DefaultValue: 0, ValueType: schema.Int64},
{Key: "postgresql_database_members", DefaultValue: 0, ValueType: schema.Int64},
{Key: "elasticsearch_database_ram_mb", DefaultValue: 0, ValueType: schema.Int64},
{Key: "elasticsearch_database_disk_mb", DefaultValue: 0, ValueType: schema.Int64},
{Key: "elasticsearch_database_core", DefaultValue: 0, ValueType: schema.Int64},
{Key: "elasticsearch_database_members", DefaultValue: 0, ValueType: schema.Int64},
}

var DatabaseCostMap map[string]DatabaseCostComponentsFunc = map[string]DatabaseCostComponentsFunc{
"databases-for-postgresql": GetPostgresCostComponents,
// "databases-for-etcd":
// "databases-for-redis":
// "databases-for-elasticsearch":
"databases-for-elasticsearch": GetElasticSearchCostComponents,
// "messages-for-rabbitmq":
// "databases-for-mongodb":
// "databases-for-mysql":
Expand All @@ -61,14 +73,14 @@ func ConvertMBtoGB(d decimal.Decimal) decimal.Decimal {

func PostgresRAMCostComponent(r *Database) *schema.CostComponent {
var R decimal.Decimal
if r.RAM != nil {
R = ConvertMBtoGB(decimal.NewFromInt(*r.RAM))
if r.PostgreSQL_Ram != nil {
R = ConvertMBtoGB(decimal.NewFromInt(*r.PostgreSQL_Ram))
} else { // set the default
R = decimal.NewFromInt(1)
}
var m decimal.Decimal
if r.Members != nil {
m = decimal.NewFromInt(*r.Members)
if r.PostgreSQL_Members != nil {
m = decimal.NewFromInt(*r.PostgreSQL_Members)
} else { // set the default
m = decimal.NewFromInt(2)
}
Expand All @@ -95,14 +107,14 @@ func PostgresRAMCostComponent(r *Database) *schema.CostComponent {

func PostgresDiskCostComponent(r *Database) *schema.CostComponent {
var d decimal.Decimal
if r.Disk != nil {
d = ConvertMBtoGB(decimal.NewFromInt(*r.Disk))
if r.PostgreSQL_Disk != nil {
d = ConvertMBtoGB(decimal.NewFromInt(*r.PostgreSQL_Disk))
} else { // set the default
d = decimal.NewFromInt(5)
}
var m decimal.Decimal
if r.Members != nil {
m = decimal.NewFromInt(*r.Members)
if r.PostgreSQL_Members != nil {
m = decimal.NewFromInt(*r.PostgreSQL_Members)
} else { // set the default
m = decimal.NewFromInt(2)
}
Expand All @@ -129,14 +141,14 @@ func PostgresDiskCostComponent(r *Database) *schema.CostComponent {

func PostgresCoreCostComponent(r *Database) *schema.CostComponent {
var c decimal.Decimal
if r.Core != nil {
c = decimal.NewFromInt(*r.Core)
if r.PostgreSQL_Core != nil {
c = decimal.NewFromInt(*r.PostgreSQL_Core)
} else { // set the default
c = decimal.NewFromInt(0)
}
var m decimal.Decimal
if r.Members != nil {
m = decimal.NewFromInt(*r.Members)
if r.PostgreSQL_Members != nil {
m = decimal.NewFromInt(*r.PostgreSQL_Members)
} else { // set the default
m = decimal.NewFromInt(2)
}
Expand Down
Loading
Loading