Merge pull request #5 from utilitywarehouse/versions

Merge application and terraform module versions

Author: george-angel

README.md

@@ -33,3 +33,9 @@ example Systemd service: [./terraform/resources/ssh-key-agent.service](./terrafo
 
 Repository includes a terraform module, for use instructions have a look at
 [./terraform/README.md](./terraform/README.md)
+
+### releasing
+
+Before creating a tag / release in Github, please update the Docker image
+reference in
+[./terraform/variables.tf](./terraform/variables.tf)

terraform/README.md

@@ -19,7 +19,6 @@ module "ssh_key_agent" {
     "[email protected]"
   ]
 
-  ssh_key_agent_version = "1.0.4"
   uri                   = "https://s3-eu-west-1.amazonaws.com/example-keys-cache/authmap"
 }
 ```

terraform/main.tf

@@ -1,15 +1,11 @@
-data "template_file" "ssh-key-agent" {
-  template = "${file("${path.module}/resources/ssh-key-agent.service")}"
-
-  vars = {
-    uri     = var.uri
-    groups  = "${join(",", var.groups)}"
-    version = var.ssh_key_agent_version
-  }
-}
-
 data "ignition_systemd_unit" "ssh-key-agent" {
   name    = "ssh-key-agent.service"
   enabled = var.enabled
-  content = data.template_file.ssh-key-agent.rendered
+  content = templatefile("${path.module}/resources/ssh-key-agent.service",
+    {
+      uri     = var.uri
+      groups  = "${join(",", var.groups)}"
+      version = var.docker_image_version
+    }
+  )
 }

terraform/outputs.tf

@@ -1,7 +1,3 @@
 output "id" {
   value = data.ignition_systemd_unit.ssh-key-agent.id
 }
-
-output "template_rendered" {
-  value = data.template_file.ssh-key-agent.rendered
-}

terraform/variables.tf

@@ -8,8 +8,9 @@ variable "groups" {
   description = "A list of allowed google groups"
 }
 
-variable "ssh_key_agent_version" {
+variable "docker_image_version" {
   type        = string
+  default     = "1.0.6"
   description = "The ssh-key-agent version"
 }
 

terraform/versions.tf

@@ -3,9 +3,6 @@ terraform {
     ignition = {
       source = "terraform-providers/ignition"
     }
-    template = {
-      source = "hashicorp/template"
-    }
   }
   required_version = ">= 0.13"
 }