From ebe650ba90d37ed421d4abe2bb283c7c102bb934 Mon Sep 17 00:00:00 2001 From: Vijay N Date: Thu, 29 Jan 2026 14:08:19 +0530 Subject: [PATCH] * Addressed Copilot review comments. * Fixed Docker CI workflow. * Fixed lint issues. --- .github/workflows/ansible_lint.yml | 2 +- ansible/README.md | 2 +- ansible/diagnostic.yml | 4 ++-- ansible/flyway.yml | 4 ++-- ansible/java.yml | 2 +- ansible/kaui.yml | 6 +++--- ansible/kaui_json_logging.yml | 4 ++-- ansible/killbill.yml | 6 +++--- ansible/killbill_json_logging.yml | 2 +- ansible/kpm.yml | 2 +- ansible/tomcat.yml | 6 +++--- ansible/tomcat_restart.yml | 2 +- ansible/tomcat_stop.yml | 2 +- docker/templates/kaui/latest/Dockerfile.template | 1 + docker/templates/killbill/latest/Dockerfile.template | 3 +++ kpm/spec/kpm/remote/maven_central_api_calls_spec.rb | 4 ++-- 16 files changed, 28 insertions(+), 24 deletions(-) diff --git a/.github/workflows/ansible_lint.yml b/.github/workflows/ansible_lint.yml index 55159e30..cd239af0 100644 --- a/.github/workflows/ansible_lint.yml +++ b/.github/workflows/ansible_lint.yml @@ -14,6 +14,6 @@ jobs: uses: ansible/ansible-lint@v25.9.2 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 diff --git a/ansible/README.md b/ansible/README.md index 81007d9b..dca0883e 100644 --- a/ansible/README.md +++ b/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. diff --git a/ansible/diagnostic.yml b/ansible/diagnostic.yml index 5baaec2b..377a8e14 100644 --- a/ansible/diagnostic.yml +++ b/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 }}" diff --git a/ansible/flyway.yml b/ansible/flyway.yml index acb14c3e..07bb4fd0 100644 --- a/ansible/flyway.yml +++ b/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 diff --git a/ansible/java.yml b/ansible/java.yml index cfb3bfd8..79746525 100644 --- a/ansible/java.yml +++ b/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 diff --git a/ansible/kaui.yml b/ansible/kaui.yml index 5662246a..3bf74e3f 100644 --- a/ansible/kaui.yml +++ b/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 diff --git a/ansible/kaui_json_logging.yml b/ansible/kaui_json_logging.yml index cad70b58..e359daed 100644 --- a/ansible/kaui_json_logging.yml +++ b/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 diff --git a/ansible/killbill.yml b/ansible/killbill.yml index 81519ad3..e86498ce 100644 --- a/ansible/killbill.yml +++ b/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 diff --git a/ansible/killbill_json_logging.yml b/ansible/killbill_json_logging.yml index 8830ea86..dd937983 100644 --- a/ansible/killbill_json_logging.yml +++ b/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 diff --git a/ansible/kpm.yml b/ansible/kpm.yml index b10f454a..23803270 100644 --- a/ansible/kpm.yml +++ b/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 diff --git a/ansible/tomcat.yml b/ansible/tomcat.yml index 5541a7e8..58e6cf29 100644 --- a/ansible/tomcat.yml +++ b/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 diff --git a/ansible/tomcat_restart.yml b/ansible/tomcat_restart.yml index 5590b602..d3be03e0 100644 --- a/ansible/tomcat_restart.yml +++ b/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 diff --git a/ansible/tomcat_stop.yml b/ansible/tomcat_stop.yml index df5666d8..ea67b595 100644 --- a/ansible/tomcat_stop.yml +++ b/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 diff --git a/docker/templates/kaui/latest/Dockerfile.template b/docker/templates/kaui/latest/Dockerfile.template index 096fad5d..68afb8ce 100644 --- a/docker/templates/kaui/latest/Dockerfile.template +++ b/docker/templates/kaui/latest/Dockerfile.template @@ -15,6 +15,7 @@ COPY ./kaui.sh $KAUI_INSTALL_DIR ENV KPM_INSTALL_CMD="ansible-playbook $ANSIBLE_OPTS \ -e kpm_install_dir=$KPM_INSTALL_DIR \ -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 \ diff --git a/docker/templates/killbill/latest/Dockerfile.template b/docker/templates/killbill/latest/Dockerfile.template index 4fa5262a..2e4e5740 100644 --- a/docker/templates/killbill/latest/Dockerfile.template +++ b/docker/templates/killbill/latest/Dockerfile.template @@ -27,6 +27,7 @@ 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_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 +38,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 +49,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 \ diff --git a/kpm/spec/kpm/remote/maven_central_api_calls_spec.rb b/kpm/spec/kpm/remote/maven_central_api_calls_spec.rb index acca9cf2..9307b13f 100644 --- a/kpm/spec/kpm/remote/maven_central_api_calls_spec.rb +++ b/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