Fix aws release

.github/workflows/ansible_lint.yml

@@ -14,6 +14,6 @@ jobs:
         uses: ansible/[email protected]
         with:
           working_directory: ansible/
-          args: "-x 204,role-name --skip-list role-name[path],yaml[line-length]"
+          args: "-x role-name,fqcn[action-core],role-name[path],yaml[line-length]"
         env:
           ANSIBLE_LIBRARY: ${{ github.workspace }}/ansible/library

ansible/README.md

@@ -153,7 +153,7 @@ To build upon these roles, you can create your own play, e.g.:
       include_role:
         name: killbill-cloud/ansible/roles/killbill
     - name: customize Kill Bill
-      ansible.builtin.import_tasks: roles/acme/tasks/main.yml
+      import_tasks: roles/acme/tasks/main.yml
 ```
 
 Note that you need to have your own templates directory, containing your own templates.

ansible/diagnostic.yml

@@ -3,9 +3,9 @@
   hosts: all
   tasks:
     - name: Setup Ruby
-      ansible.builtin.import_tasks: roles/common/tasks/main.yml
+      import_tasks: roles/common/tasks/main.yml
     - name: Setup KPM
-      ansible.builtin.import_tasks: roles/kpm/tasks/main.yml
+      import_tasks: roles/kpm/tasks/main.yml
     - name: Gather diagnostics
       killbill_diagnostics:
         kpm_path: "{{ kpm_path }}"

ansible/flyway.yml

@@ -3,6 +3,6 @@
   hosts: all
   tasks:
     - name: Setup Ruby
-      ansible.builtin.import_tasks: roles/common/tasks/main.yml
+      import_tasks: roles/common/tasks/main.yml
     - name: Install Flyway
-      ansible.builtin.import_tasks: roles/migrations/tasks/flyway.yml
+      import_tasks: roles/migrations/tasks/flyway.yml

ansible/java.yml

@@ -7,4 +7,4 @@
     java_home: /usr/lib/jvm/default-java
   tasks:
     - name: Install Java
-      ansible.builtin.import_tasks: roles/tomcat/tasks/java.yml
+      import_tasks: roles/tomcat/tasks/java.yml

ansible/kaui.yml

@@ -5,8 +5,8 @@
     kaui_kpm_yml: /var/lib/kaui/kpm.yml
   tasks:
     - name: Setup Ruby
-      ansible.builtin.import_tasks: roles/common/tasks/main.yml
+      import_tasks: roles/common/tasks/main.yml
     - name: Setup Tomcat
-      ansible.builtin.import_tasks: roles/tomcat/tasks/main.yml
+      import_tasks: roles/tomcat/tasks/main.yml
     - name: Install Kaui
-      ansible.builtin.import_tasks: roles/kaui/tasks/main.yml
+      import_tasks: roles/kaui/tasks/main.yml

ansible/kaui_json_logging.yml

@@ -3,6 +3,6 @@
   hosts: all
   tasks:
     - name: Download third-party dependencies
-      ansible.builtin.import_tasks: roles/kaui/tasks/json_logging.yml
+      import_tasks: roles/kaui/tasks/json_logging.yml
     - name: Enable Tomcat JSON logging
-      ansible.builtin.import_tasks: roles/tomcat/tasks/json_logging.yml
+      import_tasks: roles/tomcat/tasks/json_logging.yml

ansible/killbill.yml

@@ -3,8 +3,8 @@
   hosts: all
   tasks:
     - name: Setup Ruby
-      ansible.builtin.import_tasks: roles/common/tasks/main.yml
+      import_tasks: roles/common/tasks/main.yml
     - name: Setup Tomcat
-      ansible.builtin.import_tasks: roles/tomcat/tasks/main.yml
+      import_tasks: roles/tomcat/tasks/main.yml
     - name: Install Kill Bill
-      ansible.builtin.import_tasks: roles/killbill/tasks/main.yml
+      import_tasks: roles/killbill/tasks/main.yml

ansible/killbill_json_logging.yml

@@ -3,4 +3,4 @@
   hosts: all
   tasks:
     - name: Enable Tomcat JSON logging
-      ansible.builtin.import_tasks: roles/tomcat/tasks/json_logging.yml
+      import_tasks: roles/tomcat/tasks/json_logging.yml

ansible/kpm.yml

@@ -3,4 +3,4 @@
   hosts: all
   tasks:
     - name: Install KPM
-      ansible.builtin.import_tasks: roles/kpm/tasks/main.yml
+      import_tasks: roles/kpm/tasks/main.yml

ansible/roles/kaui/tasks/main.yml

@@ -81,8 +81,7 @@
 # Expand the WAR to speed up startup
 - name: Expand WAR file if not already done
   become: true
-  ansible.builtin.command: |
-    "{{ java_home }}/bin/jar" -xf ../ROOT.war
+  ansible.builtin.command: "{{ java_home }}/bin/jar -xf ../ROOT.war"
   args:
     chdir: "{{ catalina_base }}/{{ kaui_webapps }}/ROOT"
     creates: "{{ catalina_base }}/{{ kaui_webapps }}/ROOT/WEB-INF"

ansible/roles/killbill/tasks/main.yml

@@ -96,8 +96,7 @@
 # Expand the WAR to speed up startup
 - name: Expand WAR file if not already done
   become: true
-  ansible.builtin.command: |
-    "{{ java_home }}/bin/jar" -xf ../ROOT.war
+  ansible.builtin.command: "{{ java_home }}/bin/jar -xf ../ROOT.war"
   args:
     chdir: "{{ catalina_base }}/{{ kb_webapps }}/ROOT"
     creates: "{{ catalina_base }}/{{ kb_webapps }}/ROOT/WEB-INF"

ansible/roles/kpm/tasks/main.yml

@@ -65,9 +65,10 @@
 - name: Rename noarch KPM directory
   become: true
   ansible.builtin.command:
-    cmd: >
-      mv {{ kpm_install_dir }}/kpm-{{ kpm_version }}-noarch
-         {{ kpm_install_dir }}/kpm-{{ kpm_version }}-linux-{{ ansible_architecture }}
+    argv:
+      - mv
+      - "{{ kpm_install_dir }}/kpm-{{ kpm_version }}-noarch"
+      - "{{ kpm_install_dir }}/kpm-{{ kpm_version }}-linux-{{ ansible_architecture }}"
     creates: "{{ kpm_install_dir }}/kpm-{{ kpm_version }}-linux-{{ ansible_architecture }}"
   when: not kpm_bin.stat.exists and kpm_arch_test.status >= 400
   tags: kpm
@@ -106,8 +107,10 @@
 # The first time KPM is run, a Gemfile.lock needs to written out
 - name: Initialize KPM
   become: true
-  ansible.builtin.command: |
-    "{{ kpm_path }}/kpm" version
+  ansible.builtin.command:
+    argv:
+      - "{{ kpm_path }}/kpm"
+      - version
   args:
     creates: "{{ kpm_path }}/lib/vendor/Gemfile.lock"
   tags: kpm

ansible/roles/tomcat/tasks/native.yml

@@ -34,7 +34,10 @@
           tags: native
 
         - name: Find apr-1-config path
-          ansible.builtin.command: which apr-1-config
+          ansible.builtin.command:
+            argv:
+              - which
+              - apr-1-config
           register: tomcat_apr_config_path_output
           changed_when: false
           tags: native
@@ -49,7 +52,11 @@
       tags: native
       block:
         - name: Find tomcat_gnu_arch path
-          ansible.builtin.command: dpkg-architecture --query DEB_BUILD_GNU_TYPE
+          ansible.builtin.command:
+            argv:
+              - dpkg-architecture
+              - --query
+              - DEB_BUILD_GNU_TYPE
           register: tomcat_gnu_arch_output
           changed_when: false
           tags: native
@@ -79,29 +86,33 @@
 
     - name: Configure native libraries
       ansible.builtin.command:
-        cmd: >
-          ./configure
-            --build="{{ tomcat_gnu_arch }}"
-            --libdir="{{ tomcat_native_libdir }}"
-            --prefix="{{ catalina_home }}"
-            --with-apr="{{ tomcat_apr_config_path }}"
-            --with-java-home="{{ java_home }}"
-            --with-ssl=yes
+        argv:
+          - ./configure
+          - --build={{ tomcat_gnu_arch }}
+          - --libdir={{ tomcat_native_libdir }}
+          - --prefix={{ catalina_home }}
+          - --with-apr={{ tomcat_apr_config_path }}
+          - --with-java-home={{ java_home }}
+          - --with-ssl=yes
         chdir: "{{ tomcat_workspace.path }}/native"
       changed_when: false
       tags: native
 
     - name: Build native libraries
       ansible.builtin.command:
-        cmd: make all
+        argv:
+          - make
+          - all
         chdir: "{{ tomcat_workspace.path }}/native"
       changed_when: false
       tags: native
 
     - name: Install native libraries
       become: true
       ansible.builtin.command:
-        cmd: make install
+        argv:
+          - make
+          - install
         chdir: "{{ tomcat_workspace.path }}/native"
       changed_when: false
       tags: native

ansible/tomcat.yml

@@ -3,9 +3,9 @@
   hosts: all
   tasks:
     - name: Install Tomcat
-      ansible.builtin.import_tasks: roles/tomcat/tasks/install.yml
+      import_tasks: roles/tomcat/tasks/install.yml
     - name: Install Tomcat native libraries
-      ansible.builtin.import_tasks: roles/tomcat/tasks/native.yml
+      import_tasks: roles/tomcat/tasks/native.yml
       when: java_home is defined
     - name: Setup Tomcat
-      ansible.builtin.import_tasks: roles/tomcat/tasks/main.yml
+      import_tasks: roles/tomcat/tasks/main.yml

ansible/tomcat_restart.yml

@@ -4,4 +4,4 @@
   become: yes
   tasks:
     - name: Restart Tomcat
-      ansible.builtin.import_tasks: roles/tomcat/tasks/restart.yml
+      import_tasks: roles/tomcat/tasks/restart.yml

ansible/tomcat_stop.yml

@@ -4,4 +4,4 @@
   become: yes
   tasks:
     - name: Stop Tomcat
-      ansible.builtin.import_tasks: roles/tomcat/tasks/stop.yml
+      import_tasks: roles/tomcat/tasks/stop.yml

docker/templates/base/latest/Dockerfile

@@ -58,7 +58,7 @@ WORKDIR $TOMCAT_HOME
 # Install ansible roles dependencies
 ARG KILLBILL_CLOUD_VERSION
 RUN ansible-galaxy collection install community.general && \
-    ansible-galaxy install git+https://[email protected]/killbill/killbill-cloud.git,$KILLBILL_CLOUD_VERSION
+    ansible-galaxy install git+https://[email protected]/vnandwana/killbill-cloud.git,$KILLBILL_CLOUD_VERSION
 ENV KILLBILL_CLOUD_ANSIBLE_ROLES=$TOMCAT_HOME/.ansible/roles/killbill-cloud/ansible
 ENV ENV_HOST_IP=localhost
 ENV ANSIBLE_OPTS="-i localhost, \
@@ -74,6 +74,7 @@ ENV NEXUS_REPOSITORY=${NEXUS_REPOSITORY:-maven2}
 ENV KPM_INSTALL_DIR=/opt
 RUN ansible-playbook $ANSIBLE_OPTS \
                      -e kpm_install_dir=$KPM_INSTALL_DIR \
+                     -e kpm_path=$KPM_INSTALL_DIR/kpm-latest \
                      -e kpm_owner=$TOMCAT_OWNER \
                      -e kpm_group=$TOMCAT_GROUP \
                      -e nexus_url=$NEXUS_URL \

docker/templates/kaui/latest/Dockerfile.template

@@ -14,7 +14,9 @@ COPY ./kaui.sh $KAUI_INSTALL_DIR
 
 ENV KPM_INSTALL_CMD="ansible-playbook $ANSIBLE_OPTS  \
                                       -e kpm_install_dir=$KPM_INSTALL_DIR \
+                                      -e kpm_path=$KPM_INSTALL_DIR/kpm-latest \
                                       -e kpm_yml=$KAUI_INSTALL_DIR/kpm.yml \
+                                      -e kaui_kpm_yml=$KAUI_INSTALL_DIR/kpm.yml \
                                       -e tomcat_owner=$TOMCAT_OWNER \
                                       -e tomcat_group=$TOMCAT_GROUP \
                                       -e catalina_base=$CATALINA_BASE \

docker/templates/killbill/latest/Dockerfile.template

@@ -26,7 +26,9 @@ COPY ./shiro.ini.template $KILLBILL_INSTALL_DIR/config
 
 ENV KPM_INSTALL_CMD="ansible-playbook $ANSIBLE_OPTS  \
                                       -e kpm_install_dir=$KPM_INSTALL_DIR \
+                                      -e kpm_path=$KPM_INSTALL_DIR/kpm-latest \
                                       -e kpm_yml=$KILLBILL_INSTALL_DIR/kpm.yml \
+                                      -e killbill_kpm_yml=$KILLBILL_INSTALL_DIR/kpm.yml \
                                       -e kb_config_dir=$KILLBILL_INSTALL_DIR \
                                       -e kb_plugins_dir=$KILLBILL_INSTALL_DIR/bundles \
                                       -e tomcat_owner=$TOMCAT_OWNER \
@@ -37,6 +39,7 @@ ENV KPM_INSTALL_CMD="ansible-playbook $ANSIBLE_OPTS  \
 ENV KPM_DIAGNOSTIC_CMD="ansible-playbook $ANSIBLE_OPTS  \
                                          -e kpm_install_dir=$KPM_INSTALL_DIR \
                                          -e kpm_yml=$KILLBILL_INSTALL_DIR/kpm.yml \
+                                         -e killbill_kpm_yml=$KILLBILL_INSTALL_DIR/kpm.yml \
                                          -e kb_config_dir=$KILLBILL_INSTALL_DIR \
                                          -e kb_plugins_dir=$KILLBILL_INSTALL_DIR/bundles \
                                          -e tomcat_owner=$TOMCAT_OWNER \
@@ -47,6 +50,7 @@ ENV KPM_DIAGNOSTIC_CMD="ansible-playbook $ANSIBLE_OPTS  \
 ENV MIGRATIONS_CMD="ansible-playbook $ANSIBLE_OPTS \
                                      -e kpm_install_dir=$KPM_INSTALL_DIR \
                                      -e kpm_yml=$KILLBILL_INSTALL_DIR/kpm.yml \
+                                     -e killbill_kpm_yml=$KILLBILL_INSTALL_DIR/kpm.yml \
                                      -e kb_config_dir=$KILLBILL_INSTALL_DIR \
                                      -e kb_plugins_dir=$KILLBILL_INSTALL_DIR/bundles \
                                      -e flyway_owner=$TOMCAT_OWNER \

kpm/spec/kpm/remote/maven_central_api_calls_spec.rb

@@ -9,7 +9,7 @@
     logger.level = Logger::DEBUG
     logger
   end
-  let(:test_version) { '0.24.15' }
+  let(:test_version) { '0.24.16' }
   let(:coordinates_map) do
     { version: test_version,
       group_id: 'org.kill-bill.billing',
@@ -38,7 +38,7 @@
       parsed_pom = REXML::Document.new(File.read(destination))
       expect(parsed_pom.elements['//groupId'].text).to eq('org.kill-bill.billing')
       expect(parsed_pom.elements['//artifactId'].text).to eq('killbill-oss-parent')
-      expect(parsed_pom.elements['//version'].text).to eq('0.146.63')
+      expect(parsed_pom.elements['//version'].text).to eq('0.146.67')
     }
   end