From f4b750c83d729ebc8fa50a33683f9899f00e2b89 Mon Sep 17 00:00:00 2001 From: Anton Kukushkin Date: Fri, 2 Feb 2024 11:25:05 +0000 Subject: [PATCH] chore: Upgrade db versions in infra Signed-off-by: Anton Kukushkin --- test_infra/poetry.lock | 69 ++++++++++++++-------------- test_infra/pyproject.toml | 8 ++-- test_infra/stacks/databases_stack.py | 10 ++-- 3 files changed, 44 insertions(+), 43 deletions(-) diff --git a/test_infra/poetry.lock b/test_infra/poetry.lock index 6f6216a24..84c221d64 100644 --- a/test_infra/poetry.lock +++ b/test_infra/poetry.lock @@ -2,35 +2,36 @@ [[package]] name = "attrs" -version = "23.1.0" +version = "23.2.0" description = "Classes Without Boilerplate" optional = false python-versions = ">=3.7" files = [ - {file = "attrs-23.1.0-py3-none-any.whl", hash = "sha256:1f28b4522cdc2fb4256ac1a020c78acf9cba2c6b461ccd2c126f3aa8e8335d04"}, - {file = "attrs-23.1.0.tar.gz", hash = "sha256:6279836d581513a26f1bf235f9acd333bc9115683f14f7e8fae46c98fc50e015"}, + {file = "attrs-23.2.0-py3-none-any.whl", hash = "sha256:99b87a485a5820b23b879f04c2305b44b951b502fd64be915879d77a7e8fc6f1"}, + {file = "attrs-23.2.0.tar.gz", hash = "sha256:935dc3b529c262f6cf76e50877d35a4bd3c1de194fd41f47a2b7ae8f19971f30"}, ] [package.extras] cov = ["attrs[tests]", "coverage[toml] (>=5.3)"] -dev = ["attrs[docs,tests]", "pre-commit"] +dev = ["attrs[tests]", "pre-commit"] docs = ["furo", "myst-parser", "sphinx", "sphinx-notfound-page", "sphinxcontrib-towncrier", "towncrier", "zope-interface"] tests = ["attrs[tests-no-zope]", "zope-interface"] -tests-no-zope = ["cloudpickle", "hypothesis", "mypy (>=1.1.1)", "pympler", "pytest (>=4.3.0)", "pytest-mypy-plugins", "pytest-xdist[psutil]"] +tests-mypy = ["mypy (>=1.6)", "pytest-mypy-plugins"] +tests-no-zope = ["attrs[tests-mypy]", "cloudpickle", "hypothesis", "pympler", "pytest (>=4.3.0)", "pytest-xdist[psutil]"] [[package]] name = "aws-cdk-asset-awscli-v1" -version = "2.2.201" +version = "2.2.202" description = "A library that contains the AWS CLI for use in Lambda Layers" optional = false -python-versions = "~=3.7" +python-versions = "~=3.8" files = [ - {file = "aws-cdk.asset-awscli-v1-2.2.201.tar.gz", hash = "sha256:88d1c269fd5cf8c9f6e0464ed22e2d4f269dfd5b36b8c4d37687bdba9c269839"}, - {file = "aws_cdk.asset_awscli_v1-2.2.201-py3-none-any.whl", hash = "sha256:56fe2ef91d3c8d33559aa32d2130e5f35f23af1fb82f06648ebbc82ffe0a5879"}, + {file = "aws-cdk.asset-awscli-v1-2.2.202.tar.gz", hash = "sha256:3ef87d6530736b3a7b0f777fe3b4297994dd40c3ce9306d95f80f48fb18036e8"}, + {file = "aws_cdk.asset_awscli_v1-2.2.202-py3-none-any.whl", hash = "sha256:96205ea2e5e132ec52fabfff37ea25b9b859498f167d05b32564c949822cd331"}, ] [package.dependencies] -jsii = ">=1.91.0,<2.0.0" +jsii = ">=1.93.0,<2.0.0" publication = ">=0.0.3" typeguard = ">=2.13.3,<2.14.0" @@ -68,75 +69,75 @@ typeguard = ">=2.13.3,<2.14.0" [[package]] name = "aws-cdk-aws-glue-alpha" -version = "2.115.0a0" +version = "2.125.0a0" description = "The CDK Construct Library for AWS::Glue" optional = false python-versions = "~=3.8" files = [ - {file = "aws-cdk.aws-glue-alpha-2.115.0a0.tar.gz", hash = "sha256:0ece07cb1469ce25551d7a3c3f1cd6eeb211d49041c57b71d104fd1da951e954"}, - {file = "aws_cdk.aws_glue_alpha-2.115.0a0-py3-none-any.whl", hash = "sha256:c64fcba716b45a877134058c76f859ec2bc22eabad117c2c0faa28795b2c5bae"}, + {file = "aws-cdk.aws-glue-alpha-2.125.0a0.tar.gz", hash = "sha256:95797a0522177880822eb29b796ffbdc33e1e63fdc284aaae733da4d4f86a1ff"}, + {file = "aws_cdk.aws_glue_alpha-2.125.0a0-py3-none-any.whl", hash = "sha256:1ccdf7ee9d68d91f45e6e98ff9e05cc776797d9f510778de091ef4851b72bc80"}, ] [package.dependencies] -aws-cdk-lib = ">=2.115.0,<3.0.0" +aws-cdk-lib = ">=2.125.0,<3.0.0" constructs = ">=10.0.0,<11.0.0" -jsii = ">=1.93.0,<2.0.0" +jsii = ">=1.94.0,<2.0.0" publication = ">=0.0.3" typeguard = ">=2.13.3,<2.14.0" [[package]] name = "aws-cdk-aws-neptune-alpha" -version = "2.115.0a0" +version = "2.125.0a0" description = "The CDK Construct Library for AWS::Neptune" optional = false python-versions = "~=3.8" files = [ - {file = "aws-cdk.aws-neptune-alpha-2.115.0a0.tar.gz", hash = "sha256:f44606de91d5846326ed70487eb9007185b2e1d5109037f901516e01a7c2e022"}, - {file = "aws_cdk.aws_neptune_alpha-2.115.0a0-py3-none-any.whl", hash = "sha256:8097876d585a7eedcc6aad77bf316841c9a64f1ea84020bda73c5ccefd6817b0"}, + {file = "aws-cdk.aws-neptune-alpha-2.125.0a0.tar.gz", hash = "sha256:710afd826c0a88186278ef220028974c1aee5345d30494d2d0d2814f54c5b11a"}, + {file = "aws_cdk.aws_neptune_alpha-2.125.0a0-py3-none-any.whl", hash = "sha256:f05875bf1fd3243e3f22b8b523f49587756ba4f78c110547e1b4af8343ddbe04"}, ] [package.dependencies] -aws-cdk-lib = ">=2.115.0,<3.0.0" +aws-cdk-lib = ">=2.125.0,<3.0.0" constructs = ">=10.0.0,<11.0.0" -jsii = ">=1.93.0,<2.0.0" +jsii = ">=1.94.0,<2.0.0" publication = ">=0.0.3" typeguard = ">=2.13.3,<2.14.0" [[package]] name = "aws-cdk-aws-redshift-alpha" -version = "2.115.0a0" +version = "2.125.0a0" description = "The CDK Construct Library for AWS::Redshift" optional = false python-versions = "~=3.8" files = [ - {file = "aws-cdk.aws-redshift-alpha-2.115.0a0.tar.gz", hash = "sha256:6786864716239095ae9b861729b8f5decbd71bed3cc0c93fd1f82e1d1070ffb7"}, - {file = "aws_cdk.aws_redshift_alpha-2.115.0a0-py3-none-any.whl", hash = "sha256:043bba8fe2b52b02536445f4affd8d4c6506fb72e2f609d23c9a502ac30c3448"}, + {file = "aws-cdk.aws-redshift-alpha-2.125.0a0.tar.gz", hash = "sha256:eb2f174979bb9b08d077281694890f82f7447edfc9f9ea77a82ea5301f3cdb59"}, + {file = "aws_cdk.aws_redshift_alpha-2.125.0a0-py3-none-any.whl", hash = "sha256:71da55934d862d4795c0a4e85e2334d850ea6c7479cddc9544fcd7785b222fd6"}, ] [package.dependencies] -aws-cdk-lib = ">=2.115.0,<3.0.0" +aws-cdk-lib = ">=2.125.0,<3.0.0" constructs = ">=10.0.0,<11.0.0" -jsii = ">=1.93.0,<2.0.0" +jsii = ">=1.94.0,<2.0.0" publication = ">=0.0.3" typeguard = ">=2.13.3,<2.14.0" [[package]] name = "aws-cdk-lib" -version = "2.115.0" +version = "2.125.0" description = "Version 2 of the AWS Cloud Development Kit library" optional = false python-versions = "~=3.8" files = [ - {file = "aws-cdk-lib-2.115.0.tar.gz", hash = "sha256:14011c5ebd01392c82ed22828def6b8deabf2629088f0e1fc35444fa0da3715b"}, - {file = "aws_cdk_lib-2.115.0-py3-none-any.whl", hash = "sha256:e69bf63cb9ea2cc50e490271131dbe30af9d30c9f0ef4b85ff70b84527b9eeab"}, + {file = "aws-cdk-lib-2.125.0.tar.gz", hash = "sha256:c94056bc3445f83b9574e6cb66dcf023878667612af1a51346826ef93be1843d"}, + {file = "aws_cdk_lib-2.125.0-py3-none-any.whl", hash = "sha256:d22e0203a14dc03bf31477dbc0f8e33fe18ba7ad9bf82d088f611d2e32ab209f"}, ] [package.dependencies] -"aws-cdk.asset-awscli-v1" = ">=2.2.201,<3.0.0" +"aws-cdk.asset-awscli-v1" = ">=2.2.202,<3.0.0" "aws-cdk.asset-kubectl-v20" = ">=2.1.2,<3.0.0" "aws-cdk.asset-node-proxy-agent-v6" = ">=2.0.1,<3.0.0" constructs = ">=10.0.0,<11.0.0" -jsii = ">=1.93.0,<2.0.0" +jsii = ">=1.94.0,<2.0.0" publication = ">=0.0.3" typeguard = ">=2.13.3,<2.14.0" @@ -215,13 +216,13 @@ testing = ["pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", [[package]] name = "jsii" -version = "1.93.0" +version = "1.94.0" description = "Python client for jsii runtime" optional = false python-versions = "~=3.8" files = [ - {file = "jsii-1.93.0-py3-none-any.whl", hash = "sha256:d3cba8c18f2bb4eb94aa41a202b4eb14a561a3a347ed086294a6c9d5d17c90d6"}, - {file = "jsii-1.93.0.tar.gz", hash = "sha256:15349b329b79699c88a6041c8987a4470e6cfa544e5c1e4a126bc5be9f48a623"}, + {file = "jsii-1.94.0-py3-none-any.whl", hash = "sha256:1105bae271ae47c27cf31c1565c5157306efed5ad9323c9a27336f962f465716"}, + {file = "jsii-1.94.0.tar.gz", hash = "sha256:175abc356603d98f18ab6f6aa74bfeae253e4e56340aef9dc40bbb1a6a59868b"}, ] [package.dependencies] @@ -313,4 +314,4 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" python-versions = ">=3.8, <4.0" -content-hash = "91da6c7cf98b1281e2c51c5e83bd7d727c520cb58ec94b54ac0389122c3407ce" +content-hash = "e8d22301d10a9306ce963a7a8ccefb127b8c366b67ffa9a0b021a46f1f2c5b1a" diff --git a/test_infra/pyproject.toml b/test_infra/pyproject.toml index 986062ed9..d998c42e3 100644 --- a/test_infra/pyproject.toml +++ b/test_infra/pyproject.toml @@ -8,7 +8,7 @@ license = "Apache License 2.0" [tool.poetry.dependencies] python = ">=3.8, <4.0" "constructs" = ">=10.0.0,<11.0.0" -"aws-cdk-lib" = "^2.115.0" -"aws-cdk.aws-glue-alpha" = "^2.115.0a0" -"aws-cdk.aws-redshift-alpha" = "^2.115.0a0" -"aws-cdk.aws-neptune-alpha" = "^2.115.0a0" +"aws-cdk-lib" = "^2.125.0" +"aws-cdk.aws-glue-alpha" = "^2.125.0a0" +"aws-cdk.aws-redshift-alpha" = "^2.125.0a0" +"aws-cdk.aws-neptune-alpha" = "^2.125.0a0" diff --git a/test_infra/stacks/databases_stack.py b/test_infra/stacks/databases_stack.py index 9e4522bb2..a96f98351 100644 --- a/test_infra/stacks/databases_stack.py +++ b/test_infra/stacks/databases_stack.py @@ -356,7 +356,7 @@ def _setup_postgresql(self) -> None: self, "aws-sdk-pandas-postgresql-params", engine=rds.DatabaseClusterEngine.aurora_postgres( - version=rds.AuroraPostgresEngineVersion.VER_13_7, + version=rds.AuroraPostgresEngineVersion.VER_13_8, ), parameters={ "apg_plan_mgmt.capture_plan_baselines": "off", @@ -367,7 +367,7 @@ def _setup_postgresql(self) -> None: "aws-sdk-pandas-aurora-cluster-postgresql", removal_policy=RemovalPolicy.DESTROY, engine=rds.DatabaseClusterEngine.aurora_postgres( - version=rds.AuroraPostgresEngineVersion.VER_13_7, + version=rds.AuroraPostgresEngineVersion.VER_13_8, ), cluster_identifier="postgresql-cluster-sdk-pandas", credentials=rds.Credentials.from_password( @@ -448,7 +448,7 @@ def _setup_mysql(self) -> None: "aws-sdk-pandas-aurora-cluster-mysql", removal_policy=RemovalPolicy.DESTROY, engine=rds.DatabaseClusterEngine.aurora_mysql( - version=rds.AuroraMysqlEngineVersion.VER_2_10_2, + version=rds.AuroraMysqlEngineVersion.VER_2_11_4, ), cluster_identifier="mysql-cluster-sdk-pandas", default_database_name=database, @@ -532,7 +532,7 @@ def _setup_mysql_serverless(self) -> None: "aws-sdk-pandas-aurora-cluster-mysql-serverless", removal_policy=RemovalPolicy.DESTROY, engine=rds.DatabaseClusterEngine.aurora_mysql( - version=rds.AuroraMysqlEngineVersion.VER_2_10_2, + version=rds.AuroraMysqlEngineVersion.VER_2_11_4, ), cluster_identifier="mysql-serverless-cluster-sdk-pandas", default_database_name=database, @@ -587,7 +587,7 @@ def _setup_postgresql_serverless(self) -> None: "aws-sdk-pandas-aurora-cluster-postgresql-serverless", removal_policy=RemovalPolicy.DESTROY, engine=rds.DatabaseClusterEngine.aurora_postgres( - version=rds.AuroraPostgresEngineVersion.VER_11_19, + version=rds.AuroraPostgresEngineVersion.VER_13_8, ), cluster_identifier="postgresql-serverless-cluster-sdk-pandas", default_database_name=database,