@rockcarver/frodo-lib 0.19.0 → 0.19.2

package/CHANGELOG.md

@@ -7,6 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.19.2] - 2023-05-25
+
+### Changed
+
+-   \#248: Frodo Library now exports all essential log api functions through the LogOps module export `Log`.
+
+## [0.19.1] - 2023-05-21
+
+### Added
+
+-   Support for authorization policies, policy sets, and resource types through new exported modules:
+    -   ResourceType
+    -   PolicySet
+    -   Policy
+
+### Changed
+
+-   Updated dependencies
+-   rockcarver/frodo-cli#213: More debug logging for connection profile lookup by a unique substring. Use --debug to see the additional output. This is not yet a solution for rockcarver/frodo-cli#213 but should help identify the root cause.
+-   rockcarver/frodo-cli#216: More debug logging for the 2fa process and proper detection of unsupported webauthn factor.
+
+### Fixed
+
+-   \#236: Frodo now properly handles logging in as a tenant admin when admin federation is enabled.
+-   \#225: Always output original log event JSON in tailLogs function (`frodo logs tail` command in the cli)
+-   rockcarver/frodo-cli#218: Frodo now allows 3 errors when polling for status during a `frodo esv apply` before aborting.
+
 ## [0.19.0] - 2023-05-21
 
 ### Added
@@ -1122,7 +1149,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   Fixed problem with adding connection profiles
 -   Miscellaneous bug fixes
 
-[Unreleased]: https://github.com/rockcarver/frodo-lib/compare/v0.19.0...HEAD
+[Unreleased]: https://github.com/rockcarver/frodo-lib/compare/v0.19.2...HEAD
+
+[0.19.2]: https://github.com/rockcarver/frodo-lib/compare/v0.19.1...v0.19.2
+
+[0.19.1]: https://github.com/rockcarver/frodo-lib/compare/v0.19.0...v0.19.1
 
 [0.19.0]: https://github.com/rockcarver/frodo-lib/compare/v0.18.9-7...v0.19.0
 

