update display names and cost component name for volumes (#151)

IBM-Cloud · May 10, 2023 · 506e37f · 506e37f
1 parent 185b933
commit 506e37f
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 8 deletions.
diff --git a/internal/providers/terraform/ibm/ibm.go b/internal/providers/terraform/ibm/ibm.go
@@ -60,7 +60,8 @@ var globalCatalogServiceId = map[string]catalogMetadata{
 	"ibm_is_floating_ip":            {"is.floating-ip", []string{}, nil},
 	"ibm_is_flow_log":               {"is.flow-log-collector", []string{}, nil},
 	"ibm_cloudant":                  {"Cloudant", []string{}, nil},
-	"ibm_pi_instance":               {"Virtual Servers for PowerVS", []string{}, nil},
+	"ibm_pi_instance":               {"Power Systems Virtual Server", []string{}, nil},
+	"ibm_pi_volume":                 {"Power Systems Storage Volume", []string{}, nil},
 	"ibm_cos_bucket":                {"Object Storage Bucket", []string{}, nil},
 	"ibm_is_lb":                     {"is.load-balancer", []string{}, nil},
 	"ibm_is_public_gateway":         {"is.public-gateway", []string{"ibm_is_floating_ip"}, nil},

diff --git a/internal/providers/terraform/ibm/ibm_pi_volume.go b/internal/providers/terraform/ibm/ibm_pi_volume.go
@@ -31,10 +31,19 @@ func newIbmPiVolume(d *schema.ResourceData, u *schema.UsageData) *schema.Resourc
 	configuration["region"] = region
 	configuration["profile"] = r.Type
 	configuration["capacity"] = r.Size
-	configuration["volume_pool"] = r.VolumePool
-	configuration["affinity"] = r.AffinityPolicy
-	configuration["affinity_instance"] = r.AffinityInstance
-	configuration["affinity_volume"] = r.AffinityVolume
+
+	if r.VolumePool != "" {
+		configuration["volume_pool"] = r.VolumePool
+	}
+	if r.AffinityPolicy != "" {
+		configuration["affinity"] = r.AffinityPolicy
+	}
+	if r.AffinityInstance != "" {
+		configuration["affinity_instance"] = r.AffinityInstance
+	}
+	if r.AffinityVolume != "" {
+		configuration["affinity_volume"] = r.AffinityVolume
+	}
 
 	SetCatalogMetadata(d, d.Type, configuration)
 

diff --git a/internal/providers/terraform/ibm/pi_instance.go b/internal/providers/terraform/ibm/pi_instance.go
@@ -75,6 +75,7 @@ func newPiInstance(d *schema.ResourceData, u *schema.UsageData) *schema.Resource
 	memory := d.Get("pi_memory").Float()
 	storageType := d.Get("pi_storage_type").String()
 	profile := d.Get("pi_sap_profile_id").String()
+	name := d.Get("pi_instance_name").String()
 
 	var os int64 = -1
 	var isLegacyIBMiImageVersion bool
@@ -106,6 +107,7 @@ func newPiInstance(d *schema.ResourceData, u *schema.UsageData) *schema.Resource
 	configuration["region"] = region
 	configuration["storageType"] = storageType
 	configuration["image"] = imageName
+	configuration["name"] = name
 
 	if profile != "" {
 		configuration["profile"] = profile

diff --git a/internal/resources/ibm/ibm_pi_volume.go b/internal/resources/ibm/ibm_pi_volume.go
@@ -1,6 +1,8 @@
 package ibm
 
 import (
+	"fmt"
+
 	"github.com/infracost/infracost/internal/resources"
 	"github.com/infracost/infracost/internal/schema"
 	"github.com/shopspring/decimal"
@@ -68,7 +70,7 @@ func (r *IbmPiVolume) BuildResource() *schema.Resource {
 	if r.VolumePool != "" {
 		// How am I supposed to guess?
 		costComponent := &schema.CostComponent{
-			Name:            "Price dependent upon volume pool settings",
+			Name:            fmt.Sprintf("Volume pool (%d GB, %s) Price dependent on volume pool settings", r.Size, r.Name),
 			Unit:            "Gigabyte Instance Hours",
 			UnitMultiplier:  decimal.NewFromInt(1),
 			MonthlyQuantity: q,
@@ -86,7 +88,7 @@ func (r *IbmPiVolume) BuildResource() *schema.Resource {
 	} else if r.AffinityPolicy == "affinity" {
 		// How am I supposed to guess?
 		costComponent := &schema.CostComponent{
-			Name:            "Price dependent upon affinity settings",
+			Name:            fmt.Sprintf("Volume (%d GB, %s) Price dependent on affinity settings", r.Size, r.Name),
 			Unit:            "Gigabyte Instance Hours",
 			UnitMultiplier:  decimal.NewFromInt(1),
 			MonthlyQuantity: q,
@@ -104,7 +106,7 @@ func (r *IbmPiVolume) BuildResource() *schema.Resource {
 	} else if r.Type == "tier1" || r.Type == "tier3" || r.Type == "standard" || r.Type == "ssd" {
 
 		costComponent := &schema.CostComponent{
-			Name:            "Price dependent upon affinity settings",
+			Name:            fmt.Sprintf("Volume (%d GB, %s, %s)", r.Size, r.Type, r.Name),
 			Unit:            "Gigabyte Instance Hours",
 			UnitMultiplier:  decimal.NewFromInt(1),
 			MonthlyQuantity: q,