ENG-23580 updated and pushed version

Author: tropotorres

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbolt/cb-api-helper",
-  "version": "0.5.1",
+  "version": "0.5.4",
   "scripts": {
     "co:login": "aws sso login && aws codeartifact login --tool npm --repository cloudbolt-npm --domain cloudbolt --domain-owner 499620025628",
     "husky:install": "husky install",

package.json

@@ -15,7 +15,7 @@ export default {
    * @param {string} id or global_id
    * @returns {Promise} resolves with a cloudbolt API Response object of the Order object
    */
-  get: (id) => crud.getItemById(URL, id),
+  get: (id, options) => crud.getItemById(URL, id, options),
 
   /**
    * Duplicated an Order by a given id

src/api/services/v3/cmp/OrdersService.js

@@ -47,5 +47,16 @@ export default {
    * @returns {Promise} resolves with a cloudbolt API Run Resource Action Success Response
    */
   run: (id, runResourceAction) =>
-    crud.postItem(`${URL}/${id}/runAction`, runResourceAction)
+    crud.postItem(`${URL}/${id}/runAction`, runResourceAction),
+
+  /**
+   * Run a Resource Action
+   * @param {string} id or global_id
+   * @param {object} runResourceAction Resource Action object definition
+   * @param {array} runResourceAction.resources List of resource hrefs to run the Resource Action on
+   * @param {object} runResourceAction.parameters Action input parameters
+   * @returns {Promise} resolves with a cloudbolt API Run Resource Action Success Response
+   */
+  runSync: (id, runResourceAction) =>
+    crud.postItem(`${URL}/${id}/runActionSync`, runResourceAction)
 }

src/api/services/v3/cmp/ResourceActionsService.js

@@ -87,3 +87,20 @@ test('run calls the correct endpoint', async () => {
     mockResourceAction
   )
 })
+
+test('run calls the synchronous endpoint', async () => {
+  const mockFn = jest.spyOn(baseApi, 'post').mockResolvedValue({
+    data: { hello: 'world' }
+  })
+  const mockResourceAction = {
+    resources: ['resource-href'],
+    parameters: {
+      param1: 'value1'
+    }
+  }
+  await ResourceActionsService.runSync('resourceAction-id', mockResourceAction)
+  expect(mockFn).toHaveBeenCalledWith(
+    '/v3/cmp/resourceActions/resourceAction-id/runActionSync/',
+    mockResourceAction
+  )
+})

src/api/services/v3/cmp/ResourceActionsService.test.js

@@ -47,5 +47,16 @@ export default {
    * @returns {Promise} resolves with a cloudbolt API Run Server Action Success Response
    */
   run: (id, runServerAction) =>
-    crud.postItem(`${URL}/${id}/runAction`, runServerAction)
+    crud.postItem(`${URL}/${id}/runAction`, runServerAction),
+
+  /**
+   * Run a Server Action
+   * @param {string} id or global_id
+   * @param {object} runServerAction Server Action object definition
+   * @param {array} runServerAction.servers List of server hrefs to run the Server Action on
+   * @param {object} runServerAction.parameters Action input parameters
+   * @returns {Promise} resolves with a cloudbolt API Run Server Action Success Response
+   */
+  runSync: (id, runServerAction) =>
+    crud.postItem(`${URL}/${id}/runActionSync`, runServerAction)
 }

src/api/services/v3/cmp/ServerActionsService.js

@@ -82,3 +82,20 @@ test('run calls the correct endpoint', async () => {
     mockServerAction
   )
 })
+
+test('run calls the synchronous endpoint', async () => {
+  const mockFn = jest.spyOn(baseApi, 'post').mockResolvedValue({
+    data: { hello: 'world' }
+  })
+  const mockServerAction = {
+    servers: ['server-href'],
+    parameters: {
+      param1: 'value1'
+    }
+  }
+  await ServerActionsService.runSync('serverAction-id', mockServerAction)
+  expect(mockFn).toHaveBeenCalledWith(
+    '/v3/cmp/serverActions/serverAction-id/runActionSync/',
+    mockServerAction
+  )
+})

src/api/services/v3/cmp/ServerActionsService.test.js

@@ -9,4 +9,12 @@ export default {
    * @returns {Promise} resolves with a paginated list of existing Resource Types
    */
   list: (options) => crud.getItems(URL, options),
+
+  /**
+   * Retrieve an existing Server by id
+   * @param {string} id or global_id
+   * @param {Object} options anything parsable by URLSearchParams. See useful options here https://docs.cloudbolt.io/articles/#!cloudbolt-latest-docs/api-conventions/a/h2__904191799
+   * @returns {Promise} resolves with a cloudbolt API Response object of the Server object
+   */
+  get: (id, options) => crud.getItemById(URL, id, options)
 }

src/api/services/v3/cmp/ServerService.js

@@ -1,10 +1,20 @@
 import { baseApi } from '../../../baseApi'
-import ServerService from './ServerService';
+import ServerService from './ServerService'
+
+const URL = '/v3/cmp/servers/'
 
 test('list calls the correct endpoint', async () => {
   const mockFn = jest.spyOn(baseApi, 'get').mockResolvedValue({
     data: [{ hello: 'world' }]
   })
   await ServerService.list()
-  expect(mockFn).toHaveBeenCalledWith('/v3/cmp/servers/')
+  expect(mockFn).toHaveBeenCalledWith(URL)
+})
+
+test('get calls the correct endpoint', async () => {
+  const mockFn = jest.spyOn(baseApi, 'get').mockResolvedValue({
+    data: { hello: 'world' }
+  })
+  await ServerService.get('server-id')
+  expect(mockFn).toHaveBeenCalledWith(`${URL}server-id/`)
 })