From 212b0ce9f5968afcad4b198634f1d0d0e977b607 Mon Sep 17 00:00:00 2001 From: Steve McMaster Date: Thu, 30 Nov 2023 19:32:17 -0500 Subject: [PATCH] Refactor --- .drone.star | 9 +-- _distro.tf.j2 | 28 +++++++++ _distro.tf.jinja | 60 ------------------- _lang.tf.jinja => _lang.tf.j2 | 2 +- alpine.tf.jinja => alpine.tf.j2 | 2 +- android.tf.jinja => android.tf.j2 | 2 +- argocd.tf.jinja => argocd.tf.j2 | 2 +- base.tf.jinja => base.tf.j2 | 37 +++++++++++- jupyter.tf.jinja => jupyter.tf.j2 | 2 +- proxychains.tf.jinja => proxychains.tf.j2 | 2 +- splunk.tf.jinja => splunk.tf.j2 | 7 +-- ...ne_aports.tf.jinja => alpine_aports.sh.j2} | 0 .../{gcloud.tf.jinja => gcloud.sh.j2} | 0 startup_scripts/splunk_ansible.sh.j2 | 2 + .../{terraform.tf.jinja => terraform.sh.j2} | 0 terraform.tf.jinja => terraform.tf.j2 | 2 +- ubuntu.tf.jinja => ubuntu.tf.j2 | 2 +- 17 files changed, 80 insertions(+), 79 deletions(-) create mode 100644 _distro.tf.j2 delete mode 100644 _distro.tf.jinja rename _lang.tf.jinja => _lang.tf.j2 (96%) rename alpine.tf.jinja => alpine.tf.j2 (98%) rename android.tf.jinja => android.tf.j2 (96%) rename argocd.tf.jinja => argocd.tf.j2 (92%) rename base.tf.jinja => base.tf.j2 (91%) rename jupyter.tf.jinja => jupyter.tf.j2 (96%) rename proxychains.tf.jinja => proxychains.tf.j2 (93%) rename splunk.tf.jinja => splunk.tf.j2 (87%) rename startup_scripts/{alpine_aports.tf.jinja => alpine_aports.sh.j2} (100%) rename startup_scripts/{gcloud.tf.jinja => gcloud.sh.j2} (100%) create mode 100644 startup_scripts/splunk_ansible.sh.j2 rename startup_scripts/{terraform.tf.jinja => terraform.sh.j2} (100%) rename terraform.tf.jinja => terraform.tf.j2 (94%) rename ubuntu.tf.jinja => ubuntu.tf.j2 (96%) diff --git a/.drone.star b/.drone.star index e458711..d9c2b14 100644 --- a/.drone.star +++ b/.drone.star @@ -13,7 +13,7 @@ TEMPLATES = { "distro_package_manager": "apk", "distro_releases": ["edge"], "image": "cr.smcm.xyz/coder-images/alpine", - "startup_scripts": ["startup_scripts/alpine_aports.tf.jinja"], + "startup_scripts": ["alpine_aports"], }, "gcloud-terraform": { "distro_name": "Ubuntu Linux", @@ -21,7 +21,7 @@ TEMPLATES = { "distro_package_manager": "apk", "distro_releases": ["20.04", "22.04", "23.04", "23.10"], "image": "cr.smcm.xyz/coder-images/ubuntu", - "startup_scripts": ["startup_scripts/gcloud.tf.jinja", "startup_scripts/terraform.tf.jinja"], + "startup_scripts": ["gcloud", "terraform"], }, "ubuntu": { "distro_name": "Ubuntu Linux", @@ -115,7 +115,8 @@ TEMPLATES = { "coder_user_home": "/opt/splunk/etc", "coder_user_uid": "41812", "coder_user_gid": "41812", - "vs_code_root": "/opt/splunk" + "vs_code_root": "/opt/splunk", + "startup_scripts": ["splunk_ansible"] }, }, "terraform": { @@ -146,7 +147,7 @@ def main(ctx): "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), + "template": "{jinja_template}.tf.j2".format(jinja_template = jinja_template), "context": context, "output": "{coder_template}/main.tf".format(coder_template = coder_template), }, diff --git a/_distro.tf.j2 b/_distro.tf.j2 new file mode 100644 index 0000000..bc97a6b --- /dev/null +++ b/_distro.tf.j2 @@ -0,0 +1,28 @@ +{% extends "base.tf.j2" %} + +{% block parameters %} +{{ super() }} + +data "coder_parameter" "distro_release" { + name = "{{ distro_name }} Release" + description = "{{ distro_name }} Release" + type = "string" + default = "" + + mutable = true + option { + name = "Latest" + value = "" + } + {% for version in distro_releases %} + option { + name = "{{ version }}" + value = "-{{ version }}" + } + {% endfor %} +} +{% endblock %} + +{% block kubernetes_pod_main_image %} + image = "{{image}}${data.coder_parameter.distro_release.value}:latest" +{% endblock %} \ No newline at end of file diff --git a/_distro.tf.jinja b/_distro.tf.jinja deleted file mode 100644 index 050f1eb..0000000 --- a/_distro.tf.jinja +++ /dev/null @@ -1,60 +0,0 @@ -{% extends "base.tf.jinja" %} - -{% block parameters %} -{{ super() }} - -data "coder_parameter" "distro_release" { - name = "{{ distro_name }} Release" - description = "{{ distro_name }} Release" - type = "string" - default = "" - - mutable = true - option { - name = "Latest" - value = "" - } - {% for version in distro_releases %} - option { - name = "{{ version }}" - value = "-{{ version }}" - } - {% endfor %} -} -{% endblock %} - -{% block kubernetes_pod_main_image %} - image = "{{image}}${data.coder_parameter.distro_release.value}:latest" -{% endblock %} - -{% block post_startup_script_setup_home %} - {% if startup_scripts %} - {% for startup_script in startup_scripts %} - ### - # Begin {startup_script} - ### - - {% include startup_script %} - - ### - # End {startup_script} - ### - {% endfor %} - {% endif %} -{% endblock %} - -{% block startup_script_install_packages %} - {% if distro_package_manager == "apt" %} - sudo apt update - - {% if packages_to_install is defined %} - sudo apt install {{ packages_to_install | join(" ") }} - {% endif %} - {% elif distro_package_manager == "apk" %} - sudo apk update - - {% if packages_to_install is defined %} - sudo apk add {{ packages_to_install | join(" ") }} - {% endif %} - {% endif %} -{% endblock %} \ No newline at end of file diff --git a/_lang.tf.jinja b/_lang.tf.j2 similarity index 96% rename from _lang.tf.jinja rename to _lang.tf.j2 index 6bfd949..26e3de0 100644 --- a/_lang.tf.jinja +++ b/_lang.tf.j2 @@ -1,4 +1,4 @@ -{% extends "base.tf.jinja" %} +{% extends "base.tf.j2" %} {% block parameters %} {{ super() }} diff --git a/alpine.tf.jinja b/alpine.tf.j2 similarity index 98% rename from alpine.tf.jinja rename to alpine.tf.j2 index 5a5bcb5..4d624ec 100644 --- a/alpine.tf.jinja +++ b/alpine.tf.j2 @@ -1,4 +1,4 @@ -{% extends "base.tf.jinja" %} +{% extends "base.tf.j2" %} {% if feature_flags is not defined %} {% set feature_flags = {} %} diff --git a/android.tf.jinja b/android.tf.j2 similarity index 96% rename from android.tf.jinja rename to android.tf.j2 index cebbe0a..2f8bf2c 100644 --- a/android.tf.jinja +++ b/android.tf.j2 @@ -1,4 +1,4 @@ -{% extends "base.tf.jinja" %} +{% extends "base.tf.j2" %} {% set vs_code_root = "/home/circleci/project" %} diff --git a/argocd.tf.jinja b/argocd.tf.j2 similarity index 92% rename from argocd.tf.jinja rename to argocd.tf.j2 index 0498fb6..01d97a9 100644 --- a/argocd.tf.jinja +++ b/argocd.tf.j2 @@ -1,4 +1,4 @@ -{% extends "base.tf.jinja" %} +{% extends "base.tf.j2" %} {% block post_startup_script_setup_home %} [ -d "argocd" ] || mkdir argocd diff --git a/base.tf.jinja b/base.tf.j2 similarity index 91% rename from base.tf.jinja rename to base.tf.j2 index 8a143b7..9e499f9 100644 --- a/base.tf.jinja +++ b/base.tf.j2 @@ -171,7 +171,22 @@ resource "coder_agent" "main" { {% endblock %} {% block startup_script_install_packages %} - {% endblock %} + {% if packages_to_install %} + {% if distro_package_manager == "apt" %} + sudo apt update + sudo apt -y install \ + {% for package in packages_to_install %} + {{package}}{{ " \\" if not loop.last else "" }} + {% endfor %} + {% elif distro_package_manager == "apk" %} + sudo apk update + sudo apk add \ + {% for package in packages_to_install %} + {{package}}{{ " \\" if not loop.last else "" }} + {% endfor %} + {% endif %} + {% endif %} + {% endblock %}+ {% block post_startup_script_install_packages %} {% endblock %} @@ -243,6 +258,26 @@ resource "coder_app" "code-server" { {% block coder_apps %} {% endblock %} +{% block coder_scripts %} +{% if startup_scripts %} +{% for startup_script in startup_scripts %} +resource "coder_script" "{{ startup_script }}" { + agent_id = coder_agent.main.id + display_name = "{{ startup_script }}" + script = <