Rename matrix_beeper_linkedin_* variables to matrix_bridge_beeper_linkedin_*

Part of adopting a uniform naming policy for bridge variables,
where the variable prefix matches the role directory name.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

roles/custom/matrix-bridge-beeper-linkedin/tasks/main.yml

@@ -12,15 +12,15 @@
     - install-all
     - install-beeper-linkedin
   block:
-    - when: matrix_beeper_linkedin_enabled | bool
+    - when: matrix_bridge_beeper_linkedin_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/validate_config.yml"
 
-    - when: matrix_beeper_linkedin_enabled | bool
+    - when: matrix_bridge_beeper_linkedin_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_install.yml"
 
 - tags:
     - setup-all
     - setup-beeper-linkedin
   block:
-    - when: not matrix_beeper_linkedin_enabled | bool
+    - when: not matrix_bridge_beeper_linkedin_enabled | bool
       ansible.builtin.include_tasks: "{{ role_path }}/tasks/setup_uninstall.yml"

roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_install.yml

@@ -19,51 +19,51 @@
     owner: "{{ matrix_user_name }}"
     group: "{{ matrix_group_name }}"
   with_items:
-    - {path: "{{ matrix_beeper_linkedin_base_path }}", when: true}
-    - {path: "{{ matrix_beeper_linkedin_config_path }}", when: true}
-    - {path: "{{ matrix_beeper_linkedin_data_path }}", when: true}
-    - {path: "{{ matrix_beeper_linkedin_container_src_files_path }}", when: "{{ matrix_beeper_linkedin_container_image_self_build }}"}
+    - {path: "{{ matrix_bridge_beeper_linkedin_base_path }}", when: true}
+    - {path: "{{ matrix_bridge_beeper_linkedin_config_path }}", when: true}
+    - {path: "{{ matrix_bridge_beeper_linkedin_data_path }}", when: true}
+    - {path: "{{ matrix_bridge_beeper_linkedin_container_src_files_path }}", when: "{{ matrix_bridge_beeper_linkedin_container_image_self_build }}"}
   when: "item.when | bool"
 
 - name: Ensure beeper-linkedin config.yaml installed
   ansible.builtin.copy:
-    content: "{{ matrix_beeper_linkedin_configuration | to_nice_yaml(indent=2, width=999999) }}"
-    dest: "{{ matrix_beeper_linkedin_config_path }}/config.yaml"
+    content: "{{ matrix_bridge_beeper_linkedin_configuration | to_nice_yaml(indent=2, width=999999) }}"
+    dest: "{{ matrix_bridge_beeper_linkedin_config_path }}/config.yaml"
     mode: '0644'
     owner: "{{ matrix_user_name }}"
     group: "{{ matrix_group_name }}"
-  register: matrix_beeper_linkedin_config_result
+  register: matrix_bridge_beeper_linkedin_config_result
 
 - name: Ensure beeper-linkedin registration.yaml installed
   ansible.builtin.copy:
-    content: "{{ matrix_beeper_linkedin_registration | to_nice_yaml(indent=2, width=999999) }}"
-    dest: "{{ matrix_beeper_linkedin_config_path }}/registration.yaml"
+    content: "{{ matrix_bridge_beeper_linkedin_registration | to_nice_yaml(indent=2, width=999999) }}"
+    dest: "{{ matrix_bridge_beeper_linkedin_config_path }}/registration.yaml"
     mode: '0644'
     owner: "{{ matrix_user_name }}"
     group: "{{ matrix_group_name }}"
-  register: matrix_beeper_linkedin_registration_result
+  register: matrix_bridge_beeper_linkedin_registration_result
 
 - name: Ensure Beeper LinkedIn container image is pulled
   community.docker.docker_image_pull:
-    name: "{{ matrix_beeper_linkedin_container_image }}"
+    name: "{{ matrix_bridge_beeper_linkedin_container_image }}"
     pull: always
