@skyramp/skyramp 0.4.65 → 0.4.67

package/lib/dev-darwin-amd64.h

@@ -122,10 +122,10 @@ extern char* newRestEndpointWrapper(char* name, char* openApiTag, GoInt port, ch
 extern char* getEndpointWrapper(char* service, GoInt port, char* restPath);
 extern char* writeMockDescriptionWrapper(char* mockDescription, char* kubernetesService);
 extern char* writeTestDescriptionWrapper(char* testDescription, char* testName);
-extern char* applyMockDescriptionWrapper(char* namespace, char* address, char* mockDescription);
+extern char* applyMockDescriptionWrapper(char* namespace, char* address, char* mockDescription, char* mockPath, char* projectPath);
 extern char* buildRequestsWrapper(char* mockDescription);
 extern char* runTesterStartWrapper(char* namespace, char* address, char* testDescription, GoUint8 generateResult);
-extern char* runTesterStartWrapperWithGlobalHeaders(char* namespace, char* address, char* testDescription, char* testName, char* globalJsonHeaders, GoUint8 generateResult, GoUint8 isDockerEnv);
+extern char* runTesterStartWrapperWithGlobalHeaders(char* namespace, char* address, char* testDescription, char* testFileName, char* testName, char* globalJsonHeaders, GoUint8 generateResult, char* projectPath, char* overrideFile);
 extern char* runTesterStatusWrapper(char* namespace, char* address);
 
 #ifdef __cplusplus

package/lib/dev-darwin-arm64.h

@@ -122,10 +122,10 @@ extern char* newRestEndpointWrapper(char* name, char* openApiTag, GoInt port, ch
 extern char* getEndpointWrapper(char* service, GoInt port, char* restPath);
 extern char* writeMockDescriptionWrapper(char* mockDescription, char* kubernetesService);
 extern char* writeTestDescriptionWrapper(char* testDescription, char* testName);
-extern char* applyMockDescriptionWrapper(char* namespace, char* address, char* mockDescription);
+extern char* applyMockDescriptionWrapper(char* namespace, char* address, char* mockDescription, char* mockPath, char* projectPath);
 extern char* buildRequestsWrapper(char* mockDescription);
 extern char* runTesterStartWrapper(char* namespace, char* address, char* testDescription, GoUint8 generateResult);
-extern char* runTesterStartWrapperWithGlobalHeaders(char* namespace, char* address, char* testDescription, char* testName, char* globalJsonHeaders, GoUint8 generateResult, GoUint8 isDockerEnv);
+extern char* runTesterStartWrapperWithGlobalHeaders(char* namespace, char* address, char* testDescription, char* testFileName, char* testName, char* globalJsonHeaders, GoUint8 generateResult, char* projectPath, char* overrideFile);
 extern char* runTesterStatusWrapper(char* namespace, char* address);
 
 #ifdef __cplusplus

package/lib/dev-linux-386.h

@@ -122,10 +122,10 @@ extern char* newRestEndpointWrapper(char* name, char* openApiTag, GoInt port, ch
 extern char* getEndpointWrapper(char* service, GoInt port, char* restPath);
 extern char* writeMockDescriptionWrapper(char* mockDescription, char* kubernetesService);
 extern char* writeTestDescriptionWrapper(char* testDescription, char* testName);
-extern char* applyMockDescriptionWrapper(char* namespace, char* address, char* mockDescription);
+extern char* applyMockDescriptionWrapper(char* namespace, char* address, char* mockDescription, char* mockPath, char* projectPath);
 extern char* buildRequestsWrapper(char* mockDescription);
 extern char* runTesterStartWrapper(char* namespace, char* address, char* testDescription, GoUint8 generateResult);
-extern char* runTesterStartWrapperWithGlobalHeaders(char* namespace, char* address, char* testDescription, char* testName, char* globalJsonHeaders, GoUint8 generateResult, GoUint8 isDockerEnv);
+extern char* runTesterStartWrapperWithGlobalHeaders(char* namespace, char* address, char* testDescription, char* testFileName, char* testName, char* globalJsonHeaders, GoUint8 generateResult, char* projectPath, char* overrideFile);
 extern char* runTesterStatusWrapper(char* namespace, char* address);
 
 #ifdef __cplusplus

package/lib/dev-linux-amd64.h

@@ -122,10 +122,10 @@ extern char* newRestEndpointWrapper(char* name, char* openApiTag, GoInt port, ch
 extern char* getEndpointWrapper(char* service, GoInt port, char* restPath);
 extern char* writeMockDescriptionWrapper(char* mockDescription, char* kubernetesService);
 extern char* writeTestDescriptionWrapper(char* testDescription, char* testName);
-extern char* applyMockDescriptionWrapper(char* namespace, char* address, char* mockDescription);
+extern char* applyMockDescriptionWrapper(char* namespace, char* address, char* mockDescription, char* mockPath, char* projectPath);
 extern char* buildRequestsWrapper(char* mockDescription);
 extern char* runTesterStartWrapper(char* namespace, char* address, char* testDescription, GoUint8 generateResult);
-extern char* runTesterStartWrapperWithGlobalHeaders(char* namespace, char* address, char* testDescription, char* testName, char* globalJsonHeaders, GoUint8 generateResult, GoUint8 isDockerEnv);
+extern char* runTesterStartWrapperWithGlobalHeaders(char* namespace, char* address, char* testDescription, char* testFileName, char* testName, char* globalJsonHeaders, GoUint8 generateResult, char* projectPath, char* overrideFile);
 extern char* runTesterStatusWrapper(char* namespace, char* address);
 
 #ifdef __cplusplus

package/lib/dev-windows-amd64.h

@@ -122,10 +122,10 @@ extern __declspec(dllexport) char* newRestEndpointWrapper(char* name, char* open
 extern __declspec(dllexport) char* getEndpointWrapper(char* service, GoInt port, char* restPath);
 extern __declspec(dllexport) char* writeMockDescriptionWrapper(char* mockDescription, char* kubernetesService);
 extern __declspec(dllexport) char* writeTestDescriptionWrapper(char* testDescription, char* testName);
-extern __declspec(dllexport) char* applyMockDescriptionWrapper(char* namespace, char* address, char* mockDescription);
+extern __declspec(dllexport) char* applyMockDescriptionWrapper(char* namespace, char* address, char* mockDescription, char* mockPath, char* projectPath);
 extern __declspec(dllexport) char* buildRequestsWrapper(char* mockDescription);
 extern __declspec(dllexport) char* runTesterStartWrapper(char* namespace, char* address, char* testDescription, GoUint8 generateResult);
-extern __declspec(dllexport) char* runTesterStartWrapperWithGlobalHeaders(char* namespace, char* address, char* testDescription, char* testName, char* globalJsonHeaders, GoUint8 generateResult, GoUint8 isDockerEnv);
+extern __declspec(dllexport) char* runTesterStartWrapperWithGlobalHeaders(char* namespace, char* address, char* testDescription, char* testFileName, char* testName, char* globalJsonHeaders, GoUint8 generateResult, char* projectPath, char* overrideFile);
 extern __declspec(dllexport) char* runTesterStatusWrapper(char* namespace, char* address);
 
 #ifdef __cplusplus

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skyramp/skyramp",
-  "version": "0.4.65",
+  "version": "0.4.67",
   "description": "module for leveraging skyramp cli functionality",
   "scripts": {
     "lint": "eslint 'src/**/*.js' 'src/**/*.ts' --fix",

package/src/classes/SkyrampClient.js

@@ -40,8 +40,8 @@ const newDeleteDockerSkyrampWorkerWrapper = lib.func('newDeleteDockerSkyrampWork
 // tester related
 const runTesterStartWrapper = lib.func('runTesterStartWrapper', 'string', ['string', 'string', 'string', 'bool']);
 // mocker related
-const runTesterStartWrapperv1 = lib.func('runTesterStartWrapperWithGlobalHeaders', 'string', ['string', 'string', 'string', 'string', 'string', 'bool', 'bool']);
-const applyMockDescriptionWrapper = lib.func('applyMockDescriptionWrapper', 'string', ['string', 'string', 'string']);
+const runTesterStartWrapperv1 = lib.func('runTesterStartWrapperWithGlobalHeaders', 'string', ['string', 'string', 'string', 'string', 'string', 'string', 'bool', 'string', 'string']);
+const applyMockDescriptionWrapper = lib.func('applyMockDescriptionWrapper', 'string', ['string', 'string', 'string', 'string', 'string']);
 // NPM only: for VS code extension use
 const initTargetWrapper = lib.func('initTargetWrapper', 'string', ['string']);
 const deployTargetWrapper = lib.func('deployTargetWrapper', 'string', ['string', 'string', 'string', 'bool']);
@@ -256,7 +256,7 @@ class SkyrampClient {
    * @returns {Promise} - A Promise that resolves if deployment is successful, and rejects with an error if any error occurs during deployment.
    * @throws {Error} - If there is no cluster to deploy the worker to.
    */
-  async deploySkyrampWorker(namespace, workerImage='', localImage=false) {
+  async deploySkyrampWorker(namespace, workerImage = '', localImage = false) {
     if (this.kubeConfigPath === null) {
       throw new Error('No cluster to deploy worker to.');
     }
@@ -312,7 +312,7 @@ class SkyrampClient {
    * @param {string} targetNetworkName - The name of the network to connect the Docker worker to.
    * @returns {Promise} - A Promise that resolves if the Docker worker starts successfully and rejects if there is an error starting the worker.
    */
-  async runDockerSkyrampWorker(workerImage=WORKER_URL, workerTag=WORKER_TAG, hostPost=CONTAINER_PORT, targetNetworkName="") { 
+  async runDockerSkyrampWorker(workerImage = WORKER_URL, workerTag = WORKER_TAG, hostPost = CONTAINER_PORT, targetNetworkName = "") {
     return new Promise((resolve, reject) => {
       newStartDockerSkyrampWorkerWrapper.async(workerImage, workerTag, hostPost, targetNetworkName, (err, res) => {
         if (err) {
@@ -375,11 +375,11 @@ class SkyrampClient {
   async mockerApplyFromFile(namespace, address, filepath) {
     const yamlContent = getYamlBytes(readDataFromFile(filepath)[0]);
     return this.applyMockDescription(namespace, address, yamlContent);
-  }  
+  }
 
   async applyMockDescription(namespace, address, yamlContent) {
     return new Promise((resolve, reject) => {
-      applyMockDescriptionWrapper.async(namespace, address, yamlContent, (err, res) => {
+      applyMockDescriptionWrapper.async(namespace, address, yamlContent, '', '', (err, res) => {
         if (err) {
           reject(err);
         } else if (res) {
@@ -410,14 +410,14 @@ class SkyrampClient {
    * 
    * @returns {Promise} - A promise that resolves when the test scenario is started.
    */
-  async testerStartV1(namespace, address, scenario, testName, globalHeaders, generateTestReport=false, isDockerenv=false) {
-      const testDescription = createTestDescriptionFromScenario(scenario);
-      const testYamlContent = getYamlBytes(testDescription);
-      if (globalHeaders !== undefined && globalHeaders !== null) {
-        globalHeaders = JSON.stringify(globalHeaders);
-      }
-      return this.runTesterStartv1(namespace, address, testYamlContent, testName, globalHeaders, generateTestReport, isDockerenv);
+  async testerStartV1(namespace, address, scenario, testName, globalHeaders, generateTestReport = false) {
+    const testDescription = createTestDescriptionFromScenario(scenario);
+    const testYamlContent = getYamlBytes(testDescription);
+    if (globalHeaders !== undefined && globalHeaders !== null) {
+      globalHeaders = JSON.stringify(globalHeaders);
     }
+    return this.runTesterStartv1(namespace, address, testYamlContent, testName, globalHeaders, generateTestReport);
+  }
 
   // NPM only: for VS code extension use
   async testerStartFromFile(namespace, address, filepath) {
@@ -440,9 +440,9 @@ class SkyrampClient {
     });
   }
 
-  async runTesterStartv1(namespace, address, testYamlContent, testName, globalHeaders, generateReport=true, isDockerEnvironment=false) {
+  async runTesterStartv1(namespace, address, testYamlContent, testName, globalHeaders, generateReport = true) {
     return new Promise((resolve, reject) => {
-      runTesterStartWrapperv1.async(namespace, address, testYamlContent, testName, globalHeaders, generateReport, isDockerEnvironment, (err, res) => {
+      runTesterStartWrapperv1.async(namespace, address, testYamlContent, "", testName, globalHeaders, generateReport, "", "", (err, res) => {
         if (err) {
           reject(err);
         } else if (res) {