@forge/cli-shared 2.1.5-next.9 → 2.1.6-next.2

package/CHANGELOG.md

@@ -1,5 +1,51 @@
 # @forge/cli-shared
 
+## 2.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies [af1473c]
+  - @forge/manifest@2.5.1-next.1
+
+## 2.1.6-next.1
+
+### Patch Changes
+
+- Updated dependencies [06209fc]
+  - @forge/manifest@2.5.1-next.0
+
+## 2.1.6-next.0
+
+### Patch Changes
+
+- 2338be5: Handle the manifest case of remotes found in the egress permissions section when installing an app
+
+## 2.1.5
+
+### Patch Changes
+
+- Updated dependencies [4de9850]
+- Updated dependencies [70e9c8c]
+- Updated dependencies [fde4ba7]
+- Updated dependencies [601527b]
+- Updated dependencies [755e35e]
+- Updated dependencies [a5656f6]
+- Updated dependencies [cc8799c]
+- Updated dependencies [f5eb8e0]
+- Updated dependencies [f013199]
+- Updated dependencies [78d682f]
+- Updated dependencies [70e9c8c]
+- Updated dependencies [dec8066]
+- Updated dependencies [0e82242]
+  - @forge/manifest@2.5.0
+
+## 2.1.5-next.10
+
+### Patch Changes
+
+- Updated dependencies [fde4ba7]
+  - @forge/manifest@2.5.0-next.10
+
 ## 2.1.5-next.9
 
 ### Patch Changes

package/out/config/config-file.d.ts

@@ -1,7 +1,7 @@
 import { Document } from 'yaml';
 import { FileSystemReader, FileSystemWriter } from '../file-system';
 import { ConfigReader, ConfigWriter } from './';
-import { ManifestSchema, Resources } from '@forge/manifest';
+import { ManifestSchema, Resources } from '@forge/manifest/out/schema/manifest';
 export declare class ResourceDefinitionMissingError extends Error {
     constructor(resources: string[]);
 }
@@ -27,6 +27,8 @@ export declare class ConfigFile implements ConfigReader, ConfigWriter, ConfigInt
     writeToConfigFile<K extends string, V>(configKey: K, config: V): Promise<void>;
     private getHostedResourceKeys;
     private findMissingResources;
