Merge branch 'main' into BAI-1299-python-semantic-version-bugfix

gchq · Jun 11, 2024 · c17fea5 · c17fea5
2 parents ad8223c + 3af6bd3
commit c17fea5
Show file tree

Hide file tree

Showing 60 changed files with 5,752 additions and 4,137 deletions.
diff --git a/backend/config/default.cjs b/backend/config/default.cjs
@@ -136,6 +136,17 @@ module.exports = {
         subdomain: '',
       },
     },
+    cognito: {
+      identityProviderClient: {
+        region: 'eu-west-1',
+        credentials: {
+          accessKeyId: '',
+          secretAccessKey: '',
+        },
+      },
+      userPoolId: '',
+      userIdAttribute: '',
+    },
   },
 
   avScanning: {
@@ -191,10 +202,9 @@ module.exports = {
 
   s3: {
     credentials: {
-      accessKeyId: 'minioadmin',
-      secretAccessKey: 'minioadmin',
+      accessKeyId: '',
+      secretAccessKey: '',
     },
-
     endpoint: 'http://minio:9000',
     region: 'ignored',
     forcePathStyle: true,
@@ -226,7 +236,7 @@ module.exports = {
         enabled: false,
         keyId: '123-456',
         KMSClient: {
-          region: 'eu-west-2',
+          region: 'eu-west-1',
           credentials: {
             accessKeyId: 'access',
             secretAccessKey: 'secret',

diff --git a/backend/config/docker_compose.cjs b/backend/config/docker_compose.cjs
@@ -17,14 +17,22 @@ module.exports = {
     publicKey: '/certs/cert.pem',
   },
 
-  minio: {
-    connection: {
-      endPoint: 'minio',
-      port: 9000,
-      useSSL: false,
-      accessKey: 'minioadmin',
-      secretKey: 'minioadmin',
-      region: '',
+  s3: {
+    credentials: {
+      accessKeyId: 'minioadmin',
+      secretAccessKey: 'minioadmin',
+    },
+    endpoint: 'http://minio:9000',
+    region: 'ignored',
+    forcePathStyle: true,
+    rejectUnauthorized: true,
+
+    automaticallyCreateBuckets: true,
+
+    // Names of buckets that Bailo uses
+    buckets: {
+      uploads: 'uploads',
+      registry: 'registry',
     },
   },