Skip to content

Commit

Permalink
Merge branch 'master' into feat/add-support-vpn-server
Browse files Browse the repository at this point in the history
  • Loading branch information
@luisarojas
luisarojas authored Sep 11, 2024
2 parents 4307896 + 5d757dc commit d2d10f8
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 40 deletions.
6 changes: 4 additions & 2 deletions internal/providers/terraform/ibm/is_instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ func newIsInstance(d *schema.ResourceData, u *schema.UsageData) *schema.Resource
dedicatedHost := strings.TrimSpace(d.Get("dedicated_host").String())
dedicatedHostGroup := strings.TrimSpace(d.Get("dedicated_host_group").String())
isDedicated := !((dedicatedHost == "") && (dedicatedHostGroup == ""))
name := d.Get("name").String()

boot_volume := make([]struct {
Name string
Expand Down Expand Up @@ -59,9 +60,10 @@ func newIsInstance(d *schema.ResourceData, u *schema.UsageData) *schema.Resource
r.PopulateUsage(u)

configuration := make(map[string]any)
configuration["region"] = region
configuration["profile"] = profile
configuration["name"] = name
configuration["on_dedicated_host"] = isDedicated
configuration["profile"] = profile
configuration["region"] = region

SetCatalogMetadata(d, d.Type, configuration)

Expand Down
88 changes: 50 additions & 38 deletions internal/providers/terraform/ibm/testdata/is_instance_test/is_instance_test.golden
View file
Original file line number Diff line number Diff line change
@@ -1,42 +1,54 @@

Name Monthly Qty Unit Monthly Cost

ibm_is_instance.testBalancedInstance
├─ CPU hours (32 CPUs, us-east-1) 23,360 CPU hours $583.71
├─ Memory hours (128 GB, us-east-1) 93,440 Memory hours $473.58
└─ Storage GB hours (600 GB * 2, us-east-1) 876,000 Storage GB hours $100.32

ibm_is_instance.testBalancedInstanceWithBootVolume
├─ CPU hours (8 CPUs, us-east-1) 5,840 CPU hours $145.93
├─ Memory hours (32 GB, us-east-1) 23,360 Memory hours $118.40
└─ Boot volume (boot-volume-label, 150 GB) 109,500 GB Hours $12.59

ibm_is_instance.testComputeInstance
├─ CPU hours (2 CPUs, us-east-1) 1,460 CPU hours $36.48
└─ Memory hours (4 GB, us-east-1) 2,920 Memory hours $22.02

ibm_is_instance.testGpuInstance
├─ CPU hours (16 CPUs, us-east-1) 11,680 CPU hours $311.82
├─ Memory hours (128 GB, us-east-1) 93,440 Memory hours $371.90
└─ Gpu hours (2 GPUs, Tesla V100, us-east-1) 1,460 Gpu hours $3,051.40

ibm_is_instance.testIbmZInstance
├─ CPU hours (16 CPUs, us-east-1) 11,680 CPU hours $530.34
└─ Memory hours (64 GB, us-east-1) 46,720 Memory hours $407.71

ibm_is_instance.testInstanceWithoutUsage
├─ CPU hours (2 CPUs, us-east-1) Monthly cost depends on usage: $0.0249876337 per CPU hours
└─ Memory hours (4 GB, us-east-1) Monthly cost depends on usage: $0.0075416569 per Memory hours

ibm_is_vpc.testVpc
├─ VPC instance 1 Instance $0.00
├─ VPC egress free allowance (first 5GB) Monthly cost depends on usage: $0.00 per GB
└─ VPC egress us-east (first 9995 GB) Monthly cost depends on usage: $0.090915 per GB
└─ VPC egress us-east (next 40000 GB) Monthly cost depends on usage: $0.086735 per GB
└─ VPC egress us-east (next 100000 GB) Monthly cost depends on usage: $0.07315 per GB
└─ VPC egress us-east (over 149995 GB) Monthly cost depends on usage: $0.05225 per GB

OVERALL TOTAL $6,166.19
Name Monthly Qty Unit Monthly Cost

ibm_is_instance.testBalancedInstance
├─ CPU hours (32 CPUs, us-east-1) (first 1 CPU hours) 1 CPU hours $0.31
├─ CPU hours (32 CPUs, us-east-1) (over 0 CPU hours) 1 CPU hours $0.02
├─ Memory hours (128 GB, us-east-1) (first 1 Memory hours) 1 Memory hours $0.57
├─ Memory hours (128 GB, us-east-1) (over 0 Memory hours) 1 Memory hours $0.01
└─ Storage GB hours (600 GB * 2, us-east-1) 876,000 Storage GB hours $23,652.00

ibm_is_instance.testBalancedInstanceWithBootVolume
├─ CPU hours (8 CPUs, us-east-1) (first 1 CPU hours) 1 CPU hours $0.31
├─ CPU hours (8 CPUs, us-east-1) (over 0 CPU hours) 1 CPU hours $0.02
├─ Memory hours (32 GB, us-east-1) (first 1 Memory hours) 1 Memory hours $0.57
├─ Memory hours (32 GB, us-east-1) (over 0 Memory hours) 1 Memory hours $0.01
└─ Boot volume (boot-volume-label, 150 GB) 109,500 GB Hours $12.59

ibm_is_instance.testComputeInstance
├─ CPU hours (2 CPUs, us-east-1) (first 1 CPU hours) 1 CPU hours $0.31
├─ CPU hours (2 CPUs, us-east-1) (over 0 CPU hours) 1 CPU hours $0.02
└─ Memory hours (4 GB, us-east-1) (first 1 Memory hours) 1 Memory hours $0.84
└─ Memory hours (4 GB, us-east-1) (over 0 Memory hours) 1 Memory hours $0.01

ibm_is_instance.testGpuInstance
├─ CPU hours (16 CPUs, us-east-1) (first 1 CPU hours) 1 CPU hours $0.33
├─ CPU hours (16 CPUs, us-east-1) (over 0 CPU hours) 1 CPU hours $0.03
├─ Memory hours (128 GB, us-east-1) (first 1 Memory hours) 1 Memory hours $0.45
├─ Memory hours (128 GB, us-east-1) (over 0 Memory hours) 1 Memory hours $0.00
└─ Gpu hours (2 GPUs, Tesla V100, us-east-1) 1,460 Gpu hours $3,051.40

ibm_is_instance.testIbmZInstance
├─ CPU hours (16 CPUs, us-east-1) (first 1 CPU hours) 1 CPU hours $0.39
├─ CPU hours (16 CPUs, us-east-1) (over 0 CPU hours) 1 CPU hours $0.05
└─ Memory hours (64 GB, us-east-1) (first 1 Memory hours) 1 Memory hours $0.56
└─ Memory hours (64 GB, us-east-1) (over 0 Memory hours) 1 Memory hours $0.01

ibm_is_instance.testInstanceWithoutUsage
├─ CPU hours (2 CPUs, us-east-1) (first 1 CPU hours) Monthly cost depends on usage: $0.31 per CPU hours
├─ CPU hours (2 CPUs, us-east-1) (over 0 CPU hours) Monthly cost depends on usage: $0.0249876337 per CPU hours
└─ Memory hours (4 GB, us-east-1) (first 1 Memory hours) Monthly cost depends on usage: $0.84 per Memory hours
└─ Memory hours (4 GB, us-east-1) (over 0 Memory hours) Monthly cost depends on usage: $0.0075416569 per Memory hours

ibm_is_vpc.testVpc
├─ VPC instance 1 Instance $0.00
├─ VPC egress free allowance (first 5GB) Monthly cost depends on usage: $0.00 per GB
└─ VPC egress us-east (first 9995 GB) Monthly cost depends on usage: $0.090915 per GB
└─ VPC egress us-east (next 40000 GB) Monthly cost depends on usage: $0.086735 per GB
└─ VPC egress us-east (next 100000 GB) Monthly cost depends on usage: $0.07315 per GB
└─ VPC egress us-east (over 149995 GB) Monthly cost depends on usage: $0.05225 per GB

OVERALL TOTAL $26,720.80
──────────────────────────────────
9 cloud resources were detected:
∙ 7 were estimated, all of which include usage-based costs, see https://infracost.io/usage-file
Expand Down

0 comments on commit d2d10f8

Please sign in to comment.