From ed3cc1d5609db00b34e4006f1b14dbcccd24243d Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <matthew@stobbs.ca>
Date: Thu, 20 Mar 2025 22:41:16 -0600
Subject: [PATCH] fix alpine packages

- update terraform package version
---
 tasks/config/terraform.yml   |  2 +-
 tasks/config/terraformls.yml | 20 +++++++++++++++++++-
 tasks/linux.yml              |  6 ------
 tasks/pkgs/terraform.yml     | 14 +++++++++++---
 tasks/pkgs/terraformls.yml   | 14 +++++++++++---
 vars/pkgs/libreoffice.yml    |  2 ++
 vars/pkgs/neovim.yml         |  2 +-
 vars/pkgs/terraform.yml      |  4 ++--
 vars/pkgs/terraformls.yml    |  5 +++++
 9 files changed, 52 insertions(+), 17 deletions(-)

diff --git a/tasks/config/terraform.yml b/tasks/config/terraform.yml
index 129d2d7..fd573ea 100644
--- a/tasks/config/terraform.yml
+++ b/tasks/config/terraform.yml
@@ -15,5 +15,5 @@
   ansible.builtin.set_fact:
     terraform:
       method: "{{ terraform.method }}"
-      url: "{{ pkgconfig.terraform.archive.baseurl }}/terraform/{{ pkgconfig.terraform.version }}"
+      url: "{{ pkgconfig.terraform.archive.baseurl }}/{{ pkgconfig.terraform.version }}"
       file: "terraform_{{ pkgconfig.terraform.version }}_linux_amd64.zip"
diff --git a/tasks/config/terraformls.yml b/tasks/config/terraformls.yml
index 4389106..df3aef8 100644
--- a/tasks/config/terraformls.yml
+++ b/tasks/config/terraformls.yml
@@ -1,4 +1,22 @@
-- name: Set terraformls config
+# vim: set filetype=yaml.ansible :
+---
+- name: Set terraformls install method
   ansible.builtin.set_fact:
     terraformls:
+      method: "{{ pkgconfig.terraformls.method[ansible_os_family] | default(pkgconfig.terraformls.method.default) }}"
+
+- name: Set terraformls config
+  when:
+    - terraform.method == 'sys'
+  ansible.builtin.set_fact:
+    terraformls:
+      method: "{{ terraformls.method }}"
       pkgs: "{{ pkgconfig.terraformls.pkgs[ansible_system] }}"
+
+- name: Set terraformls config
+  when:
+    - terraform.method == 'gosrc'
+  ansible.builtin.set_fact:
+    terraformls:
+      method: "{{ terraformls.method }}"
+      gopkg: "{{ pkgconfig.terraformls.gobase }}@{{ pkgconfig.terraformls.version }}"
diff --git a/tasks/linux.yml b/tasks/linux.yml
index 00c0379..43124a0 100644
--- a/tasks/linux.yml
+++ b/tasks/linux.yml
@@ -23,12 +23,6 @@
         - pkg_flatpak|length > 0
       become: "{{ ext_become }}"
       block:
-        - name: Debug flatpak
-          loop: "{{ pkg_flatpak | unique }}"
-          loop_control:
-            loop_var: flatpak
-          ansible.builtin.debug:
-            var: flatpak
         - name: Install flatpak
           loop: "{{ pkg_flatpak | unique }}"
           loop_control:
diff --git a/tasks/pkgs/terraform.yml b/tasks/pkgs/terraform.yml
index b31aebf..c4811c0 100644
--- a/tasks/pkgs/terraform.yml
+++ b/tasks/pkgs/terraform.yml
@@ -9,6 +9,8 @@
         file: config/terraform.yml
 
     - name: Append terraform
+      when:
+        - terraform.method == 'sys'
       block:
         - name: Append terraform to pkg_tap
           when:
@@ -28,6 +30,12 @@
           ansible.builtin.set_fact:
             pkg_sys: "{{ pkg_sys + terraform.pkgs }}"
 
-        - name: Set terraform_configured
-          ansible.builtin.set_fact:
-            terraform_configured: true
+    - name: Append terraform to pkg_archive
+      when:
+        - terraform.method == 'archive'
+      ansible.builtin.set_fact:
+        pkg_archive: "{{ pkg_archive + ['terraform'] }}"
+
+    - name: Set terraform_configured
+      ansible.builtin.set_fact:
+        terraform_configured: true
diff --git a/tasks/pkgs/terraformls.yml b/tasks/pkgs/terraformls.yml
index 7073ed8..c7e8743 100644
--- a/tasks/pkgs/terraformls.yml
+++ b/tasks/pkgs/terraformls.yml
@@ -9,6 +9,8 @@
         file: config/terraformls.yml
 
     - name: Append terraformls
+      when:
+        - terraformls.method == 'sys'
       block:
         - name: Append terraformls to pkg_tap
           when:
@@ -28,6 +30,12 @@
           ansible.builtin.set_fact:
             pkg_sys: "{{ pkg_sys + terraformls.pkgs }}"
 
-        - name: Set terraformls_configured
-          ansible.builtin.set_fact:
-            terraformls_configured: true
+    - name: Append terraformls to pkg_go
+      when:
+        - terraform.method == 'gosrc'
+      ansible.builtin.set_fact:
+        pkg_go: "{{ pkg_go + [terraformls.gopkg] }}"
+
+    - name: Set terraformls_configured
+      ansible.builtin.set_fact:
+        terraformls_configured: true
diff --git a/vars/pkgs/libreoffice.yml b/vars/pkgs/libreoffice.yml
index 70fa673..ba76634 100644
--- a/vars/pkgs/libreoffice.yml
+++ b/vars/pkgs/libreoffice.yml
@@ -15,3 +15,5 @@ libreoffice:
       - libreoffice
     Darwin:
       - libreoffice
+    Alpine:
+      - libreoffice
diff --git a/vars/pkgs/neovim.yml b/vars/pkgs/neovim.yml
index d47fe27..893923d 100644
--- a/vars/pkgs/neovim.yml
+++ b/vars/pkgs/neovim.yml
@@ -67,7 +67,7 @@ neovim:
       - cmake
       - coreutils
       - curl
-      - gettext-tiny-dev
+      - gettext-dev
   build_installed_files:
     - share/man/man1/nvim.1
     - share/nvim/runtime/lua/jit/bc.lua
diff --git a/vars/pkgs/terraform.yml b/vars/pkgs/terraform.yml
index a60bca3..1b80f8c 100644
--- a/vars/pkgs/terraform.yml
+++ b/vars/pkgs/terraform.yml
@@ -1,7 +1,7 @@
 terraform:
-  version: 1.11.1
+  version: 1.11.2
   archive:
-    baseurl: https://releases.hashicorp.com
+    baseurl: https://releases.hashicorp.com/terraform
   method:
     default: sys
     Alpine: archive
diff --git a/vars/pkgs/terraformls.yml b/vars/pkgs/terraformls.yml
index 57999c4..a3ecef0 100644
--- a/vars/pkgs/terraformls.yml
+++ b/vars/pkgs/terraformls.yml
@@ -1,4 +1,9 @@
 terraformls:
+  version: v0.36.4
+  gobase: github.com/hashicorp/terraform-ls
+  method:
+    default: sys
+    Alpine: gosrc
   pkgs:
     Linux:
       - terraform-ls