@forge/cli-shared 2.2.2 → 2.3.0-next.2

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @forge/cli-shared
 
+## 2.3.0-next.2
+
+### Patch Changes
+
+- Updated dependencies [24203783]
+  - @forge/manifest@3.3.0-next.1
+
+## 2.3.0-next.1
+
+### Patch Changes
+
+- Updated dependencies [c145946]
+  - @forge/manifest@3.3.0-next.0
+
+## 2.3.0-next.0
+
+### Minor Changes
+
+- 949bd40: The @forge/cli will now download templates from a new service (previously bitbucket), old versions of the CLI won't receive template updates
+
 ## 2.2.2
 
 ### Patch Changes

package/out/apps/template.d.ts

@@ -17,7 +17,7 @@ export interface TemplateLister {
 export interface Templater extends TemplateLister {
     downloadAndExtract(template: string, directory: string): Promise<void>;
 }
-export declare class BitbucketTemplateDownloader implements TemplateDownloader {
+export declare class TemplateServiceDownloader implements TemplateDownloader {
     download(template: string, zipFile: string): Promise<void>;
     private buildZipUrl;
 }
@@ -30,7 +30,9 @@ export declare class ZipTemplateExtractor implements TemplateExtractor {
 export declare class TemplateFetchError extends Error {
     constructor();
 }
-export declare class BitbucketTemplateLister implements TemplateLister {
+export declare class TemplateServiceLister implements TemplateLister {
+    private isValidTemplateMapEntry;
+    private isValidTemplatesResponse;
     getAvailableTemplates(): Promise<string[]>;
 }
 export declare class ComposableTemplater implements Templater {

package/out/apps/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/apps/template.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAK/B,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,QAAQ,EAAE,MAAM;CAG7B;AAED,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AAEzD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,cAAc;IAC7B,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,SAAU,SAAQ,cAAc;IAC/C,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AAED,qBAAa,2BAA4B,YAAW,kBAAkB;IACvD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvE,OAAO,CAAC,WAAW;CAGpB;AAED,qBAAa,oBAAqB,YAAW,iBAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAExC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAc7D,2BAA2B;CAqB1C;AAED,qBAAa,kBAAmB,SAAQ,KAAK;;CAI5C;AAED,qBAAa,uBAAwB,YAAW,cAAc;IAC/C,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBxD;AAED,qBAAa,mBAAoB,YAAW,SAAS;IAEjD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,UAAU,EAAE,kBAAkB,EAC9B,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM;IAEpB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBnF,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG3C"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/apps/template.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAM/B,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,QAAQ,EAAE,MAAM;CAG7B;AAED,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AAEzD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,cAAc;IAC7B,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,SAAU,SAAQ,cAAc;IAC/C,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AAED,qBAAa,yBAA0B,YAAW,kBAAkB;IACrD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAevE,OAAO,CAAC,WAAW;CAGpB;AAED,qBAAa,oBAAqB,YAAW,iBAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAExC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAc7D,2BAA2B;CAqB1C;AAED,qBAAa,kBAAmB,SAAQ,KAAK;;CAI5C;AAKD,qBAAa,qBAAsB,YAAW,cAAc;IAC1D,OAAO,CAAC,uBAAuB;IAI/B,OAAO,CAAC,wBAAwB;IAOnB,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAkBxD;AAED,qBAAa,mBAAoB,YAAW,SAAS;IAEjD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,UAAU,EAAE,kBAAkB,EAC9B,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM;IAEpB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBnF,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG3C"}

package/out/apps/template.js

@@ -1,16 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ComposableTemplater = exports.BitbucketTemplateLister = exports.TemplateFetchError = exports.ZipTemplateExtractor = exports.BitbucketTemplateDownloader = exports.InvalidTemplateArchiveError = exports.NoTemplateError = void 0;
+exports.ComposableTemplater = exports.TemplateServiceLister = exports.TemplateFetchError = exports.ZipTemplateExtractor = exports.TemplateServiceDownloader = exports.InvalidTemplateArchiveError = exports.NoTemplateError = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const fs_extra_1 = require("fs-extra");
-const https_1 = require("https");
 const ignore_walk_1 = tslib_1.__importDefault(require("ignore-walk"));
 const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
 const path_1 = require("path");
 const tmp_1 = tslib_1.__importDefault(require("tmp"));
+const url_1 = require("url");
 const ui_1 = require("../ui");
-const BITBUCKET_PROJECT = 'XTEM';
+const TEMPLATE_SERVICE_URL = 'https://forge-templates.us-west-2.prod.public.atl-paas.net/';
+const TEMPLATE_MAP = 'templates.json';
 class NoTemplateError extends Error {
     constructor(template) {
         super(ui_1.Text.create.error.template.notFound(template));
@@ -20,27 +21,24 @@ exports.NoTemplateError = NoTemplateError;
 class InvalidTemplateArchiveError extends Error {
 }
 exports.InvalidTemplateArchiveError = InvalidTemplateArchiveError;
-class BitbucketTemplateDownloader {
+class TemplateServiceDownloader {
     async download(template, zipFile) {
-        return new Promise((resolve, reject) => {
-            const zipUrl = this.buildZipUrl(template);
-            const fileStream = fs_1.default.createWriteStream(zipFile);
-            const downloadRequest = https_1.request(zipUrl, (res) => {
-                if (res.statusCode !== 200) {
-                    reject(new NoTemplateError(template));
-                    return;
-                }
-                res.pipe(fileStream);
-            });
-            downloadRequest.end();
+        const zipUrl = this.buildZipUrl(template);
+        const fileStream = fs_1.default.createWriteStream(zipFile);
+        const response = await node_fetch_1.default(zipUrl);
+        if (!response.ok) {
+            throw new NoTemplateError(template);
+        }
+        await new Promise((resolve) => {
             fileStream.on('finish', resolve);
+            response.body.pipe(fileStream);
         });
     }
     buildZipUrl(template) {
-        return `https://bitbucket.org/atlassian/${template}/get/master.zip`;
+        return new url_1.URL(`${template}.zip`, TEMPLATE_SERVICE_URL);
     }
 }
-exports.BitbucketTemplateDownloader = BitbucketTemplateDownloader;
+exports.TemplateServiceDownloader = TemplateServiceDownloader;
 class ZipTemplateExtractor {
     constructor(zipAccessor) {
         this.zipAccessor = zipAccessor;
@@ -80,22 +78,36 @@ class TemplateFetchError extends Error {
     }
 }
 exports.TemplateFetchError = TemplateFetchError;
-class BitbucketTemplateLister {
+class TemplateServiceLister {
+    isValidTemplateMapEntry(entry) {
+        return typeof entry === 'object' && entry !== null && typeof entry.name === 'string';
+    }
+    isValidTemplatesResponse(response) {
+        if (Array.isArray(response)) {
+            return response.every((curr) => this.isValidTemplateMapEntry(curr));
+        }
+        return false;
+    }
     async getAvailableTemplates() {
         try {
-            const res = await node_fetch_1.default(`https://api.bitbucket.org/2.0/repositories/atlassian?q=project.key=%22${BITBUCKET_PROJECT}%22&sort=name&pagelen=50`);
+            const res = await node_fetch_1.default(new url_1.URL(TEMPLATE_MAP, TEMPLATE_SERVICE_URL));
             if (!res.ok) {
                 throw new TemplateFetchError();
             }
             const json = await res.json();
-            return json.values.map((repo) => repo.name);
+            if (this.isValidTemplatesResponse(json)) {
+                return json.map(({ name }) => name);
+            }
+            else {
+                throw new TemplateFetchError();
+            }
         }
         catch (e) {
             throw new TemplateFetchError();
         }
     }
 }
-exports.BitbucketTemplateLister = BitbucketTemplateLister;
+exports.TemplateServiceLister = TemplateServiceLister;
 class ComposableTemplater {
     constructor(downloader, extractor, lister, logger) {
         this.downloader = downloader;

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

@@ -211,11 +211,11 @@ export declare enum ActivityEventType {
 }
 export declare type ActivityFilter = {
     actors?: Maybe<Array<Scalars['ID']>>;
+    rootContainerIds?: Maybe<Array<Scalars['ID']>>;
     type?: Maybe<ActivitiesFilterType>;
     arguments?: Maybe<ActivityFilterArgs>;
 };
 export declare type ActivityFilterArgs = {
-    rootContainerIds?: Maybe<Array<Scalars['ID']>>;
     products?: Maybe<Array<Scalars['String']>>;
     eventTypes?: Maybe<Array<Scalars['String']>>;
     objectTypes?: Maybe<Array<Scalars['String']>>;
@@ -3879,7 +3879,7 @@ export declare type CreateDevOpsServiceRelationshipPayload = Payload & {
     serviceRelationship?: Maybe<DevOpsServiceRelationship>;
 };
 export declare type CreateEventSourceInput = {
-    cloudId?: Maybe<Scalars['ID']>;
+    cloudId: Scalars['ID'];
     externalEventSourceId: Scalars['ID'];
     eventType: CompassEventType;
 };
@@ -4335,7 +4335,7 @@ export declare type DeleteDevOpsServiceRelationshipPayload = Payload & {
     errors?: Maybe<Array<MutationError>>;
 };
 export declare type DeleteEventSourceInput = {
-    cloudId?: Maybe<Scalars['ID']>;
+    cloudId: Scalars['ID'];
     externalEventSourceId: Scalars['ID'];
     eventType: CompassEventType;
 };
@@ -6676,6 +6676,16 @@ export declare type JiraConnectTextField = Node & JiraIssueField & JiraIssueFiel
     fieldConfig?: Maybe<JiraFieldConfig>;
     userFieldConfig?: Maybe<JiraUserFieldConfig>;
 };
+export declare type JiraCustomFilter = JiraFilter & Node & {
+    __typename?: 'JiraCustomFilter';
+    id: Scalars['ID'];
+    filterId: Scalars['String'];
+    jql: Scalars['String'];
+    owner?: Maybe<User>;
+    name: Scalars['String'];
+    description?: Maybe<Scalars['String']>;
+    isFavourite?: Maybe<Scalars['Boolean']>;
+};
 export declare type JiraDatePickerField = Node & JiraIssueField & JiraIssueFieldConfiguration & JiraUserIssueFieldConfiguration & {
     __typename?: 'JiraDatePickerField';
     id: Scalars['ID'];
@@ -6814,14 +6824,24 @@ export declare type JiraFieldNonEditableReason = {
     __typename?: 'JiraFieldNonEditableReason';
     message?: Maybe<Scalars['String']>;
 };
-export declare type JiraFilter = Node & {
-    __typename?: 'JiraFilter';
+export declare type JiraFilter = {
     id: Scalars['ID'];
     filterId: Scalars['String'];
     jql: Scalars['String'];
     name: Scalars['String'];
+    isFavourite?: Maybe<Scalars['Boolean']>;
+};
+export declare type JiraFilterConnection = {
+    __typename?: 'JiraFilterConnection';
+    pageInfo: PageInfo;
+    edges?: Maybe<Array<Maybe<JiraFilterEdge>>>;
 };
-export declare type JiraFilterResult = JiraFilter | QueryError;
+export declare type JiraFilterEdge = {
+    __typename?: 'JiraFilterEdge';
+    node?: Maybe<JiraFilter>;
+    cursor: Scalars['String'];
+};
+export declare type JiraFilterResult = JiraCustomFilter | JiraSystemFilter | QueryError;
 export declare type JiraFlag = {
     __typename?: 'JiraFlag';
     isFlagged?: Maybe<Scalars['Boolean']>;
@@ -7536,7 +7556,7 @@ export declare type JiraIssueSearchByFilter = JiraIssueSearchResult & {
     __typename?: 'JiraIssueSearchByFilter';
     content?: Maybe<JiraIssueSearchContextualContent>;
     contentByFieldConfigSetIds?: Maybe<JiraIssueSearchContextlessContent>;
-    filter?: Maybe<JiraFilterResult>;
+    filter?: Maybe<JiraFilter>;
 };
 export declare type JiraIssueSearchByFilterContentArgs = {
     namespace?: Maybe<Scalars['String']>;
@@ -7627,6 +7647,9 @@ export declare type JiraIssueSearchInput = {
     jql?: Maybe<Scalars['String']>;
     filterId?: Maybe<Scalars['String']>;
 };
+export declare type JiraIssueSearchOptions = {
+    issueKey?: Maybe<Scalars['String']>;
+};
 export declare type JiraIssueSearchResult = {
     content?: Maybe<JiraIssueSearchContextualContent>;
     contentByFieldConfigSetIds?: Maybe<JiraIssueSearchContextlessContent>;
@@ -8331,6 +8354,7 @@ export declare type JiraMutation = {
     __typename?: 'JiraMutation';
     devOps?: Maybe<JiraDevOpsMutation>;
     updateIssueSearchViewFieldConfigSets?: Maybe<JiraIssueSearchViewPayload>;
+    replaceIssueSearchViewFieldConfigSets?: Maybe<JiraIssueSearchViewPayload>;
     setApplicationProperties?: Maybe<JiraSetApplicationPropertiesPayload>;
     addPermissionSchemeGrants?: Maybe<JiraPermissionSchemeAddGrantPayload>;
     removePermissionSchemeGrants?: Maybe<JiraPermissionSchemeRemoveGrantPayload>;
@@ -8340,6 +8364,10 @@ export declare type JiraMutationUpdateIssueSearchViewFieldConfigSetsArgs = {
     id: Scalars['ID'];
     fieldConfigSetIds: Array<Scalars['String']>;
 };
+export declare type JiraMutationReplaceIssueSearchViewFieldConfigSetsArgs = {
+    id: Scalars['ID'];
+    input: JiraReplaceIssueSearchViewFieldConfigSetsInput;
+};
 export declare type JiraMutationSetApplicationPropertiesArgs = {
     cloudId: Scalars['ID'];
     input: Array<JiraSetApplicationPropertyInput>;
@@ -9051,6 +9079,9 @@ export declare type JiraQuery = {
     screenIdByIssueKey?: Maybe<Scalars['Long']>;
     epicLinkFieldKey?: Maybe<Scalars['String']>;
     applicationPropertiesByKey?: Maybe<Array<JiraApplicationProperty>>;
+    filter?: Maybe<JiraFilter>;
+    favouriteFilters?: Maybe<JiraFilterConnection>;
+    systemFilters?: Maybe<JiraSystemFilterConnection>;
     jqlBuilder?: Maybe<JiraJqlBuilder>;
     allGrantTypeKeys: Array<JiraGrantTypeKey>;
     grantTypeValues?: Maybe<JiraGrantTypeValueConnection>;
@@ -9108,6 +9139,7 @@ export declare type JiraQueryIssueSearchViewByNamespaceAndViewIdArgs = {
 export declare type JiraQueryIssueSearchStableArgs = {
     cloudId: Scalars['ID'];
     issueSearchInput: JiraIssueSearchInput;
+    options?: Maybe<JiraIssueSearchOptions>;
     first?: Maybe<Scalars['Int']>;
     after?: Maybe<Scalars['String']>;
     last?: Maybe<Scalars['Int']>;
@@ -9130,6 +9162,24 @@ export declare type JiraQueryApplicationPropertiesByKeyArgs = {
     cloudId: Scalars['ID'];
     keys: Array<Scalars['String']>;
 };
+export declare type JiraQueryFilterArgs = {
+    id: Scalars['ID'];
+};
+export declare type JiraQueryFavouriteFiltersArgs = {
+    cloudId: Scalars['ID'];
+    first?: Maybe<Scalars['Int']>;
+    after?: Maybe<Scalars['String']>;
+    last?: Maybe<Scalars['Int']>;
+    before?: Maybe<Scalars['String']>;
+};
+export declare type JiraQuerySystemFiltersArgs = {
+    cloudId: Scalars['ID'];
+    isFavourite?: Maybe<Scalars['Boolean']>;
+    first?: Maybe<Scalars['Int']>;
+    after?: Maybe<Scalars['String']>;
+    last?: Maybe<Scalars['Int']>;
+    before?: Maybe<Scalars['String']>;
+};
 export declare type JiraQueryJqlBuilderArgs = {
     cloudId: Scalars['ID'];
 };
@@ -9325,6 +9375,12 @@ export declare type JiraReleasesTimeWindowInput = {
     after: Scalars['DateTime'];
     before: Scalars['DateTime'];
 };
+export declare type JiraReplaceIssueSearchViewFieldConfigSetsInput = {
+    before?: Maybe<Scalars['String']>;
+    after?: Maybe<Scalars['String']>;
+    nodes: Array<Scalars['String']>;
+    inclusive?: Maybe<Scalars['Boolean']>;
+};
 export declare type JiraResolution = Node & {
     __typename?: 'JiraResolution';
     id: Scalars['ID'];
@@ -10152,6 +10208,24 @@ export declare type JiraSubtasksFieldSubtasksArgs = {
     last?: Maybe<Scalars['Int']>;
     before?: Maybe<Scalars['String']>;
 };
+export declare type JiraSystemFilter = JiraFilter & Node & {
+    __typename?: 'JiraSystemFilter';
+    id: Scalars['ID'];
+    filterId: Scalars['String'];
+    jql: Scalars['String'];
+    name: Scalars['String'];
+    isFavourite?: Maybe<Scalars['Boolean']>;
+};
+export declare type JiraSystemFilterConnection = {
+    __typename?: 'JiraSystemFilterConnection';
+    pageInfo: PageInfo;
+    edges?: Maybe<Array<Maybe<JiraSystemFilterEdge>>>;
+};
+export declare type JiraSystemFilterEdge = {
+    __typename?: 'JiraSystemFilterEdge';
+    node?: Maybe<JiraSystemFilter>;
+    cursor: Scalars['String'];
+};
 export declare type JiraTeam = Node & {
     __typename?: 'JiraTeam';
     id: Scalars['ID'];
@@ -11508,6 +11582,7 @@ export declare type MyActivityViewedArgs = {
     after?: Maybe<Scalars['String']>;
 };
 export declare type MyActivityFilter = {
+    rootContainerIds?: Maybe<Array<Scalars['ID']>>;
     type?: Maybe<ActivitiesFilterType>;
     arguments?: Maybe<ActivityFilterArgs>;
 };