From 170a5ec0528ae48ad050ee03c5384f0047492be2 Mon Sep 17 00:00:00 2001 From: Steve McMaster Date: Fri, 25 Aug 2023 16:27:38 -0400 Subject: [PATCH] update --- .drone.star | 93 +++++++++++++++++++++++--------------------------- _lang.tf.jinja | 2 +- 2 files changed, 43 insertions(+), 52 deletions(-) diff --git a/.drone.star b/.drone.star index 314e344..ba3fc3f 100644 --- a/.drone.star +++ b/.drone.star @@ -5,21 +5,21 @@ TEMPLATES = { "_lang": { "golang": { "lang": "golang", - "versions": "1.21" + "versions": "1.21", }, "python": { "lang": "python", - "versions": "3.8,3.11" + "versions": "3.8,3.11", }, "rust": { "lang": "rust", - "versions": "1.71" - } + "versions": "1.71", + }, }, "alpine": { "alpine": { "image": "cr.smcm.xyz/coder-images/alpine", - "alpine_releases": "3.17,3.18,edge" + "alpine_releases": "3.17,3.18,edge", }, }, "android": { @@ -27,7 +27,7 @@ TEMPLATES = { "image": "cr.smcm.xyz/coder-images/android-2023.06", "coder_user_uid": "1001", "coder_user_gid": "1002", - } + }, }, "jupyter": { "jupyter-scipy-notebook": {"image": "cr.smcm.xyz/coder-images/jupyter-scipy-notebook"}, @@ -35,13 +35,13 @@ TEMPLATES = { "splunk": { "splunk": { "image": "cr.smcm.xyz/coder-images/splunk", - "splunk_versions": "8.2,9.0,9.1" + "splunk_versions": "8.2,9.0,9.1", }, }, "ubuntu": { "ubuntu": { "image": "cr.smcm.xyz/coder-images/ubuntu", - "ubuntu_releases": "20.04,22.04,23.04,23.10" + "ubuntu_releases": "20.04,22.04,23.04,23.10", }, }, } @@ -52,16 +52,7 @@ def main(ctx): "name": "default", "type": "docker", "environment": {}, - "steps": [ - { - "name": "generate templates", - "image": "alpine:edge", - "commands": [ - "echo http://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories", - "apk add jinja2-cli", - ], - }, - ], + "steps": [], "trigger": { "branch": ["main"], "event": ["push", "custom", "cron"], @@ -72,39 +63,39 @@ def main(ctx): for (coder_template, context) in TEMPLATES[jinja_template].items(): pipeline["steps"][0]["commands"].append("mkdir {name}".format(name = coder_template)) - jinja2args = " ".join([ - "-D '{key}={value}'".format(key = key, value = value) for (key, value) in context.items() - ]) - pipeline["steps"][0]["commands"].append( - "/usr/bin/jinja2 {jinja2args} {jinja_template}.tf.jinja < /dev/null > {output}".format( - jinja2args = jinja2args, - jinja_template = jinja_template, - output = "{coder_template}/main.tf".format(coder_template = coder_template), - ), - ) - - pipeline["steps"].append({ - "name": "push {coder_template}".format(coder_template = coder_template), - "image": "alpine:latest", - "environment": { - "CODER_URL": "http://coder.coder.svc.cluster.local", - "CODER_SESSION_TOKEN": { - "from_secret": "CODER_SESSION_TOKEN", + pipeline["steps"].extend([ + { + "name": "generate {coder_template}".format(coder_template = coder_template), + "image": "cr.smcm.xyz/drone-plugins/jinja2", + "settings": { + "template": "{jinja_template}.tf.jinja".format(jinja_template = jinja_template), + "context": context, + "output": "{coder_template}/main.tf".format(coder_template = coder_template), }, - "CODER_TEMPLATE_VERSION": ctx.build.commit, }, - "commands": [ - "apk add git", - "wget -q -O- {url} | tar -xzf - -C /usr/local/bin ./coder".format(url = CODER_URL), - "sleep $(( $RANDOM % 15 ))", - " || ".join([ - "coder templates push -d {name} --yes {name}".format(name = coder_template), - "coder templates create -d {name} --yes {name}".format(name = coder_template), - ]), - ], - "depends_on": [ - "generate templates", - ], - }) + { + "name": "push {coder_template}".format(coder_template = coder_template), + "image": "alpine:latest", + "environment": { + "CODER_URL": "http://coder.coder.svc.cluster.local", + "CODER_SESSION_TOKEN": { + "from_secret": "CODER_SESSION_TOKEN", + }, + "CODER_TEMPLATE_VERSION": ctx.build.commit, + }, + "commands": [ + "apk add git", + "wget -q -O- {url} | tar -xzf - -C /usr/local/bin ./coder".format(url = CODER_URL), + "sleep $(( $RANDOM % 15 ))", + " || ".join([ + "coder templates push -d {name} --yes {name}".format(name = coder_template), + "coder templates create -d {name} --yes {name}".format(name = coder_template), + ]), + ], + "depends_on": [ + "generate {coder_template}".format(coder_template = coder_template), + ], + }, + ]) - return pipeline \ No newline at end of file + return pipeline diff --git a/_lang.tf.jinja b/_lang.tf.jinja index bca0ddd..9d1c723 100644 --- a/_lang.tf.jinja +++ b/_lang.tf.jinja @@ -14,7 +14,7 @@ data "coder_parameter" "version" { name = "Latest" value = "" } - {% for version in versions.split(",") %} + {% for version in versions %} option { name = "{{ version }}" value = "-{{ version }}"