chore(airbyte-ci): move common_utils into ci_credentials

.github/workflows/airbyte-ci-tests.yml

@@ -34,7 +34,6 @@ jobs:
             internal_poetry_packages:
             - airbyte-ci/connectors/pipelines/**
             - airbyte-ci/connectors/base_images/**
-            - airbyte-ci/connectors/common_utils/**
             - airbyte-ci/connectors/connectors_insights/**
             - airbyte-ci/connectors/connector_ops/**
             - airbyte-ci/connectors/connectors_qa/**

airbyte-ci/connectors/base_images/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "airbyte-connectors-base-images"
-version = "1.5.1"
+version = "1.5.2"
 description = "This package is used to generate and publish the base images for Airbyte Connectors."
 authors = ["Augustin Lafanechere <[email protected]>"]
 readme = "README.md"

airbyte-ci/connectors/common_utils/common_utils/logger.py → airbyte-ci/connectors/ci_credentials/ci_credentials/logger.py

@@ -33,12 +33,12 @@ class Logger:
     """
 
     def __init__(self):
-        formatter = MyFormatter(fmt="[%(asctime)s] - %(levelname)-6s - %(message)s", datefmt="%d/%m/%Y %H:%M:%S.%f")
+        formatter = MyFormatter(fmt="[%(asctime)s] - %(levelname)s - %(message)s", datefmt="%d/%m/%Y %H:%M:%S.%f")
 
         logger_name = __name__
         stack_items = inspect.stack()
         for i in range(len(stack_items)):
-            if stack_items[i].filename.endswith("common_utils/logger.py"):
+            if stack_items[i].filename.endswith("ci_credentials/logger.py"):
                 logger_name = ".".join(stack_items[i + 1].filename.split("/")[-3:])[:-3]
 
         self._logger = logging.getLogger(logger_name)
@@ -56,17 +56,17 @@ def wrapper(*args):
             prefix = ""
             stack_items = inspect.stack()
             for i in range(len(stack_items)):
-                if stack_items[i].filename.endswith("common_utils/logger.py"):
+                if stack_items[i].filename.endswith("ci_credentials/logger.py"):
                     filepath = stack_items[i + 1].filename
                     line_number = stack_items[i + 1].lineno
 
                     # show last 3 path items only
                     filepath = "/".join(filepath.split("/")[-3:])
-                    prefix = f"[{filepath}:{line_number}]"
+                    prefix = f"[{filepath}:{line_number}] # "
                     break
             if prefix:
                 args = list(args)
-                args[0] = f"{prefix} # {args[0]}"
+                args[0] = f"{prefix}{args[0]}"
             func(*args)
             if func_name == "critical":
                 sys.exit(1)

airbyte-ci/connectors/ci_credentials/ci_credentials/main.py

@@ -7,9 +7,9 @@
 from json.decoder import JSONDecodeError
 
 import click
-from common_utils import Logger
 
-from . import SecretsManager
+from .logger import Logger
+from .secrets_manager import SecretsManager
 
 
 logger = Logger()

airbyte-ci/connectors/ci_credentials/ci_credentials/secrets_manager.py

@@ -13,8 +13,9 @@
 
 import requests
 import yaml
-from common_utils import GoogleApi, Logger
 
+from .google_api import GoogleApi
+from .logger import Logger
 from .models import DEFAULT_SECRET_FILE, RemoteSecret, Secret