-  when: "not matrix_beeper_linkedin_container_image_self_build | bool"
-  register: matrix_beeper_linkedin_container_image_pull_result
+  when: "not matrix_bridge_beeper_linkedin_container_image_self_build | bool"
+  register: matrix_bridge_beeper_linkedin_container_image_pull_result
   retries: "{{ devture_playbook_help_container_retries_count }}"
   delay: "{{ devture_playbook_help_container_retries_delay }}"
-  until: matrix_beeper_linkedin_container_image_pull_result is not failed
+  until: matrix_bridge_beeper_linkedin_container_image_pull_result is not failed
 
-- when: "matrix_beeper_linkedin_container_image_self_build | bool"
+- when: "matrix_bridge_beeper_linkedin_container_image_self_build | bool"
   block:
     - name: Ensure Beeper LinkedIn repository is present on self-build
       ansible.builtin.git:
-        repo: "{{ matrix_beeper_linkedin_container_image_self_build_repo }}"
-        dest: "{{ matrix_beeper_linkedin_container_src_files_path }}"
-        version: "{{ matrix_beeper_linkedin_container_image_self_build_branch }}"
+        repo: "{{ matrix_bridge_beeper_linkedin_container_image_self_build_repo }}"
+        dest: "{{ matrix_bridge_beeper_linkedin_container_src_files_path }}"
+        version: "{{ matrix_bridge_beeper_linkedin_container_image_self_build_branch }}"
         force: "yes"
       become: true
       become_user: "{{ matrix_user_name }}"
-      register: matrix_beeper_linkedin_git_pull_results
+      register: matrix_bridge_beeper_linkedin_git_pull_results
 
     # Building the container image (using the default Dockerfile) requires that a docker-requirements.txt file be generated.
     # See: https://github.com/beeper/linkedin/blob/94442db17ccb9769b377cdb8e4bf1cb3955781d7/.gitlab-ci.yml#L30-40
@@ -73,29 +73,29 @@
           {{ devture_systemd_docker_base_host_command_docker }} run
           --rm
           --entrypoint=/bin/sh
-          --mount type=bind,src={{ matrix_beeper_linkedin_container_src_files_path }},dst=/work
+          --mount type=bind,src={{ matrix_bridge_beeper_linkedin_container_src_files_path }},dst=/work
           -w /work
           docker.io/python:3.9.6-buster
           -c "pip install poetry && poetry export --without-hashes -E e2be -E images -E metrics | sed 's/==.*//g' > docker-requirements.txt"
-      register: matrix_beeper_linkedin_generate_docker_requirements_result
-      changed_when: matrix_beeper_linkedin_generate_docker_requirements_result.rc == 0
+      register: matrix_bridge_beeper_linkedin_generate_docker_requirements_result
+      changed_when: matrix_bridge_beeper_linkedin_generate_docker_requirements_result.rc == 0
 
     - name: Ensure Beeper LinkedIn container image is built
       community.docker.docker_image_build:
-        name: "{{ matrix_beeper_linkedin_container_image }}"
+        name: "{{ matrix_bridge_beeper_linkedin_container_image }}"
         dockerfile: Dockerfile
-        path: "{{ matrix_beeper_linkedin_container_src_files_path }}"
+        path: "{{ matrix_bridge_beeper_linkedin_container_src_files_path }}"
         pull: true
-        rebuild: "{{ 'always' if matrix_beeper_linkedin_git_pull_results.changed | bool else 'never' }}"
+        rebuild: "{{ 'always' if matrix_bridge_beeper_linkedin_git_pull_results.changed | bool else 'never' }}"
         args:
           TARGETARCH: "{{ matrix_architecture }}"
-      register: matrix_beeper_linkedin_container_image_build_result
+      register: matrix_bridge_beeper_linkedin_container_image_build_result
 
 - name: Ensure beeper-linkedin container network is created
