Skip to content

Commit

Permalink
fix ibm unit tests (#192)
Browse files Browse the repository at this point in the history 
* update ibm tests

* fix tf format
  • Loading branch information
@hiltol
hiltol authored Sep 18, 2024
1 parent 6bcf073 commit 34b5ff9
Show file tree
Hide file tree
Showing 21 changed files with 39 additions and 55 deletions.
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/cloudant_test/cloudant_test.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions ...providers/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions ...rraform/ibm/testdata/container_vpc_worker_pool_test/container_vpc_worker_pool_test.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
└─ VPC egress eu-de (over 149995 GB) 0 GB $0.00

mycluster
└─ VPC Container Work Zone flavor: (bx2.4x16) region: (eu-de) name: (eu-de-1) x(3) workers 2,190 hours $682.31
└─ VPC Container Work Zone flavor: (bx2.4x16) region: (eu-de) name: (eu-de-1) x(3) workers 2,190 hours $665.19

OVERALL TOTAL $5,816.13
OVERALL TOTAL $5,799.01
──────────────────────────────────
6 cloud resources were detected:
∙ 4 were estimated, 3 of which include usage-based costs, see https://infracost.io/usage-file
Expand Down
3 changes: 1 addition & 2 deletions ...s/terraform/ibm/testdata/container_vpc_worker_pool_test/container_vpc_worker_pool_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
18 changes: 9 additions & 9 deletions internal/providers/terraform/ibm/testdata/database_test/database_test.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@
└─ 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
├─ RAM 36 GB-RAM $967.79
├─ Disk 384 GB-DISK $241.27
└─ Core 9 Virtual Processor Core $291.08

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

OVERALL TOTAL $1,790.45
├─ RAM 4 GB-RAM $107.53
└─ Disk 20 GB-DISK $12.57
OVERALL TOTAL $1,837.64
──────────────────────────────────
4 cloud resources were detected:
∙ 4 were estimated, all of which include usage-based costs, see https://infracost.io/usage-file
6 cloud resources were detected:
∙ 6 were estimated, all of which include usage-based costs, see https://infracost.io/usage-file
5 changes: 2 additions & 3 deletions internal/providers/terraform/ibm/testdata/database_test/database_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down Expand Up @@ -127,7 +126,7 @@ resource "ibm_database" "test_es_platinum_db2" {
allocation_count = 4
}
memory {
allocation_mb = 1024
allocation_mb = 2048
}
}
}
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/ibm_cos_bucket_test/ibm_cos_bucket_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/ibm_is_vpc_test/ibm_is_vpc_test.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/ibm_pi_volume_test/ibm_pi_volume_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/is_floating_ip_test/is_floating_ip_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
6 changes: 4 additions & 2 deletions internal/providers/terraform/ibm/testdata/is_flow_log_test/is_flow_log_test.golden
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,10 @@
└─ Flow Log Collector us-south (over 72000 GB) Monthly cost depends on usage: $0.10 per GB

ibm_is_instance.testIsInstance
├─ CPU hours (2 CPUs, us-south-1) Monthly cost depends on usage: $0.0249876337 per CPU hours
└─ Memory hours (8 GB, us-south-1) Monthly cost depends on usage: $0.00506833 per Memory hours
├─ CPU hours (2 CPUs, us-south-1) (first 1 CPU hours) Monthly cost depends on usage: $0.31 per CPU hours
├─ CPU hours (2 CPUs, us-south-1) (over 0 CPU hours) Monthly cost depends on usage: $0.0249876337 per CPU hours
└─ Memory hours (8 GB, us-south-1) (first 1 Memory hours) Monthly cost depends on usage: $0.57 per Memory hours
└─ Memory hours (8 GB, us-south-1) (over 0 Memory hours) Monthly cost depends on usage: $0.00506833 per Memory hours

ibm_is_vpc.testVpc
├─ VPC instance 1 Instance $0.00
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/is_flow_log_test/is_flow_log_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/is_instance_test/is_instance_test.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/is_lb_test/is_lb_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/is_share_test/is_share_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/is_volume_test/is_volume_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/is_vpn_gateway_test/is_vpn_gateway_test.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/is_vpn_server_test/is_vpn_server_test.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.69.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
13 changes: 6 additions & 7 deletions internal/providers/terraform/ibm/testdata/pi_instance_test/pi_instance_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.58.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down Expand Up @@ -81,7 +80,7 @@ resource "ibm_pi_instance" "aix-shared-s922-instance" {
pi_instance_name = "aix-shared-s922"
pi_proc_type = "shared"
pi_image_id = ibm_pi_image.aix_image.id
pi_key_pair_name = ibm_pi_key.key.key_id
pi_key_pair_name = ibm_pi_key.key.id
pi_sys_type = "s922"
pi_cloud_instance_id = ibm_resource_instance.powervs_service.guid
pi_pin_policy = "none"
Expand All @@ -98,7 +97,7 @@ resource "ibm_pi_instance" "ibmi-dedicated-e980-instance" {
pi_instance_name = "ibmi-dedicated-e980"
pi_proc_type = "dedicated"
pi_image_id = ibm_pi_image.ibmi_image.id
pi_key_pair_name = ibm_pi_key.key.key_id
pi_key_pair_name = ibm_pi_key.key.id
pi_sys_type = "e980"
pi_cloud_instance_id = ibm_resource_instance.powervs_service.guid
pi_pin_policy = "none"
Expand All @@ -112,7 +111,7 @@ resource "ibm_pi_instance" "ibmi-dedicated-e980-instance" {
resource "ibm_pi_instance" "hana-dedicated-e980-instance" {
pi_instance_name = "hana-dedicated-e980"
pi_image_id = ibm_pi_image.hana_image.id
pi_key_pair_name = ibm_pi_key.key.key_id
pi_key_pair_name = ibm_pi_key.key.id
pi_sys_type = "e980"
pi_cloud_instance_id = ibm_resource_instance.powervs_service.guid
pi_pin_policy = "none"
Expand All @@ -130,7 +129,7 @@ resource "ibm_pi_instance" "netweaver-shared-s922-instance" {
pi_instance_name = "netweaver-shared-s922"
pi_proc_type = "shared"
pi_image_id = ibm_pi_image.netweaver_image.id
pi_key_pair_name = ibm_pi_key.key.key_id
pi_key_pair_name = ibm_pi_key.key.id
pi_sys_type = "s922"
pi_cloud_instance_id = ibm_resource_instance.powervs_service.guid
pi_pin_policy = "none"
Expand All @@ -147,7 +146,7 @@ resource "ibm_pi_instance" "netweaver-shared-s922-no-usage-specified-instance" {
pi_instance_name = "netweaver-shared-s922"
pi_proc_type = "shared"
pi_image_id = ibm_pi_image.netweaver_image.id
pi_key_pair_name = ibm_pi_key.key.key_id
pi_key_pair_name = ibm_pi_key.key.id
pi_sys_type = "s922"
pi_cloud_instance_id = ibm_resource_instance.powervs_service.guid
pi_pin_policy = "none"
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/resource_instance_test/resource_instance_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.64.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down
3 changes: 1 addition & 2 deletions internal/providers/terraform/ibm/testdata/tg_gateway_test/tg_gateway_test.tf
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
terraform {
required_providers {
ibm = {
source = "IBM-Cloud/ibm"
version = "1.63.0"
source = "IBM-Cloud/ibm"
}
}
}
Expand Down

0 comments on commit 34b5ff9

Please sign in to comment.