From e07209f40d5dee31afda3408ec7272ae6a32bc3f Mon Sep 17 00:00:00 2001
From: Jean-Francois Panisset <panisset@gmail.com>
Date: Tue, 22 Apr 2025 00:16:00 -0700
Subject: [PATCH] Redirect Conan - Artifactory authentication variables

The secrets for authentication against the Artifactory repository
are called ARTIFACTORY_USER and ARTIFACTORY_TOKEN, copy those
to environment variables CONAN_LOGIN_USERNAME and CONAN_PASSWORD
which are expected by Conan to authenticate package uploads.

Also fix pylint warning for obsolete --conan-login option
to aswfdocker CLI which was breaking Sonar scan.

Signed-off-by: Jean-Francois Panisset <panisset@gmail.com>
---
 .github/workflows/release.yml       | 4 ++--
 python/aswfdocker/cli/aswfdocker.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index e66f3b57..ad105271 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,8 +10,8 @@ jobs:
     env:
       DOCKER_CLI_EXPERIMENTAL: enabled
       DOCKER_BUILDKIT: '1'
-      ARTIFACTORY_USER: ${{ secrets.ARTIFACTORY_USER }}
-      ARTIFACTORY_TOKEN: ${{ secrets.ARTIFACTORY_TOKEN }}
+      CONAN_LOGIN_USERNAME: ${{ secrets.ARTIFACTORY_USER }}
+      CONAN_PASSWORD: ${{ secrets.ARTIFACTORY_TOKEN }}
 
     strategy:
       matrix:
diff --git a/python/aswfdocker/cli/aswfdocker.py b/python/aswfdocker/cli/aswfdocker.py
index 588b0c1b..8ea729b8 100644
--- a/python/aswfdocker/cli/aswfdocker.py
+++ b/python/aswfdocker/cli/aswfdocker.py
@@ -190,7 +190,7 @@ def build(
     use_conan,
     keep_source,
     keep_build,
-    conan_login,
+    conan_login,  # pylint: disable=unused-argument
     build_missing,
 ):
     """Builds a ci-package or ci-image Docker image."""