-  when: matrix_beeper_linkedin_container_network != 'host'
+  when: matrix_bridge_beeper_linkedin_container_network != 'host'
   community.general.docker_network:
     enable_ipv6: "{{ devture_systemd_docker_base_ipv6_enabled }}"
-    name: "{{ matrix_beeper_linkedin_container_network }}"
+    name: "{{ matrix_bridge_beeper_linkedin_container_network }}"
     driver: bridge
     driver_options: "{{ devture_systemd_docker_base_container_networks_driver_options }}"
 
@@ -104,15 +104,15 @@
     src: "{{ role_path }}/templates/systemd/matrix-beeper-linkedin.service.j2"
     dest: "{{ devture_systemd_docker_base_systemd_path }}/matrix-beeper-linkedin.service"
     mode: '0644'
-  register: matrix_beeper_linkedin_systemd_service_result
+  register: matrix_bridge_beeper_linkedin_systemd_service_result
 
 - name: Determine whether matrix-beeper-linkedin needs a restart
   ansible.builtin.set_fact:
-    matrix_beeper_linkedin_restart_necessary: >-
+    matrix_bridge_beeper_linkedin_restart_necessary: >-
       {{
-        matrix_beeper_linkedin_config_result.changed | default(false)
-        or matrix_beeper_linkedin_registration_result.changed | default(false)
-        or matrix_beeper_linkedin_systemd_service_result.changed | default(false)
-        or matrix_beeper_linkedin_container_image_pull_result.changed | default(false)
-        or matrix_beeper_linkedin_container_image_build_result.changed | default(false)
+        matrix_bridge_beeper_linkedin_config_result.changed | default(false)
+        or matrix_bridge_beeper_linkedin_registration_result.changed | default(false)
+        or matrix_bridge_beeper_linkedin_systemd_service_result.changed | default(false)
+        or matrix_bridge_beeper_linkedin_container_image_pull_result.changed | default(false)
+        or matrix_bridge_beeper_linkedin_container_image_build_result.changed | default(false)
       }}

roles/custom/matrix-bridge-beeper-linkedin/tasks/setup_uninstall.yml

@@ -9,9 +9,9 @@
 - name: Check existence of matrix-beeper-linkedin service
   ansible.builtin.stat:
     path: "{{ devture_systemd_docker_base_systemd_path }}/matrix-beeper-linkedin.service"
-  register: matrix_beeper_linkedin_service_stat
+  register: matrix_bridge_beeper_linkedin_service_stat
 
-- when: matrix_beeper_linkedin_service_stat.stat.exists | bool
+- when: matrix_bridge_beeper_linkedin_service_stat.stat.exists | bool
   block:
     - name: Ensure matrix-beeper-linkedin is stopped
       ansible.builtin.service:

roles/custom/matrix-bridge-beeper-linkedin/tasks/validate_config.yml

@@ -14,16 +14,16 @@
       Please rename the variable (`{{ item.old }}` -> `{{ item.new }}`) on your configuration file (vars.yml).
   when: "lookup('ansible.builtin.varnames', ('^' + item.old + '$'), wantlist=True) | length > 0"
   with_items:
