IEBH-452: Sync with the latest changes (#7)

Author: vmoshynskyi

.env.example

@@ -1,11 +1,4 @@
-# is sensitive/secret
-VAULT_TOKEN=
-
 # contains defaults but can be overriden
-CONFIG_CENTER_ENABLED=false
-VAULT_URL=
-VAULT_CRT=
-
 METADATA_SERVICE=http://metadata.utility:5066
 DATAOPS_SERVICE=http://dataops.utility:5063
 

.github/workflows/hdc-pipeline.yml

@@ -0,0 +1,37 @@
+name: HDC ci/cd pipeline
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  run_tests_hdc:
+    uses: PilotDataPlatform/pilot-hdc-ci-tools/.github/workflows/run_tests.yml@main
+    with:
+      min_coverage_percent: 76
+      coverage_target: pipelinewatch
+    secrets: inherit
+
+  build_and_publish_hdc:
+    needs: [run_tests_hdc]
+    uses: PilotDataPlatform/pilot-hdc-ci-tools/.github/workflows/build_and_publish.yml@main
+    with:
+      matrix_config: '["pipelinewatch"]'
+      service_name: 'pipelinewatch'
+    secrets: inherit
+
+  deploy_hdc:
+    needs: [build_and_publish_hdc]
+    uses: PilotDataPlatform/pilot-hdc-ci-tools/.github/workflows/trigger_deployment.yml@main
+    with:
+      hdc_service_name: 'pipelinewatch'
+    secrets: inherit

.gitignore

@@ -85,7 +85,7 @@ ipython_config.py
 # pyenv
 #   For a library or package, you might want to ignore these files since the code is
 #   intended to run in multiple environments; otherwise, check them in:
-# .python-version
+.python-version
 
 # pipenv
 #   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.

.pre-commit-config.yaml

@@ -67,15 +67,15 @@ repos:
           '--max-line-length=120',
         ]
 
-#  - repo: https://github.com/PyCQA/docformatter
-#    rev: v1.7.5
-#    hooks:
-#      - id: docformatter
-#        args: [
-#          '--wrap-summaries=120',
-#          '--wrap-descriptions=120',
-#          '--in-place',
-#        ]
+  - repo: https://github.com/PyCQA/docformatter
+    rev: 06907d0
+    hooks:
+      - id: docformatter
+        args: [
+          '--wrap-summaries=120',
+          '--wrap-descriptions=120',
+          '--in-place',
+        ]
 
   - repo: https://github.com/Lucas-C/pre-commit-hooks
     rev: v1.5.5

Jenkinsfile

@@ -6,40 +6,11 @@
 
 import logging
 from functools import lru_cache
-from typing import Any
-from typing import Dict
-from typing import Optional
 
-from common import VaultClient
 from pydantic import BaseSettings
 from pydantic import Extra
 
 
-class VaultConfig(BaseSettings):
-    """Store vault related configuration."""
-
-    APP_NAME: str = 'pipelinewatch'
-    CONFIG_CENTER_ENABLED: bool = False
-
-    VAULT_URL: Optional[str]
-    VAULT_CRT: Optional[str]
-    VAULT_TOKEN: Optional[str]
-
-    class Config:
-        env_file = '.env'
-        env_file_encoding = 'utf-8'
-
-
-def load_vault_settings(settings: BaseSettings) -> Dict[str, Any]:
-    config = VaultConfig()
-
-    if not config.CONFIG_CENTER_ENABLED:
-        return {}
-
-    client = VaultClient(config.VAULT_URL, config.VAULT_CRT, config.VAULT_TOKEN)
-    return client.get_from_vault(config.APP_NAME)
-
-
 class Settings(BaseSettings):
     """Store service configuration settings."""
 
@@ -59,10 +30,6 @@ class Config:
         env_file_encoding = 'utf-8'
         extra = Extra.allow
 
-        @classmethod
-        def customise_sources(cls, init_settings, env_settings, file_secret_settings):
-            return env_settings, init_settings, load_vault_settings, file_secret_settings
-
 
 @lru_cache(1)
 def get_settings():

config.py

@@ -4,9 +4,9 @@
 # Version 3.0 (the "License") available at https://www.gnu.org/licenses/agpl-3.0.en.html.
 # You may not use this file except in compliance with the License.
 
+from collections.abc import Generator
 from enum import Enum
 from enum import unique
-from typing import Generator
 
 from kubernetes import watch
 from kubernetes.client import BatchV1Api

pipelinewatch/stream_watcher.py

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pipelinewatch"
-version = "2.2.4"
+version = "2.2.7"
 description = ""
 authors = ["Indoc Research"]
 
@@ -9,7 +9,7 @@ python = "^3.7"
 pilot-platform-common = "0.3.0"
 kubernetes = "11.0.0"
 requests = "2.24.0"
-pydantic = "1.8.2"
+pydantic = "1.10.19"
 
 [tool.poetry.dev-dependencies]
 pytest = "7.1.1"