fleet object variable is causing too many issues downstream. Refactoring to be more like the other TF modules (#4)

Author: thathaneydude

README.md

@@ -61,11 +61,9 @@ health_check_allow_cidrs = ["<your preferred health check CIDR(s)>"]        // d
 mirror_ingress_allow_cidrs = ["<your preferred mirror CIDR(s)>"] // default: ["0.0.0.0/0"]
 
 // Licensing Module Provided - with Fleet (Option A)
-fleet_config = {
-  token           = "<your fleet token>"
-  url             = "https://<your-fleet-instance>:1443/fleet/v1/internal/softsensor/websocket"
-  server_ssl_name = "1.broala.fleet.product.corelight.io"
-}
+fleet_token = "<your fleet token>"
+fleet_url = "https://<your-fleet-instance>:1443/fleet/v1/internal/softsensor/websocket"
+fleet_server_sslname = "1.broala.fleet.product.corelight.io"
 
 // Licensing Module Provided - Without Fleet (Option B)
 license_key_file_path = "/path/to/license.txt"

main.tf

@@ -66,12 +66,12 @@ module "config" {
   sensor_management_interface_name = "eth1"
   sensor_monitoring_interface_name = "eth0"
 
-  fleet_token          = var.license_key_file_path == "" ? var.fleet_config.token : ""
-  fleet_url            = var.license_key_file_path == "" ? var.fleet_config.url : ""
-  fleet_server_sslname = var.license_key_file_path == "" ? var.fleet_config.server_ssl_name : ""
-  fleet_http_proxy     = var.license_key_file_path == "" ? var.fleet_config.http_proxy : ""
-  fleet_https_proxy    = var.license_key_file_path == "" ? var.fleet_config.https_proxy : ""
-  fleet_no_proxy       = var.license_key_file_path == "" ? var.fleet_config.no_proxy : ""
+  fleet_token          = var.license_key_file_path == "" ? var.fleet_token : ""
+  fleet_url            = var.license_key_file_path == "" ? var.fleet_url : ""
+  fleet_server_sslname = var.license_key_file_path == "" ? var.fleet_server_sslname : ""
+  fleet_http_proxy     = var.license_key_file_path == "" ? var.fleet_http_proxy : ""
+  fleet_https_proxy    = var.license_key_file_path == "" ? var.fleet_https_proxy : ""
+  fleet_no_proxy       = var.license_key_file_path == "" ? var.fleet_no_proxy : ""
 }
 
 module "instance" {

variables.tf

@@ -141,26 +141,43 @@ variable "iam_instance_profile_name" {
   default     = ""
 }
 
-variable "fleet_config" {
-  description = "(optional) Configuration for Fleet. This can be used in place of `license_key_file_path` for licensing the sensor"
-  type = object({
-    token           = string
-    url             = string
-    server_ssl_name = string
-    http_proxy      = string
-    https_proxy     = string
-    no_proxy        = string
-  })
-
-  sensitive = true
-  default = {
-    token           = ""
-    url             = ""
-    server_ssl_name = ""
-    http_proxy      = ""
-    https_proxy     = ""
-    no_proxy        = ""
-  }
+
+variable "fleet_token" {
+  type        = string
+  default     = ""
+  sensitive   = true
+  description = "(optional) the pairing token from the Fleet UI. Must be set if 'fleet_url' is provided"
+}
+
+variable "fleet_url" {
+  type        = string
+  default     = ""
+  description = "(optional) the URL of the fleet instance from the Fleet UI. Must be set if 'fleet_token' is provided"
+}
+
+variable "fleet_server_sslname" {
+  type        = string
+  default     = "1.broala.fleet.product.corelight.io"
+  description = "(optional) the SSL hostname for the fleet server"
+
+}
+
+variable "fleet_http_proxy" {
+  type        = string
+  default     = ""
+  description = "(optional) the proxy URL for HTTP traffic from the fleet"
+}
+
+variable "fleet_https_proxy" {
+  type        = string
+  default     = ""
+  description = "(optional) the proxy URL for HTTPS traffic from the fleet"
+}
+
+variable "fleet_no_proxy" {
+  type        = string
+  default     = ""
+  description = "(optional) hosts or domains to bypass the proxy for fleet traffic"
 }
 
 variable "egress_allow_cidrs" {