Merge pull request #42 from fitbeard/feat/bump_version

Drop Tower support
fitbeard · Feb 9, 2024 · 7fcff59 · 7fcff59
2 parents 53c9a8a + ac96061
commit 7fcff59
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 50 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM t42x/awxkit_base:23.5.1
+FROM t42x/awxkit_base:23.7.0
 
 ADD entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh

diff --git a/Dockerfile.base b/Dockerfile.base
@@ -1,4 +1,4 @@
-FROM python:3.10-alpine
+FROM python:3.11-alpine
 
 ADD requirements.txt /requirements.txt
 RUN pip install --no-cache-dir -r /requirements.txt

diff --git a/README.md b/README.md
@@ -1,10 +1,10 @@
-# Github action for AWX and Ansible Tower resource triggering
+# Github action for AWX and Ansible Automation Platform Controller resource triggering
 
 [![main](https://github.com/fitbeard/action-trigger-awx/workflows/main/badge.svg)](https://github.com/fitbeard/action-trigger-awx/actions?query=workflow%3Amain)
 
-This Github action aims to interact with AWX or Tower servers.
+This Github action aims to interact with AWX or Ansible Automation Platform Controller.
 
-It connects to an AWX or Tower server and launches a job or workflow_job template or updates project.
+It connects to an AWX or Ansible Automation Platform Controller server and launches a job or workflow_job template or updates project.
 
 > **Note**
 >
@@ -21,62 +21,62 @@ See [action.yml](action.yml)
     runs-on: ubuntu-latest
     steps:
       - name: "Test AWX: Simple job template"
-        uses: fitbeard/action-trigger-awx@v23.5.1
+        uses: fitbeard/action-trigger-awx@v23.7.0
         with:
-          tower_url: ${{ secrets.TOWER_HOST }}
-          tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }}
+          controller_host: ${{ secrets.CONTROLLER_HOST }}
+          controller_oauth_token: ${{ secrets.CONTROLLER_OAUTH_TOKEN }}
           resource_type: job_template
           resource_name: actions-awxkit-test
 
       - name: "Test AWX: Simple job template - specify credentials"
-        uses: fitbeard/action-trigger-awx@v23.5.1
+        uses: fitbeard/action-trigger-awx@v23.7.0
         with:
-          tower_url: ${{ secrets.TOWER_HOST }}
-          tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }}
+          controller_host: ${{ secrets.CONTROLLER_HOST }}
+          controller_oauth_token: ${{ secrets.CONTROLLER_OAUTH_TOKEN }}
           resource_type: job_template
           resource_name: actions-awxkit-test
           credentials: "test-credential"
 
       - name: "Test AWX: Simple workflow template"
-        uses: fitbeard/action-trigger-awx@v23.5.1
+        uses: fitbeard/action-trigger-awx@v23.7.0
         with:
-          tower_url: ${{ secrets.TOWER_HOST }}
-          tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }}
+          controller_host: ${{ secrets.CONTROLLER_HOST }}
+          controller_oauth_token: ${{ secrets.CONTROLLER_OAUTH_TOKEN }}
           resource_type: workflow_job_template
           resource_name: actions-awxkit-workflow-test
 
       - name: "Test AWX: Project update"
-        uses: fitbeard/action-trigger-awx@v23.5.1
+        uses: fitbeard/action-trigger-awx@v23.7.0
         with:
-          tower_url: ${{ secrets.TOWER_HOST }}
-          tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }}
+          controller_host: ${{ secrets.CONTROLLER_HOST }}
+          controller_oauth_token: ${{ secrets.CONTROLLER_OAUTH_TOKEN }}
           resource_type: project
           resource_name: ansible-project
 
       - name: "Test AWX: Inventory Source update"
-        uses: fitbeard/action-trigger-awx@v23.5.1
+        uses: fitbeard/action-trigger-awx@v23.7.0
         with:
-          tower_url: ${{ secrets.TOWER_HOST }}
-          tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }}
+          controller_host: ${{ secrets.CONTROLLER_HOST }}
+          controller_oauth_token: ${{ secrets.CONTROLLER_OAUTH_TOKEN }}
           resource_type: inventory_source
           resource_name: inventory-source-name
 
       - name: "Test AWX: Random options job template 1"
-        uses: fitbeard/action-trigger-awx@v23.5.1
+        uses: fitbeard/action-trigger-awx@v23.7.0
         with:
-          tower_url: ${{ secrets.TOWER_HOST }}
-          tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }}
+          controller_host: ${{ secrets.CONTROLLER_HOST }}
+          controller_oauth_token: ${{ secrets.CONTROLLER_OAUTH_TOKEN }}
           resource_type: job_template
           resource_name: actions-awxkit-test3
           limit: "localhost-0*"
           extra_vars: '{"test": 1, "test2": "this variable"}'
           timeout: 300
 
       - name: "Test AWX: Random options job template 2"
