@stordata/vsphere-soapify 0.0.28 → 0.0.35

package/.gitlab-ci.yml

@@ -1,12 +1,32 @@
-image: docker.stordata.fr/stordata/docker-node:16
+image: docker.stordata.fr/stordata/docker-node:20
 
 stages:
-  - build
+  - test
+  - release
 
-build:
-  stage: build
+include:
+  - template: Jobs/SAST.gitlab-ci.yml
+  - template: Jobs/Dependency-Scanning.gitlab-ci.yml
+
+variables:
+  SAST_EXCLUDED_PATHS: "*.spec.js, *.test.js"
+
+test:
+  stage: test
   tags:
     - docker
   script:
     - npm ci
-    - grunt
+    - npm run lint
+    - npm test
+
+release:
+  stage: release
+  tags:
+    - docker
+  script:
+    - npm -registry=https://registry.npmjs.org whoami
+    - npm -registry=https://registry.npmjs.org publish
+    - git checkout .
+  rules:
+    - if: $CI_COMMIT_TAG

package/.mocharc.json

@@ -0,0 +1,7 @@
+{
+  "timeout": 5000,
+  "recursive": true,
+  "require": [
+    "lib/env.test.js"
+  ]
+}

package/.nvmrc

@@ -1 +1 @@
-16.13.0
+20.9.0

package/README.md

@@ -58,12 +58,30 @@ client
 
 ## Releasing
 
-This library is released on NPM. To release a new version run `grunt release`
-Beware that you need to be logged in on NPM and have write access to the Stordata organization.
+This library is released on NPM. To release a new version:
 
-Login npm cmd line
+*  Be on `master` branch and fully rebased
+*  Tag the version to release
 
-Run `npm --registry=https://registry.npmjs.org login` then enter your credentials.
+```bash
+git tag v$(jq -r .version package.json)
+```
+
+*  Increment version number in [package.json](package.json)
+*  Persist changes in lockfile
+
+```bash
+npm i
+```
 
-Finally to ensure your connection `npm --registry=https://registry.npmjs.org whoami` and you should see your username.
+*  Commit your changes
 
+```bash
+git commit -am"[ci skip] Bumped version to $(jq -r .version package.json)"
+```
+
+*  Push everything
+
+```bash
+git push $(git config branch.master.remote) master --tags
+```

package/lib/client.js

@@ -3,18 +3,18 @@
 const soap = require('soap'),
       _ = require('lodash'),
       Parser = require('./parser'),
