Merge pull request #126 from MonolithProjects/develop

MonolithProjects · web-flow · commit b401bf517468 · 2022-03-07T10:47:39.000+01:00
Develop to Master
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -16,7 +16,7 @@ jobs:
       fail-fast: true
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: "${{ github.repository }}"
       - name: Molecule for Ansible - lint
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -33,7 +33,7 @@ jobs:
             tag: "latest"
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: "${{ github.repository }}"
       - name: Molecule for Ansible - GHR Repository
@@ -53,7 +53,7 @@ jobs:
       fail-fast: false
     steps:
       - name: checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: "${{ github.repository }}"
       - name: Molecule for Ansible - GHR Organization
diff --git a/defaults/main.yml b/defaults/main.yml
@@ -51,10 +51,6 @@ runner_name: "{{ ansible_hostname }}"
 # Will the runner be deployed on Github Enterprise server?
 runner_on_ghes: no
 
-# Custom service name when using Github Enterprise server
-# DEPRECATED: this variable is deprecated in favor of "runner_on_ghes" and will be removed in release 1.15.
-# service_name: actions.runner._services.{{ runner_name }}.service
-
 # GitHub Repository user or Organization owner used for Runner registration
 # github_account: "youruser"
 
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -3,4 +3,4 @@
 - name: Restart runner service
   service:
    name: "{{ runner_service }}"
-   state: restarted
+   state: restarted
diff --git a/molecule/default/cleanup.yml b/molecule/default/cleanup.yml
@@ -8,5 +8,6 @@
     - github_repo: ansible-github_actions_runner-testrepo
     - github_account: monolithprojects-testorg
     - runner_state: absent
+    - runner_name: test_name
   roles:
     - ansible-github_actions_runner
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -8,8 +8,11 @@
     - runner_user: ansible
     - github_repo: ansible-github_actions_runner-testrepo
     - github_account: monolithprojects-testorg
-    - runner_version: "latest"
-    - service_name: awesome
+    - runner_version: latest
+    - runner_name: test_name
+    - runner_on_ghes: yes
+    - reinstall_runner: false
+    - hide_sensitive_logs: no
     - runner_labels:
         - label1
         - repo-runner
diff --git a/molecule/org/converge.yml b/molecule/org/converge.yml
@@ -8,7 +8,7 @@
     - github_account: monolithprojects-testorg
     - runner_org: yes
     - runner_state: "stopped"
-    - runner_version: "2.274.2"
+    - runner_version: "2.287.0"
   roles:
     - robertdebock.epel
-    - ansible-github_actions_runner
+    - ansible-github_actions_runner
diff --git a/molecule/repo/cleanup.yml b/molecule/repo/cleanup.yml
@@ -9,4 +9,4 @@
     - github_account: monolithprojects-testorg
     - runner_state: absent
   roles:
-    - ansible-github_actions_runner
+    - ansible-github_actions_runner
diff --git a/molecule/repo/converge.yml b/molecule/repo/converge.yml
@@ -9,9 +9,9 @@
     - github_repo: ansible-github_actions_runner-testrepo
     - github_account: monolithprojects-testorg
     - runner_version: "latest"
-    - runner_labels: 
+    - runner_labels:
         - label1
         - repo-runner
   roles:
     - robertdebock.epel
-    - ansible-github_actions_runner
+    - ansible-github_actions_runner
diff --git a/tasks/assert.yml b/tasks/assert.yml
@@ -5,9 +5,6 @@
       - github_account is defined
     fail_msg: "github_account is not defined"
   run_once: yes
-  tags:
-    - install
-    - uninstall
 
 - name: Check access_token variable (RUN ONCE)
   assert:
@@ -16,27 +13,10 @@
       - access_token | length > 0
     fail_msg: "access_token was not found or is using an invalid format."
   run_once: yes
-  tags:
-    - install
-    - uninstall
 
 - name: Check runner_org variable (RUN ONCE)
   assert:
     that:
       - runner_org == True or runner_org == False
     fail_msg: "runner_org should be a boolean value"
   run_once: yes
