update arsenal

docs/developers/running-azurite-locally.rst

@@ -0,0 +1,12 @@
+# Running Azurite
+
+(Azurite)[https://github.com/azure/azurite] is the blob server mock developed by Azure itself.
+
+## Running with docker
+
+The following command will run Azurite locally on your machine with the proper credentials
+to run Cloudserver's test.
+
+```shell
+docker run --rm --env AZURITE_ACCOUNTS="fakeaccountname:Fake00Key001;fakeaccountname2:Fake00Key002" -p 10000:10000 mcr.microsoft.com/azure-storage/azurite
+```

eve/main.yml

@@ -7,31 +7,6 @@ branches:
 
 models:
   - env: &global-env
-      azurebackend_AZURE_STORAGE_ACCESS_KEY: >-
-        %(secret:azure_storage_access_key)s
-      azurebackend_AZURE_STORAGE_ACCOUNT_NAME: >-
-        %(secret:azure_storage_account_name)s
-      azurebackend_AZURE_STORAGE_ENDPOINT: >-
-        %(secret:azure_storage_endpoint)s
-      azurebackend2_AZURE_STORAGE_ACCESS_KEY: >-
-        %(secret:azure_storage_access_key_2)s
-      azurebackend2_AZURE_STORAGE_ACCOUNT_NAME: >-
-        %(secret:azure_storage_account_name_2)s
-      azurebackend2_AZURE_STORAGE_ENDPOINT: >-
-        %(secret:azure_storage_endpoint_2)s
-      azurebackendmismatch_AZURE_STORAGE_ACCESS_KEY: >-
-        %(secret:azure_storage_access_key)s
-      azurebackendmismatch_AZURE_STORAGE_ACCOUNT_NAME: >-
-        %(secret:azure_storage_account_name)s
-      azurebackendmismatch_AZURE_STORAGE_ENDPOINT: >-
-        %(secret:azure_storage_endpoint)s
-      azurenonexistcontainer_AZURE_STORAGE_ACCESS_KEY: >-
-        %(secret:azure_storage_access_key)s
-      azurenonexistcontainer_AZURE_STORAGE_ACCOUNT_NAME: >-
-        %(secret:azure_storage_account_name)s
-      azurenonexistcontainer_AZURE_STORAGE_ENDPOINT: >-
-        %(secret:azure_storage_endpoint)s
-      azuretest_AZURE_BLOB_ENDPOINT: "%(secret:azure_storage_endpoint)s"
       b2backend_B2_ACCOUNT_ID: "%(secret:b2backend_b2_account_id)s"
       b2backend_B2_STORAGE_ACCESS_KEY: >-
         %(secret:b2backend_b2_storage_access_key)s

eve/workers/pod.yaml

@@ -196,10 +196,10 @@ spec:
       imagePullPolicy: IfNotPresent
       resources:
         requests:
-          cpu: 500m
+          cpu: 400m
           memory: 1536Mi
         limits:
-          cpu: 500m
+          cpu: 400m
           memory: 1536Mi
       volumeMounts:
         - name: artifacts
@@ -222,6 +222,27 @@ spec:
           cpu: 100m
           memory: 128Mi
     {%- endif %}
+    {% if vars.env.S3DATA is defined and vars.env.S3DATA == "multiple" -%}
+    - name: azurite
+      image: mcr.microsoft.com/azure-storage/azurite:3.13.0
+      command: ['azurite']
+      args: ['--blobHost', '0.0.0.0', '--debug', '/artifacts/azurite.log']
+      env:
+      - name: AZURITE_ACCOUNTS
+        value: "fakeaccountname:Fake00Key001;fakeaccountname2:Fake00Key002"
+      volumeMounts:
+        - name: azurite
+          mountPath: /data
+        - name: artifacts
+          mountPath: /artifacts
+      resources:
+        requests:
+          cpu: 100m
+          memory: 256Mi
+        limits:
+          cpu: 100m
+          memory: 256Mi
+    {% endif %}
   volumes:
     - name: creds
       emptyDir: {}
@@ -231,3 +252,5 @@ spec:
       emptyDir: {}
     - name: kmip-certs
       emptyDir: {}
+    - name: azurite
+      emptyDir: {}

package.json

@@ -20,7 +20,7 @@
   "homepage": "https://github.com/scality/S3#readme",
   "dependencies": {
     "@hapi/joi": "^17.1.0",
-    "arsenal": "github:scality/Arsenal#8.1.8",
+    "arsenal": "github:scality/Arsenal#8.1.10",
     "async": "~2.5.0",
     "aws-sdk": "2.905.0",
     "azure-storage": "^2.1.0",

tests/locationConfig/locationConfigCeph.json

@@ -137,7 +137,7 @@
         "objectId": "azurebackend",
         "legacyAwsBehavior": true,
         "details": {
-            "azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/",
+            "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
             "azureStorageAccountName": "fakeaccountname",
             "azureStorageAccessKey": "Fake00Key001",
             "bucketMatch": true,
@@ -149,7 +149,7 @@
         "objectId": "azurebackend2",
         "legacyAwsBehavior": true,
         "details": {
-            "azureStorageEndpoint": "https://fakeaccountname2.blob.core.fake.net/",
+            "azureStorageEndpoint": "http://localhost:10000/fakeaccountname2",
             "azureStorageAccountName": "fakeaccountname2",
             "azureStorageAccessKey": "Fake00Key002",
             "bucketMatch": true,
@@ -161,7 +161,7 @@
         "objectId": "azurebackendmismatch",
         "legacyAwsBehavior": true,
         "details": {
-            "azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/",
+            "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
             "azureStorageAccountName": "fakeaccountname",
             "azureStorageAccessKey": "Fake00Key001",
             "bucketMatch": false,
@@ -173,9 +173,9 @@
         "objectId": "azurenonexistcontainer",
         "legacyAwsBehavior": true,
         "details": {
-            "azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/",
+            "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
             "azureStorageAccountName": "fakeaccountname",
-            "azureStorageAccessKey": "Fake00Key123",
+            "azureStorageAccessKey": "Fake00Key001",
             "bucketMatch": true,
             "azureContainerName": "s3createbucketonfly"
         }

tests/locationConfig/locationConfigTests.json

@@ -109,7 +109,7 @@
         "objectId": "azurebackend",
         "legacyAwsBehavior": true,
         "details": {
-            "azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/",
+            "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
             "azureStorageAccountName": "fakeaccountname",
             "azureStorageAccessKey": "Fake00Key001",
             "bucketMatch": true,
@@ -121,7 +121,7 @@
         "objectId": "azurebackend2",
         "legacyAwsBehavior": true,
         "details": {
-            "azureStorageEndpoint": "https://fakeaccountname2.blob.core.fake.net/",
+            "azureStorageEndpoint": "http://localhost:10000/fakeaccountname2",
             "azureStorageAccountName": "fakeaccountname2",
             "azureStorageAccessKey": "Fake00Key002",
             "bucketMatch": true,
@@ -133,7 +133,7 @@
         "objectId": "azurebackendmismatch",
         "legacyAwsBehavior": true,
         "details": {
-            "azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/",
+            "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
             "azureStorageAccountName": "fakeaccountname",
             "azureStorageAccessKey": "Fake00Key001",
             "bucketMatch": false,
@@ -145,9 +145,9 @@
         "objectId": "azurenonexistcontainer",
         "legacyAwsBehavior": true,
         "details": {
-            "azureStorageEndpoint": "https://fakeaccountname.blob.core.fake.net/",
+            "azureStorageEndpoint": "http://localhost:10000/fakeaccountname",
             "azureStorageAccountName": "fakeaccountname",
-            "azureStorageAccessKey": "Fake00Key123",
+            "azureStorageAccessKey": "Fake00Key001",
             "bucketMatch": true,
             "azureContainerName": "s3createbucketonfly"
         }

yarn.lock

@@ -675,9 +675,9 @@ arraybuffer.slice@~0.0.7:
   resolved "https://registry.yarnpkg.com/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz#3bbc4275dd584cc1b10809b89d4e8b63a69e7675"
   integrity sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==
 
-"arsenal@github:scality/Arsenal#8.1.8":
-  version "8.1.8"
-  resolved "https://codeload.github.com/scality/Arsenal/tar.gz/29dd069a5f2cfac8df027ddca17af83f6c53a05e"
+"arsenal@github:scality/Arsenal#8.1.10":
+  version "8.1.10"
+  resolved "https://codeload.github.com/scality/Arsenal/tar.gz/ed1d6c12c2e54bb6cfb747040d7b0711a21143c9"
   dependencies:
     "@hapi/joi" "^15.1.0"
     JSONStream "^1.0.0"