test(s3): simplify s3 configurations (#919)

* test(s3): simplify S3 configurations

* remove env var setting config property to default value

* expose minio console port

* remove unused env var

Author: andrewazores

compose/s3-cloudserver.yml

@@ -4,14 +4,10 @@ services:
       s3:
         condition: service_healthy
     environment:
-      STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:8000
       STORAGE_EXT_URL: /storage/
       QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
       QUARKUS_S3_AWS_REGION: us-east-1
-      QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
-      QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: accessKey1
-      QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: verySecretKey1
       AWS_ACCESS_KEY_ID: accessKey1
       AWS_SECRET_ACCESS_KEY: verySecretKey1
   s3:
@@ -27,13 +23,13 @@ services:
       SCALITY_ACCESS_KEY_ID: accessKey1
       SCALITY_SECRET_ACCESS_KEY: verySecretKey1
     restart: always
-    # healthcheck:
-    #   test:
-    #     - CMD-SHELL
-    #     - curl
-    #     - --fail
-    #     - http://localhost:8000/
-    #   interval: 10s
-    #   retries: 3
-    #   start_period: 30s
-    #   timeout: 5s
+    healthcheck:
+      test:
+        - CMD-SHELL
+        - curl
+        - --fail
+        - http://localhost:8000/_/healthcheck/deep
+      interval: 10s
+      retries: 3
+      start_period: 30s
+      timeout: 5s

compose/s3-localstack.yml

@@ -4,14 +4,10 @@ services:
       s3:
         condition: service_healthy
     environment:
-      STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:4566
       STORAGE_EXT_URL: /storage/
       QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
       QUARKUS_S3_AWS_REGION: us-east-1
-      QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
-      QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: unused
-      QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: unused
       AWS_ACCESS_KEY_ID: unused
       AWS_SECRET_ACCESS_KEY: unused
   s3:

compose/s3-minio.yml

@@ -4,26 +4,23 @@ services:
       s3:
         condition: service_healthy
     environment:
-      STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:9000
       STORAGE_EXT_URL: /storage/
       QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
       QUARKUS_S3_AWS_REGION: us-east-1
-      QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
-      QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: minioroot
-      QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: minioroot
       AWS_ACCESS_KEY_ID: minioroot
       AWS_SECRET_ACCESS_KEY: minioroot
   s3:
     image: ${MINIO_IMAGE:-quay.io/minio/minio:latest}
     hostname: s3
+    ports:
+      - "9001:9001"
     expose:
       - "9000"
     command: server /data --console-address ":9001"
     environment:
       MINIO_ROOT_USER: minioroot
       MINIO_ROOT_PASSWORD: minioroot
-      MINIO_DEFAULT_BUCKETS: ${PRECREATE_BUCKETS}
     volumes:
       - minio_data:/data
       - minio_certs:/certs

compose/s3-seaweed.yml

@@ -4,15 +4,10 @@ services:
       s3:
         condition: service_healthy
     environment:
-      STORAGE_BUCKETS_ARCHIVES_NAME: archivedrecordings
-      CRYOSTAT_SERVICES_REPORTS_STORAGE_CACHE_NAME: archivedreports
       QUARKUS_S3_ENDPOINT_OVERRIDE: http://s3:8333
       STORAGE_EXT_URL: /storage/
       QUARKUS_S3_PATH_STYLE_ACCESS: "true" # needed since compose setup does not support DNS subdomain resolution
       QUARKUS_S3_AWS_REGION: us-east-1
-      QUARKUS_S3_AWS_CREDENTIALS_TYPE: static
-      QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_ACCESS_KEY_ID: access_key
-      QUARKUS_S3_AWS_CREDENTIALS_STATIC_PROVIDER_SECRET_ACCESS_KEY: secret_key
       AWS_ACCESS_KEY_ID: access_key
       AWS_SECRET_ACCESS_KEY: secret_key
   s3: