From 975f72afb915e36c1ed972954757707fe61cf477 Mon Sep 17 00:00:00 2001 From: Miroslav Ivanov Date: Thu, 1 Sep 2022 15:33:55 +0300 Subject: [PATCH 1/7] Pin minikerberos in vdk-kerberos-auth plugin --- projects/vdk-plugins/vdk-kerberos-auth/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt index 9a950aa4e2..f37ce4bef8 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt +++ b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt @@ -1,5 +1,5 @@ docker-compose -minikerberos +minikerberos==0.2.20 pytest pytest-docker requests-kerberos From d594da1a424efd87a9df55865ba52391283f34fb Mon Sep 17 00:00:00 2001 From: Miroslav Ivanov Date: Thu, 1 Sep 2022 16:16:47 +0300 Subject: [PATCH 2/7] Pin minikerberos in vdk-kerberos-auth plugin --- projects/vdk-plugins/vdk-kerberos-auth/requirements.txt | 2 +- projects/vdk-plugins/vdk-kerberos-auth/setup.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt index f37ce4bef8..b423783947 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt +++ b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt @@ -1,5 +1,5 @@ docker-compose -minikerberos==0.2.20 +minikerberos==0.2.18 pytest pytest-docker requests-kerberos diff --git a/projects/vdk-plugins/vdk-kerberos-auth/setup.py b/projects/vdk-plugins/vdk-kerberos-auth/setup.py index 0a52baebe9..a572f92077 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/setup.py +++ b/projects/vdk-plugins/vdk-kerberos-auth/setup.py @@ -14,7 +14,12 @@ description="Versatile Data Kit SDK plugin adds Kerberos/GSSAPI support.", long_description=pathlib.Path("README.md").read_text(), long_description_content_type="text/markdown", - install_requires=["vdk-core", "minikerberos", "requests-kerberos", "pykerberos"], + install_requires=[ + "vdk-core", + "minikerberos==0.2.18", + "requests-kerberos", + "pykerberos", + ], package_dir={"": "src"}, packages=setuptools.find_namespace_packages(where="src"), entry_points={ From dde22d31091bb610f240995e2dc4c236d2344316 Mon Sep 17 00:00:00 2001 From: Miroslav Ivanov Date: Thu, 1 Sep 2022 16:31:45 +0300 Subject: [PATCH 3/7] Pin minikerberos in vdk-kerberos-auth plugin --- projects/vdk-plugins/build-plugin.sh | 1 + projects/vdk-plugins/vdk-kerberos-auth/requirements.txt | 2 +- projects/vdk-plugins/vdk-kerberos-auth/setup.py | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/projects/vdk-plugins/build-plugin.sh b/projects/vdk-plugins/build-plugin.sh index 7138989ea6..a92ebac8af 100755 --- a/projects/vdk-plugins/build-plugin.sh +++ b/projects/vdk-plugins/build-plugin.sh @@ -32,6 +32,7 @@ then fi fi +pip list pip install pytest-cov pytest --junitxml=tests.xml --cov vdk --cov-report term-missing --cov-report xml:coverage.xml diff --git a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt index b423783947..f37ce4bef8 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt +++ b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt @@ -1,5 +1,5 @@ docker-compose -minikerberos==0.2.18 +minikerberos==0.2.20 pytest pytest-docker requests-kerberos diff --git a/projects/vdk-plugins/vdk-kerberos-auth/setup.py b/projects/vdk-plugins/vdk-kerberos-auth/setup.py index a572f92077..fe7b4aab22 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/setup.py +++ b/projects/vdk-plugins/vdk-kerberos-auth/setup.py @@ -16,7 +16,7 @@ long_description_content_type="text/markdown", install_requires=[ "vdk-core", - "minikerberos==0.2.18", + "minikerberos==0.2.20", "requests-kerberos", "pykerberos", ], From 1628965ece46cc14e05695372f92cf9278f77be7 Mon Sep 17 00:00:00 2001 From: Miroslav Ivanov Date: Thu, 1 Sep 2022 16:38:49 +0300 Subject: [PATCH 4/7] Pin minikerberos in vdk-kerberos-auth plugin --- projects/vdk-plugins/build-plugin.sh | 1 - projects/vdk-plugins/vdk-kerberos-auth/requirements.txt | 2 +- projects/vdk-plugins/vdk-kerberos-auth/setup.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/projects/vdk-plugins/build-plugin.sh b/projects/vdk-plugins/build-plugin.sh index a92ebac8af..7138989ea6 100755 --- a/projects/vdk-plugins/build-plugin.sh +++ b/projects/vdk-plugins/build-plugin.sh @@ -32,7 +32,6 @@ then fi fi -pip list pip install pytest-cov pytest --junitxml=tests.xml --cov vdk --cov-report term-missing --cov-report xml:coverage.xml diff --git a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt index f37ce4bef8..4fbdbc9a64 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt +++ b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt @@ -1,5 +1,5 @@ docker-compose -minikerberos==0.2.20 +minikerberos==0.3.0 pytest pytest-docker requests-kerberos diff --git a/projects/vdk-plugins/vdk-kerberos-auth/setup.py b/projects/vdk-plugins/vdk-kerberos-auth/setup.py index fe7b4aab22..500018a4cd 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/setup.py +++ b/projects/vdk-plugins/vdk-kerberos-auth/setup.py @@ -16,7 +16,7 @@ long_description_content_type="text/markdown", install_requires=[ "vdk-core", - "minikerberos==0.2.20", + "minikerberos==0.3.0", "requests-kerberos", "pykerberos", ], From 323c255959c464d9f2b73723b9c5bc3f8c39d01d Mon Sep 17 00:00:00 2001 From: Miroslav Ivanov Date: Thu, 1 Sep 2022 16:53:54 +0300 Subject: [PATCH 5/7] Pin minikerberos in vdk-kerberos-auth plugin --- projects/vdk-plugins/vdk-kerberos-auth/requirements.txt | 2 +- projects/vdk-plugins/vdk-kerberos-auth/setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt index 4fbdbc9a64..d750f8a894 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt +++ b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt @@ -1,5 +1,5 @@ docker-compose -minikerberos==0.3.0 +minikerberos==0.2.20 # Pinned minikerberos because the plugin is not compatible with 0.3.0 pytest pytest-docker requests-kerberos diff --git a/projects/vdk-plugins/vdk-kerberos-auth/setup.py b/projects/vdk-plugins/vdk-kerberos-auth/setup.py index 500018a4cd..fe7b4aab22 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/setup.py +++ b/projects/vdk-plugins/vdk-kerberos-auth/setup.py @@ -16,7 +16,7 @@ long_description_content_type="text/markdown", install_requires=[ "vdk-core", - "minikerberos==0.3.0", + "minikerberos==0.2.20", "requests-kerberos", "pykerberos", ], From 6af47d05c03854deba8abd6d490400e1d4489f08 Mon Sep 17 00:00:00 2001 From: Miroslav Ivanov Date: Thu, 1 Sep 2022 18:07:44 +0300 Subject: [PATCH 6/7] Pin minikerberos in vdk-kerberos-auth plugin --- .../vdk-kerberos-auth/tests/test_kerberos.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/vdk-plugins/vdk-kerberos-auth/tests/test_kerberos.py b/projects/vdk-plugins/vdk-kerberos-auth/tests/test_kerberos.py index 32b6f83a99..52cbeef691 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/tests/test_kerberos.py +++ b/projects/vdk-plugins/vdk-kerberos-auth/tests/test_kerberos.py @@ -55,7 +55,7 @@ def test_invalid_authentication_mode(self): ["run", jobs_path_from_caller_directory("test-job")] ) - assert "VDK_KRB_AUTH has invalid value" in result.output + assert "VDK_KRB_AUTH has invalid value" in str(result.exception) cli_assert_equal(1, result) def test_kinit_authentication(self): @@ -160,7 +160,7 @@ def test_kinit_authentication_with_wrong_credentials(self): ): result: Result = self.__runner.invoke(["run", data_job_path]) - assert "kinit returned exitcode 1" in result.output + assert "kinit returned exitcode 1" in str(result.exception) cli_assert_equal(1, result) def test_kinit_authentication_error_fail_fast_is_false(self): @@ -197,7 +197,7 @@ def test_kinit_authentication_with_missing_keytab(self): ): result: Result = self.__runner.invoke(["run", data_job_path]) - assert "Cannot locate keytab file" in result.output + assert "Cannot locate keytab file" in str(result.exception) cli_assert_equal(1, result) def test_minikerberos_authentication(self): @@ -235,7 +235,7 @@ def test_minikerberos_authentication_with_wrong_credentials(self): ): result: Result = self.__runner.invoke(["run", data_job_path]) - assert "Client not found in Kerberos database" in result.output + assert "Client not found in Kerberos database" in str(result.exception) cli_assert_equal(1, result) def test_minikerberos_authentication_with_missing_keytab(self): @@ -255,5 +255,5 @@ def test_minikerberos_authentication_with_missing_keytab(self): ): result: Result = self.__runner.invoke(["run", data_job_path]) - assert "Cannot locate keytab file" in result.output + assert "Cannot locate keytab file" in str(result.exception) cli_assert_equal(1, result) From ca5bafe4ae5110216d379eb283fbdf4fbb94eb09 Mon Sep 17 00:00:00 2001 From: Miroslav Ivanov Date: Thu, 1 Sep 2022 18:11:55 +0300 Subject: [PATCH 7/7] Pin minikerberos in vdk-kerberos-auth plugin --- projects/vdk-plugins/vdk-kerberos-auth/requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt index d750f8a894..b56655cad1 100644 --- a/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt +++ b/projects/vdk-plugins/vdk-kerberos-auth/requirements.txt @@ -1,5 +1,7 @@ docker-compose -minikerberos==0.2.20 # Pinned minikerberos because the plugin is not compatible with 0.3.0 +# Pinned minikerberos because the current implementation is not compatible with 0.3.0+ +# https://github.com/vmware/versatile-data-kit/issues/1169 +minikerberos==0.2.20 pytest pytest-docker requests-kerberos