From 1fe8217ba2e8f645f430c307e90f6e22552bedab Mon Sep 17 00:00:00 2001 From: Kent Ou <84220825+kentnsw@users.noreply.github.com> Date: Thu, 15 Dec 2022 13:38:16 +1100 Subject: [PATCH] lib - poetry re-lock c7n and c7n-mailer --- poetry.lock | 15 +++- tools/c7n_gcp/tests/test_notify_gcp.py | 16 ++-- tools/c7n_mailer/c7n_mailer/deploy.py | 2 +- tools/c7n_mailer/poetry.lock | 115 +++++++++++++++++++++++-- 4 files changed, 130 insertions(+), 18 deletions(-) diff --git a/poetry.lock b/poetry.lock index 4d626352183..fd9575ffacb 100644 --- a/poetry.lock +++ b/poetry.lock @@ -59,6 +59,10 @@ description = "Function decoration for backoff and retry" category = "main" optional = false python-versions = ">=3.7,<4.0" +files = [ + {file = "backoff-2.2.1-py3-none-any.whl", hash = "sha256:63579f9a0628e06278f7e47b7d7d5b6ce20dc65c5e96a6f3ca99a6adca0396e8"}, + {file = "backoff-2.2.1.tar.gz", hash = "sha256:03f829f5bb1923180821643f8753b0502c3b682293992485b0eef2807afa5cba"}, +] [[package]] name = "bleach" @@ -447,6 +451,10 @@ description = "GraphQL client for Python" category = "main" optional = false python-versions = "*" +files = [ + {file = "gql-3.4.0-py2.py3-none-any.whl", hash = "sha256:59c8a0b8f0a2f3b0b2ff970c94de86f82f65cb1da3340bfe57143e5f7ea82f71"}, + {file = "gql-3.4.0.tar.gz", hash = "sha256:ca81aa8314fa88a8c57dd1ce34941278e0c352d762eb721edcba0387829ea7c0"}, +] [package.dependencies] backoff = ">=1.11.1,<3.0" @@ -473,6 +481,10 @@ description = "GraphQL implementation for Python, a port of GraphQL.js, the Java category = "main" optional = false python-versions = ">=3.6,<4" +files = [ + {file = "graphql-core-3.2.3.tar.gz", hash = "sha256:06d2aad0ac723e35b1cb47885d3e5c45e956a53bc1b209a9fc5369007fe46676"}, + {file = "graphql_core-3.2.3-py3-none-any.whl", hash = "sha256:5766780452bd5ec8ba133f8bf287dc92713e3868ddd83aee4faab9fc3e303dc3"}, +] [package.dependencies] typing-extensions = {version = ">=4.2,<5", markers = "python_version < \"3.8\""} @@ -1331,6 +1343,7 @@ optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" files = [ {file = "tabulate-0.8.10-py3-none-any.whl", hash = "sha256:0ba055423dbaa164b9e456abe7920c5e8ed33fcc16f6d1b2f2d152c8e1e8b4fc"}, + {file = "tabulate-0.8.10-py3.8.egg", hash = "sha256:436f1c768b424654fce8597290d2764def1eea6a77cfa5c33be00b1bc0f4f63d"}, {file = "tabulate-0.8.10.tar.gz", hash = "sha256:6c57f3f3dd7ac2782770155f3adb2db0b1a269637e42f27599925e64b114f519"}, ] @@ -1650,4 +1663,4 @@ testing = ["flake8 (<5)", "func-timeout", "jaraco.functools", "jaraco.itertools" [metadata] lock-version = "2.0" python-versions = "^3.7" -content-hash = "8498a7491444d81b1968b883fafa2517f6df8d8ef6722abe5e698c7b0588113d" +content-hash = "0098a2400a51238539723746b8e044b62a75947dd4ff50b87a25f65534627bf4" diff --git a/tools/c7n_gcp/tests/test_notify_gcp.py b/tools/c7n_gcp/tests/test_notify_gcp.py index 9a215553b3f..b669696b8b7 100644 --- a/tools/c7n_gcp/tests/test_notify_gcp.py +++ b/tools/c7n_gcp/tests/test_notify_gcp.py @@ -59,12 +59,12 @@ def client_factory(*args, **kw): 'body': { 'messages': { # NOTE updated below due to c7n_resource_type_id added to response - 'data': ('eJzdUztvwjAQ3v0rkOcmEJAoMHXq1l9QVZGxDzBybMs+o0aI/14/Eh4SU9Wp' - 'HjLc5/sed86ZUDiBRrqZ6KDUC6GMcxM0tlLEGuXBoxGS6aqZrxt6w5+DDvbS' - '6IQxpVLBGiV5HwtnQjXrIEEIHittUO760uNNcDxDe25rG7Y+bCs0VvKE76RC' - 'cD7Cn+SOxTpzBI5+ypUJorp6meZGP41USajoFDJyIV85AUaTV0LsbSa8OULo' - 'rGKYqwJ2LCjMWZw0TmLfHoAJcAmdp3p0m5yM0aTeTwrXpChlSpPlaPDg3oTp' - 'mNQ1Nx3NhtAx7a1xWOY0GiqDKN3J/q9Dx9jkEmngG3hIjoblzoZTPfmMhz70' - 'eWTZZbNcNqvVYrGcRfgUtzNsfVav62ZFr0N+DPSPJ3z3jv/ipUY6/qo3Hwz5' - 'AcT73R9QWHOoeKMdRdsUaVhruZGX/gNvpj8R') + 'data': ('eJzdU7tOAzEQ7O8rItfcJSFSCKmo6PgChE6OvUmMfF7LXkecovw7ftzlgaBB' + 'VLhwsbM7O7NrHysGBzDE1hMTtL6rGBcCg6FWyRhjQmOQtQieUCpu2CXhB9TB' + 'TqFJINc6BSxqJfoYOFbM8A4SROCpNkhq25caj8GJDO2EbWzY+LCpCa0SCd8q' + 'TeB8hF+rKxbr8B0E+ekXGdNc6KeRKjUqfQpZdaresgWKIs+E1NtMeFFE0FnN' + 'KUclbHnQlL04hU5R3+6BS3AJvU/xqDYpGa0ps5sUrknplCkxt2PBg3uS2HFl' + 'GoEdy4LIceMtOipzGgWVQZTqJP/XpqPt6hRp4ANESIqG9c6GU39zjYfd1Hni' + 'WeV8uZyvVovFchbhQ9zOsPVZ89jMV+w85FtD/3jCV+/4L15qpBMPZv3CSexB' + 'Pl/9gMKaTcWMdmzaJkvDWktGXvon+3ZBpQ==') }}}) diff --git a/tools/c7n_mailer/c7n_mailer/deploy.py b/tools/c7n_mailer/c7n_mailer/deploy.py index c4b281ef812..26359311b01 100644 --- a/tools/c7n_mailer/c7n_mailer/deploy.py +++ b/tools/c7n_mailer/c7n_mailer/deploy.py @@ -34,7 +34,7 @@ def dispatch(event, context): 'jinja2', 'markupsafe', 'yaml', 'ldap3', 'pyasn1', 'redis', 'jmespath', # gcp dependencies 'google', 'pyasn1_modules', 'rsa', 'cachetools', 'googleapiclient', - 'httplib2', 'pyparsing', 'uritemplate', 'google_auth_httplib2', 'retrying', 'ratelimiter', + 'httplib2', 'pyparsing', 'uritemplate', 'google_auth_httplib2', 'retrying', 'pyrate_limiter', # for other dependencies 'pkg_resources', # transport datadog - recursive deps diff --git a/tools/c7n_mailer/poetry.lock b/tools/c7n_mailer/poetry.lock index 26eb2305fb5..45983273889 100644 --- a/tools/c7n_mailer/poetry.lock +++ b/tools/c7n_mailer/poetry.lock @@ -1564,6 +1564,10 @@ description = "XML bomb protection for Python stdlib modules" category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*, !=3.4.*" +files = [ + {file = "defusedxml-0.7.1-py2.py3-none-any.whl", hash = "sha256:a352e7e428770286cc899e2542b6cdaedb2b4953ff269a210103ec58f6198a61"}, + {file = "defusedxml-0.7.1.tar.gz", hash = "sha256:1bb3032db185915b62d7c6209c5a8792be6a32ab2fedacc84e01b52c51aa3e69"}, +] [[package]] name = "distlib" @@ -1625,7 +1629,7 @@ files = [ ] [package.dependencies] -google-auth = ">=2.14.1,<3.0dev" +google-auth = ">=1.25.0,<3.0dev" googleapis-common-protos = ">=1.56.2,<2.0dev" grpcio = {version = ">=1.33.2,<2.0dev", optional = true, markers = "extra == \"grpc\""} grpcio-status = {version = ">=1.33.2,<2.0dev", optional = true, markers = "extra == \"grpc\""} @@ -1633,7 +1637,7 @@ protobuf = ">=3.19.5,<3.20.0 || >3.20.0,<3.20.1 || >3.20.1,<4.21.0 || >4.21.0,<4 requests = ">=2.18.0,<3.0.0dev" [package.extras] -grpc = ["grpcio (>=1.33.2,<2.0dev)", "grpcio (>=1.49.1,<2.0dev)", "grpcio-status (>=1.33.2,<2.0dev)", "grpcio-status (>=1.49.1,<2.0dev)"] +grpc = ["grpcio (>=1.33.2,<2.0dev)", "grpcio-status (>=1.33.2,<2.0dev)"] grpcgcp = ["grpcio-gcp (>=0.2.2,<1.0dev)"] grpcio-gcp = ["grpcio-gcp (>=0.2.2,<1.0dev)"] @@ -1969,7 +1973,7 @@ grpcio = ">=1.0.0,<2.0.0dev" [[package]] name = "grpcio" -version = "1.51.1" +version = "1.49.1" description = "HTTP/2-based RPC framework" category = "main" optional = true @@ -2022,12 +2026,15 @@ files = [ {file = "grpcio-1.49.1.tar.gz", hash = "sha256:d4725fc9ec8e8822906ae26bb26f5546891aa7fbc3443de970cc556d43a5c99f"}, ] +[package.dependencies] +six = ">=1.5.2" + [package.extras] -protobuf = ["grpcio-tools (>=1.51.1)"] +protobuf = ["grpcio-tools (>=1.49.1)"] [[package]] name = "grpcio-status" -version = "1.51.1" +version = "1.49.1" description = "Status proto mapping for gRPC" category = "main" optional = true @@ -2039,8 +2046,8 @@ files = [ [package.dependencies] googleapis-common-protos = ">=1.5.5" -grpcio = ">=1.51.1" -protobuf = ">=4.21.6" +grpcio = ">=1.49.1" +protobuf = ">=4.21.3" [[package]] name = "httplib2" @@ -2136,6 +2143,41 @@ files = [ [package.dependencies] six = "*" +[[package]] +name = "jaraco-classes" +version = "3.2.3" +description = "Utility functions for Python class constructs" +category = "main" +optional = false +python-versions = ">=3.7" +files = [ + {file = "jaraco.classes-3.2.3-py3-none-any.whl", hash = "sha256:2353de3288bc6b82120752201c6b1c1a14b058267fa424ed5ce5984e3b922158"}, + {file = "jaraco.classes-3.2.3.tar.gz", hash = "sha256:89559fa5c1d3c34eff6f631ad80bb21f378dbcbb35dd161fd2c6b93f5be2f98a"}, +] + +[package.dependencies] +more-itertools = "*" + +[package.extras] +docs = ["jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"] +testing = ["flake8 (<5)", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"] + +[[package]] +name = "jeepney" +version = "0.8.0" +description = "Low-level, pure Python DBus protocol wrapper." +category = "main" +optional = false +python-versions = ">=3.7" +files = [ + {file = "jeepney-0.8.0-py3-none-any.whl", hash = "sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755"}, + {file = "jeepney-0.8.0.tar.gz", hash = "sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806"}, +] + +[package.extras] +test = ["async-timeout", "pytest", "pytest-asyncio (>=0.17)", "pytest-trio", "testpath", "trio"] +trio = ["async_generator", "trio"] + [[package]] name = "jinja2" version = "3.1.2" @@ -2161,6 +2203,10 @@ description = "Python library for interacting with JIRA via REST APIs." category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "jira-3.2.0-py3-none-any.whl", hash = "sha256:8b30c79aec4610000d2c49739e98226853f30e4056471550e7fc972cffbbbcff"}, + {file = "jira-3.2.0.tar.gz", hash = "sha256:b7cb2ba909fde2464792948d58042096aa481493b40ab567661e08975f5e86c8"}, +] [package.dependencies] defusedxml = "*" @@ -2247,6 +2293,10 @@ description = "Store and access your passwords safely." category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "keyring-23.11.0-py3-none-any.whl", hash = "sha256:3dd30011d555f1345dec2c262f0153f2f0ca6bca041fb1dc4588349bb4c0ac1e"}, + {file = "keyring-23.11.0.tar.gz", hash = "sha256:ad192263e2cdd5f12875dedc2da13534359a7e760e77f8d04b50968a821c2361"}, +] [package.dependencies] importlib-metadata = {version = ">=4.11.4", markers = "python_version < \"3.12\""} @@ -2267,7 +2317,10 @@ category = "main" optional = false python-versions = "*" files = [ + {file = "ldap3-2.9.1-py2.6.egg", hash = "sha256:5ab7febc00689181375de40c396dcad4f2659cd260fc5e94c508b6d77c17e9d5"}, + {file = "ldap3-2.9.1-py2.7.egg", hash = "sha256:2bc966556fc4d4fa9f445a1c31dc484ee81d44a51ab0e2d0fd05b62cac75daa6"}, {file = "ldap3-2.9.1-py2.py3-none-any.whl", hash = "sha256:5869596fc4948797020d3f03b7939da938778a0f9e2009f7a072ccf92b8e8d70"}, + {file = "ldap3-2.9.1-py3.9.egg", hash = "sha256:5630d1383e09ba94839e253e013f1aa1a2cf7a547628ba1265cb7b9a844b5687"}, {file = "ldap3-2.9.1.tar.gz", hash = "sha256:f3e7fc4718e3f09dda568b57100095e0ce58633bcabbed8667ce3f8fbaa4229f"}, ] @@ -2331,6 +2384,10 @@ description = "More routines for operating on iterables, beyond itertools" category = "main" optional = false python-versions = ">=3.7" +files = [ + {file = "more-itertools-9.0.0.tar.gz", hash = "sha256:5a6257e40878ef0520b1803990e3e22303a41b5714006c32a3fd8304b26ea1ab"}, + {file = "more_itertools-9.0.0-py3-none-any.whl", hash = "sha256:250e83d7e81d0c87ca6bd942e6aeab8cc9daa6096d12c5308f3f92fa5e5c1f41"}, +] [[package]] name = "msal" @@ -2632,7 +2689,18 @@ category = "main" optional = false python-versions = "*" files = [ + {file = "pyasn1-0.4.8-py2.4.egg", hash = "sha256:fec3e9d8e36808a28efb59b489e4528c10ad0f480e57dcc32b4de5c9d8c9fdf3"}, + {file = "pyasn1-0.4.8-py2.5.egg", hash = "sha256:0458773cfe65b153891ac249bcf1b5f8f320b7c2ce462151f8fa74de8934becf"}, + {file = "pyasn1-0.4.8-py2.6.egg", hash = "sha256:5c9414dcfede6e441f7e8f81b43b34e834731003427e5b09e4e00e3172a10f00"}, + {file = "pyasn1-0.4.8-py2.7.egg", hash = "sha256:6e7545f1a61025a4e58bb336952c5061697da694db1cae97b116e9c46abcf7c8"}, {file = "pyasn1-0.4.8-py2.py3-none-any.whl", hash = "sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d"}, + {file = "pyasn1-0.4.8-py3.1.egg", hash = "sha256:78fa6da68ed2727915c4767bb386ab32cdba863caa7dbe473eaae45f9959da86"}, + {file = "pyasn1-0.4.8-py3.2.egg", hash = "sha256:08c3c53b75eaa48d71cf8c710312316392ed40899cb34710d092e96745a358b7"}, + {file = "pyasn1-0.4.8-py3.3.egg", hash = "sha256:03840c999ba71680a131cfaee6fab142e1ed9bbd9c693e285cc6aca0d555e576"}, + {file = "pyasn1-0.4.8-py3.4.egg", hash = "sha256:7ab8a544af125fb704feadb008c99a88805126fb525280b2270bb25cc1d78a12"}, + {file = "pyasn1-0.4.8-py3.5.egg", hash = "sha256:e89bf84b5437b532b0803ba5c9a5e054d21fec423a89952a74f87fa2c9b7bce2"}, + {file = "pyasn1-0.4.8-py3.6.egg", hash = "sha256:014c0e9976956a08139dc0712ae195324a75e142284d5f87f1a87ee1b068a359"}, + {file = "pyasn1-0.4.8-py3.7.egg", hash = "sha256:99fcc3c8d804d1bc6d9a099921e39d827026409a58f2a720dcdb89374ea0c776"}, {file = "pyasn1-0.4.8.tar.gz", hash = "sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba"}, ] @@ -2645,7 +2713,18 @@ optional = true python-versions = "*" files = [ {file = "pyasn1-modules-0.2.8.tar.gz", hash = "sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e"}, + {file = "pyasn1_modules-0.2.8-py2.4.egg", hash = "sha256:0fe1b68d1e486a1ed5473f1302bd991c1611d319bba158e98b106ff86e1d7199"}, + {file = "pyasn1_modules-0.2.8-py2.5.egg", hash = "sha256:fe0644d9ab041506b62782e92b06b8c68cca799e1a9636ec398675459e031405"}, + {file = "pyasn1_modules-0.2.8-py2.6.egg", hash = "sha256:a99324196732f53093a84c4369c996713eb8c89d360a496b599fb1a9c47fc3eb"}, + {file = "pyasn1_modules-0.2.8-py2.7.egg", hash = "sha256:0845a5582f6a02bb3e1bde9ecfc4bfcae6ec3210dd270522fee602365430c3f8"}, {file = "pyasn1_modules-0.2.8-py2.py3-none-any.whl", hash = "sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74"}, + {file = "pyasn1_modules-0.2.8-py3.1.egg", hash = "sha256:f39edd8c4ecaa4556e989147ebf219227e2cd2e8a43c7e7fcb1f1c18c5fd6a3d"}, + {file = "pyasn1_modules-0.2.8-py3.2.egg", hash = "sha256:b80486a6c77252ea3a3e9b1e360bc9cf28eaac41263d173c032581ad2f20fe45"}, + {file = "pyasn1_modules-0.2.8-py3.3.egg", hash = "sha256:65cebbaffc913f4fe9e4808735c95ea22d7a7775646ab690518c056784bc21b4"}, + {file = "pyasn1_modules-0.2.8-py3.4.egg", hash = "sha256:15b7c67fabc7fc240d87fb9aabf999cf82311a6d6fb2c70d00d3d0604878c811"}, + {file = "pyasn1_modules-0.2.8-py3.5.egg", hash = "sha256:426edb7a5e8879f1ec54a1864f16b882c2837bfd06eee62f2c982315ee2473ed"}, + {file = "pyasn1_modules-0.2.8-py3.6.egg", hash = "sha256:cbac4bc38d117f2a49aeedec4407d23e8866ea4ac27ff2cf7fb3e5b570df19e0"}, + {file = "pyasn1_modules-0.2.8-py3.7.egg", hash = "sha256:c29a5e5cc7a3f05926aff34e097e84f8589cd790ce0ed41b67aed6857b26aafd"}, ] [package.dependencies] @@ -2851,6 +2930,18 @@ files = [ {file = "pywin32-305-cp39-cp39-win_amd64.whl", hash = "sha256:50768c6b7c3f0b38b7fb14dd4104da93ebced5f1a50dc0e834594bff6fbe1271"}, ] +[[package]] +name = "pywin32-ctypes" +version = "0.2.0" +description = "" +category = "main" +optional = false +python-versions = "*" +files = [ + {file = "pywin32-ctypes-0.2.0.tar.gz", hash = "sha256:24ffc3b341d457d48e8922352130cf2644024a4ff09762a2261fd34c36ee5942"}, + {file = "pywin32_ctypes-0.2.0-py2.py3-none-any.whl", hash = "sha256:9dc2d991b3479cc2df15930958b674a48a227d5361d413827a4cfd0b5876fc98"}, +] + [[package]] name = "pyyaml" version = "6.0" @@ -2964,6 +3055,10 @@ description = "A utility belt for advanced users of python-requests" category = "main" optional = false python-versions = ">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*" +files = [ + {file = "requests-toolbelt-0.10.1.tar.gz", hash = "sha256:62e09f7ff5ccbda92772a29f394a49c3ad6cb181d568b1337626b2abb628a63d"}, + {file = "requests_toolbelt-0.10.1-py2.py3-none-any.whl", hash = "sha256:18565aa58116d9951ac39baa288d3adb5b3ff975c4f25eee78555d89e8f247f7"}, +] [package.dependencies] requests = ">=2.0.1,<3.0.0" @@ -3023,6 +3118,10 @@ description = "Python bindings to FreeDesktop.org Secret Service API" category = "main" optional = false python-versions = ">=3.6" +files = [ + {file = "SecretStorage-3.3.3-py3-none-any.whl", hash = "sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99"}, + {file = "SecretStorage-3.3.3.tar.gz", hash = "sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77"}, +] [package.dependencies] cryptography = ">=2.0" @@ -3251,4 +3350,4 @@ gcp = ["c7n-gcp", "google-cloud-secret-manager"] [metadata] lock-version = "2.0" python-versions = "^3.7" -content-hash = "f7eb2914d00becbef2bf7f8cc34e8a1d71f2318b883c17db9b36b3ba8768f5f8" +content-hash = "c4f52b08fec197e6d79ef55d985b2a67a226ad7cca9c11d7041dc12371dead40"