Fixed api key token name

onedata · Oct 24, 2016 · 6b4fb2c · 6b4fb2c
1 parent 5abcaf1
commit 6b4fb2c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 12 deletions.
diff --git a/build.sh b/build.sh
@@ -42,4 +42,4 @@ docker run --rm -e "CHOWNUID=${UID}" -v `pwd`:/swagger -t docker.onedata.org/swa
 #
 # Build Bash client
 #
-docker run --rm -e "CHOWNUID=${UID}" -v `pwd`:/swagger -t docker.onedata.org/bash-swagger-codegen:0.3.5 generate -i ./swagger.json -l bash -o ./generated/bash -c bash-config.json
+docker run --rm -e "CHOWNUID=${UID}" -v `pwd`:/swagger -t docker.onedata.org/bash-swagger-codegen:0.3.6 generate -i ./swagger.json -l bash -o ./generated/bash -c bash-config.json
diff --git a/index.yaml b/index.yaml
@@ -16,7 +16,7 @@ tags:
 securityDefinitions:
   api_key:
     type: apiKey
-    name: X-Auth-Key
+    name: X-Auth-Token
     in: header
   basic:
     type: basic
diff --git a/info/index.yaml b/info/index.yaml
@@ -23,7 +23,7 @@ description: |
   Currently this is supported through authentication token which can be generate using the Onedata user interface. 
   The token must be added to the request header like this:
   ```
-  macaroon: LAKSJHDLKJAHSDKLJHASKLCBBASKLCBLHABSCBALKSBCK...
+  X-Auth-Token: LAKSJHDLKJAHSDKLJHASKLCBBASKLCBLHABSCBALKSBCK...
   ```
 
   In addition please take into account, that depending on your account authorization rights, not all operations
@@ -84,13 +84,13 @@ description: |
   **Create replica of file at specific storage provider**
   ```bash
   curl -v --tlsv1.2 -H "X-Auth-Token: $TOKEN" -X POST \
-  "https://$PROVIDER:8443/replicas/MySpace1/MyFile2.txt?provider_id=ASDNKJASF"
+  "https://$PROVIDER:8443/api/v3/oneprovider/replicas/MySpace1/MyFile2.txt?provider_id=ASDNKJASF"
   ```
 
   **Get space storage qouta metric**
   ```bash
   curl -v --tlsv1.2 -H "X-Auth-Token: $TOKEN" -X GET \
-  "https://$PROVIDER:8443/metrics/space/MySpace1?metric=storage_qouta"
+  "https://$PROVIDER:8443/api/v3/oneprovider/metrics/space/MySpace1?metric=storage_qouta"
   ```
 
   More detailed examples are available in the documentation of each operation.

diff --git a/paths/index_.yaml b/paths/index_.yaml
@@ -116,7 +116,6 @@ post:
           type: string
           description: >
             The path to the index resource, including it's assigned identifier.
-
     '400':
       description: Invalid request.
       schema:
@@ -148,11 +147,11 @@ post:
     required: false
   - name: body
     in: body
-    description: The index function.
+    description: >
+      The index function.
     schema:
       type: string
     required: true
   x-code-samples:
   - lang: Shell
-    source: "cat index.js | oneprovider-rest-cli addSpaceIndex space_id=ASLDJLASKJDLADkhhasdaksdaADS name=MyIndex1"
-
+    source: "cat index.js | oneprovider-rest-cli addSpaceIndex space_id=ASLDJLASKJDLADkhhasdaksdaADS name=MyIndex1"
diff --git a/paths/replicas-path.yaml b/paths/replicas-path.yaml
@@ -76,6 +76,13 @@ post:
   tags:
     - Replication
   summary: Replicate file or folder by path
+  x-bash-codegen-description: |
+    Replicates a file to a specified provider. This operation is asynchronous 
+    as it can take a long time depending on the size of the data to move. 
+
+    If the `path` parameter specifies a folder, entire folder is replicated to 
+    requested provider.
+
   description: |
     Replicates a file to a specified provider. This operation is asynchronous as it can take a long time depending on the size of the data to move. 
 
@@ -101,7 +108,7 @@ post:
 
     { "transferId": "b3c85b99-44db-4277-8c66-2ccd50888565" }
     ```
-  produces:
+  consumes:
     - application/json
   responses:
     '200':

diff --git a/tests/bash-swagger-test.sh b/tests/bash-swagger-test.sh
@@ -13,14 +13,14 @@ export ONEPROVIDER_CLI=generated/bash/oneprovider-rest-cli
     run bash $ONEPROVIDER_CLI getAllSpaces --dry-run X-Auth-Key:SECRET
     [[ "$output" =~ "${ONEPROVIDER_HOST}/api/v3/oneprovider/spaces" ]]
     [[ "$output" =~ "-X GET" ]]
-    [[ "$output" =~ "X-Auth-Key: SECRET" ]]
+    [[ "$output" =~ "X-Auth-Token: SECRET" ]]
 }
 
 @test "getAllSpaces Api key from environment variable" {
     run bash $ONEPROVIDER_CLI getAllSpaces --dry-run
     [[ "$output" =~ "${ONEPROVIDER_HOST}/api/v3/oneprovider/spaces" ]]
     [[ "$output" =~ "-X GET" ]]
-    [[ "$output" =~ "X-Auth-Key: SECRET" ]]
+    [[ "$output" =~ "X-Auth-Token: SECRET" ]]
 }
 
 @test "getAllSpaces username and password" {