From d6527dc3bbd868096b15eba069ca14d8fe25cb9f Mon Sep 17 00:00:00 2001 From: Dave Schindler Date: Tue, 28 Nov 2023 17:25:59 -0500 Subject: [PATCH 1/3] Added missing dependency --- requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a97354b..aef6edd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,5 @@ jinja2<3.0 diagrams>=0.14 cachetools diskcache -pytz \ No newline at end of file +pytz +markupsafe==2.0.1 \ No newline at end of file From 1550396440a3f38c591c29c842493cab68ab25f2 Mon Sep 17 00:00:00 2001 From: Dave Schindler Date: Tue, 28 Nov 2023 17:27:07 -0500 Subject: [PATCH 2/3] fixed hardcoded region breaking aws cli calls outside the us-east-1 region --- cloudiscovery/provider/aws/common_aws.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudiscovery/provider/aws/common_aws.py b/cloudiscovery/provider/aws/common_aws.py index 661a142..b3e8061 100644 --- a/cloudiscovery/provider/aws/common_aws.py +++ b/cloudiscovery/provider/aws/common_aws.py @@ -93,7 +93,7 @@ def paths(self): ), "HEADER", ) - self.client = self.session.client("ssm", region_name="us-east-1") + self.client = self.session.client("ssm", region_name=self.region) paths = self.parameters() for path in paths: paths_found.append(path["Value"]) From b10dd1d094c1441ee2698e29926203e564ff50eb Mon Sep 17 00:00:00 2001 From: Dave Schindler Date: Tue, 28 Nov 2023 17:28:17 -0500 Subject: [PATCH 3/3] Added missing installation steps to Dockerfile so that cloudiscovery's actually runable --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 4f4b8de..17d49fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,5 +13,6 @@ RUN apt-get install -y bash COPY . /opt/cloudiscovery RUN pip install -r requirements.txt +RUN ./setup.py build && ./setup.py install && ./setup.py bdist -RUN bash \ No newline at end of file +CMD bash \ No newline at end of file