basic integration test working

Author: 4141done

__tests__/basic.test.js

@@ -1,22 +1,20 @@
 
 const Minio = require("minio");
+const request = require("supertest");
 
-const FILES = [
-  {
-    path: "/foo/bar.txt",
-    content: "dog"
+const FILES = {
+  "/foo/bar.txt": {
+    content: "dog",
   },
-  {
-    path: "/foo/baz.txt",
-    content: "cat"
+  "/foo/baz.txt": {
+    content: "cat",
   },
-  {
-    path: "/grumpy.txt",
-    content: "bah"
-  }
-];
+  "/grumpy.txt": {
+    content: "bah",
+  },
+};
 
-const BUCKET_NAME = "javier";
+const BUCKET_NAME = "bucket-1";
 
 beforeAll(async () => {
   const minioClient = new Minio.Client({
@@ -27,25 +25,30 @@ beforeAll(async () => {
     secretKey: 'wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY',
   });
 
-  ensureBucketWithObjects(minioClient, BUCKET_NAME, FILES);
+  await ensureBucketWithObjects(minioClient, BUCKET_NAME, FILES);
 });
 
 async function ensureBucketWithObjects(s3Client, bucketName, objects) {
   if (await s3Client.bucketExists(BUCKET_NAME)) {
-    await s3Client.removeObjects(BUCKET_NAME, FILES.map((f) => f.path));
+    await s3Client.removeObjects(BUCKET_NAME, Object.keys(FILES));
     await s3Client.removeBucket(BUCKET_NAME);
   }
 
   await s3Client.makeBucket(BUCKET_NAME, 'us-east-1');
 
-  for (const i in FILES) {
-    console.log(`now loading file ${FILES[i]}`)
-    let buf = Buffer.from(FILES[i].content, "utf-8");
-    let res = await s3Client.putObject(BUCKET_NAME, FILES[i].path, buf);
+  for (const path of Object.keys(FILES)) {
+    console.log(`now loading file ${path}`);
+    let buf = Buffer.from(FILES[path].content, "utf-8");
+    let res = await s3Client.putObject(BUCKET_NAME, path, buf);
     console.log(`Uploaded file: ${JSON.stringify(res)}`);
   }
 }
 
-test('adds 1 + 2 to equal 3', () => {
-  expect(true).toBe(true);
+test('adds 1 + 2 to equal 3', async () => {
+  const res = await request('http://localhost:8989')
+    .get("/foo/bar.txt")
+    .set("accept", "binary/octet-stream");
+
+  expect(res.statusCode).toBe(200);
+  expect(res.text).toBe(FILES["/foo/bar.txt"].content);
 });

common/etc/nginx/templates/default.conf.template

@@ -15,8 +15,8 @@ map $request_uri $uri_full_path {
 
 # Remove/replace a portion of request URL (if configured)
 map $uri_full_path $uri_path {
-	"~^$STRIP_LEADING_DIRECTORY_PATH(.*)"  ${PREFIX_LEADING_DIRECTORY_PATH}$1;
-    default ${PREFIX_LEADING_DIRECTORY_PATH}$uri_full_path;
+	"~^$STRIP_LEADING_DIRECTORY_PATH(.*)"  $PREFIX_LEADING_DIRECTORY_PATH$1;
+    default $PREFIX_LEADING_DIRECTORY_PATH$uri_full_path;
 }
 
 map $S3_STYLE $s3_host_hdr {

test/docker-compose.yaml

@@ -29,8 +29,8 @@ services:
       ALLOW_DIRECTORY_LIST: "false"
       PROVIDE_INDEX_PAGE:
       APPEND_SLASH_FOR_POSSIBLE_DIRECTORY:
-      STRIP_LEADING_DIRECTORY_PATH:
-      PREFIX_LEADING_DIRECTORY_PATH:
+      STRIP_LEADING_DIRECTORY_PATH: ""
+      PREFIX_LEADING_DIRECTORY_PATH: ""
       AWS_SIGS_VERSION: "4"
       STATIC_SITE_HOSTING:
       PROXY_CACHE_MAX_SIZE: "10g"