From cc6fca7ae4dc3d5de49a1775f2c3e655080216e8 Mon Sep 17 00:00:00 2001 From: Juan Leaniz Date: Tue, 27 Feb 2024 14:49:13 -0600 Subject: [PATCH] Remove GCP dependencies (#1440) * Remove gcp dependencies * Update dockerfiles * Update dockerfiles * Update gcp error reporting * Updates to formatting * Add unit test * Update unit test * Clean up * Update unit test * Update error reporting * Update file * Update config template * Catch exception * Updates * fix lint --- poetry.lock | 37 +++++++++++++++++++++++++++++++++++++ pyproject.toml | 5 ++++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/poetry.lock b/poetry.lock index b6b85be88..7444ba131 100644 --- a/poetry.lock +++ b/poetry.lock @@ -4124,6 +4124,40 @@ files = [ {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"}, ] +[[package]] +name = "turbinia-api-lib" +version = "1.0.2" +description = "Turbinia API Server" +optional = false +python-versions = ">=3.7,<4.0" +files = [ + {file = "turbinia_api_lib-1.0.2-py3-none-any.whl", hash = "sha256:04b3f471fb01046d81031cc0f95e5368f855647251eb7823dad00d0c07f8f80b"}, + {file = "turbinia_api_lib-1.0.2.tar.gz", hash = "sha256:b1885c43987591294c0beacd03732fb07decb5608f0c69a3158ead178f3c6b9e"}, +] + +[package.dependencies] +aenum = ">=3.1.11" +pydantic = ">=1.10.5,<2.0.0" +python-dateutil = ">=2.8.2" +urllib3 = ">=1.25.3,<2" + +[[package]] +name = "turbinia-api-lib" +version = "1.0.2" +description = "Turbinia API Server" +optional = false +python-versions = ">=3.7,<4.0" +files = [ + {file = "turbinia_api_lib-1.0.2-py3-none-any.whl", hash = "sha256:04b3f471fb01046d81031cc0f95e5368f855647251eb7823dad00d0c07f8f80b"}, + {file = "turbinia_api_lib-1.0.2.tar.gz", hash = "sha256:b1885c43987591294c0beacd03732fb07decb5608f0c69a3158ead178f3c6b9e"}, +] + +[package.dependencies] +aenum = ">=3.1.11" +pydantic = ">=1.10.5,<2.0.0" +python-dateutil = ">=2.8.2" +urllib3 = ">=1.25.3,<2" + [[package]] name = "tqdm" version = "4.66.2" @@ -4171,6 +4205,9 @@ files = [ {file = "typing_extensions-4.10.0-py3-none-any.whl", hash = "sha256:69b1a937c3a517342112fb4c6df7e72fc39a38e7891a5730ed4985b5214b5475"}, {file = "typing_extensions-4.10.0.tar.gz", hash = "sha256:b0abd7c89e8fb96f98db18d86106ff1d90ab692004eb746cf6eda2682f91b3cb"}, ] + {file = "typing_extensions-4.9.0-py3-none-any.whl", hash = "sha256:af72aea155e91adfc61c3ae9e0e342dbc0cba726d6cba4b6c72c1f34e47291cd"}, + {file = "typing_extensions-4.9.0.tar.gz", hash = "sha256:23478f88c37f27d76ac8aee6c905017a143b0b1b886c3c9f66bc2fd94f9f5783"}, +] [[package]] name = "tzdata" diff --git a/pyproject.toml b/pyproject.toml index 89f7c884c..84f0cf0cc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -27,7 +27,9 @@ libcloudforensics = { version = "20240214" } pandas = { version = "^2.1.0" } plaso = { version = "20240308", optional = true } prometheus_client = { version = "^0.17.1" } -protobuf = { version = ">=3.19.0", optional = true } +protobuf = { version = ">=3.19.0,<4.0.0dev", optional = true } +proto-plus = { version = "<2.0.0dev,>=1.22.0", optional = true } +psq = { version = "*", optional = true } pydantic = { version = "^1.10.5,<2"} pyglove = { version = ">=0.4.4" } pyhindsight = { version = "^20230327.0", optional = true } @@ -48,6 +50,7 @@ google-auth-oauthlib = "^1.1.0" mock = "*" pytest = "*" turbinia-api-lib = "^1.0.2" +turbinia-api-lib = "^1.0.2" yapf = "*" [tool.poetry.extras]