Merge pull request #9 from dnks0/feature/dbx-proxy

* fix docker setup for lower range ports
* updated test setup
* removed terraform warnings
* added validation for dbx-proxy-image-version

Author: dnks0

.gitignore

@@ -35,5 +35,5 @@ dist
 # terraform files
 **/.terraform/
 **/.terraform.lock.hcl
-**/terraform.tfstate
-**/terraform.tfstate.backup
+**/terraform*.tfstate
+**/terraform*.backup

terraform/aws/modules/proxy/ec2.tf

@@ -142,7 +142,6 @@ resource "aws_autoscaling_group" "this" {
 
   instance_refresh {
     strategy = "Rolling"
-    triggers = ["launch_template"]
 
     preferences {
       # With desired=max=1, allowing downtime lets the ASG replace the single instance

terraform/aws/modules/proxy/local.tf

@@ -73,5 +73,4 @@ locals {
       ],
     ]
   }
-
 }

terraform/aws/provider.tf

@@ -14,10 +14,6 @@ terraform {
   }
 }
 
-provider "random" {}
-
-provider "cloudinit" {}
-
 provider "aws" {
   # authentication configured via env!
   region = var.region

terraform/common/local.tf

@@ -8,5 +8,6 @@ locals {
   docker_compose_yaml = templatefile("${path.module}/templates/docker-compose.yaml.tpl", {
     dbx_proxy_image_version = var.dbx_proxy_image_version
     dbx_proxy_health_port   = var.dbx_proxy_health_port
+    dbx_proxy_listener      = var.dbx_proxy_listener
   })
 }

terraform/common/templates/docker-compose.yaml.tpl

@@ -6,10 +6,15 @@ services:
       - NET_BIND_SERVICE
     environment:
       - DBX_PROXY_HEALTH_PORT=${dbx_proxy_health_port}
+    ports:
+      - "${dbx_proxy_health_port}:${dbx_proxy_health_port}"
+%{ for listener in dbx_proxy_listener ~}
+      - "${listener.port}:${listener.port}"
+%{ endfor ~}
     volumes:
       - /dbx-proxy/conf:/dbx-proxy/conf:rw
       - dbx-proxy-run:/dbx-proxy/run
-    network_mode: "host"
+
     restart: unless-stopped
 
 volumes:

terraform/common/variables.tf

@@ -1,6 +1,14 @@
 variable "dbx_proxy_image_version" {
   description = "Docker image version for dbx-proxy."
   type        = string
+  validation {
+    condition = (
+        var.dbx_proxy_image_version == "latest"
+        || can(regex("^[0-9]+\\.[0-9]+\\.[0-9]+$", var.dbx_proxy_image_version))
+        || can(regex("^[0-9a-f]{7,40}$", lower(var.dbx_proxy_image_version)))
+    )
+    error_message = "dbx_proxy_image_version must be a real image tag: semver (e.g., 0.1.1), (short)git hash, or \"latest\"."
+  }
 }
 
 variable "dbx_proxy_health_port" {

tests/docker/docker-compose.yaml

@@ -7,7 +7,7 @@ services:
     working_dir: /tmp/common
     volumes:
       - ../../terraform/common:/workspace/common:ro
-      - ./render-config/terraform.tfvars:/workspace/terraform.tfvars:ro
+      - ./render-config/.tfvars:/workspace/.tfvars:ro
       - conf:/out
     entrypoint:
       - /bin/sh
@@ -18,7 +18,7 @@ services:
         cp -R /workspace/common /tmp/common
         cd /tmp/common
         terraform init -backend=false -input=false
-        terraform plan -refresh=false -input=false -var-file=/workspace/terraform.tfvars -out=/tmp/plan.tfplan
+        terraform plan -refresh=false -input=false -var-file=/workspace/.tfvars -out=/tmp/plan.tfplan
         # Write atomically so other containers don't observe a partially-written file.
         terraform show -json /tmp/plan.tfplan | jq -r '.planned_values.outputs.dbx_proxy_cfg.value' > /out/dbx-proxy.cfg.tmp
         mv /out/dbx-proxy.cfg.tmp /out/dbx-proxy.cfg

…ts/docker/render-config/terraform.tfvars tests/docker/render-config/.tfvarstests/docker/render-config/terraform.tfvars renamed to tests/docker/render-config/.tfvars tests/docker/render-config/terraform.tfvars renamed to tests/docker/render-config/.tfvars

@@ -1,4 +1,4 @@
-dbx_proxy_image_version = "test"
+dbx_proxy_image_version = "latest"
 dbx_proxy_health_port   = 8080
 dbx_proxy_max_connections = 8192
 dbx_proxy_listener = [