@forge/util

Index: package/packages/ari/avp/index.js
===================================================================
--- package/packages/ari/avp/index.js
+++ package/packages/ari/avp/index.js
@@ -285,32 +285,29 @@
   }
 };
 
 // src/avp/chart/types.ts
-var AvpChartAriResourceOwner = "avp", AvpChartAriResourceType = "chart";
+var AvpChartAriResourceType = "chart";
 
 // src/avp/chart/manifest.ts
 var avpChartAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^[a-zA-Z0-9_\\-.]{1,255}$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpChartAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpChartAriResourceType,
   resourceIdSlug: "activation/{activationId}/{chartId}",
   resourceIdSegmentFormats: {
     activationId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
     chartId: /[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/avp/chart/index.ts
 var AvpChartAri = class _AvpChartAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._chartId = opts.resourceIdSegmentValues.chartId;
+    super(opts), this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._chartId = opts.resourceIdSegmentValues.chartId;
   }
   get siteId() {
     return this._siteId;
   }
@@ -348,32 +345,29 @@
   }
 };
 
 // src/avp/control/types.ts
-var AvpControlAriResourceOwner = "avp", AvpControlAriResourceType = "control";
+var AvpControlAriResourceType = "control";
 
 // src/avp/control/manifest.ts
 var avpControlAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^[a-zA-Z0-9_\\-.]{1,255}$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpControlAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpControlAriResourceType,
   resourceIdSlug: "activation/{activationId}/{controlId}",
   resourceIdSegmentFormats: {
     activationId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
     controlId: /[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/avp/control/index.ts
 var AvpControlAri = class _AvpControlAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._controlId = opts.resourceIdSegmentValues.controlId;
+    super(opts), this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._controlId = opts.resourceIdSegmentValues.controlId;
   }
   get siteId() {
     return this._siteId;
   }
@@ -411,32 +405,29 @@
   }
 };
 
 // src/avp/dashboard/types.ts
-var AvpDashboardAriResourceOwner = "avp", AvpDashboardAriResourceType = "dashboard";
+var AvpDashboardAriResourceType = "dashboard";
 
 // src/avp/dashboard/manifest.ts
 var avpDashboardAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^[a-zA-Z0-9_\\-.]{1,255}$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpDashboardAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpDashboardAriResourceType,
   resourceIdSlug: "activation/{activationId}/{dashboardId}",
   resourceIdSegmentFormats: {
     activationId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
     dashboardId: /[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/avp/dashboard/index.ts
 var AvpDashboardAri = class _AvpDashboardAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._dashboardId = opts.resourceIdSegmentValues.dashboardId;
+    super(opts), this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._dashboardId = opts.resourceIdSegmentValues.dashboardId;
   }
   get siteId() {
     return this._siteId;
   }
@@ -474,34 +465,30 @@
   }
 };
 
 // src/avp/dashboard-chart/types.ts
-var AvpDashboardChartAriResourceOwner = "avp", AvpDashboardChartAriResourceType = "dashboard-chart";
+var AvpDashboardChartAriResourceType = "dashboard-chart";
 
 // src/avp/dashboard-chart/manifest.ts
 var avpDashboardChartAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^[a-zA-Z0-9_\\-.]{1,255}$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpDashboardChartAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpDashboardChartAriResourceType,
   resourceIdSlug: "activation/{activationId}/dashboard/{dashboardId}/{chartId}",
   resourceIdSegmentFormats: {
     activationId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
     dashboardId: /[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}/,
-    // eslint-disable-line no-useless-escape
     chartId: /[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/avp/dashboard-chart/index.ts
 var AvpDashboardChartAri = class _AvpDashboardChartAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._dashboardId = opts.resourceIdSegmentValues.dashboardId, this._chartId = opts.resourceIdSegmentValues.chartId;
+    super(opts), this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._dashboardId = opts.resourceIdSegmentValues.dashboardId, this._chartId = opts.resourceIdSegmentValues.chartId;
   }
   get siteId() {
     return this._siteId;
   }
@@ -544,32 +531,29 @@
   }
 };
 
 // src/avp/data-share/types.ts