-  tags:
-    - install
-    - uninstall
-
-- name: GHES service_name deprecation check (RUN ONCE)
-  assert:
-    that:
-      - service_name is not defined
-    fail_msg: '[DEPRECATION WARNING]: Variable "service_name" will is deprecated and will be removed in release 1.15. Start using "running_on_ghes" boolean variable.'
-  ignore_errors: yes
-  run_once: yes
-  tags:
-    - install
-    - uninstall
diff --git a/tasks/collect_info.yml b/tasks/collect_info.yml
@@ -0,0 +1,40 @@
+---
+- block:
+  - name: Set complete API url for repo runner
+    set_fact:
+      github_full_api_url: "{{ github_api_url }}/repos/{{ github_owner | default(github_account) }}/{{ github_repo }}/actions/runners"
+    when: not runner_org
+
+  - name: Set complete API url for org runner
+    set_fact:
+      github_full_api_url: "{{ github_api_url }}/orgs/{{ github_owner | default(github_account) }}/actions/runners"
+    when: runner_org | bool
+
+  - name: Get registration token (RUN ONCE)
+    uri:
+      url: "{{ github_full_api_url }}/registration-token"
+      headers:
+        Authorization: "token {{ access_token }}"
+        Accept: "application/vnd.github.v3+json"
+      method: POST
+      status_code: 201
+      force_basic_auth: yes
+    register: registration
+    run_once: yes
+
+  - name: Check currently registered runners for repo (RUN ONCE)
+    uri:
+      url: "{{ github_full_api_url }}"
+      headers:
+        Authorization: "token {{ access_token }}"
+        Accept: "application/vnd.github.v3+json"
+      method: GET
+      status_code: 200
+      force_basic_auth: yes
+    register: registered_runners
+    run_once: yes
+
+  - name: Check service facts
+    service_facts:
+
+  check_mode: false
diff --git a/tasks/collect_info_org.yml b/tasks/collect_info_org.yml
diff --git a/tasks/collect_info_repo.yml b/tasks/collect_info_repo.yml
diff --git a/tasks/install_deps.yml b/tasks/install_deps.yml
@@ -12,8 +12,6 @@
     state: present
     update_cache: yes
   when: (ansible_distribution == "Debian" and ansible_distribution_major_version == "9")
-  tags:
-    - install
 
 - name: Install dependencies on Debian Buster
   package:
@@ -27,8 +25,6 @@
     state: present
     update_cache: yes
   when: (ansible_distribution == "Debian" and ansible_distribution_major_version == "10")
-  tags:
-    - install
 
 - name: Install dependencies on Debian Bullseye
   package:
@@ -42,8 +38,6 @@
     state: present
     update_cache: yes
   when: (ansible_distribution == "Debian" and ansible_distribution_major_version == "11")
-  tags:
-    - install
 
 - name: Install dependencies on Ubuntu Xenial systems
   package:
@@ -57,8 +51,6 @@
     state: present
     update_cache: yes
   when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "16")
-  tags:
-    - install
 
 - name: Install dependencies on Ubuntu Bionic systems
   package:
@@ -72,8 +64,6 @@
     state: present
     update_cache: yes
   when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "18")
-  tags:
-    - install
 
 - name: Install dependencies on Ubuntu Focal systems
   package:
@@ -87,8 +77,6 @@
     state: present
     update_cache: yes
   when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "20")
-  tags:
-    - install
 
 - name: Install dependencies on RHEL/CentOS/Fedora systems
   package:
@@ -105,5 +93,3 @@
         (ansible_distribution == "CentOS") or
         (ansible_distribution == "Fedora") or
         (ansible_distribution == "Rocky")
-  tags:
-    - install
diff --git a/tasks/install_runner.yml b/tasks/install_runner.yml
diff --git a/tasks/main.yml b/tasks/main.yml
diff --git a/tasks/uninstall_runner.yml b/tasks/uninstall_runner.yml