+    private getRemoteFromEgressPermission;
+    private instanceOfRemote;
     getEgressPermissions(): Promise<{
         type: string;
         domains: string[] | undefined;

package/out/config/config-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAa,EAAwB,QAAQ,EAAE,MAAM,MAAM,CAAC;AAI5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EAAW,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGrE,qBAAa,8BAA+B,SAAQ,KAAK;gBAC3C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAED,oBAAY,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AACpC,oBAAY,YAAY,GAAG,UAAU,GAAG,SAAS,CAAC;AAClD,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,qBAAa,UAAW,YAAW,YAAY,EAAE,YAAY,EAAE,gBAAgB;IACjE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAoB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAzD,UAAU,EAAE,gBAAgB,EAAmB,UAAU,EAAE,gBAAgB;IAE3F,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IASxC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IAUrC,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;IAW5D,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAMjD,OAAO,CAAC,kBAAkB;IAmBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe3F,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,oBAAoB;IAKf,oBAAoB,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,EAAE,CAAC;IAsClF,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAe1E,YAAY,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IA0B1C,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAI1D"}
+{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAa,EAAwB,QAAQ,EAAE,MAAM,MAAM,CAAC;AAI5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EAEL,cAAc,EACd,SAAS,EAMV,MAAM,qCAAqC,CAAC;AAE7C,qBAAa,8BAA+B,SAAQ,KAAK;gBAC3C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAED,oBAAY,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AACpC,oBAAY,YAAY,GAAG,UAAU,GAAG,SAAS,CAAC;AAClD,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,qBAAa,UAAW,YAAW,YAAY,EAAE,YAAY,EAAE,gBAAgB;IACjE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAoB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAzD,UAAU,EAAE,gBAAgB,EAAmB,UAAU,EAAE,gBAAgB;IAE3F,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IASxC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IAUrC,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;IAW5D,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAMjD,OAAO,CAAC,kBAAkB;IAmBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe3F,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,6BAA6B;IAYrC,OAAO,CAAC,gBAAgB;IAIX,oBAAoB,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,EAAE,CAAC;IAoClF,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAe1E,YAAY,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IA0B1C,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAI1D"}

package/out/config/config-file.js

@@ -112,8 +112,22 @@ class ConfigFile {
         const missing = resourceKeys.filter((resourceKey) => !resources.some(({ key }) => resourceKey === key));
         return missing;
     }
+    getRemoteFromEgressPermission(remoteEgressPermission, remotes) {
+        if (!remotes) {
+            return remoteEgressPermission;
+        }
+        for (const remote of remotes) {
+            if (remote.key === remoteEgressPermission) {
+                return new url_1.URL(remote.baseUrl).hostname;
+            }
+        }
+        return remoteEgressPermission;
+    }
+    instanceOfRemote(remote) {
+        return typeof remote !== 'string' && 'remote' in remote;
+    }
     async getEgressPermissions() {
-        const { permissions } = await this.readConfig();
+        const { permissions, remotes } = await this.readConfig();
         const egressPermissions = permissions === null || permissions === void 0 ? void 0 : permissions.external;
         if (!egressPermissions) {
             return [];
@@ -126,9 +140,11 @@ class ConfigFile {
             return ({
                 type: typePrefix ? `${typePrefix}_${entry[0]}` : entry[0],
                 domains: (_a = entry[1]) === null || _a === void 0 ? void 0 : _a.map((url) => {
-                    let domain = url;
+                    let domain = this.instanceOfRemote(url) ? url.remote : url;
                     try {
-                        domain = new url_1.URL(url).hostname;
+                        domain = this.instanceOfRemote(url)
+                            ? this.getRemoteFromEgressPermission(url.remote, remotes)
+                            : new url_1.URL(url).hostname;
                     }
                     catch (e) {
                     }
@@ -137,9 +153,7 @@ class ConfigFile {
             });
         });
         const egressUrls = getDomainsFromPermissions(otherEgress);
-        const fetchUrls = fetchEgress
-            ? getDomainsFromPermissions(fetchEgress, 'fetch')
-            : [];
+        const fetchUrls = fetchEgress ? getDomainsFromPermissions(fetchEgress, 'fetch') : [];
         return [...egressUrls, ...fetchUrls];
     }
     async getAuthProviders() {

package/out/graphql/graphql-types.d.ts

@@ -1696,6 +1696,7 @@ export declare type CompassCreateMetricDefinitionInput = {
     cloudId: Scalars['ID'];
     name: Scalars['String'];
     description?: Maybe<Scalars['String']>;
+    format?: Maybe<CompassMetricDefinitionFormatInput>;
 };
 export declare type CompassCreateMetricDefinitionPayload = Payload & {
     __typename?: 'CompassCreateMetricDefinitionPayload';
@@ -1948,7 +1949,6 @@ export declare type CompassHasMetricValueScorecardCriteria = CompassScorecardCri
     weight: Scalars['Int'];
     comparatorValue: Scalars['Float'];
     metricDefinitionId: Scalars['ID'];
-    metricDefinitionName?: Maybe<Scalars['String']>;
     comparator: CompassCriteriaNumberComparatorOptions;
     scorecardCriteriaScore?: Maybe<CompassScorecardCriteriaScore>;
 };
@@ -1995,12 +1995,24 @@ export declare type CompassMetricDefinition = {
     id: Scalars['ID'];
     name?: Maybe<Scalars['String']>;
     description?: Maybe<Scalars['String']>;
+    format?: Maybe<CompassMetricDefinitionFormat>;
 };
 export declare type CompassMetricDefinitionEdge = {
     __typename?: 'CompassMetricDefinitionEdge';
     cursor: Scalars['String'];
     node?: Maybe<CompassMetricDefinition>;
 };
+export declare type CompassMetricDefinitionFormat = CompassMetricDefinitionFormatSuffix;
+export declare type CompassMetricDefinitionFormatInput = {
+    suffix?: Maybe<CompassMetricDefinitionFormatSuffixInput>;
+};
+export declare type CompassMetricDefinitionFormatSuffix = {
+    __typename?: 'CompassMetricDefinitionFormatSuffix';
+    suffix?: Maybe<Scalars['String']>;
+};
+export declare type CompassMetricDefinitionFormatSuffixInput = {
+    suffix: Scalars['String'];
+};
 export declare type CompassMetricDefinitionsConnection = {
     __typename?: 'CompassMetricDefinitionsConnection';
     edges?: Maybe<Array<CompassMetricDefinitionEdge>>;
@@ -2011,7 +2023,6 @@ export declare type CompassMetricDefinitionsQuery = {
     cloudId: Scalars['ID'];
     first?: Maybe<Scalars['Int']>;
     after?: Maybe<Scalars['String']>;
-    names?: Maybe<Array<Scalars['String']>>;
 };
 export declare type CompassMetricDefinitionsQueryResult = CompassMetricDefinitionsConnection | QueryError;
 export declare type CompassMetricSource = {
@@ -2303,6 +2314,7 @@ export declare type CompassUpdateMetricDefinitionInput = {
     id: Scalars['ID'];
     name?: Maybe<Scalars['String']>;
     description?: Maybe<Scalars['String']>;
+    format?: Maybe<CompassMetricDefinitionFormatInput>;
 };
 export declare type CompassUpdateMetricDefinitionPayload = Payload & {
     __typename?: 'CompassUpdateMetricDefinitionPayload';
@@ -2676,7 +2688,6 @@ export declare type CreateCompassHasLinkScorecardCriteriaInput = {
 export declare type CreateCompassHasMetricValueCriteriaInput = {
     weight: Scalars['Int'];
     metricDefinitionId: Scalars['ID'];
-    metricDefinitionName?: Maybe<Scalars['String']>;
     comparatorValue: Scalars['Float'];
     comparator: CompassCriteriaNumberComparatorOptions;
 };
@@ -7629,12 +7640,13 @@ export declare type JiraServiceManagementActiveApproval = Node & {
     name?: Maybe<Scalars['String']>;
     finalDecision?: Maybe<JiraServiceManagementApprovalDecisionResponseType>;
     approvers?: Maybe<JiraServiceManagementApproverConnection>;
+    excludedApprovers?: Maybe<JiraUserConnection>;
     canAnswerApproval?: Maybe<Scalars['Boolean']>;
     decisions?: Maybe<JiraServiceManagementDecisionConnection>;
     createdDate?: Maybe<Scalars['DateTime']>;
-    configuration?: Maybe<JiraServiceManagementApprovalConfiguration>;
+    configurations?: Maybe<Array<Maybe<JiraServiceManagementApprovalConfiguration>>>;
     status?: Maybe<JiraServiceManagementApprovalStatus>;
-    approverPrincipals?: Maybe<JiraServiceManagementApproverPrincipal>;
+    approverPrincipals?: Maybe<JiraServiceManagementApproverPrincipalConnection>;
     pendingApprovalCount?: Maybe<Scalars['Int']>;
 };
 export declare type JiraServiceManagementApprovalCondition = {
@@ -7644,7 +7656,7 @@ export declare type JiraServiceManagementApprovalCondition = {
 };
 export declare type JiraServiceManagementApprovalConfiguration = {
     __typename?: 'JiraServiceManagementApprovalConfiguration';
-    approversConfiguration?: Maybe<JiraServiceManagementApproversConfiguration>;
+    approversConfigurations?: Maybe<Array<Maybe<JiraServiceManagementApproversConfiguration>>>;
     condition?: Maybe<JiraServiceManagementApprovalCondition>;
 };
 export declare enum JiraServiceManagementApprovalDecisionResponseType {
@@ -7676,7 +7688,7 @@ export declare type JiraServiceManagementApprovalStatus = {
     __typename?: 'JiraServiceManagementApprovalStatus';
     id?: Maybe<Scalars['String']>;
     name?: Maybe<Scalars['String']>;
-    categoryId?: Maybe<Scalars['Long']>;
+    categoryId?: Maybe<Scalars['String']>;
 };
 export declare type JiraServiceManagementApprover = {
     __typename?: 'JiraServiceManagementApprover';
@@ -7694,12 +7706,23 @@ export declare type JiraServiceManagementApproverEdge = {
     node?: Maybe<JiraServiceManagementApprover>;
     cursor: Scalars['String'];
 };
-export declare type JiraServiceManagementApproverPrincipal = JiraServiceManagementUserApproverPrincipal | JiraServiceManagementUserApproverPrincipalConnection | JiraServiceManagementGroupApproverPrincipals;
+export declare type JiraServiceManagementApproverPrincipal = JiraServiceManagementUserApproverPrincipal | JiraServiceManagementUserApproverPrincipalConnection | JiraServiceManagementGroupApproverPrincipalConnection;
+export declare type JiraServiceManagementApproverPrincipalConnection = {
+    __typename?: 'JiraServiceManagementApproverPrincipalConnection';
+    totalCount?: Maybe<Scalars['Int']>;
+    pageInfo: PageInfo;
+    edges?: Maybe<Array<Maybe<JiraServiceManagementApproverPrincipalEdge>>>;
+};
+export declare type JiraServiceManagementApproverPrincipalEdge = {
+    __typename?: 'JiraServiceManagementApproverPrincipalEdge';
+    node?: Maybe<JiraServiceManagementApproverPrincipal>;
+    cursor: Scalars['String'];
+};
 export declare type JiraServiceManagementApproversConfiguration = {
     __typename?: 'JiraServiceManagementApproversConfiguration';
     type?: Maybe<Scalars['String']>;
-    customFieldName?: Maybe<Scalars['String']>;
-    customFieldId?: Maybe<Scalars['String']>;
+    fieldName?: Maybe<Scalars['String']>;
+    fieldId?: Maybe<Scalars['String']>;
 };
 export declare type JiraServiceManagementAttachment = JiraAttachment & Node & {
     __typename?: 'JiraServiceManagementAttachment';
@@ -7786,14 +7809,21 @@ export declare type JiraServiceManagementFeedback = {
 };
 export declare type JiraServiceManagementGroupApproverPrincipal = {
     __typename?: 'JiraServiceManagementGroupApproverPrincipal';
-    groupApproverPrincipalId?: Maybe<Scalars['String']>;
+    groupId?: Maybe<Scalars['String']>;
     name?: Maybe<Scalars['String']>;
     memberCount?: Maybe<Scalars['Int']>;
     approvedCount?: Maybe<Scalars['Int']>;
 };
-export declare type JiraServiceManagementGroupApproverPrincipals = {
-    __typename?: 'JiraServiceManagementGroupApproverPrincipals';
-    jiraServiceManagementGroupApproverPrincipals?: Maybe<Array<Maybe<JiraServiceManagementGroupApproverPrincipal>>>;
+export declare type JiraServiceManagementGroupApproverPrincipalConnection = {
+    __typename?: 'JiraServiceManagementGroupApproverPrincipalConnection';
+    totalCount?: Maybe<Scalars['Int']>;
+    pageInfo: PageInfo;
+    edges?: Maybe<Array<Maybe<JiraServiceManagementGroupApproverPrincipalEdge>>>;
+};
+export declare type JiraServiceManagementGroupApproverPrincipalEdge = {
+    __typename?: 'JiraServiceManagementGroupApproverPrincipalEdge';
+    node?: Maybe<JiraServiceManagementGroupApproverPrincipal>;
+    cursor: Scalars['String'];
 };
 export declare type JiraServiceManagementIncident = {
     __typename?: 'JiraServiceManagementIncident';
@@ -10192,8 +10222,8 @@ export declare type PolarisIssueLinkType = {
 };
 export declare type PolarisMatrixAxis = {
     __typename?: 'PolarisMatrixAxis';
-    dimension?: Maybe<Scalars['String']>;
-    field?: Maybe<PolarisIdeaField>;
+    dimension: Scalars['String'];
+    field: PolarisIdeaField;
 };
 export declare type PolarisMatrixConfig = {
     __typename?: 'PolarisMatrixConfig';
@@ -10385,7 +10415,7 @@ export declare type PolarisTimelineConfig = {
     __typename?: 'PolarisTimelineConfig';
     startDateField?: Maybe<PolarisIdeaField>;
     dueDateField?: Maybe<PolarisIdeaField>;
-    mode?: Maybe<PolarisTimelineMode>;
+    mode: PolarisTimelineMode;
 };
 export declare enum PolarisTimelineMode {
     Months = "MONTHS",
@@ -10923,7 +10953,8 @@ export declare type RankColumnOutput = MutationResponse & {
 };
 export declare enum RateLimitingCurrency {
     TestingService = "TESTING_SERVICE",
-    ForgeMetricsCurrency = "FORGE_METRICS_CURRENCY"
+    ForgeMetricsCurrency = "FORGE_METRICS_CURRENCY",
+    CompassInsertMetricValueCurrency = "COMPASS_INSERT_METRIC_VALUE_CURRENCY"
 }
 export declare type RawStatus = {
     __typename?: 'RawStatus';
@@ -12306,7 +12337,6 @@ export declare type UpdateCompassHasMetricValueCriteriaInput = {
     id: Scalars['ID'];
     weight?: Maybe<Scalars['Int']>;
     metricDefinitionId?: Maybe<Scalars['ID']>;
-    metricDefinitionName?: Maybe<Scalars['String']>;
     comparatorValue?: Maybe<Scalars['Float']>;
     comparator?: Maybe<CompassCriteriaNumberComparatorOptions>;
 };