chore: (IAC-1196) resolving ssh file error

sassoftware · Oct 25, 2023 · 1fbac69 · 1fbac69
1 parent 52710b9
commit 1fbac69
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/linting-configs/.tflint.hcl b/linting-configs/.tflint.hcl
@@ -26,3 +26,14 @@ plugin "terraform" {
 rule "azurerm_kubernetes_cluster_default_node_pool_invalid_vm_size" {
   enabled = false
 }
+
+# We specify the versions and providers in the top level versions.tf.
+# This stops it from throwing a warning when scanning our modules
+# in viya4-iac-azure/modules/
+rule "terraform_required_version" {
+  enabled = false
+}
+
+rule "terraform_required_providers" {
+  enabled = false
+}
diff --git a/locals.tf b/locals.tf
@@ -4,8 +4,13 @@
 locals {
 
   # Useful flags
+  # ssh_public_key = (var.create_jump_vm || var.storage_type == "standard"
+  #   ? file(var.ssh_public_key)
+  #   : null
+  # )
+
   ssh_public_key = (var.create_jump_vm || var.storage_type == "standard"
-    ? file(var.ssh_public_key)
+    ? can(file(var.ssh_public_key)) ? file(var.ssh_public_key) : var.ssh_public_key != null ? length(var.ssh_public_key) > 0 ? var.ssh_public_key : null : null
     : null
   )
 

diff --git a/variables.tf b/variables.tf
@@ -79,7 +79,7 @@ variable "fips_enabled" {
 variable "ssh_public_key" {
   description = "A custom ssh key to control access to the AKS cluster. Changing this forces a new resource to be created."
   type        = string
-  default     = ""
+  default     = null
 }
 
 variable "default_public_access_cidrs" {