From 4886c6fcc9d653188cd54afb1770f4c99ce331c1 Mon Sep 17 00:00:00 2001 From: Patrick VanderKnyff Date: Mon, 22 Jul 2024 15:20:39 -0700 Subject: [PATCH 1/2] Fix null oauth version check --- connector-packager/connector_packager/jar_jdk_packager.py | 6 +++--- connector-packager/tests/test_jar_packager.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/connector-packager/connector_packager/jar_jdk_packager.py b/connector-packager/connector_packager/jar_jdk_packager.py index 97a9fee5..4d5a8d97 100644 --- a/connector-packager/connector_packager/jar_jdk_packager.py +++ b/connector-packager/connector_packager/jar_jdk_packager.py @@ -96,9 +96,9 @@ def get_min_support_version(file_list: List[ConnectorFile], cur_min_version_tabl reasons.append("Support for multiple OAuth configs was added in the 2023.1 release") elif (oauthConfigs is not None and len(oauthConfigs) == 1): firstConfig = oauthConfigs[0] - if firstConfig.attrib['file'] == "null_config" and 2024.1 > float(min_version_tableau): - min_version_tableau = "2024.1" - reasons.append("Connector uses Null OAuth Config, which was added in the 2024.1 release") + if firstConfig.attrib['file'] == "null_config" and 2023.3 > float(min_version_tableau): + min_version_tableau = "2022023.3" + reasons.append("Connector uses Null OAuth Config, which was added in the 2023.3 release") if version.parse(cur_min_version_tableau) > version.parse(min_version_tableau): reasons.append("min-tableau-version set to " + cur_min_version_tableau + ", since that is higher than calculated version of " + min_version_tableau) diff --git a/connector-packager/tests/test_jar_packager.py b/connector-packager/tests/test_jar_packager.py index 4f2b5ead..0bec9f70 100644 --- a/connector-packager/tests/test_jar_packager.py +++ b/connector-packager/tests/test_jar_packager.py @@ -454,7 +454,7 @@ def test_jdk_create_jar_with_null_oauth_config(self): manifest = ET.parse(path_to_extracted_manifest) self.assertEqual(manifest.getroot().get("min-version-tableau"), - VERSION_2024_1, "wrong min-version-tableau attr or doesn't exist") + VERSION_2023_3, "wrong min-version-tableau attr or doesn't exist") if dest_dir.exists(): shutil.rmtree(dest_dir) From 6a420618b0aec3f392c77e04049d73af266ade8b Mon Sep 17 00:00:00 2001 From: Patrick VanderKnyff Date: Mon, 22 Jul 2024 15:27:32 -0700 Subject: [PATCH 2/2] Fix typo --- connector-packager/connector_packager/jar_jdk_packager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connector-packager/connector_packager/jar_jdk_packager.py b/connector-packager/connector_packager/jar_jdk_packager.py index 4d5a8d97..9821b8fb 100644 --- a/connector-packager/connector_packager/jar_jdk_packager.py +++ b/connector-packager/connector_packager/jar_jdk_packager.py @@ -97,7 +97,7 @@ def get_min_support_version(file_list: List[ConnectorFile], cur_min_version_tabl elif (oauthConfigs is not None and len(oauthConfigs) == 1): firstConfig = oauthConfigs[0] if firstConfig.attrib['file'] == "null_config" and 2023.3 > float(min_version_tableau): - min_version_tableau = "2022023.3" + min_version_tableau = "2023.3" reasons.append("Connector uses Null OAuth Config, which was added in the 2023.3 release") if version.parse(cur_min_version_tableau) > version.parse(min_version_tableau):