-        uses: fitbeard/action-trigger-awx@v23.5.1
+        uses: fitbeard/action-trigger-awx@v23.7.0
         with:
-          tower_url: ${{ secrets.TOWER_HOST }}
-          tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }}
+          controller_host: ${{ secrets.CONTROLLER_HOST }}
+          controller_oauth_token: ${{ secrets.CONTROLLER_OAUTH_TOKEN }}
           resource_type: job_template
           resource_name: actions-awxkit-test3
           limit: "localhost-0*"
@@ -87,10 +87,10 @@ See [action.yml](action.yml)
           skip_tags: "nonsense"
 
       - name: "Test AWX: Simple job template without waiting"
-        uses: fitbeard/action-trigger-awx@v23.5.1
+        uses: fitbeard/action-trigger-awx@v23.7.0
         with:
-          tower_url: ${{ secrets.TOWER_HOST }}
-          tower_token: ${{ secrets.TOWER_OAUTH_TOKEN }}
+          controller_host: ${{ secrets.CONTROLLER_HOST }}
+          controller_oauth_token: ${{ secrets.CONTROLLER_OAUTH_TOKEN }}
           resource_type: job_template
           resource_name: actions-awxkit-test2
           monitor: "false"

diff --git a/action.yml b/action.yml
@@ -1,18 +1,18 @@
 ---
-name: Trigger AWX and Ansible Tower resources
+name: Trigger AWX and Ansible Automation Platform Controller resources
 author: Tadas Sutkaitis
-description: Trigger resource on AWX or Ansible Tower
+description: Trigger resource on AWX or Ansible Automation Platform Controller
 branding:
   color: red
   icon: play-circle
 inputs:
-  tower_url:
-    description: "AWX or Ansible Tower URL."
+  controller_host:
+    description: "AWX or Ansible Automation Platform Controller URL."
     required: true
-  tower_token:
-    description: "AWX or Ansible Tower Oauth token."
+  controller_oauth_token:
+    description: "AWX or Ansible Automation Platform Controller Oauth token."
     required: true
-  tower_verify_ssl:
+  controller_verify_ssl:
     description: "Require valid SSL certificate"
     required: false
     default: "true"
@@ -57,9 +57,9 @@ runs:
   using: docker
   image: Dockerfile
   env:
-    TOWER_HOST: ${{ inputs.tower_url }}
-    TOWER_OAUTH_TOKEN: ${{ inputs.tower_token }}
-    TOWER_VERIFY_SSL: ${{ inputs.tower_verify_ssl }}
+    CONTROLLER_HOST: ${{ inputs.controller_host }}
+    CONTROLLER_OAUTH_TOKEN: ${{ inputs.controller_oauth_token }}
+    CONTROLLER_VERIFY_SSL: ${{ inputs.controller_verify_ssl }}
     RESOURCE_TYPE: ${{ inputs.resource_type }}
     RESOURCE_NAME: ${{ inputs.resource_name }}
     JOB_TYPE: ${{ inputs.job_type }}

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -4,22 +4,22 @@ set -e
 
 export PYTHONUNBUFFERED=1
 
-if [ -z "$TOWER_HOST" ]; then
-  echo "Tower host is not set. Exiting."
+if [ -z "$CONTROLLER_HOST" ]; then
+  echo "Controller host is not set. Exiting."
   exit 1
 fi
 
-if [ -z "$TOWER_OAUTH_TOKEN" ]; then
-  echo "Tower oauth token is not set. Exiting."
+if [ -z "$CONTROLLER_OAUTH_TOKEN" ]; then
+  echo "Controller oauth token is not set. Exiting."
   exit 1
 fi
 
-if [ -z "$TOWER_VERIFY_SSL" ]; then
-  TOWER_VERIFY_SSL="true"
-elif [ $TOWER_VERIFY_SSL = "true" ]; then
-  TOWER_VERIFY_SSL="true"
-elif [ $TOWER_VERIFY_SSL = "false" ]; then
-  TOWER_VERIFY_SSL="false"
+if [ -z "$CONTROLLER_VERIFY_SSL" ]; then
+  CONTROLLER_VERIFY_SSL="true"
+elif [ $CONTROLLER_VERIFY_SSL = "true" ]; then
+  CONTROLLER_VERIFY_SSL="true"
+elif [ $CONTROLLER_VERIFY_SSL = "false" ]; then
+  CONTROLLER_VERIFY_SSL="false"
 else
   echo "Unknown ssl verify value. Exiting."
   exit 1

diff --git a/requirements.txt b/requirements.txt
@@ -1 +1 @@
-awxkit==23.5.1
+awxkit==23.7.0