From a3a673e9fc058378b078fecc4a9e6c69b5feb776 Mon Sep 17 00:00:00 2001 From: Anthony Zawacki Date: Fri, 15 Sep 2023 12:01:58 -0400 Subject: [PATCH] Ensure all input variables have types specified. --- outputs.tf | 2 ++ variables.tf | 42 +++++++++++++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/outputs.tf b/outputs.tf index dee8bf4..b0c6e23 100644 --- a/outputs.tf +++ b/outputs.tf @@ -1,5 +1,6 @@ output "public_endpoint" { + description = "The public endpoint to use to access kiali" value = { hostname = local.public_hostname port_number = local.public_port_number @@ -8,6 +9,7 @@ output "public_endpoint" { } output "internal_endpoint" { + description = "The internal endpoint to use to access kiali" value = { hostname = local.internal_hostname port_number = local.internal_port_number diff --git a/variables.tf b/variables.tf index ec41901..b90d012 100644 --- a/variables.tf +++ b/variables.tf @@ -1,18 +1,22 @@ variable "profile" { description = "The AWS_PROFILE to use while running the scripts." + type = string default = "" } variable "cluster_name" { description = "The name of the cluster into which the tools are deployed." + type = string } variable "cluster_domain" { description = "The domain name used to reference ingresses for the cluster" + type = string } variable "namespace" { description = "The namespace to create and into which the tools are deployed." + type = string default = "istio-tools" } @@ -24,64 +28,78 @@ variable "create_namespace" { variable "istio_namespace" { description = "The namespace where istio has been deployed." + type = string default = "istio-system" } variable "operators_namespace" { description = "The namespace into which all operators are to be deployed." + type = string } variable "keycloak_namespace" { description = "The namespace holding the keycloak instance." - default = null + type = string + default = "" } variable "grafana_namespace" { description = "The namespace holding the grafana instance, used to look up the grafana password." + type = string } variable "grafana_secret_name" { description = "The secret in the holding the grafana admin password." + type = string } variable "grafana_public_url" { description = "The URL incoming traffic from outisde the cluster uses to access grafana." + type = string } variable "grafana_internal_url" { description = "The url within the cluster to use to access grafana." + type = string } variable "prometheus_internal_url" { description = "The url within the cluster to use to query the prometheus server." + type = string } variable "jaeger_internal_url" { description = "The url within the cluster to use to query the jaegertracing." + type = string } variable "sso_client_id" { description = "The client id to use for SSO" - default = null + type = string + default = "" } variable "sso_client_secret" { description = "The secret associated with the sso_client_id" - default = null + type = string + default = "" } variable "keycloak_public_url" { description = "The hostname used with the cluster domain to access keycloak" - default = null + type = string + default = "" } variable "keycloak_realm" { description = "The existing keycloak realm in which the client should be created" - default = null + type = string + default = "" } variable "public_hostname" { description = "The hostname to use for kiali that will be publicly available" + type = string default = "kiali" } @@ -95,6 +113,7 @@ variable "certificate_issuer" { # helm search repo kiali/kiali-operator variable "kiali_operator_version" { description = "The version of kiali to install" + type = string default = "1.73.0" } @@ -102,25 +121,30 @@ variable "kiali_operator_version" { # helm show values kiali/kiali-operator | grep tag: variable "kiali_application_version" { description = "The version of kiali to install" + type = string default = "v1.73.0" } variable "gogatekeeper_chart_version" { description = "When SSO information is supplied, use this gogatekeeper chart version to protect kiali/jaeger" - default = null + type = string + default = "" } variable "gogatekeeper_registry" { description = "When SSO information is supplied, use gogatekeeper in this registry to protect kiali/jaeger" - default = null + type = string + default = "" } variable "gogatekeeper_repository" { description = "When SSO information is supplied, use gogatekeeper in this repository to protect kiali/jaeger" - default = null + type = string + default = "" } variable "gogatekeeper_tag" { description = "When SSO information is supplied, use gogatekeeper with this tag to protect kiali/jaeger" - default = null + type = string + default = "" }