From fbd2a0e5bc794f328ebcdadf22998e273f82fff6 Mon Sep 17 00:00:00 2001 From: Lucas Pinheiro Date: Tue, 1 Apr 2025 07:54:23 -0300 Subject: [PATCH 1/8] release: bump version to v0.5.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6066731..55c2ad0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "aws-semaphore-agent", - "version": "0.4.2", + "version": "0.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "aws-semaphore-agent", - "version": "0.4.2", + "version": "0.5.0", "dependencies": { "aws-cdk": "^2.164.1", "aws-cdk-lib": "^2.164.1", diff --git a/package.json b/package.json index 0a1e658..837ba03 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "aws-semaphore-agent", - "version": "0.4.2", + "version": "0.5.0", "bin": { "aws-semaphore-agent": "bin/aws-semaphore-agent.js" }, From eb542b10c144ac61c4ba00ac3b763a114d67cc7f Mon Sep 17 00:00:00 2001 From: Lucas Pinheiro Date: Wed, 2 Apr 2025 09:59:52 -0300 Subject: [PATCH 2/8] fix Erlang installation --- packer/linux/ansible/group_vars/all.yml | 2 -- packer/linux/ansible/roles/erlang/tasks/main.yml | 13 ------------- 2 files changed, 15 deletions(-) diff --git a/packer/linux/ansible/group_vars/all.yml b/packer/linux/ansible/group_vars/all.yml index 77efc77..0d159d9 100644 --- a/packer/linux/ansible/group_vars/all.yml +++ b/packer/linux/ansible/group_vars/all.yml @@ -8,6 +8,4 @@ docker_apt_repository: "deb [arch=amd64] https://download.docker.com/linux/{{ an docker_apt_gpg_key: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" yq_url: "https://github.com/mikefarah/yq/releases/download/v4.16.2/yq_linux_amd64" cloudwatch_agent_url: https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/amd64/latest/amazon-cloudwatch-agent.deb -erlang_apt_gpg_key: https://packages.erlang-solutions.com/ubuntu/erlang_solutions.asc -erlang_apt_repository: "deb [arch=amd64] https://packages.erlang-solutions.com/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} contrib" systemd_restart_seconds: 300 diff --git a/packer/linux/ansible/roles/erlang/tasks/main.yml b/packer/linux/ansible/roles/erlang/tasks/main.yml index c1e5715..1f087d4 100644 --- a/packer/linux/ansible/roles/erlang/tasks/main.yml +++ b/packer/linux/ansible/roles/erlang/tasks/main.yml @@ -1,17 +1,4 @@ --- -- name: Add Erlang GPG apt Key - when: install_erlang | bool - ansible.builtin.apt_key: - url: "{{ erlang_apt_gpg_key }}" - state: present - -- name: Add Erlang Repository - when: install_erlang | bool - ansible.builtin.apt_repository: - repo: "{{ erlang_apt_repository }}" - state: present - update_cache: true - - name: Install Erlang when: install_erlang | bool ansible.builtin.apt: From 84a77be8c076b79516e6aa6e2c375130cc533df0 Mon Sep 17 00:00:00 2001 From: Lucas Pinheiro Date: Wed, 2 Apr 2025 11:18:20 -0300 Subject: [PATCH 3/8] use Erlang package from rabbitmq/cloudsmith --- .../linux/ansible/roles/erlang/tasks/main.yml | 24 ++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/packer/linux/ansible/roles/erlang/tasks/main.yml b/packer/linux/ansible/roles/erlang/tasks/main.yml index 1f087d4..0cca205 100644 --- a/packer/linux/ansible/roles/erlang/tasks/main.yml +++ b/packer/linux/ansible/roles/erlang/tasks/main.yml @@ -1,6 +1,28 @@ --- +- name: Download GPG key + get_url: + url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key + dest: /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg_armored + checksum: sha256:84df2e5fd80d464c3eb9acd2f751b2f6a723438200915dd50fbf12f08698e4ec + +- name: De-Armor GPG key + command: gpg --dearmor < /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg_armored > /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg + no_log: true + args: + creates: /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg + +- name: "Add repository to APT sources list" + ansible.builtin.apt_repository: + repo: "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" + state: present + +- name: "Add src repository to APT sources list" + ansible.builtin.apt_repository: + repo: "deb-src [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" + state: present + - name: Install Erlang when: install_erlang | bool ansible.builtin.apt: pkg: - - erlang-base=1:24.3.3-1 + - erlang-base=1:24.3.4.17-1 From 4345ba7ba3cdc927a3abb77365327cc52d5348ee Mon Sep 17 00:00:00 2001 From: Lucas Pinheiro Date: Wed, 2 Apr 2025 11:22:09 -0300 Subject: [PATCH 4/8] proper indentation --- packer/linux/ansible/roles/erlang/tasks/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/linux/ansible/roles/erlang/tasks/main.yml b/packer/linux/ansible/roles/erlang/tasks/main.yml index 0cca205..5ddb605 100644 --- a/packer/linux/ansible/roles/erlang/tasks/main.yml +++ b/packer/linux/ansible/roles/erlang/tasks/main.yml @@ -13,13 +13,13 @@ - name: "Add repository to APT sources list" ansible.builtin.apt_repository: - repo: "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" - state: present + repo: "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" + state: present - name: "Add src repository to APT sources list" ansible.builtin.apt_repository: - repo: "deb-src [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" - state: present + repo: "deb-src [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" + state: present - name: Install Erlang when: install_erlang | bool From 153326b6e988107b5fba002d67eb8d9f6a5f9c81 Mon Sep 17 00:00:00 2001 From: Lucas Pinheiro Date: Wed, 2 Apr 2025 11:26:01 -0300 Subject: [PATCH 5/8] ansible lint --- packer/linux/ansible/roles/erlang/tasks/main.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packer/linux/ansible/roles/erlang/tasks/main.yml b/packer/linux/ansible/roles/erlang/tasks/main.yml index 5ddb605..3c967ae 100644 --- a/packer/linux/ansible/roles/erlang/tasks/main.yml +++ b/packer/linux/ansible/roles/erlang/tasks/main.yml @@ -1,12 +1,14 @@ --- - name: Download GPG key - get_url: + ansible.builtin.get_url: url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key dest: /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg_armored checksum: sha256:84df2e5fd80d464c3eb9acd2f751b2f6a723438200915dd50fbf12f08698e4ec + mode: '0755' + force: true - name: De-Armor GPG key - command: gpg --dearmor < /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg_armored > /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg + ansible.builtin.command: gpg --dearmor < /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg_armored > /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg no_log: true args: creates: /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg From fe30f50c6fae87731d53c6c751005cd25a8842a5 Mon Sep 17 00:00:00 2001 From: Lucas Pinheiro Date: Wed, 2 Apr 2025 11:31:46 -0300 Subject: [PATCH 6/8] skip lint for now --- packer/linux/ansible/roles/erlang/tasks/main.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packer/linux/ansible/roles/erlang/tasks/main.yml b/packer/linux/ansible/roles/erlang/tasks/main.yml index 3c967ae..6be1706 100644 --- a/packer/linux/ansible/roles/erlang/tasks/main.yml +++ b/packer/linux/ansible/roles/erlang/tasks/main.yml @@ -17,6 +17,8 @@ ansible.builtin.apt_repository: repo: "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" state: present + tags: + - skip_ansible_lint - name: "Add src repository to APT sources list" ansible.builtin.apt_repository: From 679643589d13de8b3c7e976777e8a070615816ec Mon Sep 17 00:00:00 2001 From: Lucas Pinheiro Date: Wed, 2 Apr 2025 11:38:44 -0300 Subject: [PATCH 7/8] use vars --- packer/linux/ansible/group_vars/all.yml | 3 +++ packer/linux/ansible/roles/erlang/tasks/main.yml | 16 +++++++--------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/packer/linux/ansible/group_vars/all.yml b/packer/linux/ansible/group_vars/all.yml index 0d159d9..4f59d6d 100644 --- a/packer/linux/ansible/group_vars/all.yml +++ b/packer/linux/ansible/group_vars/all.yml @@ -7,5 +7,8 @@ awscli_url: "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-{{ awscli_vers docker_apt_repository: "deb [arch=amd64] https://download.docker.com/linux/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} stable" docker_apt_gpg_key: "https://download.docker.com/linux/{{ ansible_distribution | lower }}/gpg" yq_url: "https://github.com/mikefarah/yq/releases/download/v4.16.2/yq_linux_amd64" +erlang_gpg_key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key +erlang_gpg_key_checksum: "84df2e5fd80d464c3eb9acd2f751b2f6a723438200915dd50fbf12f08698e4ec" +erlang_gpg_key_path: /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg cloudwatch_agent_url: https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/amd64/latest/amazon-cloudwatch-agent.deb systemd_restart_seconds: 300 diff --git a/packer/linux/ansible/roles/erlang/tasks/main.yml b/packer/linux/ansible/roles/erlang/tasks/main.yml index 6be1706..84d2070 100644 --- a/packer/linux/ansible/roles/erlang/tasks/main.yml +++ b/packer/linux/ansible/roles/erlang/tasks/main.yml @@ -1,28 +1,26 @@ --- - name: Download GPG key ansible.builtin.get_url: - url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key - dest: /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg_armored - checksum: sha256:84df2e5fd80d464c3eb9acd2f751b2f6a723438200915dd50fbf12f08698e4ec + url: "{{ erlang_gpg_key_url }}" + dest: "{{ erlang_gpg_key_path }}_armored" + checksum: "sha256:{{ erlang_gpg_key_checksum }}" mode: '0755' force: true - name: De-Armor GPG key - ansible.builtin.command: gpg --dearmor < /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg_armored > /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg + ansible.builtin.command: gpg --dearmor < {{ erlang_gpg_key_path }}_armored > {{ erlang_gpg_key_path }} no_log: true args: - creates: /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg + creates: "{{ erlang_gpg_key_path }}" - name: "Add repository to APT sources list" ansible.builtin.apt_repository: - repo: "deb [arch=amd64 signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" + repo: "deb [arch=amd64 signed-by={{ erlang_gpg_key_path }}] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" state: present - tags: - - skip_ansible_lint - name: "Add src repository to APT sources list" ansible.builtin.apt_repository: - repo: "deb-src [signed-by=/usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" + repo: "deb-src [signed-by={{ erlang_gpg_key_path }}] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main" state: present - name: Install Erlang From b4bf3ab8d8091b1e5399ecbb8b1c2fd1560a8166 Mon Sep 17 00:00:00 2001 From: Lucas Pinheiro Date: Wed, 2 Apr 2025 12:11:11 -0300 Subject: [PATCH 8/8] no need to dearmor --- packer/linux/ansible/group_vars/all.yml | 2 +- packer/linux/ansible/roles/erlang/tasks/main.yml | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/packer/linux/ansible/group_vars/all.yml b/packer/linux/ansible/group_vars/all.yml index 4f59d6d..32d7bd5 100644 --- a/packer/linux/ansible/group_vars/all.yml +++ b/packer/linux/ansible/group_vars/all.yml @@ -9,6 +9,6 @@ docker_apt_gpg_key: "https://download.docker.com/linux/{{ ansible_distribution | yq_url: "https://github.com/mikefarah/yq/releases/download/v4.16.2/yq_linux_amd64" erlang_gpg_key_url: https://github.com/rabbitmq/signing-keys/releases/download/3.0/cloudsmith.rabbitmq-erlang.E495BB49CC4BBE5B.key erlang_gpg_key_checksum: "84df2e5fd80d464c3eb9acd2f751b2f6a723438200915dd50fbf12f08698e4ec" -erlang_gpg_key_path: /usr/share/keyrings/rabbitmq.E495BB49CC4BBE5B.gpg +erlang_gpg_key_path: /usr/share/keyrings/rabbitmq-erlang.E495BB49CC4BBE5B.asc cloudwatch_agent_url: https://s3.amazonaws.com/amazoncloudwatch-agent/ubuntu/amd64/latest/amazon-cloudwatch-agent.deb systemd_restart_seconds: 300 diff --git a/packer/linux/ansible/roles/erlang/tasks/main.yml b/packer/linux/ansible/roles/erlang/tasks/main.yml index 84d2070..4fc4580 100644 --- a/packer/linux/ansible/roles/erlang/tasks/main.yml +++ b/packer/linux/ansible/roles/erlang/tasks/main.yml @@ -2,17 +2,11 @@ - name: Download GPG key ansible.builtin.get_url: url: "{{ erlang_gpg_key_url }}" - dest: "{{ erlang_gpg_key_path }}_armored" + dest: "{{ erlang_gpg_key_path }}" checksum: "sha256:{{ erlang_gpg_key_checksum }}" mode: '0755' force: true -- name: De-Armor GPG key - ansible.builtin.command: gpg --dearmor < {{ erlang_gpg_key_path }}_armored > {{ erlang_gpg_key_path }} - no_log: true - args: - creates: "{{ erlang_gpg_key_path }}" - - name: "Add repository to APT sources list" ansible.builtin.apt_repository: repo: "deb [arch=amd64 signed-by={{ erlang_gpg_key_path }}] https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-erlang/deb/ubuntu focal main"