Merge branch 'aws-cve-fix' into 'master'

Aws side cve fix

See merge request !488

NOTICE

@@ -8,7 +8,7 @@ This software includes the following software and licenses:
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- typing-extensions (from https://pypi.org/project/typing-extensions/4.10.0/, https://pypi.org/project/typing-extensions/4.4.0/)
+- typing-extensions (from https://pypi.org/project/typing-extensions/4.12.0rc1/, https://pypi.org/project/typing-extensions/4.4.0/)
 
 ========================================================================
 Apache-2.0
@@ -22,7 +22,7 @@ The following software have components provided under the terms of this license:
 - cryptography (from https://github.com/pyca/cryptography)
 - elasticsearch (from https://github.com/elastic/elasticsearch, https://github.com/elastic/elasticsearch-py, https://repo1.maven.org/maven2/org/elasticsearch/elasticsearch)
 - elasticsearch-dsl (from https://github.com/elasticsearch/elasticsearch-dsl-py)
-- fastapi (from https://pypi.org/project/fastapi/0.110.1/, https://pypi.org/project/fastapi/0.86.0/)
+- fastapi (from https://pypi.org/project/fastapi/0.111.0/, https://pypi.org/project/fastapi/0.86.0/)
 - google-api-core (from https://github.com/googleapis/python-api-core)
 - google-auth (from https://github.com/GoogleCloudPlatform/google-auth-library-python, https://github.com/googleapis/google-auth-library-python)
 - google-cloud-core (from https://github.com/googleapis/python-cloud-core)
@@ -63,13 +63,13 @@ BSD-3-Clause
 ========================================================================
 The following software have components provided under the terms of this license:
 
-- Jinja2 (from http://jinja.pocoo.org/, https://palletsprojects.com/p/jinja/)
+- Jinja2 (from http://jinja.pocoo.org/, https://palletsprojects.com/p/jinja/, https://pypi.org/project/Jinja2/3.1.4/)
 - MarkupSafe (from https://palletsprojects.com/p/markupsafe/)
 - click (from https://palletsprojects.com/p/click/)
 - cryptography (from https://github.com/pyca/cryptography)
 - httpcore (from https://github.com/encode/httpcore, https://pypi.org/project/httpcore/0.18.0/, https://pypi.org/project/httpcore/1.0.5/)
 - httpx (from https://pypi.org/project/httpx/0.23.1/, https://pypi.org/project/httpx/0.27.0/)
-- idna (from https://pypi.org/project/idna/3.4/, https://pypi.org/project/idna/3.6/)
+- idna (from https://pypi.org/project/idna/3.4/, https://pypi.org/project/idna/3.7/)
 - isodate (from http://cheeseshop.python.org/pypi/isodate, https://github.com/gweis/isodate/)
 - jinja2
 - oauthlib (from https://github.com/oauthlib/oauthlib)
@@ -101,7 +101,7 @@ The following software have components provided under the terms of this license:
 - PyYAML (from http://pyyaml.org/wiki/PyYAML)
 - Pygments (from https://pygments.org/)
 - annotated-types (from https://pypi.org/project/annotated-types/0.5.0/, https://pypi.org/project/annotated-types/0.6.0/)
-- anyio (from https://pypi.org/project/anyio/3.3.0/, https://pypi.org/project/anyio/4.3.0/)
+- anyio (from https://pypi.org/project/anyio/3.3.0/, https://pypi.org/project/anyio/4.4.0/)
 - attrs (from https://attrs.readthedocs.io/, https://pypi.org/project/attrs/23.2.0/, https://www.attrs.org/)
 - azure-core (from https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/core/azure-core)
 - azure-identity (from https://github.com/Azure/azure-sdk-for-python/tree/main/sdk/identity/azure-identity)
@@ -112,8 +112,8 @@ The following software have components provided under the terms of this license:
 - cffi
 - charset-normalizer (from https://github.com/Ousret/charset_normalizer)
 - coverage (from https://github.com/nedbat/coveragepy)
-- exceptiongroup (from https://pypi.org/project/exceptiongroup/1.0.1/, https://pypi.org/project/exceptiongroup/1.2.0/)
-- fastapi (from https://pypi.org/project/fastapi/0.110.1/, https://pypi.org/project/fastapi/0.86.0/)
+- exceptiongroup (from https://pypi.org/project/exceptiongroup/1.0.1/, https://pypi.org/project/exceptiongroup/1.2.1/)
+- fastapi (from https://pypi.org/project/fastapi/0.111.0/, https://pypi.org/project/fastapi/0.86.0/)
 - h11
 - iniconfig (from http://github.com/RonnyPfannschmidt/iniconfig, https://pypi.org/project/iniconfig/2.0.0/)
 - jmespath (from https://github.com/jmespath/jmespath.py)
@@ -124,10 +124,10 @@ The following software have components provided under the terms of this license:
 - msal-extensions (from https://pypi.org/project/msal-extensions/1.0.0/)
 - munch (from http://github.com/Infinidat/munch, https://github.com/Infinidat/munch)
 - pluggy
-- pydantic (from https://github.com/samuelcolvin/pydantic, https://pypi.org/project/pydantic/2.6.4/)
+- pydantic (from https://github.com/samuelcolvin/pydantic, https://pypi.org/project/pydantic/2.7.1/)
 - pydantic-core (from https://github.com/pydantic/pydantic-core)
 - pyrsistent (from https://github.com/tobgu/pyrsistent/)
-- pytest (from http://pytest.org, https://docs.pytest.org/en/latest/, https://pypi.org/project/pytest/8.1.1/)
+- pytest (from http://pytest.org, https://docs.pytest.org/en/latest/, https://pypi.org/project/pytest/8.2.1/)
 - pytest-cov (from https://github.com/pytest-dev/pytest-cov)
 - pytest-mock (from https://github.com/pytest-dev/pytest-mock/)
 - pytest-order (from https://github.com/pytest-dev/pytest-order)
@@ -157,9 +157,9 @@ Python-2.0
 The following software have components provided under the terms of this license:
 
 - cryptography (from https://github.com/pyca/cryptography)
-- exceptiongroup (from https://pypi.org/project/exceptiongroup/1.0.1/, https://pypi.org/project/exceptiongroup/1.2.0/)
+- exceptiongroup (from https://pypi.org/project/exceptiongroup/1.0.1/, https://pypi.org/project/exceptiongroup/1.2.1/)
 - portalocker (from https://github.com/WoLpH/portalocker)
-- typing-extensions (from https://pypi.org/project/typing-extensions/4.10.0/, https://pypi.org/project/typing-extensions/4.4.0/)
+- typing-extensions (from https://pypi.org/project/typing-extensions/4.12.0rc1/, https://pypi.org/project/typing-extensions/4.4.0/)
 
 ========================================================================
 bsd-2-clause-views

build/aws/build-aws/Dockerfile

@@ -13,8 +13,7 @@
 # limitations under the License.
 
 # This Dockerfile assumes you used "make build" to convert the AdminUI to static files in frontend/adminui/dist/policyservice
-FROM public.ecr.aws/docker/library/alpine:3.18.4
-
+FROM public.ecr.aws/docker/library/alpine:3.19.1
 # set environment variables
 # PYTHONDONTWRITEBYTECODE - Prevents Python from writing pyc files to disc (equivalent to python -B option)
 ENV PYTHONDONTWRITEBYTECODE 1
@@ -34,6 +33,7 @@ RUN apk add py3-pip
 WORKDIR /opt
 COPY ./app /opt
 RUN python3 -m venv "/opt/.python/" --system-site-packages
+RUN pip install setuptools==65.5.1 --upgrade
 RUN /opt/.python/bin/pip install --no-cache-dir --upgrade -r /opt/requirements.txt
 
 RUN apk del gcc musl-dev linux-headers python3-dev