fix: address feedback

Author: Jordan-Williams2

README.md

@@ -124,7 +124,7 @@ No modules.
 | <a name="input_logs_agent_image_version"></a> [logs\_agent\_image\_version](#input\_logs\_agent\_image\_version) | The version of the Logs agent image to deploy. | `string` | `"1.5.1"` | no |
 | <a name="input_logs_agent_log_source_namespaces"></a> [logs\_agent\_log\_source\_namespaces](#input\_logs\_agent\_log\_source\_namespaces) | The list of namespaces from which logs should be forwarded by agent. If namespaces are not listed, logs from all namespaces will be sent. | `list(string)` | `[]` | no |
 | <a name="input_logs_agent_name"></a> [logs\_agent\_name](#input\_logs\_agent\_name) | The name of the Logs agent. The name is used in all Kubernetes and Helm resources in the cluster. | `string` | `"logs-agent"` | no |
-| <a name="input_logs_agent_namespace"></a> [logs\_agent\_namespace](#input\_logs\_agent\_namespace) | The namespace where the Logs agent is deployed. The default value is `ibm-agent`. | `string` | `"ibm-agent"` | no |
+| <a name="input_logs_agent_namespace"></a> [logs\_agent\_namespace](#input\_logs\_agent\_namespace) | The namespace where the Logs agent is deployed. The default value is `ibm-observe`. | `string` | `"ibm-observe"` | no |
 | <a name="input_logs_agent_resources"></a> [logs\_agent\_resources](#input\_logs\_agent\_resources) | The resources configuration for cpu/memory/storage. [Learn More](https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-agent-helm-template-clusters#agent-helm-template-clusters-chart-options-resources) | <pre>object({<br/>    limits = object({<br/>      cpu    = string<br/>      memory = string<br/>    })<br/>    requests = object({<br/>      cpu    = string<br/>      memory = string<br/>    })<br/>  })</pre> | <pre>{<br/>  "limits": {<br/>    "cpu": "500m",<br/>    "memory": "3Gi"<br/>  },<br/>  "requests": {<br/>    "cpu": "100m",<br/>    "memory": "1Gi"<br/>  }<br/>}</pre> | no |
 | <a name="input_logs_agent_selected_log_source_paths"></a> [logs\_agent\_selected\_log\_source\_paths](#input\_logs\_agent\_selected\_log\_source\_paths) | The list of specific log sources paths. Logs will only be collected from the specified log source paths. If no paths are specified, it will send logs from `/var/log/containers`. | `list(string)` | `[]` | no |
 | <a name="input_logs_agent_tolerations"></a> [logs\_agent\_tolerations](#input\_logs\_agent\_tolerations) | List of tolerations to apply to Logs agent. The default value means a pod will run on every node. | <pre>list(object({<br/>    key               = optional(string)<br/>    operator          = optional(string)<br/>    value             = optional(string)<br/>    effect            = optional(string)<br/>    tolerationSeconds = optional(number)<br/>  }))</pre> | <pre>[<br/>  {<br/>    "operator": "Exists"<br/>  }<br/>]</pre> | no |

examples/logs-agent-ocp/main.tf

@@ -15,7 +15,7 @@ module "resource_group" {
 ##############################################################################
 
 locals {
-  logs_agent_namespace = "ibm-agent"
+  logs_agent_namespace = "ibm-observe"
   logs_agent_name      = "logs-agent"
 }
 
@@ -32,7 +32,7 @@ module "trusted_profile" {
       service = "logs"
     }]
   }]
-  # Set up fine-grained authorization for `logs-agent` running in ROKS cluster in `ibm-agent` namespace.
+  # Set up fine-grained authorization for `logs-agent` running in ROKS cluster in `ibm-observe` namespace.
   trusted_profile_links = [{
     cr_type = "ROKS_SA"
     links = [{

ibm_catalog.json

@@ -30,7 +30,6 @@
           "label": "Fully Configurable",
           "name": "fully-configurable",
           "working_directory": "solutions/fully-configurable",
-          "compliance": {},
           "iam_permissions": [
             {
               "service_name": "containers-kubernetes",

solutions/fully-configurable/DA-types.md

@@ -1,6 +1,6 @@
 # Configuring Logs Agent Tolerations
 
-When you deploy the IBM Logs agent using the `terraform-ibm-logs-agent` module, you can configure the tolerations that the agent applies to its pods by using the `logs_agent_tolerations` variable. This variable allows you to specify tolerations for scheduling the logs agent pods on nodes with specific taints.
+When you deploy the IBM Logs agent using `Cloud automation for Logs agent`, you can configure the tolerations that the agent applies to its pods by using the `logs_agent_tolerations` variable. This variable allows you to specify tolerations for scheduling the logs agent pods on nodes with specific taints.
 
 ### Options for `logs_agent_tolerations`
 - `key` (optional): The taint key that the toleration applies to.
@@ -39,7 +39,7 @@ The `logs_agent_tolerations` variable is used to configure the tolerations for t
 
 # Configuring Logs Agent Additional Metadata
 
-When you deploy the IBM logs agent using the `terraform-ibm-logs-agent` module, you can configure additional metadata fields to be added to the routed logs by using the `logs_agent_additional_metadata` variable. This variable allows you to specify key-value pairs of metadata that will be included in the logs.
+When you deploy the IBM logs agent using `Cloud automation for Logs agent`, you can configure additional metadata fields to be added to the routed logs by using the `logs_agent_additional_metadata` variable. This variable allows you to specify key-value pairs of metadata that will be included in the logs.
 
 ### Options for `logs_agent_additional_metadata`
 - `key` (optional): The metadata key to add to the logs.
@@ -74,7 +74,7 @@ The `logs_agent_additional_metadata` variable is used to configure additional me
 
 # Configuring Logs Agent Resources
 
-When you deploy the IBM Logs agent using the `terraform-ibm-logs-agent` module, you can configure the resource requests and limits for the logs agent pods by using the `logs_agent_resources` variable. This variable allows you to specify the CPU and memory resources allocated to the logs agent. [Learn More](https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-agent-helm-template-clusters#agent-helm-template-clusters-chart-options-resources).
+When you deploy the IBM Logs agent using `Cloud automation for Logs agent`, you can configure the resource requests and limits for the logs agent pods by using the `logs_agent_resources` variable. This variable allows you to specify the CPU and memory resources allocated to the logs agent. [Learn More](https://cloud.ibm.com/docs/cloud-logs?topic=cloud-logs-agent-helm-template-clusters#agent-helm-template-clusters-chart-options-resources).
 
 ### Options for `logs_agent_resources`
 - `requests` (optional): Specifies the minimum amount of resources required. Includes:

solutions/fully-configurable/variables.tf

@@ -21,7 +21,7 @@ variable "cluster_resource_group_id" {
 variable "cluster_config_endpoint_type" {
   description = "Specify the type of endpoint to use to access the cluster configuration. Possible values: `default`, `private`, `vpe`, `link`. The `default` value uses the default endpoint of the cluster."
   type        = string
-  default     = "private"
+  default     = "default"
   nullable    = false # use default if null is passed in
 }
 
@@ -84,15 +84,19 @@ variable "logs_agent_name" {
 
 variable "logs_agent_namespace" {
   type        = string
-  description = "The namespace where the Logs agent is deployed. The default value is `ibm-agent`."
-  default     = "ibm-agent"
+  description = "The namespace where the Logs agent is deployed. The default value is `ibm-observe`."
+  default     = "ibm-observe"
   nullable    = false
 }
 
 variable "logs_agent_trusted_profile_id" {
   type        = string
   description = "The IBM Cloud trusted profile ID. Used only when `logs_agent_iam_mode` is set to `TrustedProfile`. The trusted profile must have an IBM Cloud Logs `Sender` role. Must provide a value for `logs_agent_iam_api_key` if `logs_agent_trusted_profile_id` is null."
   default     = null
+  validation {
+    condition     = !(var.logs_agent_iam_mode == "TrustedProfile" && var.logs_agent_trusted_profile_id == null)
+    error_message = "The `logs_agent_trusted_profile_id` is required when `logs_agent_iam_mode` is set to `TrustedProfile`."
+  }
 }
 
 variable "logs_agent_iam_api_key" {

tests/resources/main.tf

@@ -84,7 +84,7 @@ module "ocp_base" {
   vpc_subnets                         = local.cluster_vpc_subnets
   worker_pools                        = local.worker_pools
   access_tags                         = []
-  disable_outbound_traffic_protection = true # set as True to enable outbound traffic
+  disable_outbound_traffic_protection = false
 }
 
 ##############################################################################
@@ -165,7 +165,7 @@ module "cloud_logs" {
 ##############################################################################
 
 locals {
-  logs_agent_namespace = "ibm-agent"
+  logs_agent_namespace = "ibm-observe"
   logs_agent_name      = "logs-agent"
 }
 
@@ -181,7 +181,7 @@ module "trusted_profile" {
       service = "logs"
     }]
   }]
-  # Set up fine-grained authorization for `logs-agent` running in ROKS cluster in `ibm-agent` namespace.
+  # Set up fine-grained authorization for `logs-agent` running in ROKS cluster in `ibm-observe` namespace.
   trusted_profile_links = [{
     cr_type = "ROKS_SA"
     links = [{

variables.tf

@@ -92,8 +92,8 @@ variable "logs_agent_name" {
 
 variable "logs_agent_namespace" {
   type        = string
-  description = "The namespace where the Logs agent is deployed. The default value is `ibm-agent`."
-  default     = "ibm-agent"
+  description = "The namespace where the Logs agent is deployed. The default value is `ibm-observe`."
+  default     = "ibm-observe"
   nullable    = false
 }