From 6ea6f0c43de59f9d65b8ff8bc11c3b29dfeef105 Mon Sep 17 00:00:00 2001
From: Pere Miquel Brull <p.brull@stuart.com>
Date: Sun, 30 Jan 2022 21:26:41 +0100
Subject: [PATCH] Fix #2383 - Multiple validation workflows (#2500)

* Clean duplicated validation

* Move black dep to dev

* Fix black version for ingestion core

* Validate core generated in the same workflow
---
 .github/workflows/py-generate.yml  |  2 ++
 .github/workflows/py-generate2.yml | 43 ------------------------------
 ingestion-core/setup.py            |  1 +
 ingestion/setup.py                 |  2 +-
 4 files changed, 4 insertions(+), 44 deletions(-)
 delete mode 100644 .github/workflows/py-generate2.yml

diff --git a/.github/workflows/py-generate.yml b/.github/workflows/py-generate.yml
index 8f7a372b431..92ceb1428df 100644
--- a/.github/workflows/py-generate.yml
+++ b/.github/workflows/py-generate.yml
@@ -39,3 +39,5 @@ jobs:
         run: |
           source env/bin/activate
           make generate
+      - name: Generate core models
+        run: make core_generate
diff --git a/.github/workflows/py-generate2.yml b/.github/workflows/py-generate2.yml
deleted file mode 100644
index e2b9c10eca5..00000000000
--- a/.github/workflows/py-generate2.yml
+++ /dev/null
@@ -1,43 +0,0 @@
-#  Copyright 2021 Collate
-#  Licensed under the Apache License, Version 2.0 (the "License");
-#  you may not use this file except in compliance with the License.
-#  You may obtain a copy of the License at
-#  http://www.apache.org/licenses/LICENSE-2.0
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-#  limitations under the License.
-
-name: Validate Pydantic Models 2
-
-on:
-  pull_request:
-    branches:
-      - main
-    paths:
-      - 'catalog-rest-service/src/main/resources/json/**'
-
-jobs:
-  validate:
-    runs-on: ubuntu-latest
-    defaults:
-      run:
-        shell: bash
-        working-directory: ingestion-core
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python 3.9
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-      - name: Install Ubuntu related dependencies
-        run: |
-          sudo apt-get install -y libsasl2-dev unixodbc-dev python3-venv
-      - name: Install Python
-        run: |
-          python3 -m venv env
-      - name: Generate models
-        run: |
-          source env/bin/activate
-          make generate
\ No newline at end of file
diff --git a/ingestion-core/setup.py b/ingestion-core/setup.py
index ff5ab7318a2..d57ec4b8a47 100644
--- a/ingestion-core/setup.py
+++ b/ingestion-core/setup.py
@@ -22,6 +22,7 @@ def get_long_description():
 
 dev = {
     "datamodel-code-generator==0.11.14",
+    "black==21.12b0",
     "incremental",
     "twine",
     "twisted",
diff --git a/ingestion/setup.py b/ingestion/setup.py
index 8e4c7bb7627..7f0f21c4d68 100644
--- a/ingestion/setup.py
+++ b/ingestion/setup.py
@@ -113,12 +113,12 @@ dev = {
     "boto3==1.20.14",
     "botocore==1.23.14",
     "datamodel-code-generator==0.11.14",
+    "black==21.12b0",  # required for datamodel-code-generator==0.11.14
     "docker",
     "google-cloud-storage==1.43.0",
     "twine",
 }
 test = {
-    "black==21.12b0",
     "isort",
     "pre-commit",
     "pylint",