Patching (#34)

* updating pipfile and pipfile.lock

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating more versions

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating cryptography

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating confluent kafka

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* trying latest confluent-kafka version

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating pipenv

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* adding install for librdkafka

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* adding sudo

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating install for librdkafka-dev

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating apt install

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating apt command

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* testing workaround for installing librdkafka

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* adding sudo

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* adding cd command

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* testing other installs

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* testing different version of confluent-kafka

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* testing 2.5.0 for kafka

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* testing running on focal

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating pipenv in dockerfile

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating setuptools and removing group beta in travis yml

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating postgres references to v14

Signed-off-by: Kristi-Kazmierczak <[email protected]>

* updating dockerfile and pipfile

Signed-off-by: Kristi-Kazmierczak <[email protected]>

---------

Signed-off-by: Kristi-Kazmierczak <[email protected]>

Author: krkazmier

.travis.yml

@@ -2,8 +2,7 @@ os: linux
 language: python
 python:
   - "3.9.18" # Matches version in Dockerfiles/Dockerfile.dss
-dist: bionic
-group: beta
+dist: focal
 services:
   - docker
 before_install:

Dockerfiles/Dockerfile.dss

@@ -8,6 +8,7 @@ ENV PYTHONUSERBASE $PYROOT
 ENV PATH $PATH:$PYROOT/bin
 
 RUN pip install pip==23.3
+RUN pip install setuptools==76.0.0
 
 RUN apt-get update && \
     apt-get upgrade -y && \

Makefile

@@ -97,7 +97,7 @@ setup: setup-trivy setup-cosign setup-deploy-tools
 
 .PHONY: start-local-test-db
 start-local-test-db: stop-local-test-db
-	docker run -p 54320:5432 -d --name $(TEST_DB_CONTAINER_NAME) -e POSTGRES_HOST_AUTH_METHOD=trust postgres:11
+	docker run -p 54320:5432 -d --name $(TEST_DB_CONTAINER_NAME) -e POSTGRES_HOST_AUTH_METHOD=trust postgres:14
 	@echo "username/password: postgres/postgres"
 
 .PHONY: stop-local-test-db

Pipfile

@@ -17,25 +17,25 @@ pytest-cov = "==3.0.0"
 
 [packages]
 logmatic-python = "==0.1.7"
-confluent-kafka = "==1.8.2"
+confluent-kafka = "==2.5.0"
 jaeger-client = "==4.8.0"
 prometheus-client = "==0.14.0"
 psycopg2-binary = "==2.9.3"
 click = "==8.1.2"
 flask = "==2.2.5"
 backoff = "==1.11.1"
 boxsdk = {extras = ["jwt"],version = "==3.2.0"}
-cryptography = "==42.0.5"
+cryptography = "==43.0.1"
 hvac = "==0.11.2"
 asyncio = "==3.4.3"
-requests = "==2.31.0"
+requests = "==2.32.3"
 gunicorn = "==22.0.0"
 gevent = "==23.9.1"
 pyjwt = "==2.5.0"
-ibm-db = "==3.1.1"
+ibm-db = "==3.2.6"
 detect-secrets = {ref = "0.13.1+ibm.62.dss", git = "https://github.com/ibm/detect-secrets.git"}
 pytest = "==8.1.1"
-Werkzeug = "== 3.0.3"
+Werkzeug = "== 3.0.6"
 pre-commit = "==3.7.0"
 
 [requires]

Pipfile.lock

@@ -33,7 +33,7 @@ pip install psycopg2
 ## setting up a local instance of the DB
 
 spin up an instance of postgress in docker:
-`docker run -d --name my_postgres -v my_dbdata:/var/lib/postgresql/data -p 54320:5432 postgres:11`
+`docker run -d --name my_postgres -v my_dbdata:/var/lib/postgresql/data -p 54320:5432 postgres:14`
 
 install psql tool: (not required but helpful for setting up the DB & having another path into the DB - remotely too)
 `sudo dnf install psql`

detect_secrets_stream/secret_corpus_db/README.md

@@ -23,7 +23,7 @@ spec:
       #     emptyDir: {}
       containers:
       - name: postgres
-        image: postgres:11-alpine
+        image: postgres:14-alpine
         resources:
           requests:
             cpu: 20m