From 0470452ce4c202302277ec9efa7c850067bcd565 Mon Sep 17 00:00:00 2001 From: giorod3 Date: Wed, 31 Jul 2019 12:56:30 -0700 Subject: [PATCH 1/2] added a new api support for WAAS and added a new call to list WAAS Policies. This is a work in progress while I add other calls I will need. --- configs/endpoints.js | 10 +++++++++- oci.js | 6 ++++-- services/waas.js | 6 ++++++ services/waas/waasPolicy.js | 22 ++++++++++++++++++++++ 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 services/waas.js create mode 100644 services/waas/waasPolicy.js diff --git a/configs/endpoints.js b/configs/endpoints.js index 6408963..8c15cdb 100644 --- a/configs/endpoints.js +++ b/configs/endpoints.js @@ -60,7 +60,15 @@ var service = objectStore : { 'us-phoenix-1' : 'objectstorage.us-phoenix-1.oraclecloud.com', 'us-ashburn-1' : 'objectstorage.us-ashburn-1.oraclecloud.com', 'eu-frankfurt-1' : 'objectstorage.eu-frankfurt-1.oraclecloud.com', - 'uk-london-1' : 'objectstorage.uk-london-1.oraclecloud.com' } + 'uk-london-1' : 'objectstorage.uk-london-1.oraclecloud.com' }, + waas: { 'us-phoenix-1': 'waas.us-phoenix-1.oraclecloud.com', + 'us-ashburn-1': 'waas.us-ashburn-1.oraclecloud.com', + 'eu-frankfurt-1': 'waas.eu-frankfurt-1.oraclecloud.com', + 'uk-london-1': 'waas.uk-london-1.oraclecloud.com', + 'ca-toronto-1': 'waas.ca-toronto-1.oraclecloud.com', + 'ap-mumbai-1': 'waas.ap-mumbai-1.oraclecloud.com', + 'ap-seoul-1': 'waas.ap-seoul-1.oraclecloud.com', + 'ap-tokyo-1': 'waas.ap-tokyo-1.oraclecloud.com'} }; module.exports = { diff --git a/oci.js b/oci.js index 9620624..e34b198 100644 --- a/oci.js +++ b/oci.js @@ -12,7 +12,8 @@ var kms = require( './services/kms.js' ); var loadBalance = require( './services/loadBalance.js' ); var search = require( './services/search.js' ); var containerEngine = require( './services/containerEngine.js' ); -var myServices = require( './services/myServices.js') +var myServices = require( './services/myServices.js'); +var waas = require( './services/waas.js'); module.exports = { amazon: amazon, @@ -29,5 +30,6 @@ module.exports = { kms: kms, loadBalance: loadBalance, search: search, - containerEngine: containerEngine + containerEngine: containerEngine, + waas: waas, } \ No newline at end of file diff --git a/services/waas.js b/services/waas.js new file mode 100644 index 0000000..e5729e0 --- /dev/null +++ b/services/waas.js @@ -0,0 +1,6 @@ +var waasPolicy = require( './waas/waasPolicy.js' ); + + +module.exports = { + waasPolicy: waasPolicy, +} \ No newline at end of file diff --git a/services/waas/waasPolicy.js b/services/waas/waasPolicy.js new file mode 100644 index 0000000..808f97d --- /dev/null +++ b/services/waas/waasPolicy.js @@ -0,0 +1,22 @@ +var ocirest = require('../../utils/ocirest.js'); +var endpoint = require('../../configs/endpoints.js'); + + + +function list( auth, parameters, callback ) { + var possibleHeaders = ['opc-request-id']; + var possibleQueryStrings = ['compartmentId', 'limit', 'page', 'sortBy', 'sortOrder', 'id','timeCreatedGreaterThanOrEqualTo','timeCreatedLessThan', 'displayName', 'lifecycleState']; + var headers = ocirest.buildHeaders( possibleHeaders, parameters ); + var queryString = ocirest.buildQueryString( possibleQueryStrings, parameters ); + + ocirest.process( auth, + { path : auth.RESTversion + '/waasPolicies' + queryString, + host : endpoint.service.waas[auth.region], + headers : headers, + method : 'GET' }, + callback ); +}; + +module.exports = { + list: list +}; From 96a1132559d841b375c132e2fcd32530807fbd40 Mon Sep 17 00:00:00 2001 From: giorod3 Date: Wed, 31 Jul 2019 13:24:26 -0700 Subject: [PATCH 2/2] added get to waasPolicy --- services/waas/waasPolicy.js | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/services/waas/waasPolicy.js b/services/waas/waasPolicy.js index 808f97d..e084143 100644 --- a/services/waas/waasPolicy.js +++ b/services/waas/waasPolicy.js @@ -1,7 +1,17 @@ var ocirest = require('../../utils/ocirest.js'); var endpoint = require('../../configs/endpoints.js'); - +function get( auth, parameters, callback ) { + var possibleHeaders = ['opc-request-id']; + var headers = ocirest.buildHeaders( possibleHeaders, parameters ); + ocirest.process( auth, + { path : auth.RESTversion + + '/waasPolicies/' + encodeURIComponent(parameters.waasPolicyId), + host : endpoint.service.waas[auth.region], + headers : headers, + method : 'GET' }, + callback ); +}; function list( auth, parameters, callback ) { var possibleHeaders = ['opc-request-id']; @@ -18,5 +28,6 @@ function list( auth, parameters, callback ) { }; module.exports = { - list: list + list: list, + get: get };