-      request = require('./request'),
       { ServiceInstance, HostSystem, VirtualMachine, Datacenter, Datastore } = require('./sdk').managed,
       { PerfQuerySpec, PerfMetricId } = require('./sdk').data,
       DEFAULT_FEATURES = require('./features');
 
 module.exports = class Client {
+
   /**
    * Creates a new Client to access a vSphere server.
    *
    * @param {String} url The URL to the vSphere endpoint.
    *  Use the base URL only, the library manages the actual SDK endpoints automatically
-   * @param {Object} [requestOptions] Options given to request. See https://github.com/request/request#requestoptions-callback
+   * @param {Object} [options] The client options, passed to the `soap` library directly
    * @param {Object} [features] An optional list of feature flags to control advanced settings of the created Client
    * @param {boolean} [features.alwaysUseMaxSampleInQuerySpec=false] Whether to force the use of `maxSample` in QuerySpec objects,
    *  even though this might form invalid calls. Use with caution !
@@ -22,9 +22,9 @@ module.exports = class Client {
    *
    * @constructor
    */
-  constructor(url, requestOptions, features) {
+  constructor(url, options, features) {
     this.url = url;
-    this.requestOptions = requestOptions;
+    this.options = options;
     this.features = _.defaults(features, DEFAULT_FEATURES);
 
     this.parser = new Parser(this);
@@ -43,10 +43,7 @@ module.exports = class Client {
   getClient() {
     const wsdl = `${__dirname}/wsdl/5.5/vimService.wsdl`;
 
-    return this._cache('client', () => soap.createClientAsync(wsdl, {
-      endpoint: this.url,
-      request: request(this.url, this.requestOptions)
-    }));
+    return this._cache('client', () => soap.createClientAsync(wsdl, { endpoint: this.url, ...this.options }));
   }
 
   /**

package/lib/env.test.js

@@ -0,0 +1,4 @@
+'use strict';
+
+process.env.NODE_ENV = 'tests';
+process.env.TZ = 'UTC';

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@stordata/vsphere-soapify",
-  "version": "0.0.28",
+  "version": "0.0.35",
   "description": "A NodeJS abstraction layer for the vSphere SOAP API",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "npx mocha lib/all.spec.js 'lib/**/*.spec.js'",
+    "lint": "npx eslint index.js lib/**/*.js"
   },
   "repository": {
     "type": "git",
@@ -19,7 +20,7 @@
   "author": "Stordata <teamdenbas@stordata.fr>",
   "license": "UNLICENCED",
   "engines": {
-    "node": ">= 16"
+    "node": ">= 20"
   },
   "publishConfig": {
     "access": "public",
@@ -29,26 +30,22 @@
     "axios": "0.27.2",
     "debug": "4.3.4",
     "lodash": "4.17.21",
-    "soap": "0.45.0",
-    "tough-cookie": "4.1.2"
+    "soap": "1.0.0",
+    "tough-cookie": "4.1.3"
   },
   "devDependencies": {
-    "@stordata/eslint-config": "1.0.20220924010720",
-    "chai": "4.3.6",
+    "@stordata/eslint-config": "1.0.20231104011033",
+    "chai": "4.3.10",
     "chai-datetime": "1.8.0",
-    "eslint": "8.24.0",
-    "eslint-plugin-import": "2.26.0",
+    "eslint": "8.53.0",
+    "eslint-plugin-import": "2.29.0",
     "eslint-plugin-json": "3.1.0",
-    "eslint-plugin-no-only-tests": "3.0.0",
+    "eslint-plugin-no-only-tests": "3.1.0",
     "eslint-plugin-node": "11.1.0",
-    "grunt": "1.5.3",
-    "grunt-env": "1.0.1",
-    "grunt-eslint": "24.0.0",
-    "grunt-release": "0.14.0",
-    "grunt-simple-mocha": "0.4.1",
+    "mocha": "10.2.0",
     "mockdate": "3.0.5",
-    "nock": "13.2.9",
-    "sinon": "14.0.0",
+    "nock": "13.3.8",
+    "sinon": "17.0.1",
     "sinon-chai": "3.7.0"
   }
 }

package/samples/index.js

@@ -3,13 +3,16 @@
 'use strict';
 
 const https = require('https'),
+      request = require('../lib/request'),
       { Client } = require('..'),
       { VSPHERE_URI, LOGIN, PASSWORD } = process.env;
 
 module.exports = (sample) => {
   const client = new Client(VSPHERE_URI, {
-    httpsAgent: new https.Agent({
-      rejectUnauthorized: false
+    request: request(VSPHERE_URI, {
+      httpsAgent: new https.Agent({
+        rejectUnauthorized: false
+      })
     })
   });
 

package/Gruntfile.js

@@ -1,42 +0,0 @@
-'use strict';
-
-module.exports = (grunt) => {
-  grunt.initConfig({
-    eslint: {
-      target: [
-        'index.js',
-        'Gruntfile.js',
-        'lib/**/*.js'
-      ]
-    },
-    simplemocha: {
-      options: {
-        timeout: 5000
-      },
-      all: {
-        src: ['lib/all.spec.js', 'lib/**/*.spec.js']
-      }
-    },
-    env: {
-      tests: {
-        NODE_ENV: 'tests',
-        TZ: 'UTC'
-      }
-    },
-    release: {
-      options: {
-        tagName: 'v<%= version %>',
-        beforeRelease: ['build']
-      }
-    }
-  });
-
-  grunt.loadNpmTasks('grunt-eslint');
-  grunt.loadNpmTasks('grunt-simple-mocha');
-  grunt.loadNpmTasks('grunt-env');
-  grunt.loadNpmTasks('grunt-release');
-
-  grunt.registerTask('default', ['build']);
-
-  grunt.registerTask('build', ['env:tests', 'eslint', 'simplemocha']);
-};