Merge branch 'main' into person/mdilyan/cicd-vep

README.md

@@ -48,8 +48,11 @@ VDK creates data processing workflows to:
 - Track both code and data modifications and the relationship between them, allowing quicker troubleshooting and version rollback.
 
 
-![Without / With Versatile Data Kit](./support/images/versatile-data-kit-before-after-light.svg#gh-light-mode-only)
-![Without / With Versatile Data Kit](./support/images/versatile-data-kit-before-after-dark.svg#gh-dark-mode-only)
+![Without / With Versatile Data Kit](./support/images/versatile-data-kit-before-after-img-transparent-light.svg#gh-light-mode-only)
+![Without / With Versatile Data Kit](./support/images/versatile-data-kit-before-after-img-transparent-dark.svg#gh-dark-mode-only)
+![Without / With Versatile Data Kit code](./support/images/versatile-data-kit-before-after-code-transparent-light.svg#gh-light-mode-only)
+![Without / With Versatile Data Kit code](./support/images/versatile-data-kit-before-after-code-transparent-dark.svg#gh-dark-mode-only)
+
 
 # Versatile Data Kit Components
 - Software Development Kit (SDK):

projects/control-service/projects/versions-of-external-dependencies.gradle

@@ -16,7 +16,7 @@ project.ext {
             'org.junit.platform:junit-platform-suite-api'                        : 'org.junit.platform:junit-platform-suite-api:1.9.2',
             'com.mmnaseri.utils:spring-data-mock'                                : 'com.mmnaseri.utils:spring-data-mock:2.2.0',
             'org.mockito:mockito-core'                                           : 'org.mockito:mockito-core:5.1.1',
-            'net.bytebuddy:byte-buddy'                                           : 'net.bytebuddy:byte-buddy:1.14.0',
+            'net.bytebuddy:byte-buddy'                                           : 'net.bytebuddy:byte-buddy:1.14.1',
             'com.fasterxml.jackson.core:jackson-databind'                        : 'com.fasterxml.jackson.core:jackson-databind:2.14.2',
             'com.fasterxml.jackson.datatype:jackson-datatype-jsr310'             : 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2',
             'org.json:json'                                                      : 'org.json:json:20230227',
@@ -31,7 +31,7 @@ project.ext {
             'com.graphql-java:graphql-java-spring-boot-starter-webmvc'           : 'com.graphql-java:graphql-java-spring-boot-starter-webmvc:2021-10-25T04-50-54-fbc162f',
             'com.cronutils:cron-utils'                                           : 'com.cronutils:cron-utils:9.2.0',
             'net.lingala.zip4j:zip4j'                                            : 'net.lingala.zip4j:zip4j:2.11.5',
-            'net.javacrumbs.shedlock:shedlock-spring'                            : 'net.javacrumbs.shedlock:shedlock-spring:4.43.0',
+            'net.javacrumbs.shedlock:shedlock-spring'                            : 'net.javacrumbs.shedlock:shedlock-spring:5.2.0',
             'net.javacrumbs.shedlock:shedlock-provider-jdbc-template'            : 'net.javacrumbs.shedlock:shedlock-provider-jdbc-template:4.42.0',
             'org.testcontainers:testcontainers'                                  : 'org.testcontainers:testcontainers:1.17.6',
             'org.mock-server:mockserver-netty'                                   : 'org.mock-server:mockserver-netty:5.15.0', //5.11.2

projects/vdk-heartbeat/tests/vdk/internal/test_trino_database_test.py

@@ -1,8 +1,8 @@
 # Copyright 2021-2023 VMware, Inc.
 # SPDX-License-Identifier: Apache-2.0
 from datetime import datetime
-from unittest.mock import MagicMock
 
+from vdk.internal.heartbeat.config import Config
 from vdk.internal.heartbeat.trino_database_test import TrinoDatabaseRunTest
 
 
@@ -18,7 +18,7 @@ def test_create_table():
     }
 
     queries = []
-    trino_test = TrinoDatabaseRunTest(MagicMock())
+    trino_test = TrinoDatabaseRunTest(Config())
     trino_test._execute_query = lambda q: queries.append(q)
 
     trino_test._create_table(db, table_name, columns)
@@ -37,7 +37,7 @@ def test_delete_table():
     table_name = "my_table"
 
     queries = []
-    trino_test = TrinoDatabaseRunTest(MagicMock())
+    trino_test = TrinoDatabaseRunTest(Config())
     trino_test._execute_query = lambda q: queries.append(q)
 
     trino_test._delete_table(db, table_name)
@@ -58,7 +58,7 @@ def test_insert_table_row():
     }
 
     queries = []
-    trino_test = TrinoDatabaseRunTest(MagicMock())
+    trino_test = TrinoDatabaseRunTest(Config())
     trino_test._execute_query = lambda q: queries.append(q)
 
     trino_test._insert_table_row(db, table_name, row)
@@ -82,7 +82,7 @@ def test_select_data():
     }
 
     queries = []
-    trino_test = TrinoDatabaseRunTest(MagicMock())
+    trino_test = TrinoDatabaseRunTest(Config())
     trino_test._execute_query = lambda q: queries.append(q)
 
     trino_test._select_data(db, table_name, column_filters)