Fix api tests and update swagger (#38)

* add copy swagger

* fix git job config test

* update swagger

.gitignore

@@ -5,3 +5,4 @@ node_modules
 .vscode/settings.json
 .tests/
 .lib/
+lib/

copy_swagger.js

@@ -0,0 +1,19 @@
+var exec = require('child_process').exec;
+var os = require('os');
+
+function puts(error, stdout, stderr) {
+    if (error) {
+        console.log(error);
+    }
+    console.error(stderr);
+    console.log(stdout);
+}
+
+if (os.type() === 'Linux')
+   exec("cp src/api/v2/swagger.yaml lib/src/api/v2/swagger.yaml", puts);
+else if (os.type() === 'Darwin')
+   exec("cp src/api/v2/swagger.yaml lib/src/api/v2/swagger.yaml", puts);
+else if (os.type() === 'Windows_NT')
+   exec("copy src\\api\\v2\\swagger.yaml lib\\src\\api\\v2\\swagger.yaml", puts);
+else
+   throw new Error("Unsupported OS found: " + os.type());

package.json

@@ -16,7 +16,8 @@
     "preapi-test": "ts-node -r tsconfig-paths/register tests/common/apiTestCaseGenerator.ts -- \"src/api/v2/swagger.yaml\" \".tests/apiTestCase.json\"",
     "api-test": "mocha -r ts-node/register -r tsconfig-paths/register tests/api_tests/**/*.spec.ts -t 20000",
     "prebuild": "tslint --config tslint.json --project tsconfig.build.json",
-    "build": "ttsc -p tsconfig.json"
+    "build": "ttsc -p tsconfig.json && npm run copy-swagger",
+    "copy-swagger": "node copy_swagger.js"
   },
   "homepage": "https://github.com/Microsoft/openpaisdk",
   "repository": {
@@ -74,4 +75,4 @@
   "bin": {
     "pai": "lib/src/cli.js"
   }
-}
+}

src/api/v2/swagger.yaml

@@ -216,7 +216,7 @@ paths:
                   - user
                   - admin
         '400':
-          description: NoUserError or IncorrectPassworkError
+          description: NoUserError or IncorrectPasswordError
           content:
             application/json:
               schema:
@@ -1014,7 +1014,7 @@ paths:
       security:
         - bearerAuth: []
       parameters:
-        - name: user
+        - name: username
           in: query
           description: filter jobs with username
           schema:
@@ -2017,6 +2017,8 @@ components:
             - type: object
               description: other/unknown type
               properties: {}
+        readOnly:
+          type: boolean
         secretName:
           type: string
         mountOptions:
@@ -2252,16 +2254,16 @@ components:
         - email
         - extension
   responses:
-    IncorrectPassworkError:
-      description: IncorrectPassworkError
+    IncorrectPasswordError:
+      description: IncorrectPasswordError
       content:
         application/json:
           schema:
             $ref: '#/components/schemas/Response'
           examples:
-            IncorrectPassworkError:
+            IncorrectPasswordError:
               value:
-                code: IncorrectPassworkError
+                code: IncorrectPasswordError
                 message: Password is incorrect.
     NoVirtualClusterError:
       description: NoVirtualClusterError

tests/common/apiTestCases.ts

@@ -876,7 +876,10 @@ export const ApiDefaultTestCases: {[key: string]: IApiTestCase} = {
                             type: 'raw',
                             value: 'sdk_test_nonexist_job'
                         }
-                    ]
+                    ],
+                    response: {
+                        statusCode: 404
+                    }
                 }
             }
         ],