@forge/cli-shared 3.11.0-next.4 → 3.11.0-next.6

package/out/graphql/graphql-types.js

@@ -2177,6 +2177,8 @@ var ShepherdAlertStatus;
 (function (ShepherdAlertStatus) {
     ShepherdAlertStatus["InProgress"] = "IN_PROGRESS";
     ShepherdAlertStatus["Triaged"] = "TRIAGED";
+    ShepherdAlertStatus["TriagedExpectedActivity"] = "TRIAGED_EXPECTED_ACTIVITY";
+    ShepherdAlertStatus["TriagedTruePositive"] = "TRIAGED_TRUE_POSITIVE";
     ShepherdAlertStatus["Untriaged"] = "UNTRIAGED";
 })(ShepherdAlertStatus = exports.ShepherdAlertStatus || (exports.ShepherdAlertStatus = {}));
 var ShepherdAlertTemplateType;

package/out/graphql/minimal-graphql-runner.d.ts

@@ -11,10 +11,8 @@ export declare class OutdatedClientVersionError extends UserError {
 }
 export declare class GraphQLProviderServiceError extends BaseError {
     private readonly userError;
-    private readonly requestId;
     constructor(userError: boolean, requestId: string | undefined, errors: GraphQLError[]);
     isUserError(): boolean;
-    getAttributes(): Record<string, any>;
 }
 export declare class GraphqlError extends Error {
     constructor(data: any, requestId?: string);

package/out/graphql/minimal-graphql-runner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"minimal-graphql-runner.d.ts","sourceRoot":"","sources":["../../src/graphql/minimal-graphql-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAY,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAIjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAQjD,qBAAa,0BAA2B,SAAQ,SAAS;CAAG;AAI5D,qBAAa,0BAA2B,SAAQ,SAAS;;CAIxD;AAED,qBAAa,2BAA4B,SAAQ,SAAS;IAEtD,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,SAAS;gBADT,SAAS,EAAE,OAAO,EAClB,SAAS,EAAE,MAAM,GAAG,SAAS,EAC9C,MAAM,EAAE,YAAY,EAAE;IAIjB,WAAW,IAAI,OAAO;IAItB,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAM5C;AAED,qBAAa,YAAa,SAAQ,KAAK;gBACzB,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,MAAM;CAG1C;AAED,qBAAa,oBAAqB,YAAW,aAAa;IAEtD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAFV,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,UAAU,GAAG,SAAS;IAGxC,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU;;;;IAkCjE,SAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,mBAAmB;IAMpF,UAAU,CAAC,mBAAmB,EAAE,mBAAmB,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAWtF,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,gBAAgB;YAIV,4BAA4B;IAgB1C,OAAO,CAAC,YAAY;CAUrB"}
+{"version":3,"file":"minimal-graphql-runner.d.ts","sourceRoot":"","sources":["../../src/graphql/minimal-graphql-runner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAG1D,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAY,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAIjD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAQjD,qBAAa,0BAA2B,SAAQ,SAAS;CAAG;AAI5D,qBAAa,0BAA2B,SAAQ,SAAS;;CAIxD;AAED,qBAAa,2BAA4B,SAAQ,SAAS;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE;IAG/F,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,YAAa,SAAQ,KAAK;gBACzB,IAAI,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,MAAM;CAG1C;AAED,qBAAa,oBAAqB,YAAW,aAAa;IAEtD,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAFV,aAAa,EAAE,aAAa,EAC5B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,UAAU,GAAG,SAAS;IAGxC,GAAG,CAAC,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU;;;;IAkCjE,SAAS,CAAC,sBAAsB,CAAC,QAAQ,EAAE,MAAM,EAAE,mBAAmB,EAAE,mBAAmB;IAMpF,UAAU,CAAC,mBAAmB,EAAE,mBAAmB,GAAG;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE;IAWtF,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,gBAAgB;YAIV,4BAA4B;IAgB1C,OAAO,CAAC,YAAY;CAUrB"}

package/out/graphql/minimal-graphql-runner.js

@@ -17,16 +17,12 @@ class OutdatedClientVersionError extends shared_1.UserError {
 exports.OutdatedClientVersionError = OutdatedClientVersionError;
 class GraphQLProviderServiceError extends shared_1.BaseError {
     constructor(userError, requestId, errors) {
-        super(`${ui_1.Text.graphQL.error}: ${JSON.stringify(errors)}, requestId=${requestId || 'unknown'}`);
+        super(requestId, `${ui_1.Text.graphQL.error}: ${JSON.stringify(errors)}, requestId=${requestId || 'unknown'}`);
         this.userError = userError;
-        this.requestId = requestId;
     }
     isUserError() {
         return this.userError;
     }
-    getAttributes() {
-        return Object.assign(Object.assign({}, super.getAttributes()), { requestId: this.requestId });
-    }
 }
 exports.GraphQLProviderServiceError = GraphQLProviderServiceError;
 class GraphqlError extends Error {

package/out/graphql/mutation-aware-graphql-client.d.ts

@@ -6,7 +6,7 @@ export declare class UnexpectedGraphQlResponseError extends BaseError {
 export declare class GraphQlMutationError extends UnexpectedGraphQlResponseError {
     private readonly code;
     private readonly statusCode;
-    private readonly requestId;
+    readonly requestId: string | undefined;
     constructor(message: string, { requestId, code, statusCode }: {
         requestId: string | undefined;
         code?: string;
@@ -16,7 +16,6 @@ export declare class GraphQlMutationError extends UnexpectedGraphQlResponseError
     getStatusCode: () => number | undefined;
     getRequestId: () => string | undefined;
     isUserError(): boolean;
-    getAttributes(): Record<string, any>;
 }
 export declare class MutationAwareGraphQLClient implements GraphQLClient {
     private readonly runner;

package/out/graphql/mutation-aware-graphql-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutation-aware-graphql-client.d.ts","sourceRoot":"","sources":["../../src/graphql/mutation-aware-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,qBAAa,8BAA+B,SAAQ,SAAS;CAAG;AAChE,qBAAa,oBAAqB,SAAQ,8BAA8B;IACtE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;gBAG7C,OAAO,EAAE,MAAM,EACf,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE;QAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;IAQxG,OAAO,QAAO,MAAM,CAElB;IAEF,aAAa,QAAO,MAAM,GAAG,SAAS,CAEpC;IAEF,YAAY,QAAO,MAAM,GAAG,SAAS,CAEnC;IAEK,WAAW,IAAI,OAAO;IAItB,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;CAM5C;AAED,qBAAa,0BAA2B,YAAW,aAAa;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAErC,MAAM,CAAC,MAAM,SAAS,MAAM,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU;;;;IAuBhG,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU;;;CAI/E"}
+{"version":3,"file":"mutation-aware-graphql-client.d.ts","sourceRoot":"","sources":["../../src/graphql/mutation-aware-graphql-client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,kBAAkB,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEtC,qBAAa,8BAA+B,SAAQ,SAAS;CAAG;AAChE,qBAAa,oBAAqB,SAAQ,8BAA8B;IACtE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAqB;IAChD,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;gBAGrC,OAAO,EAAE,MAAM,EACf,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE;QAAE,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,UAAU,CAAC,EAAE,MAAM,CAAA;KAAE;IAQxG,OAAO,QAAO,MAAM,CAElB;IAEF,aAAa,QAAO,MAAM,GAAG,SAAS,CAEpC;IAEF,YAAY,QAAO,MAAM,GAAG,SAAS,CAEnC;IAEK,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,0BAA2B,YAAW,aAAa;IAClD,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,aAAa;IAErC,MAAM,CAAC,MAAM,SAAS,MAAM,kBAAkB,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU;;;;IAuBhG,KAAK,CAAC,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU;;;CAI/E"}

package/out/graphql/mutation-aware-graphql-client.js

@@ -7,7 +7,7 @@ class UnexpectedGraphQlResponseError extends shared_1.BaseError {
 exports.UnexpectedGraphQlResponseError = UnexpectedGraphQlResponseError;
 class GraphQlMutationError extends UnexpectedGraphQlResponseError {
     constructor(message, { requestId, code, statusCode }) {
-        super(message);
+        super(requestId, message);
         this.getCode = () => {
             return this.code;
         };
@@ -24,9 +24,6 @@ class GraphQlMutationError extends UnexpectedGraphQlResponseError {
     isUserError() {
         return Boolean(this.statusCode && this.statusCode >= 400 && this.statusCode < 500);
     }
-    getAttributes() {
-        return Object.assign(Object.assign({}, super.getAttributes()), { requestId: this.getRequestId() });
-    }
 }
 exports.GraphQlMutationError = GraphQlMutationError;
 class MutationAwareGraphQLClient {

package/out/shared/error-handling.d.ts

@@ -1,12 +1,16 @@
 import { Logger } from '../ui';
 export declare class BaseError extends Error implements ErrorWithAnalytics {
+    protected readonly requestId?: string | undefined;
+    constructor(requestId?: string | undefined, message?: string);
     getAttributes(): Record<string, any>;
     isUserError(): boolean;
 }
 export declare class UserError extends BaseError {
+    constructor(message?: string, requestId?: string | undefined);
     isUserError(): boolean;
 }
 export declare class HiddenError extends BaseError {
+    constructor(message?: string, requestId?: string | undefined);
 }
 export declare const exitOnError: (logger: Logger, error?: Error, hint?: string | null) => Promise<never>;
 export declare const wrapError: (error: unknown) => Error;

package/out/shared/error-handling.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"error-handling.d.ts","sourceRoot":"","sources":["../../src/shared/error-handling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAI/B,qBAAa,SAAU,SAAQ,KAAM,YAAW,kBAAkB;IACzD,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAKpC,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,SAAU,SAAQ,SAAS;IAC/B,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,WAAY,SAAQ,SAAS;CAAG;AAgB7C,eAAO,MAAM,WAAW,WAAkB,MAAM,UAAU,KAAK,SAAS,MAAM,GAAG,IAAI,KAAG,QAAQ,KAAK,CAsBpG,CAAC;AAOF,eAAO,MAAM,SAAS,UAAW,OAAO,KAAG,KAK1C,CAAC;AAMF,eAAO,MAAM,aAAa,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,KAAK,IAAI,KAIhE,CAAC;AAKF,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC;CAClE;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,cAAe,SAAQ,SAAS;CAAG"}
+{"version":3,"file":"error-handling.d.ts","sourceRoot":"","sources":["../../src/shared/error-handling.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAI/B,qBAAa,SAAU,SAAQ,KAAM,YAAW,kBAAkB;IACpD,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC;gBAAV,SAAS,CAAC,oBAAoB,EAAE,OAAO,CAAC,EAAE,MAAM;IAIxE,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;IAMpC,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,SAAU,SAAQ,SAAS;gBAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS;IAIrD,WAAW,IAAI,OAAO;CAG9B;AAED,qBAAa,WAAY,SAAQ,SAAS;gBAC5B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS;CAG7D;AAgBD,eAAO,MAAM,WAAW,WAAkB,MAAM,UAAU,KAAK,SAAS,MAAM,GAAG,IAAI,KAAG,QAAQ,KAAK,CAsBpG,CAAC;AAOF,eAAO,MAAM,SAAS,UAAW,OAAO,KAAG,KAK1C,CAAC;AAMF,eAAO,MAAM,aAAa,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC,KAAK,IAAI,KAIhE,CAAC;AAKF,MAAM,WAAW,kBAAkB;IACjC,aAAa,EAAE,MAAM,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,OAAO,CAAC,CAAC;CAClE;AAED,qBAAa,eAAgB,SAAQ,SAAS;CAAG;AAEjD,qBAAa,cAAe,SAAQ,SAAS;CAAG"}

package/out/shared/error-handling.js

@@ -5,9 +5,14 @@ const tslib_1 = require("tslib");
 const ui_1 = require("../ui");
 const Sentry = tslib_1.__importStar(require("@sentry/node"));
 class BaseError extends Error {
+    constructor(requestId, message) {
+        super(message);
+        this.requestId = requestId;
+    }
     getAttributes() {
         return {
-            isUserError: this.isUserError()
+            isUserError: this.isUserError(),
+            requestId: this.requestId
         };
     }
     isUserError() {
@@ -16,12 +21,18 @@ class BaseError extends Error {
 }
 exports.BaseError = BaseError;
 class UserError extends BaseError {
+    constructor(message, requestId) {
+        super(requestId, message);
+    }
     isUserError() {
         return true;
     }
 }
 exports.UserError = UserError;
 class HiddenError extends BaseError {
+    constructor(message, requestId) {
+        super(requestId, message);
+    }
 }
 exports.HiddenError = HiddenError;
 function removePrefixFromErrorMessage(message) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "3.11.0-next.4",
+  "version": "3.11.0-next.6",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -37,7 +37,7 @@
     "launchdarkly-node-client-sdk": "^2.0.3",
     "node-fetch": "2.6.7",
     "ora": "^4.0.3",
-    "recursive-readdir": "^2.2.2",
+    "recursive-readdir": "^2.2.3",
     "terminal-link": "^2.1.1",
     "tmp": "^0.1.0",
     "typescript": "^4.8.4",
@@ -60,7 +60,7 @@
     "@types/jest": "^29.1.2",
     "@types/js-yaml": "^3.12.2",
     "@types/node-fetch": "^2.5.7",
-    "@types/recursive-readdir": "^2.2.0",
+    "@types/recursive-readdir": "^2.2.1",
     "@types/tmp": "^0.1.0",
     "@types/unzipper": "^0.10.1",
     "graphql-tools": "^6.2.4",