Merge branch 'master' into fix/sysdig-defaults

IBM-Cloud · Apr 15, 2024 · 3f9c757 · 3f9c757
2 parents 15f2515 + 16f0228
commit 3f9c757
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/infracost-usage-example.yml b/infracost-usage-example.yml
@@ -1275,8 +1275,8 @@ resource_usage:
     monthly_instance_hours: 730 # Monthly number of instance hours
 
   ibm_resource_instance.resource_instance_kms: 
-    kms_key_versions: 300 # Number of key versions managed per month
-    secretsmanager_active_secrets: 400 # Number of active secrets
+    kms_key_versions: 6 # Number of key versions managed per month
+    secretsmanager_active_secrets: 1 # Number of active secrets
     secretsmanager_instance: 1 # Number of instances of secrets manager
     appid_advanced_authentications: 20000 # Number of advanced authentications in a month
     appid_authentications: 15000 # Number of simple authentications in a month

diff --git a/...iders/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.golden b/...iders/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.golden
@@ -17,7 +17,7 @@
  ├─ VPC Container Work Zone flavor: (bx2.4x16) region: (us-south) name: (us-south-1) x(3) workers            3  hours            $0.83 
  └─ VPC Container Work Zone flavor: (bx2.4x16) region: (us-south) name: (us-south-2) x(3) workers            3  hours            $0.83 
 
- mycluster-without-usage                                                                                                               
+ myrokscluster-with-usage                                                                                                               
  ├─ VPC Container Work Zone flavor: (bx2.4x16) region: (us-south) name: (us-south-1) x(3) workers        2,190  hours          $983.08 
  └─ VPC Container Work Zone flavor: (bx2.4x16) region: (us-south) name: (us-south-2) x(3) workers        2,190  hours          $983.08 
 

diff --git a/...providers/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.tf b/...providers/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.tf
@@ -64,7 +64,7 @@ resource "ibm_container_vpc_cluster" "cluster_without_usage" {
 }
 
 resource "ibm_container_vpc_cluster" "roks_cluster_with_usage" {
-  name              = "mycluster-without-usage"
+  name              = "myrokscluster-with-usage"
   vpc_id            = ibm_is_vpc.vpc1.id
   flavor            = "bx2.4x16"
   worker_count      = 3

diff --git a/...rs/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.usage.yml b/...rs/terraform/ibm/testdata/container_vpc_cluster_test/container_vpc_cluster_test.usage.yml
@@ -3,4 +3,6 @@ resource_usage:
   ibm_container_vpc_cluster.cluster:
     monthly_instance_hours: 730
   ibm_is_vpc.vpc1:
-    gigabyte_transmitted_outbounds: 50100
+    gigabyte_transmitted_outbounds: 50100
+  ibm_container_vpc_cluster.roks_cluster_with_usage:
+    monthly_instance_hours: 730
diff --git a/internal/providers/terraform/tftest/tftest.go b/internal/providers/terraform/tftest/tftest.go
@@ -41,6 +41,9 @@ var tfProviders = `
 			azurerm = {
 				source  = "hashicorp/azurerm"
 			}
+			ibm = {
+				source = "IBM-Cloud/ibm"
+			}
 		}
 	}
 
@@ -70,6 +73,10 @@ var tfProviders = `
 		skip_provider_registration = true
 		features {}
 	}
+
+	provider "ibm" {
+		region = "us-south"
+	}
 `
 
 var (