From a600a20b7dc57ccb57f7df714b73a11e0512bbca Mon Sep 17 00:00:00 2001
From: Matthew Stobbs <matthew@stobbs.ca>
Date: Fri, 24 Jan 2025 16:43:28 -0700
Subject: [PATCH] workaround broken home tap package installation

---
 tasks/main.yml           | 17 +++++++++++++++--
 tasks/pkgs/consul.yml    |  2 +-
 tasks/pkgs/nomad.yml     |  2 +-
 tasks/pkgs/packer.yml    |  2 +-
 tasks/pkgs/terraform.yml |  2 +-
 tasks/pkgs/vault.yml     |  2 +-
 vars/main.yml            |  1 +
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/tasks/main.yml b/tasks/main.yml
index fe737c5..1a4c863 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -9,7 +9,7 @@
     - config
     - packages
 
-- name: upgrade linux packages
+- name: upgrade all packages
   block:
     - ansible.builtin.dnf:
         name: "*"
@@ -19,6 +19,10 @@
         name: "*"
         state: latest
       when: ansible_os_family == 'Debian'
+    - community.general.homebrew:
+        name: "*"
+        state: latest
+      when: ansible_os_family == 'Darwin'
   become: true
   when: full_upgrade
 
@@ -49,8 +53,10 @@
         state: present
       when: brewtaps|length > 0
 
+    - debug:
+        var: syspkgs
     - community.general.homebrew:
-        name: "{{ syspkgs | unique }}"
+        name: "{{ syspkgs }}"
         state: "{{ install_state }}"
       when: syspkgs|length > 0
    
@@ -58,6 +64,13 @@
         name: "{{ caskpkgs | unique }}"
         state: "{{ install_state }}"
       when: caskpkgs|length > 0
+
+    - name: workaround to install homebrew taps
+      ansible.builtin.command:
+        cmd: "brew install {{ tappkg }}"
+      loop: "{{ tappkgs }}"
+      loop_control:
+        loop_var: tappkg
   tags:
     - packages
     - Darwin
diff --git a/tasks/pkgs/consul.yml b/tasks/pkgs/consul.yml
index 531f6bb..9ab84dc 100644
--- a/tasks/pkgs/consul.yml
+++ b/tasks/pkgs/consul.yml
@@ -9,4 +9,4 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ syspkgs + [ _hashicorp.consul[ansible_os_family] ] }}"
+    tappkgs: "{{ tappkgs + [ _hashicorp.consul[ansible_os_family] ] }}"
diff --git a/tasks/pkgs/nomad.yml b/tasks/pkgs/nomad.yml
index 7546d9a..98d975e 100644
--- a/tasks/pkgs/nomad.yml
+++ b/tasks/pkgs/nomad.yml
@@ -9,5 +9,5 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ syspkgs + [ _hashicorp.nomad[ansible_system] ] }}"
+    tappkgs: "{{ tappkgs + [ _hashicorp.nomad[ansible_system] ] }}"
 
diff --git a/tasks/pkgs/packer.yml b/tasks/pkgs/packer.yml
index 65c2e4c..fb0e994 100644
--- a/tasks/pkgs/packer.yml
+++ b/tasks/pkgs/packer.yml
@@ -9,4 +9,4 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ syspkgs + [ _hashicorp.packer[ansible_system] ] }}"
+    tappkgs: "{{ tappkgs + [ _hashicorp.packer[ansible_system] ] }}"
diff --git a/tasks/pkgs/terraform.yml b/tasks/pkgs/terraform.yml
index 2304641..93592cd 100644
--- a/tasks/pkgs/terraform.yml
+++ b/tasks/pkgs/terraform.yml
@@ -9,4 +9,4 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ syspkgs + [ _hashicorp.terraform[ansible_system] ] }}"
+    tappkgs: "{{ tappkgs + [ _hashicorp.terraform[ansible_system] ] }}"
diff --git a/tasks/pkgs/vault.yml b/tasks/pkgs/vault.yml
index 2edbb0b..47490a7 100644
--- a/tasks/pkgs/vault.yml
+++ b/tasks/pkgs/vault.yml
@@ -10,4 +10,4 @@
 
 - name: append to pkgs
   set_fact:
-    syspkgs: "{{ syspkgs + [ _hashicorp.vault[ansible_system] ] }}"
+    tappkgs: "{{ tappkgs + [ _hashicorp.vault[ansible_system] ] }}"
diff --git a/vars/main.yml b/vars/main.yml
index 6834a21..ab77f7e 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -14,3 +14,4 @@ packages: []
 pipxpkgs: []
 srcpkgs: []
 syspkgs: []
+tappkgs: []