-var AvpDataShareAriResourceOwner = "avp", AvpDataShareAriResourceType = "data-share";
+var AvpDataShareAriResourceType = "data-share";
 
 // src/avp/data-share/manifest.ts
 var avpDataShareAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^[a-zA-Z0-9_\\-.]{1,255}$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpDataShareAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpDataShareAriResourceType,
   resourceIdSlug: "activation/{activationId}/{datashareId}",
   resourceIdSegmentFormats: {
     activationId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
     datashareId: /[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/avp/data-share/index.ts
 var AvpDataShareAri = class _AvpDataShareAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._datashareId = opts.resourceIdSegmentValues.datashareId;
+    super(opts), this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._datashareId = opts.resourceIdSegmentValues.datashareId;
   }
   get siteId() {
     return this._siteId;
   }
@@ -607,32 +591,29 @@
   }
 };
 
 // src/avp/datasource/types.ts
-var AvpDatasourceAriResourceOwner = "avp", AvpDatasourceAriResourceType = "datasource";
+var AvpDatasourceAriResourceType = "datasource";
 
 // src/avp/datasource/manifest.ts
 var avpDatasourceAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^[a-zA-Z0-9_\\-.]{1,255}$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpDatasourceAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpDatasourceAriResourceType,
   resourceIdSlug: "activation/{activationId}/{datasourceId}",
   resourceIdSegmentFormats: {
     activationId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
     datasourceId: /[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/avp/datasource/index.ts
 var AvpDatasourceAri = class _AvpDatasourceAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._datasourceId = opts.resourceIdSegmentValues.datasourceId;
+    super(opts), this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._datasourceId = opts.resourceIdSegmentValues.datasourceId;
   }
   get siteId() {
     return this._siteId;
   }
@@ -670,34 +651,30 @@
   }
 };
 
 // src/avp/pipeline-query/types.ts
-var AvpPipelineQueryAriResourceOwner = "avp", AvpPipelineQueryAriResourceType = "pipeline-query";
+var AvpPipelineQueryAriResourceType = "pipeline-query";
 
 // src/avp/pipeline-query/manifest.ts
 var avpPipelineQueryAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^[a-zA-Z0-9_\\-.]{1,255}$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpPipelineQueryAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpPipelineQueryAriResourceType,
   resourceIdSlug: "activation/{activationId}/pipeline/{pipelineId}/{pipelineQueryId}",
   resourceIdSegmentFormats: {
     activationId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
     pipelineId: /[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}/,
-    // eslint-disable-line no-useless-escape
     pipelineQueryId: /[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/avp/pipeline-query/index.ts
 var AvpPipelineQueryAri = class _AvpPipelineQueryAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._pipelineId = opts.resourceIdSegmentValues.pipelineId, this._pipelineQueryId = opts.resourceIdSegmentValues.pipelineQueryId;
+    super(opts), this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._pipelineId = opts.resourceIdSegmentValues.pipelineId, this._pipelineQueryId = opts.resourceIdSegmentValues.pipelineQueryId;
   }
   get siteId() {
     return this._siteId;
   }
@@ -740,30 +717,27 @@
   }
 };
 
 // src/avp/role/types.ts
-var AvpRoleAriResourceOwner = "avp", AvpRoleAriResourceType = "role";
+var AvpRoleAriResourceType = "role";
 
 // src/avp/role/manifest.ts
 var avpRoleAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpRoleAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpRoleAriResourceType,
   resourceIdSlug: "{roleId}",
   resourceIdSegmentFormats: {
     roleId: /[!a-zA-Z0-9\-_.~@:;{}=]+(\/[!a-zA-Z0-9\-_.~@:;{}=]+)*/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/avp/role/index.ts
 var AvpRoleAri = class _AvpRoleAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._roleId = opts.resourceIdSegmentValues.roleId;
+    super(opts), this._roleId = opts.resourceIdSegmentValues.roleId;
   }
   get roleId() {
     return this._roleId;
   }
