From a8525d0db25d194305fe554026e2e8ca62182860 Mon Sep 17 00:00:00 2001 From: Zhengda Lu Date: Thu, 10 Apr 2025 17:23:53 +0000 Subject: [PATCH 1/5] Revert "Parse RDS end-of-life versions. (#19773)" This reverts commit caa7937869b7a6b6b006389c3cc8bcc24952fc5f. --- postgres/datadog_checks/postgres/version_utils.py | 11 ----------- postgres/tests/test_version_utils.py | 7 ------- 2 files changed, 18 deletions(-) diff --git a/postgres/datadog_checks/postgres/version_utils.py b/postgres/datadog_checks/postgres/version_utils.py index 89b27e3e3d735..854cd378d82a1 100644 --- a/postgres/datadog_checks/postgres/version_utils.py +++ b/postgres/datadog_checks/postgres/version_utils.py @@ -69,22 +69,11 @@ def parse_version(raw_version): version.append(0) return VersionInfo(*version) except ValueError: - pass - try: # Postgres might be in development, with format \d+[beta|rc]\d+ match = re.match(r'(\d+)([a-zA-Z]+)(\d+)', raw_version) if match: version = list(match.groups()) return VersionInfo.parse('{}.0.0-{}.{}'.format(*version)) - else: - raise ValueError('Unable to match development version') - except ValueError: - # RDS changes the version format when the version switches to EOL. - # Example: 11.22-rds.20241121. - match = re.match(r'(\d+\.\d+)-rds\.(\d+)', raw_version) - if match: - version = list(match.groups()) - return VersionInfo.parse('{}.{}'.format(*version)) raise Exception("Cannot determine which version is {}".format(raw_version)) @staticmethod diff --git a/postgres/tests/test_version_utils.py b/postgres/tests/test_version_utils.py index 7900d562a1d84..5189014b46054 100644 --- a/postgres/tests/test_version_utils.py +++ b/postgres/tests/test_version_utils.py @@ -79,10 +79,3 @@ def test_transform_version(): 'version.scheme': 'semver', } assert expected == version - - -def test_parse_rds_eol_version(): - version = '11.22-rds.20241121' - v11_22_rds = VersionUtils.parse_version(version) - - assert v11_22_rds == VersionInfo(11, 22, 20241121) From 7bc1521d1df3da247d0eaad468cba1ac8d5df300 Mon Sep 17 00:00:00 2001 From: Zhengda Lu Date: Thu, 10 Apr 2025 17:24:24 +0000 Subject: [PATCH 2/5] Revert "Omit .* regex filter (#19470)" This reverts commit 7551df997c2b6dd5126737299ea6c972d66982a4. --- postgres/datadog_checks/postgres/relationsmanager.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/postgres/datadog_checks/postgres/relationsmanager.py b/postgres/datadog_checks/postgres/relationsmanager.py index 3f3356beb7978..bbf3c2d9e4095 100644 --- a/postgres/datadog_checks/postgres/relationsmanager.py +++ b/postgres/datadog_checks/postgres/relationsmanager.py @@ -408,11 +408,8 @@ def filter_relation_query(self, query, schema_field): relation_filter = [] if r.get(RELATION_NAME): relation_filter.append("( relname = '{}'".format(r[RELATION_NAME])) - elif r.get(RELATION_REGEX) and r.get(RELATION_REGEX) != ".*": + elif r.get(RELATION_REGEX): relation_filter.append("( relname ~ '{}'".format(r[RELATION_REGEX])) - else: - # Stub filter to allow for appending - relation_filter.append("( 1=1") if ALL_SCHEMAS not in r[SCHEMAS]: schema_filter = ','.join("'{}'".format(s) for s in r[SCHEMAS]) From c0b274321792433101cf8954cb2358c70926ccfd Mon Sep 17 00:00:00 2001 From: Sarah Witt Date: Fri, 11 Apr 2025 09:03:10 -0400 Subject: [PATCH 3/5] Revert dependency bump (#20064) * resolve conflicts * remove uptime --- LICENSE-3rdparty.csv | 2 +- agent_requirements.in | 18 +++++++++--------- amazon_msk/pyproject.toml | 2 +- cisco_aci/pyproject.toml | 2 +- datadog_checks_base/pyproject.toml | 12 ++++++------ http_check/pyproject.toml | 2 +- kubevirt_api/pyproject.toml | 2 +- mongo/pyproject.toml | 2 +- mysql/pyproject.toml | 4 ++-- postgres/pyproject.toml | 6 +++--- riakcs/pyproject.toml | 2 +- spark/pyproject.toml | 2 +- sqlserver/pyproject.toml | 2 +- tls/pyproject.toml | 2 +- 14 files changed, 30 insertions(+), 30 deletions(-) diff --git a/LICENSE-3rdparty.csv b/LICENSE-3rdparty.csv index ebf3a9f2186d8..f12308abc1cb7 100644 --- a/LICENSE-3rdparty.csv +++ b/LICENSE-3rdparty.csv @@ -11,7 +11,7 @@ binary,PyPI,Apache-2.0,Copyright 2018 Ofek Lev binary,PyPI,MIT,Copyright 2018 Ofek Lev boto3,PyPI,Apache-2.0,"Copyright 2013-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved." botocore,PyPI,Apache-2.0,"Copyright 2012-2022 Amazon.com, Inc. or its affiliates. All Rights Reserved." -cachetools,PyPI,MIT,Copyright (c) 2014-2025 Thomas Kemmer +cachetools,PyPI,MIT,Copyright (c) 2014-2024 Thomas Kemmer check-postgres,"https://github.com/bucardo/",BSD-2-Clause,Copyright 2007 - 2023 Greg Sabino Mullane clickhouse-cityhash,PyPI,MIT,"Copyright (c) 2011, Alexander Marshalov " clickhouse-driver,PyPI,MIT,Copyright (c) 2017 by Konstantin Lebedev. diff --git a/agent_requirements.in b/agent_requirements.in index 21d47ac161a16..461c991bb06c3 100644 --- a/agent_requirements.in +++ b/agent_requirements.in @@ -1,23 +1,23 @@ aerospike==7.1.1; sys_platform != 'win32' and sys_platform != 'darwin' aws-requests-auth==0.4.3 -azure-identity==1.20.0 -beautifulsoup4==4.13.3 +azure-identity==1.19.0 +beautifulsoup4==4.12.3 binary==1.0.1 -boto3==1.36.26 -botocore==1.36.26 -cachetools==5.5.2 +boto3==1.36.16 +botocore==1.36.16 +cachetools==5.5.1 clickhouse-cityhash==1.0.2.4 clickhouse-driver==0.2.9 cm-client==45.0.4 confluent-kafka==2.8.0 -cryptography==44.0.1 +cryptography==43.0.1 ddtrace==2.10.6 dnspython==2.7.0 foundationdb==6.3.24 hazelcast-python-client==5.5.0 in-toto==2.0.0 jellyfish==1.1.3 -kubernetes==32.0.1 +kubernetes==32.0.0 lazy-loader==0.4 ldap3==2.9.1 lxml==5.1.1 @@ -41,7 +41,7 @@ pymongo[srv]==4.8.0; python_version >= '3.9' pymqi==1.12.11; sys_platform != 'darwin' or platform_machine != 'arm64' pymysql==1.1.1 pyodbc==5.2.0; sys_platform != 'darwin' or platform_machine != 'arm64' -pyopenssl==24.3.0 +pyopenssl==24.2.1 pysmi==1.2.1 pysnmp-mibs==0.1.6 pysnmp==5.1.0 @@ -63,7 +63,7 @@ rethinkdb==2.4.10.post1 securesystemslib[crypto,pynacl]==0.28.0 semver==3.0.4 service-identity[idna]==24.2.0 -simplejson==3.20.1 +simplejson==3.19.3 snowflake-connector-python==3.13.2 supervisor==4.2.5 tuf==4.0.0 diff --git a/amazon_msk/pyproject.toml b/amazon_msk/pyproject.toml index d0e3676b07b69..52aadc98e5be3 100644 --- a/amazon_msk/pyproject.toml +++ b/amazon_msk/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "boto3==1.36.26", + "boto3==1.36.16", ] [project.urls] diff --git a/cisco_aci/pyproject.toml b/cisco_aci/pyproject.toml index e94542272e369..b95d5b2c853d3 100644 --- a/cisco_aci/pyproject.toml +++ b/cisco_aci/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cryptography==44.0.1", + "cryptography==43.0.1", ] [project.urls] diff --git a/datadog_checks_base/pyproject.toml b/datadog_checks_base/pyproject.toml index 4245ddb53e858..cedf0a016bae7 100644 --- a/datadog_checks_base/pyproject.toml +++ b/datadog_checks_base/pyproject.toml @@ -35,8 +35,8 @@ db = [ ] deps = [ "binary==1.0.1", - "cachetools==5.5.2", - "cryptography==44.0.1", + "cachetools==5.5.1", + "cryptography==43.0.1", "ddtrace==2.10.6", "jellyfish==1.1.3", "lazy-loader==0.4", @@ -49,15 +49,15 @@ deps = [ "requests-toolbelt==1.0.0", "requests-unixsocket2==0.4.2", "requests==2.32.3", - "simplejson==3.20.1", + "simplejson==3.19.3", "wrapt==1.17.2", ] http = [ "aws-requests-auth==0.4.3", - "botocore==1.36.26", + "botocore==1.36.16", "oauthlib==3.2.2", "pyjwt==2.10.1", - "pyopenssl==24.3.0", + "pyopenssl==24.2.1", "pysocks==1.7.1", "requests-kerberos==0.15.0", "requests-ntlm==1.3.0", @@ -67,7 +67,7 @@ json = [ "orjson==3.10.15", ] kube = [ - "kubernetes==32.0.1", + "kubernetes==32.0.0", "requests-oauthlib==2.0.0", ] diff --git a/http_check/pyproject.toml b/http_check/pyproject.toml index d9b65c66411c8..08f0f433415b7 100644 --- a/http_check/pyproject.toml +++ b/http_check/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cryptography==44.0.1", + "cryptography==43.0.1", "requests-ntlm==1.3.0", ] diff --git a/kubevirt_api/pyproject.toml b/kubevirt_api/pyproject.toml index c73f9aa06158b..bc635fb1445be 100644 --- a/kubevirt_api/pyproject.toml +++ b/kubevirt_api/pyproject.toml @@ -37,7 +37,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "kubernetes==32.0.1", + "kubernetes==32.0.0" ] [project.urls] diff --git a/mongo/pyproject.toml b/mongo/pyproject.toml index 1af550199fc36..3aff3ee913967 100644 --- a/mongo/pyproject.toml +++ b/mongo/pyproject.toml @@ -37,7 +37,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cachetools==5.5.2", + "cachetools==5.5.1", "psutil==6.0.0", "pymongo[srv]==4.8.0; python_version >= '3.9'", ] diff --git a/mysql/pyproject.toml b/mysql/pyproject.toml index c06f27ebc846b..aa918877fde29 100644 --- a/mysql/pyproject.toml +++ b/mysql/pyproject.toml @@ -36,8 +36,8 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cachetools==5.5.2", - "cryptography==44.0.1", + "cachetools==5.5.1", + "cryptography==43.0.1", "pymysql==1.1.1", ] diff --git a/postgres/pyproject.toml b/postgres/pyproject.toml index 10ed17b4147fc..55a0677de4fad 100644 --- a/postgres/pyproject.toml +++ b/postgres/pyproject.toml @@ -37,9 +37,9 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "azure-identity==1.20.0", - "boto3==1.36.26", - "cachetools==5.5.2", + "azure-identity==1.19.0", + "boto3==1.36.16", + "cachetools==5.5.1", "psycopg2-binary==2.9.9", "semver==3.0.4", ] diff --git a/riakcs/pyproject.toml b/riakcs/pyproject.toml index 1a76c39c37bd3..4dd0dd19de94e 100644 --- a/riakcs/pyproject.toml +++ b/riakcs/pyproject.toml @@ -36,7 +36,7 @@ dynamic = [ [project.optional-dependencies] deps = [ - "boto3==1.36.26", + "boto3==1.36.16", ] [project.urls] diff --git a/spark/pyproject.toml b/spark/pyproject.toml index f783611e2fb0d..64fcac372fca6 100644 --- a/spark/pyproject.toml +++ b/spark/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "beautifulsoup4==4.13.3", + "beautifulsoup4==4.12.3", ] [project.urls] diff --git a/sqlserver/pyproject.toml b/sqlserver/pyproject.toml index ef0167420c677..febc8dc93cf5d 100644 --- a/sqlserver/pyproject.toml +++ b/sqlserver/pyproject.toml @@ -37,7 +37,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "azure-identity==1.20.0", + "azure-identity==1.19.0", "lxml==5.1.1", "pyodbc==5.2.0; sys_platform != 'darwin' or platform_machine != 'arm64'", "pywin32==308; sys_platform == 'win32'", diff --git a/tls/pyproject.toml b/tls/pyproject.toml index 751800402bc21..f04ab67f1349c 100644 --- a/tls/pyproject.toml +++ b/tls/pyproject.toml @@ -36,7 +36,7 @@ license = "BSD-3-Clause" [project.optional-dependencies] deps = [ - "cryptography==44.0.1", + "cryptography==43.0.1", "service-identity[idna]==24.2.0", ] From 3d6f87e2d2d846cd60307356b60b080cf0929e02 Mon Sep 17 00:00:00 2001 From: Alex Lopez Date: Thu, 20 Mar 2025 17:16:54 +0100 Subject: [PATCH 4/5] Fix Workflow Dispatch for build deps workflow (#19889) * Print debugging to figure out variable values on workflow dispatches * Revert "Print debugging to figure out variable values on workflow dispatches" This reverts commit f8e098586bc7fa63455698148ce992c19d02cabe. * Fix workflow dispatch by using github.ref_name instead of github.ref --- .github/workflows/build-deps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-deps.yml b/.github/workflows/build-deps.yml index d7c7d8cb51710..f4f5efa3ed3ef 100644 --- a/.github/workflows/build-deps.yml +++ b/.github/workflows/build-deps.yml @@ -237,7 +237,7 @@ jobs: publish: name: Publish artifacts - if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && (github.ref == github.event.repository.default_branch || startsWith(github.ref, '7.'))) + if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && (github.ref_name == github.event.repository.default_branch || startsWith(github.ref_name, '7.'))) needs: - build - build-macos From e41d5442e4b066753e928f6dc4c9f3362d7d9950 Mon Sep 17 00:00:00 2001 From: Ilia Kurenkov Date: Wed, 26 Mar 2025 10:41:12 +0100 Subject: [PATCH 5/5] rename --- .github/workflows/{build-deps.yml => resolve-build-deps.yaml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{build-deps.yml => resolve-build-deps.yaml} (99%) diff --git a/.github/workflows/build-deps.yml b/.github/workflows/resolve-build-deps.yaml similarity index 99% rename from .github/workflows/build-deps.yml rename to .github/workflows/resolve-build-deps.yaml index f4f5efa3ed3ef..492ae956ddfc5 100644 --- a/.github/workflows/build-deps.yml +++ b/.github/workflows/resolve-build-deps.yaml @@ -1,4 +1,4 @@ -name: Build dependencies +name: Resolve Dependencies and Build Wheels on: workflow_dispatch: @@ -236,7 +236,7 @@ jobs: path: output publish: - name: Publish artifacts + name: Publish artifacts and update lockfiles via PR if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && (github.ref_name == github.event.repository.default_branch || startsWith(github.ref_name, '7.'))) needs: - build