From 111eef4d6d3c685179e6c69ea7230168e9247394 Mon Sep 17 00:00:00 2001
From: Martin Norling <norlingjr@gmail.com>
Date: Wed, 2 Nov 2022 16:39:12 +0100
Subject: [PATCH] Update tests

---
 .github/integration/tests/tests.sh  | 2 +-
 .github/workflows/functionality.yml | 3 ---
 .github/workflows/gotest.yml        | 7 ++-----
 dev_utils/docker-compose.yml        | 2 +-
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/.github/integration/tests/tests.sh b/.github/integration/tests/tests.sh
index 5557c12..f1d799e 100644
--- a/.github/integration/tests/tests.sh
+++ b/.github/integration/tests/tests.sh
@@ -12,7 +12,7 @@ function check_output_status() {
 
 cd dev_utils || exit 1
 
-s3cmd -c directS3 put README.md s3://test/some_user/ >/dev/null 2>&1 || exit 1
+s3cmd -c directS3 put README.md s3://test/some_user/ || exit 1
 
 echo "- Testing allowed actions"
 
diff --git a/.github/workflows/functionality.yml b/.github/workflows/functionality.yml
index b3f398c..4d2d2b0 100644
--- a/.github/workflows/functionality.yml
+++ b/.github/workflows/functionality.yml
@@ -25,9 +25,6 @@ jobs:
       - name: install s3cmd
         run: pip3 install s3cmd
 
-      - name: generate certificates
-        run: cd dev_utils && /bin/sh make_certs.sh
-
       - name: Deploy containers
         run: cd dev_utils && GOLANG_VERSION=${{ matrix.go-version }} docker-compose up -d --build
 
diff --git a/.github/workflows/gotest.yml b/.github/workflows/gotest.yml
index d1f3477..fab7371 100644
--- a/.github/workflows/gotest.yml
+++ b/.github/workflows/gotest.yml
@@ -17,11 +17,8 @@ jobs:
       - name: Check out source code
         uses: actions/checkout@v3
 
-      - name: generate certificates
-        run: cd dev_utils && /bin/sh make_certs.sh
-
       - name: Deploy containers
-        run: cd dev_utils && docker-compose up -d s3_backend mq_server
+        run: cd dev_utils && docker-compose up -d s3 mq_server
 
       - name: Wait for containers to start
         run: |
@@ -36,7 +33,7 @@ jobs:
           done
           done
 
-      - name: Calc coverage 
+      - name: Calc coverage
         run: go test -tags live -coverprofile=coverage.txt -covermode=atomic
 
       - name: Codecov
diff --git a/dev_utils/docker-compose.yml b/dev_utils/docker-compose.yml
index 6aee353..ce4d826 100644
--- a/dev_utils/docker-compose.yml
+++ b/dev_utils/docker-compose.yml
@@ -25,7 +25,7 @@ services:
       certfixer:
         condition: service_completed_successfully
     ports:
-      - "9000:9001"
+      - "9001:9001"
     volumes:
       - s3_certs:/root/.minio/certs
       - data:/data