🚨 fix: codeql warning

Author: jobs62

.github/workflows/pull-request.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v5
-    - uses: pre-commit/action@v3.0.0
+    - uses: pre-commit/action@v3.0.1
     - name: setup fuse
       run: |
         sudo apt-get update --fix-missing
@@ -28,7 +28,7 @@ jobs:
         cd pkg && make ./configure --py3_ver=11 --arch_old=2014 && make osc-cli-x86_64.AppImage
         ./osc-cli-x86_64.AppImage 2>&1 | grep Usage
     - name: Upload artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v5
       with:
         name: osc-cli
         path: |
@@ -43,7 +43,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v5
-    - uses: pre-commit/action@v2.0.3
+    - uses: pre-commit/action@v3.0.1
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
@@ -75,18 +75,3 @@ jobs:
         OSC_TEST_REGION: ${{ secrets.OSC_TEST_REGION }}
     - name: Test python package building
       run: make build
-  dependabot-auto-merge:
-    needs: [tests-packaging, tests-app]
-    runs-on: ubuntu-latest
-    if: ${{ github.actor == 'dependabot[bot]' }}
-    steps:
-      - name: Dependabot metadata
-        id: metadata
-        uses: dependabot/fetch-metadata@v1.1.1
-        with:
-          github-token: "${{ secrets.GITHUB_TOKEN }}"
-      - name: Auto-merge
-        run: gh pr merge --auto --rebase "$PR_URL"
-        env:
-          PR_URL: ${{github.event.pull_request.html_url}}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

osc_sdk/sdk.py

@@ -16,7 +16,7 @@
 import fire
 import requests
 import xmltodict
-from requests.models import Request, Response
+from requests.models import Response
 from typing_extensions import TypedDict
 
 CANONICAL_URI = "/"
@@ -141,8 +141,8 @@ def __str__(self) -> str:
         return (
             f"Error --> status = {self.status_code}, "
             f"code = {self.error_code}, "
-            f'{"code_type = " if self.code_type is not None else ""}'
-            f'{self.code_type + ", " if self.code_type is not None else ""}'
+            f"{'code_type = ' if self.code_type is not None else ''}"
+            f"{self.code_type + ', ' if self.code_type is not None else ''}"
             f"Reason = {self.message}, "
             f"request_id = {self.request_id}"
         )
@@ -389,7 +389,7 @@ def make_request(self, call: str, **kwargs: CallParameters):
                 "content-type": self.CONTENT_TYPE,
                 "host": self.host,
                 "x-amz-date": self.date,
-                "x-amz-target": f'{self.API_NAME}_{datetime.date.today().strftime("%Y%m%d")}.{call}',
+                "x-amz-target": f"{self.API_NAME}_{datetime.date.today().strftime('%Y%m%d')}.{call}",
             }
 
             payload_hash = hashlib.sha256(
@@ -521,7 +521,7 @@ def build_headers(self, target: str, json_parameters: str) -> Headers:
 
         signed_headers = "host;x-amz-date;x-amz-target"
         canonical_headers = (
-            f"host:{self.host}\n" f"x-amz-date:{self.date}\n" f"x-amz-target:{target}\n"
+            f"host:{self.host}\nx-amz-date:{self.date}\nx-amz-target:{target}\n"
         )
         headers = {
             "content-type": self.CONTENT_TYPE,
@@ -607,7 +607,7 @@ def get_parameters(
         # Specific to ICU
         if (
             self.authentication_method == "accesskey"
-            or self.authentication_method == None
+            or self.authentication_method is None
         ):
             data.update({"AuthenticationMethod": "accesskey"})
 
@@ -702,7 +702,7 @@ def build_headers(self, target: str, _) -> Headers:
 
         signed_headers = "host;x-osc-date;x-osc-target"
         canonical_headers = (
-            f"host:{self.host}\n" f"x-osc-date:{self.date}\n" f"x-osc-target:{target}\n"
+            f"host:{self.host}\nx-osc-date:{self.date}\nx-osc-target:{target}\n"
         )
         headers = {
             "Content-Type": self.CONTENT_TYPE,
@@ -733,15 +733,14 @@ def get_conf(profile: str) -> Configuration:
     for v in json_profiles:
         json_profile = json_profiles[v]
         if "region" in json_profile:
-
             # use default stuffs only when "region" is use
             # to keep region_name format retrocompatible
-            if not "host" in json_profile and not "endpoint" in json_profile:
+            if "host" not in json_profile and "endpoint" not in json_profile:
                 json_profile["host"] = DEFAULT_HOST
-            if not "https" in json_profile:
+            if "https" not in json_profile:
                 json_profile["https"] = True
 
-            if not "region_name" in json_profile:
+            if "region_name" not in json_profile:
                 json_profile["region_name"] = json_profile["region"]
             del json_profile["region"]
     conf = cast(Mapping[str, Configuration], json_profiles)
@@ -768,7 +767,6 @@ def api_connect(
     config_path: Optional[str] = None,
     **kwargs: CallParameters,
 ):
-
     calls = {
         "api": OSCCall,
         "directlink": DirectLinkCall,
@@ -811,8 +809,8 @@ def main():
                 global PASSWORD_ARG
                 PASSWORD_ARG = argv[i + 1]
             elif a == "--bash_completion":
-                f = open(BASH_COMPLETION_PATH, "r")
-                print(f.read())
+                with open(BASH_COMPLETION_PATH, "r") as f:
+                    print(f.read())
                 sys.exit()
                 return 0
             elif a == "--version":

setup.py

@@ -1,4 +1,12 @@
 from setuptools import find_packages, setup
+import os
+
+
+def get_long_description():
+    root_path = os.path.dirname(os.path.abspath(__file__))
+    with open(os.path.join(root_path, "README.md"), "r", encoding="utf-8") as fd:
+        return fd.read()
+
 
 setup(
     name="osc-sdk",
@@ -7,7 +15,7 @@
     author="Outscale SAS",
     author_email="contact@outscale.com",
     description="Outscale API SDK and CLI",
-    long_description=open("README.md").read(),
+    long_description=get_long_description(),
     long_description_content_type="text/markdown",
     include_package_data=True,
     license="BSD",
@@ -20,6 +28,8 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
+        "Programming Language :: Python :: 3.12",
         "Operating System :: OS Independent",
     ],
     url="https://github.com/outscale/osc-cli",