package/cjs/api/ApiTypes.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApiTypes.js","names":["PolicyConditionType","exports","ScriptLanguage","ScriptContext","Saml2ProiderLocation"],"sources":["api/ApiTypes.ts"],"sourcesContent":["export interface NoIdObjectSkeletonInterface {\n  _rev?: number;\n  [k: string]:\n    | string\n    | number\n    | boolean\n    | string[]\n    | IdObjectSkeletonInterface\n    | object\n    | null;\n}\n\nexport interface IdObjectSkeletonInterface extends NoIdObjectSkeletonInterface {\n  _id: string;\n}\n\nexport interface PagedResults {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  result: any[];\n  resultCount: number;\n  pagedResultsCookie: string;\n  totalPagedResultsPolicy: string;\n  totalPagedResults: number;\n  remainingPagedResults: number;\n}\n\nexport interface UiConfigInterface {\n  categories: string;\n}\n\nexport interface NodeRefSkeletonInterface {\n  connections: Record<string, string>;\n  displayName: string;\n  nodeType: string;\n  x: number;\n  y: number;\n}\n\nexport interface InnerNodeRefSkeletonInterface {\n  _id: string;\n  displayName: string;\n  nodeType: string;\n}\n\nexport type TreeSkeleton = IdObjectSkeletonInterface & {\n  entryNodeId: string;\n  nodes: Record<string, NodeRefSkeletonInterface>;\n  identityResource?: string;\n  uiConfig?: UiConfigInterface;\n  enabled?: boolean;\n};\n\nexport type AmServiceType = IdObjectSkeletonInterface & {\n  name: string;\n};\n\nexport type NodeSkeleton = IdObjectSkeletonInterface & {\n  _type: AmServiceType;\n  nodes?: InnerNodeRefSkeletonInterface[];\n  tree?: string;\n  identityResource?: string;\n};\n\nexport type SocialIdpSkeleton = IdObjectSkeletonInterface & {\n  _type: AmServiceType;\n  enabled: boolean;\n};\n\nexport type PolicySetSkeleton = NoIdObjectSkeletonInterface & {\n  name: string;\n  resourceTypeUuids: string[];\n};\n\nexport type ResourceTypeSkeleton = NoIdObjectSkeletonInterface & {\n  uuid: string;\n  name: string;\n};\n\nexport enum PolicyConditionType {\n  Script = 'Script',\n  AMIdentityMembership = 'AMIdentityMembership',\n  IPv6 = 'IPv6',\n  IPv4 = 'IPv4',\n  SimpleTime = 'SimpleTime',\n  LEAuthLevel = 'LEAuthLevel',\n  LDAPFilter = 'LDAPFilter',\n  AuthScheme = 'AuthScheme',\n  Session = 'Session',\n  AND = 'AND',\n  AuthenticateToRealm = 'AuthenticateToRealm',\n  ResourceEnvIP = 'ResourceEnvIP',\n  Policy = 'Policy',\n  OAuth2Scope = 'OAuth2Scope',\n  SessionProperty = 'SessionProperty',\n  OR = 'OR',\n  Transaction = 'Transaction',\n  NOT = 'NOT',\n  AuthLevel = 'AuthLevel',\n  AuthenticateToService = 'AuthenticateToService',\n}\n\nexport type PolicyCondition = NoIdObjectSkeletonInterface & {\n  type: keyof typeof PolicyConditionType;\n  condition?: PolicyCondition;\n  conditions?: PolicyCondition[];\n};\n\nexport type PolicySkeleton = IdObjectSkeletonInterface & {\n  name: string;\n  applicationName: string;\n  condition?: PolicyCondition;\n  resourceTypeUuid: string;\n};\n\nexport type OAuth2ClientSkeleton = IdObjectSkeletonInterface & {\n  overrideOAuth2ClientConfig?: {\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  advancedOAuth2ClientConfig?: {\n    descriptions: {\n      inherited: boolean;\n      value: string[];\n    };\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  signEncOAuth2ClientConfig?: {\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  coreOpenIDClientConfig?: {\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  coreOAuth2ClientConfig?: {\n    userpassword?: null;\n    clientName?: {\n      inherited: boolean;\n      value: string[];\n    };\n    accessTokenLifetime?: {\n      inherited: boolean;\n      value: number;\n    };\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  coreUmaClientConfig?: {\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  _type: AmServiceType;\n};\n\nexport type AmServiceSkeleton = IdObjectSkeletonInterface & {\n  _type: AmServiceType;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  [key: string]: any;\n};\n\nexport type AgentSkeleton = IdObjectSkeletonInterface & {\n  _type: AmServiceType;\n};\n\nexport type EmailTemplateSkeleton = IdObjectSkeletonInterface & {\n  defaultLocale?: string;\n  displayName?: string;\n  enabled?: boolean;\n  from: string;\n  subject: Record<string, string>;\n  message?: Record<string, string>;\n  html?: Record<string, string>;\n};\n\nexport type ThemeSkeleton = IdObjectSkeletonInterface & {\n  name: string;\n  isDefault: boolean;\n  linkedTrees: string[];\n};\n\nexport type UiThemeRealmObject = IdObjectSkeletonInterface & {\n  name: string;\n  realm: Map<string, ThemeSkeleton[]>;\n};\n\nexport enum ScriptLanguage {\n  GROOVY,\n  JAVASCRIPT,\n}\n\nexport enum ScriptContext {\n  OAUTH2_ACCESS_TOKEN_MODIFICATION,\n  AUTHENTICATION_CLIENT_SIDE,\n  AUTHENTICATION_TREE_DECISION_NODE,\n  AUTHENTICATION_SERVER_SIDE,\n  SOCIAL_IDP_PROFILE_TRANSFORMATION,\n  OAUTH2_VALIDATE_SCOPE,\n  CONFIG_PROVIDER_NODE,\n  OAUTH2_AUTHORIZE_ENDPOINT_DATA_PROVIDER,\n  OAUTH2_EVALUATE_SCOPE,\n  POLICY_CONDITION,\n  OIDC_CLAIMS,\n  SAML2_IDP_ADAPTER,\n  SAML2_IDP_ATTRIBUTE_MAPPER,\n  OAUTH2_MAY_ACT,\n}\n\nexport type ScriptSkeleton = IdObjectSkeletonInterface & {\n  name: string;\n  description: string;\n  default: boolean;\n  script: string | string[];\n  language: keyof typeof ScriptLanguage;\n  context: keyof typeof ScriptContext;\n  createdBy: string;\n  creationDate: number;\n  lastModifiedBy: string;\n  lastModifiedDate: number;\n};\n\nexport enum Saml2ProiderLocation {\n  HOSTED = 'hosted',\n  REMOTE = 'remote',\n}\n\nexport type Saml2ProviderStub = IdObjectSkeletonInterface & {\n  entityId: string;\n  location: Saml2ProiderLocation;\n  roles: string[];\n};\n\nexport type Saml2ProviderSkeleton = IdObjectSkeletonInterface & {\n  entityId: string;\n  entityLocation: Saml2ProiderLocation;\n  serviceProvider: unknown;\n  identityProvider: unknown;\n  attributeQueryProvider: unknown;\n  xacmlPolicyEnforcementPoint: unknown;\n};\n\nexport type CircleOfTrustSkeleton = IdObjectSkeletonInterface & {\n  _type: AmServiceType;\n  status: string;\n  trustedProviders: string[];\n};\n\nexport type PagedResult<Result> = {\n  result: Result[];\n  resultCount: number;\n  pagedResultsCookie: string;\n  totalPagedResultsPolicy: 'EXACT';\n  totalPagedResults: number;\n  remainingPagedResults: number;\n};\n"],"mappings":";;;;;;IA8EYA,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAAAC,OAAA,CAAAD,mBAAA,GAAAA,mBAAA;AAAA,IAsGnBE,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA;AAAAD,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAAA,IAKdC,aAAa,0BAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAA,OAAbA,aAAa;AAAA;AAAAF,OAAA,CAAAE,aAAA,GAAAA,aAAA;AAAA,IA8BbC,oBAAoB,0BAApBA,oBAAoB;EAApBA,oBAAoB;EAApBA,oBAAoB;EAAA,OAApBA,oBAAoB;AAAA;AAAAH,OAAA,CAAAG,oBAAA,GAAAA,oBAAA"}
+{"version":3,"file":"ApiTypes.js","names":["PolicyConditionType","exports","ScriptLanguage","ScriptContext","Saml2ProiderLocation"],"sources":["api/ApiTypes.ts"],"sourcesContent":["export interface NoIdObjectSkeletonInterface {\n  _rev?: number;\n  [k: string]:\n    | string\n    | number\n    | boolean\n    | string[]\n    | IdObjectSkeletonInterface\n    | object\n    | null;\n}\n\nexport interface IdObjectSkeletonInterface extends NoIdObjectSkeletonInterface {\n  _id: string;\n}\n\nexport interface PagedResults {\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  result: any[];\n  resultCount: number;\n  pagedResultsCookie: string;\n  totalPagedResultsPolicy: string;\n  totalPagedResults: number;\n  remainingPagedResults: number;\n}\n\nexport interface UiConfigInterface {\n  categories: string;\n}\n\nexport interface NodeRefSkeletonInterface {\n  connections: Record<string, string>;\n  displayName: string;\n  nodeType: string;\n  x: number;\n  y: number;\n}\n\nexport interface InnerNodeRefSkeletonInterface {\n  _id: string;\n  displayName: string;\n  nodeType: string;\n}\n\nexport type TreeSkeleton = IdObjectSkeletonInterface & {\n  entryNodeId: string;\n  nodes: Record<string, NodeRefSkeletonInterface>;\n  identityResource?: string;\n  uiConfig?: UiConfigInterface;\n  enabled?: boolean;\n};\n\nexport type AmServiceType = IdObjectSkeletonInterface & {\n  name: string;\n};\n\nexport type NodeSkeleton = IdObjectSkeletonInterface & {\n  _type: AmServiceType;\n  nodes?: InnerNodeRefSkeletonInterface[];\n  tree?: string;\n  identityResource?: string;\n};\n\nexport type SocialIdpSkeleton = IdObjectSkeletonInterface & {\n  _type: AmServiceType;\n  enabled: boolean;\n};\n\nexport type PolicySetSkeleton = NoIdObjectSkeletonInterface & {\n  name: string;\n  resourceTypeUuids: string[];\n};\n\nexport type ResourceTypeSkeleton = NoIdObjectSkeletonInterface & {\n  uuid: string;\n  name: string;\n};\n\nexport enum PolicyConditionType {\n  Script = 'Script',\n  AMIdentityMembership = 'AMIdentityMembership',\n  IPv6 = 'IPv6',\n  IPv4 = 'IPv4',\n  SimpleTime = 'SimpleTime',\n  LEAuthLevel = 'LEAuthLevel',\n  LDAPFilter = 'LDAPFilter',\n  AuthScheme = 'AuthScheme',\n  Session = 'Session',\n  AND = 'AND',\n  AuthenticateToRealm = 'AuthenticateToRealm',\n  ResourceEnvIP = 'ResourceEnvIP',\n  Policy = 'Policy',\n  OAuth2Scope = 'OAuth2Scope',\n  SessionProperty = 'SessionProperty',\n  OR = 'OR',\n  Transaction = 'Transaction',\n  NOT = 'NOT',\n  AuthLevel = 'AuthLevel',\n  AuthenticateToService = 'AuthenticateToService',\n}\n\nexport type PolicyCondition = NoIdObjectSkeletonInterface & {\n  type: keyof typeof PolicyConditionType;\n  condition?: PolicyCondition;\n  conditions?: PolicyCondition[];\n};\n\nexport type PolicySkeleton = IdObjectSkeletonInterface & {\n  name: string;\n  applicationName: string;\n  condition?: PolicyCondition;\n  resourceTypeUuid: string;\n};\n\nexport type OAuth2ClientSkeleton = IdObjectSkeletonInterface & {\n  overrideOAuth2ClientConfig?: {\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  advancedOAuth2ClientConfig?: {\n    descriptions: {\n      inherited: boolean;\n      value: string[];\n    };\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  signEncOAuth2ClientConfig?: {\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  coreOpenIDClientConfig?: {\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  coreOAuth2ClientConfig?: {\n    userpassword?: null;\n    clientName?: {\n      inherited: boolean;\n      value: string[];\n    };\n    accessTokenLifetime?: {\n      inherited: boolean;\n      value: number;\n    };\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  coreUmaClientConfig?: {\n    [k: string]: string | number | boolean | string[] | object | null;\n  };\n  _type: AmServiceType;\n};\n\nexport type AmServiceSkeleton = IdObjectSkeletonInterface & {\n  _type: AmServiceType;\n  // eslint-disable-next-line @typescript-eslint/no-explicit-any\n  [key: string]: any;\n};\n\nexport type AgentSkeleton = IdObjectSkeletonInterface & {\n  _type: AmServiceType;\n};\n\nexport type EmailTemplateSkeleton = IdObjectSkeletonInterface & {\n  defaultLocale?: string;\n  displayName?: string;\n  enabled?: boolean;\n  from: string;\n  subject: Record<string, string>;\n  message?: Record<string, string>;\n  html?: Record<string, string>;\n};\n\nexport type ThemeSkeleton = IdObjectSkeletonInterface & {\n  name: string;\n  isDefault: boolean;\n  linkedTrees: string[];\n};\n\nexport type UiThemeRealmObject = IdObjectSkeletonInterface & {\n  name: string;\n  realm: Map<string, ThemeSkeleton[]>;\n};\n\nexport enum ScriptLanguage {\n  GROOVY,\n  JAVASCRIPT,\n}\n\nexport enum ScriptContext {\n  OAUTH2_ACCESS_TOKEN_MODIFICATION,\n  AUTHENTICATION_CLIENT_SIDE,\n  AUTHENTICATION_TREE_DECISION_NODE,\n  AUTHENTICATION_SERVER_SIDE,\n  SOCIAL_IDP_PROFILE_TRANSFORMATION,\n  OAUTH2_VALIDATE_SCOPE,\n  CONFIG_PROVIDER_NODE,\n  OAUTH2_AUTHORIZE_ENDPOINT_DATA_PROVIDER,\n  OAUTH2_EVALUATE_SCOPE,\n  POLICY_CONDITION,\n  OIDC_CLAIMS,\n  SAML2_IDP_ADAPTER,\n  SAML2_IDP_ATTRIBUTE_MAPPER,\n  OAUTH2_MAY_ACT,\n}\n\nexport type ScriptSkeleton = IdObjectSkeletonInterface & {\n  name: string;\n  description: string;\n  default: boolean;\n  script: string | string[];\n  language: keyof typeof ScriptLanguage;\n  context: keyof typeof ScriptContext;\n  createdBy: string;\n  creationDate: number;\n  lastModifiedBy: string;\n  lastModifiedDate: number;\n};\n\nexport enum Saml2ProiderLocation {\n  HOSTED = 'hosted',\n  REMOTE = 'remote',\n}\n\nexport type Saml2ProviderStub = IdObjectSkeletonInterface & {\n  entityId: string;\n  location: Saml2ProiderLocation;\n  roles: string[];\n};\n\nexport type Saml2ProviderSkeleton = IdObjectSkeletonInterface & {\n  entityId: string;\n  entityLocation: Saml2ProiderLocation;\n  serviceProvider: unknown;\n  identityProvider: unknown;\n  attributeQueryProvider: unknown;\n  xacmlPolicyEnforcementPoint: unknown;\n};\n\nexport type CircleOfTrustSkeleton = IdObjectSkeletonInterface & {\n  _type: AmServiceType;\n  status: string;\n  trustedProviders: string[];\n};\n\nexport type PagedResult<Result> = {\n  result: Result[];\n  resultCount: number;\n  pagedResultsCookie: string;\n  totalPagedResultsPolicy: 'EXACT';\n  totalPagedResults: number;\n  remainingPagedResults: number;\n};\n\nexport type LogApiKey = {\n  name: string;\n  api_key_id: string;\n  created_at: string;\n};\n\nexport type LogEventPayloadSkeleton = NoIdObjectSkeletonInterface & {\n  context: string;\n  level: string;\n  logger: string;\n  mdc: {\n    transactionId: string;\n  };\n  message: string;\n  thread: string;\n  timestamp: string;\n  transactionId: string;\n};\n\nexport type LogEventSkeleton = NoIdObjectSkeletonInterface & {\n  payload: string | LogEventPayloadSkeleton;\n  timestamp: string;\n  type: string;\n  source: string;\n};\n"],"mappings":";;;;;;IA8EYA,mBAAmB,0BAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAnBA,mBAAmB;EAAA,OAAnBA,mBAAmB;AAAA;AAAAC,OAAA,CAAAD,mBAAA,GAAAA,mBAAA;AAAA,IAsGnBE,cAAc,0BAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAdA,cAAc,CAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA;AAAAD,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAAA,IAKdC,aAAa,0BAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAbA,aAAa,CAAbA,aAAa;EAAA,OAAbA,aAAa;AAAA;AAAAF,OAAA,CAAAE,aAAA,GAAAA,aAAA;AAAA,IA8BbC,oBAAoB,0BAApBA,oBAAoB;EAApBA,oBAAoB;EAApBA,oBAAoB;EAAA,OAApBA,oBAAoB;AAAA;AAAAH,OAAA,CAAAG,oBAAA,GAAAA,oBAAA"}

package/cjs/api/cloud/LogApi.js

@@ -22,9 +22,18 @@ var logsFetchURLTemplate = '%s/monitoring/logs?source=%s&beginTime=%s&endTime=%s
 var logsSourcesURLTemplate = '%s/monitoring/logs/sources';
 var logsCreateAPIKeyAndSecretURLTemplate = '%s/keys?_action=create';
 var logsGetAPIKeysURLTemplate = '%s/keys';
+
+/**
+ * Get available API keys
+ * @returns {Promise<PagedResult<LogApiKey>>} a promise resolving to a paged log api key results object
+ */
 function getAPIKeys() {
   return _getAPIKeys.apply(this, arguments);
 }
+/**
+ * Get available log sources
+ * @returns {Promise<PagedResult<string>>} a promise resolving to a paged string results object
+ */
 function _getAPIKeys() {
   _getAPIKeys = _asyncToGenerator(function* () {
     var urlString = _util.default.format(logsGetAPIKeysURLTemplate, (0, _ApiUtils.getTenantURL)(state.getHost()));
@@ -41,32 +50,55 @@ function getSources() {
 function _getSources() {
   _getSources = _asyncToGenerator(function* () {
     var urlString = _util.default.format(logsSourcesURLTemplate, (0, _ApiUtils.getTenantURL)(state.getHost()));
-    return (0, _BaseApi.generateLogApi)().get(urlString);
+    var {
+      data
+    } = yield (0, _BaseApi.generateLogApi)().get(urlString);
+    return data;
   });
   return _getSources.apply(this, arguments);
 }
 function createAPIKeyAndSecret(_x) {
   return _createAPIKeyAndSecret.apply(this, arguments);
 }
+/**
+ * Tail logs
+ * @param {string} source log source(s) to tail
+ * @param {string} cookie paged results cookie
+ * @returns {Promise<PagedResult<LogEventSkeleton>>} promise resolving to paged log event result
+ */
 function _createAPIKeyAndSecret() {
   _createAPIKeyAndSecret = _asyncToGenerator(function* (keyName) {
     var urlString = _util.default.format(logsCreateAPIKeyAndSecretURLTemplate, (0, _ApiUtils.getTenantURL)(state.getHost()));
-    return (0, _BaseApi.generateLogKeysApi)().post(urlString, {
+    var {
+      data
+    } = yield (0, _BaseApi.generateLogKeysApi)().post(urlString, {
       name: keyName
     });
+    return data;
   });
   return _createAPIKeyAndSecret.apply(this, arguments);
 }
 function tail(_x2, _x3) {
   return _tail.apply(this, arguments);
 }
+/**
+ * Fetch logs
+ * @param {string} source log source(s) to tail
+ * @param {string} startTs start timestamp
+ * @param {string} endTs end timestamp
+ * @param {string} cookie paged results cookie
+ * @returns {Promise<PagedResult<LogEventSkeleton>>} promise resolving to paged log event result
+ */
 function _tail() {
   _tail = _asyncToGenerator(function* (source, cookie) {
     var urlString = _util.default.format(logsTailURLTemplate, (0, _ApiUtils.getTenantURL)(state.getHost()), encodeURIComponent(source));
     if (cookie) {
       urlString += "&_pagedResultsCookie=".concat(encodeURIComponent(cookie));
     }
-    return (0, _BaseApi.generateLogApi)().get(urlString);
+    var {
+      data
+    } = yield (0, _BaseApi.generateLogApi)().get(urlString);
+    return data;
   });
   return _tail.apply(this, arguments);
 }
@@ -79,9 +111,12 @@ function _fetch() {
     if (cookie) {
       urlString += "&_pagedResultsCookie=".concat(encodeURIComponent(cookie));
     }
-    return (0, _BaseApi.generateLogApi)({
+    var {
+      data
+    } = yield (0, _BaseApi.generateLogApi)({
       timeout: 60000
     }).get(urlString);
+    return data;
   });
   return _fetch.apply(this, arguments);
 }

package/cjs/api/cloud/LogApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"LogApi.js","names":["_util","_interopRequireDefault","require","_BaseApi","_ApiUtils","state","_interopRequireWildcard","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","asyncGeneratorStep","gen","resolve","reject","_next","_throw","arg","info","value","error","done","Promise","then","_asyncToGenerator","fn","self","args","arguments","apply","err","undefined","logsTailURLTemplate","logsFetchURLTemplate","logsSourcesURLTemplate","logsCreateAPIKeyAndSecretURLTemplate","logsGetAPIKeysURLTemplate","getAPIKeys","_getAPIKeys","urlString","util","format","getTenantURL","getHost","data","generateLogKeysApi","getSources","_getSources","generateLogApi","createAPIKeyAndSecret","_x","_createAPIKeyAndSecret","keyName","post","name","tail","_x2","_x3","_tail","source","cookie","encodeURIComponent","concat","fetch","_x4","_x5","_x6","_x7","_fetch","startTs","endTs","timeout"],"sources":["api/cloud/LogApi.ts"],"sourcesContent":["import util from 'util';\nimport { generateLogApi, generateLogKeysApi } from '../BaseApi';\nimport { getTenantURL } from '../utils/ApiUtils';\nimport * as state from '../../shared/State';\n\nconst logsTailURLTemplate = '%s/monitoring/logs/tail?source=%s';\nconst logsFetchURLTemplate =\n  '%s/monitoring/logs?source=%s&beginTime=%s&endTime=%s';\nconst logsSourcesURLTemplate = '%s/monitoring/logs/sources';\nconst logsCreateAPIKeyAndSecretURLTemplate = '%s/keys?_action=create';\nconst logsGetAPIKeysURLTemplate = '%s/keys';\n\nexport async function getAPIKeys() {\n  const urlString = util.format(\n    logsGetAPIKeysURLTemplate,\n    getTenantURL(state.getHost())\n  );\n  const { data } = await generateLogKeysApi().get(urlString);\n  return data;\n}\n\nexport async function getSources() {\n  const urlString = util.format(\n    logsSourcesURLTemplate,\n    getTenantURL(state.getHost())\n  );\n  return generateLogApi().get(urlString);\n}\n\nexport async function createAPIKeyAndSecret(keyName) {\n  const urlString = util.format(\n    logsCreateAPIKeyAndSecretURLTemplate,\n    getTenantURL(state.getHost())\n  );\n  return generateLogKeysApi().post(urlString, { name: keyName });\n}\n\nexport async function tail(source, cookie) {\n  let urlString = util.format(\n    logsTailURLTemplate,\n    getTenantURL(state.getHost()),\n    encodeURIComponent(source)\n  );\n  if (cookie) {\n    urlString += `&_pagedResultsCookie=${encodeURIComponent(cookie)}`;\n  }\n  return generateLogApi().get(urlString);\n}\n\nexport async function fetch(source, startTs, endTs, cookie) {\n  let urlString = util.format(\n    logsFetchURLTemplate,\n    getTenantURL(state.getHost()),\n    encodeURIComponent(source),\n    startTs,\n    endTs\n  );\n  if (cookie) {\n    urlString += `&_pagedResultsCookie=${encodeURIComponent(cookie)}`;\n  }\n  return generateLogApi({ timeout: 60000 }).get(urlString);\n}\n"],"mappings":"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"}
+{"version":3,"file":"LogApi.js","names":["_util","_interopRequireDefault","require","_BaseApi","_ApiUtils","state","_interopRequireWildcard","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","asyncGeneratorStep","gen","resolve","reject","_next","_throw","arg","info","value","error","done","Promise","then","_asyncToGenerator","fn","self","args","arguments","apply","err","undefined","logsTailURLTemplate","logsFetchURLTemplate","logsSourcesURLTemplate","logsCreateAPIKeyAndSecretURLTemplate","logsGetAPIKeysURLTemplate","getAPIKeys","_getAPIKeys","urlString","util","format","getTenantURL","getHost","data","generateLogKeysApi","getSources","_getSources","generateLogApi","createAPIKeyAndSecret","_x","_createAPIKeyAndSecret","keyName","post","name","tail","_x2","_x3","_tail","source","cookie","encodeURIComponent","concat","fetch","_x4","_x5","_x6","_x7","_fetch","startTs","endTs","timeout"],"sources":["api/cloud/LogApi.ts"],"sourcesContent":["import util from 'util';\nimport { generateLogApi, generateLogKeysApi } from '../BaseApi';\nimport { getTenantURL } from '../utils/ApiUtils';\nimport * as state from '../../shared/State';\nimport { LogApiKey, LogEventSkeleton, PagedResult } from '../ApiTypes';\n\nconst logsTailURLTemplate = '%s/monitoring/logs/tail?source=%s';\nconst logsFetchURLTemplate =\n  '%s/monitoring/logs?source=%s&beginTime=%s&endTime=%s';\nconst logsSourcesURLTemplate = '%s/monitoring/logs/sources';\nconst logsCreateAPIKeyAndSecretURLTemplate = '%s/keys?_action=create';\nconst logsGetAPIKeysURLTemplate = '%s/keys';\n\n/**\n * Get available API keys\n * @returns {Promise<PagedResult<LogApiKey>>} a promise resolving to a paged log api key results object\n */\nexport async function getAPIKeys(): Promise<PagedResult<LogApiKey>> {\n  const urlString = util.format(\n    logsGetAPIKeysURLTemplate,\n    getTenantURL(state.getHost())\n  );\n  const { data } = await generateLogKeysApi().get(urlString);\n  return data;\n}\n\n/**\n * Get available log sources\n * @returns {Promise<PagedResult<string>>} a promise resolving to a paged string results object\n */\nexport async function getSources(): Promise<PagedResult<string>> {\n  const urlString = util.format(\n    logsSourcesURLTemplate,\n    getTenantURL(state.getHost())\n  );\n  const { data } = await generateLogApi().get(urlString);\n  return data;\n}\n\nexport async function createAPIKeyAndSecret(keyName: string) {\n  const urlString = util.format(\n    logsCreateAPIKeyAndSecretURLTemplate,\n    getTenantURL(state.getHost())\n  );\n  const { data } = await generateLogKeysApi().post(urlString, {\n    name: keyName,\n  });\n  return data;\n}\n\n/**\n * Tail logs\n * @param {string} source log source(s) to tail\n * @param {string} cookie paged results cookie\n * @returns {Promise<PagedResult<LogEventSkeleton>>} promise resolving to paged log event result\n */\nexport async function tail(\n  source: string,\n  cookie: string\n): Promise<PagedResult<LogEventSkeleton>> {\n  let urlString = util.format(\n    logsTailURLTemplate,\n    getTenantURL(state.getHost()),\n    encodeURIComponent(source)\n  );\n  if (cookie) {\n    urlString += `&_pagedResultsCookie=${encodeURIComponent(cookie)}`;\n  }\n  const { data } = await generateLogApi().get(urlString);\n  return data as PagedResult<LogEventSkeleton>;\n}\n\n/**\n * Fetch logs\n * @param {string} source log source(s) to tail\n * @param {string} startTs start timestamp\n * @param {string} endTs end timestamp\n * @param {string} cookie paged results cookie\n * @returns {Promise<PagedResult<LogEventSkeleton>>} promise resolving to paged log event result\n */\nexport async function fetch(\n  source: string,\n  startTs: string,\n  endTs: string,\n  cookie: string\n): Promise<PagedResult<LogEventSkeleton>> {\n  let urlString = util.format(\n    logsFetchURLTemplate,\n    getTenantURL(state.getHost()),\n    encodeURIComponent(source),\n    startTs,\n    endTs\n  );\n  if (cookie) {\n    urlString += `&_pagedResultsCookie=${encodeURIComponent(cookie)}`;\n  }\n  const { data } = await generateLogApi({ timeout: 60000 }).get(urlString);\n  return data as PagedResult<LogEventSkeleton>;\n}\n"],"mappings":";;;;;;;;;;AAAA,IAAAA,KAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,KAAA,GAAAC,uBAAA,CAAAJ,OAAA;AAA4C,SAAAK,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,yBAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAF,wBAAAM,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAAA,SAAAjB,uBAAAW,GAAA,WAAAA,GAAA,IAAAA,GAAA,CAAAC,UAAA,GAAAD,GAAA,KAAAE,OAAA,EAAAF,GAAA;AAAA,SAAAiB,mBAAAC,GAAA,EAAAC,OAAA,EAAAC,MAAA,EAAAC,KAAA,EAAAC,MAAA,EAAAX,GAAA,EAAAY,GAAA,cAAAC,IAAA,GAAAN,GAAA,CAAAP,GAAA,EAAAY,GAAA,OAAAE,KAAA,GAAAD,IAAA,CAAAC,KAAA,WAAAC,KAAA,IAAAN,MAAA,CAAAM,KAAA,iBAAAF,IAAA,CAAAG,IAAA,IAAAR,OAAA,CAAAM,KAAA,YAAAG,OAAA,CAAAT,OAAA,CAAAM,KAAA,EAAAI,IAAA,CAAAR,KAAA,EAAAC,MAAA;AAAA,SAAAQ,kBAAAC,EAAA,6BAAAC,IAAA,SAAAC,IAAA,GAAAC,SAAA,aAAAN,OAAA,WAAAT,OAAA,EAAAC,MAAA,QAAAF,GAAA,GAAAa,EAAA,CAAAI,KAAA,CAAAH,IAAA,EAAAC,IAAA,YAAAZ,MAAAI,KAAA,IAAAR,kBAAA,CAAAC,GAAA,EAAAC,OAAA,EAAAC,MAAA,EAAAC,KAAA,EAAAC,MAAA,UAAAG,KAAA,cAAAH,OAAAc,GAAA,IAAAnB,kBAAA,CAAAC,GAAA,EAAAC,OAAA,EAAAC,MAAA,EAAAC,KAAA,EAAAC,MAAA,WAAAc,GAAA,KAAAf,KAAA,CAAAgB,SAAA;AAG5C,IAAMC,mBAAmB,GAAG,mCAAmC;AAC/D,IAAMC,oBAAoB,GACxB,sDAAsD;AACxD,IAAMC,sBAAsB,GAAG,4BAA4B;AAC3D,IAAMC,oCAAoC,GAAG,wBAAwB;AACrE,IAAMC,yBAAyB,GAAG,SAAS;;AAE3C;AACA;AACA;AACA;AAHA,SAIsBC,UAAUA,CAAA;EAAA,OAAAC,WAAA,CAAAT,KAAA,OAAAD,SAAA;AAAA;AAShC;AACA;AACA;AACA;AAHA,SAAAU,YAAA;EAAAA,WAAA,GAAAd,iBAAA,CATO,aAA6D;IAClE,IAAMe,SAAS,GAAGC,aAAI,CAACC,MAAM,CAC3BL,yBAAyB,EACzB,IAAAM,sBAAY,EAACvD,KAAK,CAACwD,OAAO,CAAC,CAAC,CAC9B,CAAC;IACD,IAAM;MAAEC;IAAK,CAAC,SAAS,IAAAC,2BAAkB,EAAC,CAAC,CAAC9C,GAAG,CAACwC,SAAS,CAAC;IAC1D,OAAOK,IAAI;EACb,CAAC;EAAA,OAAAN,WAAA,CAAAT,KAAA,OAAAD,SAAA;AAAA;AAAA,SAMqBkB,UAAUA,CAAA;EAAA,OAAAC,WAAA,CAAAlB,KAAA,OAAAD,SAAA;AAAA;AAAA,SAAAmB,YAAA;EAAAA,WAAA,GAAAvB,iBAAA,CAAzB,aAA0D;IAC/D,IAAMe,SAAS,GAAGC,aAAI,CAACC,MAAM,CAC3BP,sBAAsB,EACtB,IAAAQ,sBAAY,EAACvD,KAAK,CAACwD,OAAO,CAAC,CAAC,CAC9B,CAAC;IACD,IAAM;MAAEC;IAAK,CAAC,SAAS,IAAAI,uBAAc,EAAC,CAAC,CAACjD,GAAG,CAACwC,SAAS,CAAC;IACtD,OAAOK,IAAI;EACb,CAAC;EAAA,OAAAG,WAAA,CAAAlB,KAAA,OAAAD,SAAA;AAAA;AAAA,SAEqBqB,qBAAqBA,CAAAC,EAAA;EAAA,OAAAC,sBAAA,CAAAtB,KAAA,OAAAD,SAAA;AAAA;AAW3C;AACA;AACA;AACA;AACA;AACA;AALA,SAAAuB,uBAAA;EAAAA,sBAAA,GAAA3B,iBAAA,CAXO,WAAqC4B,OAAe,EAAE;IAC3D,IAAMb,SAAS,GAAGC,aAAI,CAACC,MAAM,CAC3BN,oCAAoC,EACpC,IAAAO,sBAAY,EAACvD,KAAK,CAACwD,OAAO,CAAC,CAAC,CAC9B,CAAC;IACD,IAAM;MAAEC;IAAK,CAAC,SAAS,IAAAC,2BAAkB,EAAC,CAAC,CAACQ,IAAI,CAACd,SAAS,EAAE;MAC1De,IAAI,EAAEF;IACR,CAAC,CAAC;IACF,OAAOR,IAAI;EACb,CAAC;EAAA,OAAAO,sBAAA,CAAAtB,KAAA,OAAAD,SAAA;AAAA;AAAA,SAQqB2B,IAAIA,CAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,KAAA,CAAA7B,KAAA,OAAAD,SAAA;AAAA;AAgB1B;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAPA,SAAA8B,MAAA;EAAAA,KAAA,GAAAlC,iBAAA,CAhBO,WACLmC,MAAc,EACdC,MAAc,EAC0B;IACxC,IAAIrB,SAAS,GAAGC,aAAI,CAACC,MAAM,CACzBT,mBAAmB,EACnB,IAAAU,sBAAY,EAACvD,KAAK,CAACwD,OAAO,CAAC,CAAC,CAAC,EAC7BkB,kBAAkB,CAACF,MAAM,CAC3B,CAAC;IACD,IAAIC,MAAM,EAAE;MACVrB,SAAS,4BAAAuB,MAAA,CAA4BD,kBAAkB,CAACD,MAAM,CAAC,CAAE;IACnE;IACA,IAAM;MAAEhB;IAAK,CAAC,SAAS,IAAAI,uBAAc,EAAC,CAAC,CAACjD,GAAG,CAACwC,SAAS,CAAC;IACtD,OAAOK,IAAI;EACb,CAAC;EAAA,OAAAc,KAAA,CAAA7B,KAAA,OAAAD,SAAA;AAAA;AAAA,SAUqBmC,KAAKA,CAAAC,GAAA,EAAAC,GAAA,EAAAC,GAAA,EAAAC,GAAA;EAAA,OAAAC,MAAA,CAAAvC,KAAA,OAAAD,SAAA;AAAA;AAAA,SAAAwC,OAAA;EAAAA,MAAA,GAAA5C,iBAAA,CAApB,WACLmC,MAAc,EACdU,OAAe,EACfC,KAAa,EACbV,MAAc,EAC0B;IACxC,IAAIrB,SAAS,GAAGC,aAAI,CAACC,MAAM,CACzBR,oBAAoB,EACpB,IAAAS,sBAAY,EAACvD,KAAK,CAACwD,OAAO,CAAC,CAAC,CAAC,EAC7BkB,kBAAkB,CAACF,MAAM,CAAC,EAC1BU,OAAO,EACPC,KACF,CAAC;IACD,IAAIV,MAAM,EAAE;MACVrB,SAAS,4BAAAuB,MAAA,CAA4BD,kBAAkB,CAACD,MAAM,CAAC,CAAE;IACnE;IACA,IAAM;MAAEhB;IAAK,CAAC,SAAS,IAAAI,uBAAc,EAAC;MAAEuB,OAAO,EAAE;IAAM,CAAC,CAAC,CAACxE,GAAG,CAACwC,SAAS,CAAC;IACxE,OAAOK,IAAI;EACb,CAAC;EAAA,OAAAwB,MAAA,CAAAvC,KAAA,OAAAD,SAAA;AAAA"}

package/cjs/ops/PolicyOps.js

@@ -232,17 +232,18 @@ function _getScripts() {
   });
   return _getScripts.apply(this, arguments);
 }
-function exportPolicyDependencies(_x7, _x8, _x9) {
-  return _exportPolicyDependencies.apply(this, arguments);
+function exportPolicyPrerequisites(_x7, _x8) {
+  return _exportPolicyPrerequisites.apply(this, arguments);
 }
 /**
- * Export policy
- * @param {string} policyId policy id/name
- * @returns {Promise<PolicyExportInterface>} a promise that resolves to a PolicyExportInterface object
+ * Helper function to export dependencies of a policy set
+ * @param {unknown} policyData policy set data
+ * @param {PolicyExportOptions} options export options
+ * @param {PolicyExportInterface} exportData export data
  */
-function _exportPolicyDependencies() {
-  _exportPolicyDependencies = _asyncToGenerator(function* (policyData, options, exportData) {
-    (0, _Console.debugMessage)("PolicyOps.exportPolicyDependencies: start [policy=".concat(policyData['name'], "]"));
+function _exportPolicyPrerequisites() {
+  _exportPolicyPrerequisites = _asyncToGenerator(function* (policyData, exportData) {
+    (0, _Console.debugMessage)("PolicyOps.exportPolicyPrerequisites: start [policy=".concat(policyData['name'], "]"));
     // resource types
     if (policyData.resourceTypeUuid) {
       var resourceType = yield (0, _ResourceTypesApi.getResourceType)(policyData.resourceTypeUuid);
@@ -253,6 +254,21 @@ function _exportPolicyDependencies() {
       var policySet = yield (0, _PolicySetOps.getPolicySet)(policyData.applicationName);
       exportData.policyset[policyData.applicationName] = policySet;
     }
+    (0, _Console.debugMessage)("PolicySetOps.exportPolicyPrerequisites: end");
+  });
+  return _exportPolicyPrerequisites.apply(this, arguments);
+}
+function exportPolicyDependencies(_x9, _x10, _x11) {
+  return _exportPolicyDependencies.apply(this, arguments);
+}
+/**
+ * Export policy
+ * @param {string} policyId policy id/name
+ * @returns {Promise<PolicyExportInterface>} a promise that resolves to a PolicyExportInterface object
+ */
+function _exportPolicyDependencies() {
+  _exportPolicyDependencies = _asyncToGenerator(function* (policyData, options, exportData) {
+    (0, _Console.debugMessage)("PolicyOps.exportPolicyDependencies: start [policy=".concat(policyData['name'], "]"));
     // scripts
     var scripts = yield getScripts(policyData);
     for (var scriptData of scripts) {
@@ -265,7 +281,7 @@ function _exportPolicyDependencies() {
   });
   return _exportPolicyDependencies.apply(this, arguments);
 }
-function exportPolicy(_x10, _x11) {
+function exportPolicy(_x12) {
   return _exportPolicy.apply(this, arguments);
 }
 /**
@@ -274,11 +290,19 @@ function exportPolicy(_x10, _x11) {
  * @returns {Promise<PolicyExportInterface>} a promise that resolves to an PolicyExportInterface object
  */
 function _exportPolicy() {
-  _exportPolicy = _asyncToGenerator(function* (policyId, options) {
+  _exportPolicy = _asyncToGenerator(function* (policyId) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+      deps: true,
+      prereqs: false,
+      useStringArrays: true
+    };
     (0, _Console.debugMessage)("PolicyOps.exportPolicy: start");
     var policyData = yield getPolicy(policyId);
     var exportData = createPolicyExportTemplate();
     exportData.policy[policyData._id] = policyData;
+    if (options.prereqs) {
+      yield exportPolicyPrerequisites(policyData, exportData);
+    }
     if (options.deps) {
       yield exportPolicyDependencies(policyData, options, exportData);
     }
@@ -287,17 +311,22 @@ function _exportPolicy() {
   });
   return _exportPolicy.apply(this, arguments);
 }
-function exportPolicies(_x12) {
+function exportPolicies() {
   return _exportPolicies.apply(this, arguments);
 }
 /**
  * Export policies by policy set
- * @param {string} policySetId policy set id/name
+ * @param {string} policySetName policy set id/name
  * @param {PolicyExportOptions} options export options
  * @returns {Promise<PolicyExportInterface>} a promise that resolves to an PolicyExportInterface object
  */
 function _exportPolicies() {
-  _exportPolicies = _asyncToGenerator(function* (options) {
+  _exportPolicies = _asyncToGenerator(function* () {
+    var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {
+      deps: true,
+      prereqs: false,
+      useStringArrays: true
+    };
     (0, _Console.debugMessage)("PolicyOps.exportPolicies: start");
     var exportData = createPolicyExportTemplate();
     var errors = [];
@@ -305,6 +334,13 @@ function _exportPolicies() {
       var policies = yield getPolicies();
       for (var policyData of policies) {
         exportData.policy[policyData._id] = policyData;
+        if (options.prereqs) {
+          try {
+            yield exportPolicyPrerequisites(policyData, exportData);
+          } catch (error) {
+            errors.push(error);
+          }
+        }
         if (options.deps) {
           try {
             yield exportPolicyDependencies(policyData, options, exportData);
@@ -325,7 +361,7 @@ function _exportPolicies() {
   });
   return _exportPolicies.apply(this, arguments);
 }
-function exportPoliciesByPolicySet(_x13, _x14) {
+function exportPoliciesByPolicySet(_x13) {
   return _exportPoliciesByPolicySet.apply(this, arguments);
 }
 /**
@@ -334,14 +370,26 @@ function exportPoliciesByPolicySet(_x13, _x14) {
  * @param {PolicyExportInterface} exportData export data
  */
 function _exportPoliciesByPolicySet() {
-  _exportPoliciesByPolicySet = _asyncToGenerator(function* (policySetId, options) {
+  _exportPoliciesByPolicySet = _asyncToGenerator(function* (policySetName) {
+    var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+      deps: true,
+      prereqs: false,
+      useStringArrays: true
+    };
     (0, _Console.debugMessage)("PolicyOps.exportPolicies: start");
     var exportData = createPolicyExportTemplate();
     var errors = [];
     try {
-      var policies = yield getPoliciesByPolicySet(policySetId);
+      var policies = yield getPoliciesByPolicySet(policySetName);
       for (var policyData of policies) {
         exportData.policy[policyData._id] = policyData;
+        if (options.prereqs) {
+          try {
+            yield exportPolicyPrerequisites(policyData, exportData);
+          } catch (error) {
+            errors.push(error);
+          }
+        }
         if (options.deps) {
           try {
             yield exportPolicyDependencies(policyData, options, exportData);
@@ -362,16 +410,16 @@ function _exportPoliciesByPolicySet() {
   });
   return _exportPoliciesByPolicySet.apply(this, arguments);
 }
-function importPolicyHardDependencies(_x15, _x16) {
-  return _importPolicyHardDependencies.apply(this, arguments);
+function importPolicyPrerequisites(_x14, _x15) {
+  return _importPolicyPrerequisites.apply(this, arguments);
 }
 /**
  * Helper function to import soft dependencies of a policy
  * @param {PolicySkeleton} policyData policy object
  * @param {PolicyExportInterface} exportData export data
  */
-function _importPolicyHardDependencies() {
-  _importPolicyHardDependencies = _asyncToGenerator(function* (policyData, exportData) {
+function _importPolicyPrerequisites() {
+  _importPolicyPrerequisites = _asyncToGenerator(function* (policyData, exportData) {
     (0, _Console.debugMessage)("PolicyOps.importPolicyHardDependencies: start [policy=".concat(policyData._id, "]"));
     var errors = [];
     try {
@@ -409,20 +457,20 @@ function _importPolicyHardDependencies() {
     }
     (0, _Console.debugMessage)("PolicyOps.importPolicyHardDependencies: end");
   });
-  return _importPolicyHardDependencies.apply(this, arguments);
+  return _importPolicyPrerequisites.apply(this, arguments);
 }
-function importPolicySoftDependencies(_x17, _x18) {
-  return _importPolicySoftDependencies.apply(this, arguments);
+function importPolicyDependencies(_x16, _x17) {
+  return _importPolicyDependencies.apply(this, arguments);
 }
 /**
  * Import policy by id
- * @param {string} name client id
+ * @param {string} policyId policy id
  * @param {PolicyExportInterface} importData import data
  * @param {PolicyImportOptions} options import options
  * @returns {Promise<PolicySkeleton>} imported policy object
  */
-function _importPolicySoftDependencies() {
-  _importPolicySoftDependencies = _asyncToGenerator(function* (policyData, exportData) {
+function _importPolicyDependencies() {
+  _importPolicyDependencies = _asyncToGenerator(function* (policyData, exportData) {
     (0, _Console.debugMessage)("PolicyOps.importPolicySoftDependencies: start [policy=".concat(policyData._id, "]"));
     var errors = [];
     try {
@@ -454,9 +502,9 @@ function _importPolicySoftDependencies() {
     }
     (0, _Console.debugMessage)("PolicyOps.importPolicySoftDependencies: end");
   });
-  return _importPolicySoftDependencies.apply(this, arguments);
+  return _importPolicyDependencies.apply(this, arguments);
 }
-function importPolicy(_x19, _x20) {
+function importPolicy(_x18, _x19) {
   return _importPolicy.apply(this, arguments);
 }
 /**
@@ -466,22 +514,25 @@ function importPolicy(_x19, _x20) {
  * @returns {Promise<PolicySkeleton>} imported policy object
  */
 function _importPolicy() {
-  _importPolicy = _asyncToGenerator(function* (name, importData) {
+  _importPolicy = _asyncToGenerator(function* (policyId, importData) {
     var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
-      deps: true
+      deps: true,
+      prereqs: false
     };
     var response = null;
     var errors = [];
     var imported = [];
     for (var id of Object.keys(importData.policy)) {
-      if (id === name) {
+      if (id === policyId) {
         try {
           var policyData = importData.policy[id];
-          delete policyData._provider;
           delete policyData._rev;
-          if (options.deps) {
+          if (options.policySetName) {
+            policyData.applicationName = options.policySetName;
+          }
+          if (options.prereqs) {
             try {
-              yield importPolicyHardDependencies(policyData, importData);
+              yield importPolicyPrerequisites(policyData, importData);
             } catch (error) {
               errors.push(error);
             }
@@ -494,7 +545,7 @@ function _importPolicy() {
           }
           if (options.deps) {
             try {
-              yield importPolicySoftDependencies(policyData, importData);
+              yield importPolicyDependencies(policyData, importData);
             } catch (error) {
               errors.push(error);
             }
@@ -512,13 +563,13 @@ function _importPolicy() {
       throw new Error("Import error:\n".concat(errorMessages));
     }
     if (0 === imported.length) {
-      throw new Error("Import error:\n".concat(name, " not found in import data!"));
+      throw new Error("Import error:\n".concat(policyId, " not found in import data!"));
     }
     return response;
   });
   return _importPolicy.apply(this, arguments);
 }
-function importFirstPolicy(_x21) {
+function importFirstPolicy(_x20) {
   return _importFirstPolicy.apply(this, arguments);
 }
 /**
@@ -530,7 +581,8 @@ function importFirstPolicy(_x21) {
 function _importFirstPolicy() {
   _importFirstPolicy = _asyncToGenerator(function* (importData) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-      deps: true
+      deps: true,
+      prereqs: false
     };
     var response = null;
     var errors = [];
@@ -538,11 +590,13 @@ function _importFirstPolicy() {
     for (var id of Object.keys(importData.policy)) {
       try {
         var policyData = importData.policy[id];
-        delete policyData._provider;
         delete policyData._rev;
-        if (options.deps) {
+        if (options.policySetName) {
+          policyData.applicationName = options.policySetName;
+        }
+        if (options.prereqs) {
           try {
-            yield importPolicyHardDependencies(policyData, importData);
+            yield importPolicyPrerequisites(policyData, importData);
           } catch (error) {
             errors.push(error);
           }
@@ -555,7 +609,7 @@ function _importFirstPolicy() {
         }
         if (options.deps) {
           try {
-            yield importPolicySoftDependencies(policyData, importData);
+            yield importPolicyDependencies(policyData, importData);
           } catch (error) {
             errors.push(error);
           }
@@ -579,13 +633,14 @@ function _importFirstPolicy() {
   });
   return _importFirstPolicy.apply(this, arguments);
 }
-function importPolicies(_x22) {
+function importPolicies(_x21) {
   return _importPolicies.apply(this, arguments);
 }
 function _importPolicies() {
   _importPolicies = _asyncToGenerator(function* (importData) {
     var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
-      deps: true
+      deps: true,
+      prereqs: false
     };
     var response = [];
     var errors = [];
@@ -594,9 +649,12 @@ function _importPolicies() {
       try {
         var policyData = importData.policy[id];
         delete policyData._rev;
-        if (options.deps) {
+        if (options.policySetName) {
+          policyData.applicationName = options.policySetName;
+        }
+        if (options.prereqs) {
           try {
-            yield importPolicyHardDependencies(policyData, importData);
+            yield importPolicyPrerequisites(policyData, importData);
           } catch (error) {
             errors.push(error);
           }
@@ -609,7 +667,7 @@ function _importPolicies() {
         }
         if (options.deps) {
           try {
-            yield importPolicySoftDependencies(policyData, importData);
+            yield importPolicyDependencies(policyData, importData);
           } catch (error) {
             errors.push(error);
           }