feat: use common helm

Author: Jordan-Williams2

tests/pr_test.go

@@ -125,7 +125,7 @@ func TestFullyConfigurableSolution(t *testing.T) {
 		options.TerraformVars = []testschematic.TestSchematicTerraformVar{
 			{Name: "ibmcloud_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string", Secure: true},
 			{Name: "cluster_id", Value: terraform.Output(t, existingTerraformOptions, "workload_cluster_id"), DataType: "string"},
-			{Name: "logs_agent_trusted_profile_id", Value: terraform.Output(t, existingTerraformOptions, "trusted_profile_id"), DataType: "string"},
+			{Name: "agent_iam_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string"},
 			{Name: "cloud_logs_ingress_endpoint", Value: terraform.Output(t, existingTerraformOptions, "cloud_logs_ingress_private_endpoint"), DataType: "string"},
 			{Name: "cluster_resource_group_id", Value: terraform.Output(t, existingTerraformOptions, "cluster_resource_group_id"), DataType: "string"},
 		}
@@ -206,7 +206,7 @@ func TestFullyConfigurableUpgradeSolution(t *testing.T) {
 		options.TerraformVars = []testschematic.TestSchematicTerraformVar{
 			{Name: "ibmcloud_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string", Secure: true},
 			{Name: "cluster_id", Value: terraform.Output(t, existingTerraformOptions, "workload_cluster_id"), DataType: "string"},
-			{Name: "logs_agent_trusted_profile_id", Value: terraform.Output(t, existingTerraformOptions, "trusted_profile_id"), DataType: "string"},
+			{Name: "agent_iam_api_key", Value: options.RequiredEnvironmentVars["TF_VAR_ibmcloud_api_key"], DataType: "string"},
 			{Name: "cloud_logs_ingress_endpoint", Value: terraform.Output(t, existingTerraformOptions, "cloud_logs_ingress_private_endpoint"), DataType: "string"},
 			{Name: "cluster_resource_group_id", Value: terraform.Output(t, existingTerraformOptions, "cluster_resource_group_id"), DataType: "string"},
 		}

tests/resources/main.tf

@@ -104,24 +104,3 @@ module "cloud_logs" {
     }
   }
 }
-
-##############################################################################
-# Service ID with logs sender role + apikey
-##############################################################################
-
-# As a `Sender`, you can send logs to your IBM Cloud Logs service instance - but not query or tail logs. This role is meant to be used by agent and routers sending logs.
-module "iam_service_id" {
-  source                          = "terraform-ibm-modules/iam-service-id/ibm"
-  version                         = "1.2.0"
-  iam_service_id_name             = "${var.prefix}-service-id"
-  iam_service_id_description      = "Logs Agent service id"
-  iam_service_id_apikey_provision = true
-  iam_service_policies = {
-    logs = {
-      roles = ["Sender"]
-      resources = [{
-        service = "logs"
-      }]
-    }
-  }
-}

tests/resources/outputs.tf

@@ -32,11 +32,6 @@ output "cluster_resource_group_id" {
   description = "Resource group ID of the workload cluster."
 }
 
-output "service_id_apikey" {
-  value       = module.iam_service_id.service_id_apikey
-  description = "The apikey of the service id."
-}
-
 output "cloud_logs_instance_name" {
   value       = module.cloud_logs.name
   description = "The name of the provisioned IBM Cloud Logs instance."