@@ -792,30 +766,27 @@
   }
 };
 
 // src/avp/site/types.ts
-var AvpSiteAriResourceOwner = "avp", AvpSiteAriResourceType = "site";
+var AvpSiteAriResourceType = "site";
 
 // src/avp/site/manifest.ts
 var avpSiteAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpSiteAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpSiteAriResourceType,
   resourceIdSlug: "{siteId}",
   resourceIdSegmentFormats: {
     siteId: /[a-zA-Z0-9_\-.]{1,255}/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/avp/site/index.ts
 var AvpSiteAri = class _AvpSiteAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._siteId = opts.resourceIdSegmentValues.siteId;
+    super(opts), this._siteId = opts.resourceIdSegmentValues.siteId;
   }
   get siteId() {
     return this._siteId;
   }
@@ -844,32 +815,29 @@
   }
 };
 
 // src/avp/subscription/types.ts
-var AvpSubscriptionAriResourceOwner = "avp", AvpSubscriptionAriResourceType = "subscription";
+var AvpSubscriptionAriResourceType = "subscription";
 
 // src/avp/subscription/manifest.ts
 var avpSubscriptionAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^[a-zA-Z0-9_\\-.]{1,255}$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpSubscriptionAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpSubscriptionAriResourceType,
   resourceIdSlug: "activation/{activationId}/{subscriptionId}",
   resourceIdSegmentFormats: {
     activationId: /[a-zA-Z0-9\-]+/,
     // eslint-disable-line no-useless-escape
     subscriptionId: /[0-9a-f]{8}-[0-9a-f]{4}-[0-5][0-9a-f]{3}-[089ab][0-9a-f]{3}-[0-9a-f]{12}/
-    // eslint-disable-line no-useless-escape
   }
 };
 
 // src/avp/subscription/index.ts
 var AvpSubscriptionAri = class _AvpSubscriptionAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._subscriptionId = opts.resourceIdSegmentValues.subscriptionId;
+    super(opts), this._siteId = opts.cloudId || "", this._activationId = opts.resourceIdSegmentValues.activationId, this._subscriptionId = opts.resourceIdSegmentValues.subscriptionId;
   }
   get siteId() {
     return this._siteId;
   }
@@ -907,17 +875,16 @@
   }
 };
 
 // src/avp/workspace/types.ts
-var AvpWorkspaceAriResourceOwner = "avp", AvpWorkspaceAriResourceType = "workspace";
+var AvpWorkspaceAriResourceType = "workspace";
 
 // src/avp/workspace/manifest.ts
 var avpWorkspaceAriStaticOpts = {
   qualifier: "ari",
   platformQualifier: "cloud",
   cloudId: new RegExp("^[a-zA-Z0-9_\\-.]{1,255}$"),
-  // eslint-disable-line no-useless-escape
-  resourceOwner: AvpWorkspaceAriResourceOwner,
+  resourceOwner: "avp",
   resourceType: AvpWorkspaceAriResourceType,
   resourceIdSlug: "{workspaceId}",
   resourceIdSegmentFormats: {
     workspaceId: /[a-zA-Z0-9\-]+/
@@ -927,10 +894,9 @@
 
 // src/avp/workspace/index.ts
 var AvpWorkspaceAri = class _AvpWorkspaceAri extends RegisteredAri {
   constructor(opts) {
-    super(opts);
-    this._siteId = opts.cloudId || "", this._workspaceId = opts.resourceIdSegmentValues.workspaceId;
+    super(opts), this._siteId = opts.cloudId || "", this._workspaceId = opts.resourceIdSegmentValues.workspaceId;
   }
   get siteId() {
     return this._siteId;
   }