-    - {'old': 'matrix_beeper_linkedin_login_shared_secret', 'new': '<superseded by matrix_beeper_linkedin_bridge_login_shared_secret_map_*>'}
-    - {'old': 'matrix_beeper_linkedin_docker_image_name_prefix', 'new': 'matrix_beeper_linkedin_container_image_registry_prefix'}
-    - {'old': 'matrix_beeper_linkedin_docker_image', 'new': 'matrix_beeper_linkedin_container_image'}
-    - {'old': 'matrix_beeper_linkedin_docker_image_force_pull', 'new': 'matrix_beeper_linkedin_container_image_force_pull'}
-    - {'old': 'matrix_beeper_linkedin_docker_image_registry_prefix', 'new': 'matrix_beeper_linkedin_container_image_registry_prefix'}
-    - {'old': 'matrix_beeper_linkedin_docker_image_registry_prefix_upstream', 'new': 'matrix_beeper_linkedin_container_image_registry_prefix_upstream'}
-    - {'old': 'matrix_beeper_linkedin_docker_image_registry_prefix_upstream_default', 'new': 'matrix_beeper_linkedin_container_image_registry_prefix_upstream_default'}
-    - {'old': 'matrix_beeper_linkedin_docker_image_tag', 'new': 'matrix_beeper_linkedin_container_image_tag'}
-    - {'old': 'matrix_beeper_linkedin_docker_src_files_path', 'new': 'matrix_beeper_linkedin_container_src_files_path'}
-    - {'old': 'matrix_beeper_linkedin_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
+    - {'old': 'matrix_bridge_beeper_linkedin_login_shared_secret', 'new': '<superseded by matrix_bridge_beeper_linkedin_bridge_login_shared_secret_map_*>'}
+    - {'old': 'matrix_bridge_beeper_linkedin_docker_image_name_prefix', 'new': 'matrix_bridge_beeper_linkedin_container_image_registry_prefix'}
+    - {'old': 'matrix_bridge_beeper_linkedin_docker_image', 'new': 'matrix_bridge_beeper_linkedin_container_image'}
+    - {'old': 'matrix_bridge_beeper_linkedin_docker_image_force_pull', 'new': 'matrix_bridge_beeper_linkedin_container_image_force_pull'}
+    - {'old': 'matrix_bridge_beeper_linkedin_docker_image_registry_prefix', 'new': 'matrix_bridge_beeper_linkedin_container_image_registry_prefix'}
+    - {'old': 'matrix_bridge_beeper_linkedin_docker_image_registry_prefix_upstream', 'new': 'matrix_bridge_beeper_linkedin_container_image_registry_prefix_upstream'}
+    - {'old': 'matrix_bridge_beeper_linkedin_docker_image_registry_prefix_upstream_default', 'new': 'matrix_bridge_beeper_linkedin_container_image_registry_prefix_upstream_default'}
+    - {'old': 'matrix_bridge_beeper_linkedin_docker_image_tag', 'new': 'matrix_bridge_beeper_linkedin_container_image_tag'}
+    - {'old': 'matrix_bridge_beeper_linkedin_docker_src_files_path', 'new': 'matrix_bridge_beeper_linkedin_container_src_files_path'}
+    - {'old': 'matrix_bridge_beeper_linkedin_container_image_force_pull', 'new': '<removed> (the new community.docker.docker_image_pull module handles this natively)'}
 
 - name: Fail if required beeper-linkedin settings not defined
   ansible.builtin.fail:
@@ -31,8 +31,8 @@
       You need to define a required configuration setting (`{{ item.name }}`).
   when: "item.when | bool and lookup('vars', item.name, default='') | string | length == 0"
   with_items:
-    - {'name': 'matrix_beeper_linkedin_appservice_token', when: true}
-    - {'name': 'matrix_beeper_linkedin_homeserver_address', when: true}
-    - {'name': 'matrix_beeper_linkedin_homeserver_token', when: true}
-    - {'name': 'matrix_beeper_linkedin_database_hostname', when: "{{ matrix_beeper_linkedin_database_engine == 'postgres' }}"}
-    - {'name': 'matrix_beeper_linkedin_container_network', when: true}
+    - {'name': 'matrix_bridge_beeper_linkedin_appservice_token', when: true}
+    - {'name': 'matrix_bridge_beeper_linkedin_homeserver_address', when: true}
+    - {'name': 'matrix_bridge_beeper_linkedin_homeserver_token', when: true}
+    - {'name': 'matrix_bridge_beeper_linkedin_database_hostname', when: "{{ matrix_bridge_beeper_linkedin_database_engine == 'postgres' }}"}
+    - {'name': 'matrix_bridge_beeper_linkedin_container_network', when: true}