@forge/lint 0.0.0-experimental-29a2cc1 → 0.0.0-experimental-c3effe3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/CHANGELOG.md +14 -4
  2. package/out/lint/linters/permission-linter/permission-linter.d.ts +2 -0
  3. package/out/lint/linters/permission-linter/permission-linter.d.ts.map +1 -1
  4. package/out/lint/linters/permission-linter/permission-linter.js +16 -5
  5. package/out/lint/linters/permission-linter/verifiers/external-fetch-verifier.d.ts +0 -1
  6. package/out/lint/linters/permission-linter/verifiers/external-fetch-verifier.d.ts.map +1 -1
  7. package/out/lint/linters/permission-linter/verifiers/external-fetch-verifier.js +1 -12
  8. package/package.json +3 -4
package/CHANGELOG.md CHANGED
@@ -1,17 +1,27 @@
1
1
  # @forge/lint
2
2
 
3
- ## 0.0.0-experimental-29a2cc1
3
+ ## 0.0.0-experimental-c3effe3
4
+
5
+ ### Minor Changes
6
+
7
+ - 8309725: FORGEPAPA-959 - Add support for linting against JSW and JSM open api
4
8
 
5
9
  ### Patch Changes
6
10
 
7
11
  - 7fe19b4: More resilient linting against handler exports
8
12
  - Updated dependencies [69f42bd]
9
13
  - Updated dependencies [b447be2]
10
- - Updated dependencies [4d1c111]
14
+ - Updated dependencies [189ba71]
11
15
  - Updated dependencies [4285fc3]
12
16
  - Updated dependencies [74e00c8]
13
- - @forge/cli-shared@0.0.0-experimental-29a2cc1
14
- - @forge/manifest@0.0.0-experimental-29a2cc1
17
+ - @forge/cli-shared@0.0.0-experimental-c3effe3
18
+ - @forge/manifest@0.0.0-experimental-c3effe3
19
+
20
+ ## 3.2.0-next.5
21
+
22
+ ### Minor Changes
23
+
24
+ - 8309725: FORGEPAPA-959 - Add support for linting against JSW and JSM open api
15
25
 
16
26
  ## 3.1.3-next.4
17
27
 
package/out/lint/linters/permission-linter/permission-linter.d.ts CHANGED
@@ -22,6 +22,8 @@ interface PermissionLintCriteriaMatches {
22
22
  export declare class PermissionLinter extends BaseLinter<ApiCall, PermissionLintCriteriaMatches, ApiCall[]> {
23
23
  private manifest;
24
24
  static JIRA_CACHE_KEY: string;
25
+ static JSM_CACHE_KEY: string;
26
+ static JSW_CACHE_KEY: string;
25
27
  static CONFLUENCE_CACHE_KEY: string;
26
28
  private jira?;
27
29
  private confluence?;
package/out/lint/linters/permission-linter/permission-linter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"permission-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/permission-linter/permission-linter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAe,MAAM,iBAAiB,CAAC;AAE/E,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,eAAe,EACf,cAAc,EACd,cAAc,EACd,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAML,WAAW,EAGZ,MAAM,aAAa,CAAC;AAUrB,UAAU,aAAa;IACrB,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;KAC7B,CAAC;CACH;AAED,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAKhD,eAAO,MAAM,sBAAsB,WACzB,cAAc,EAAE,YACd,cAAc,EAAE,mBACT,mBAAmB,GAAG,gCAAgC,GAAG,+BAA+B,uCAExG,GAAG,CAAC,MAAM,CAkBZ,CAAC;AAEF,eAAO,MAAM,qBAAqB,WACxB,cAAc,EAAE,YACd,cAAc,EAAE,SACnB,YAAY,KAClB,OAAO,CAAC,YAAY,CAsEtB,CAAC;AAEF,UAAU,6BAA6B;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC;IACzB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,EAAE,CAAC;IAQhE,OAAO,CAAC,QAAQ;IAPjD,MAAM,CAAC,cAAc,SAAgC;IACrD,MAAM,CAAC,oBAAoB,SAAsC;IAEjE,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,UAAU,CAAC,CAA0B;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAa;gBAEf,WAAW,EAAE,MAAM,EAAU,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU;IAIlE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IA4CvC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAajD,SAAS,CAAC,QAAQ,IACd,CAAC,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC,GACtG,SAAS;IAIb,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAsB3D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAWtE,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAKrE,OAAO,CAAC,YAAY;CAarB"}
1
+ {"version":3,"file":"permission-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/permission-linter/permission-linter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAe,MAAM,iBAAiB,CAAC;AAE/E,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,eAAe,EACf,cAAc,EACd,cAAc,EACd,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAML,WAAW,EAGZ,MAAM,aAAa,CAAC;AAUrB,UAAU,aAAa;IACrB,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;KAC7B,CAAC;CACH;AAED,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAKhD,eAAO,MAAM,sBAAsB,WACzB,cAAc,EAAE,YACd,cAAc,EAAE,mBACT,mBAAmB,GAAG,gCAAgC,GAAG,+BAA+B,uCAExG,GAAG,CAAC,MAAM,CAkBZ,CAAC;AAEF,eAAO,MAAM,qBAAqB,WACxB,cAAc,EAAE,YACd,cAAc,EAAE,SACnB,YAAY,KAClB,OAAO,CAAC,YAAY,CAsEtB,CAAC;AAEF,UAAU,6BAA6B;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC;IACzB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,EAAE,CAAC;IAUhE,OAAO,CAAC,QAAQ;IATjD,MAAM,CAAC,cAAc,SAAgC;IACrD,MAAM,CAAC,aAAa,SAA+B;IACnD,MAAM,CAAC,aAAa,SAA+B;IACnD,MAAM,CAAC,oBAAoB,SAAsC;IAEjE,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,UAAU,CAAC,CAA0B;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAa;gBAEf,WAAW,EAAE,MAAM,EAAU,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU;IAIlE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgEvC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAajD,SAAS,CAAC,QAAQ,IACd,CAAC,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC,GACtG,SAAS;IAIb,SAAS,CAAC,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAsB3D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAWtE,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAKrE,OAAO,CAAC,YAAY;CAarB"}
package/out/lint/linters/permission-linter/permission-linter.js CHANGED
@@ -84,20 +84,29 @@ class PermissionLinter extends base_linter_1.default {
84
84
  this.cache = cli_shared_1.CachedConf.getCache(CACHE_KEY);
85
85
  const LOCAL_CONF_SWAGGER = process.env.LOCAL_CONF_SWAGGER;
86
86
  const LOCAL_JIRA_SWAGGER = process.env.LOCAL_JIRA_SWAGGER;
87
+ const LOCAL_JSM_SWAGGER = process.env.LOCAL_JSM_SWAGGER;
88
+ const LOCAL_JSW_SWAGGER = process.env.LOCAL_JSW_SWAGGER;
87
89
  const USE_LOCAL_SWAGGER = process.env.USE_LOCAL_SWAGGER;
88
90
  let swaggerFiles;
89
- if (USE_LOCAL_SWAGGER && LOCAL_CONF_SWAGGER && LOCAL_JIRA_SWAGGER) {
90
- swaggerFiles = [this.getProductPathsFile(LOCAL_JIRA_SWAGGER), this.getProductPathsFile(LOCAL_CONF_SWAGGER)];
91
+ if (USE_LOCAL_SWAGGER && LOCAL_CONF_SWAGGER && LOCAL_JIRA_SWAGGER && LOCAL_JSM_SWAGGER && LOCAL_JSW_SWAGGER) {
92
+ swaggerFiles = [
93
+ this.getProductPathsFile(LOCAL_JIRA_SWAGGER),
94
+ this.getProductPathsFile(LOCAL_JSM_SWAGGER),
95
+ this.getProductPathsFile(LOCAL_JSW_SWAGGER),
96
+ this.getProductPathsFile(LOCAL_CONF_SWAGGER)
97
+ ];
91
98
  }
92
99
  else {
93
100
  swaggerFiles = [
94
101
  this.getProductPaths(PermissionLinter.JIRA_CACHE_KEY, 'https://developer.atlassian.com/cloud/jira/platform/swagger-v3.v3.json'),
102
+ this.getProductPaths(PermissionLinter.JSM_CACHE_KEY, 'https://developer.atlassian.com/cloud/jira/service-desk/swagger.v3.json'),
103
+ this.getProductPaths(PermissionLinter.JSW_CACHE_KEY, 'https://developer.atlassian.com/cloud/jira/software/swagger.v3.json'),
95
104
  this.getProductPaths(PermissionLinter.CONFLUENCE_CACHE_KEY, 'https://developer.atlassian.com/cloud/confluence/swagger.v3.json')
96
105
  ];
97
106
  }
98
- const [jira, confluence] = await Promise.all(swaggerFiles);
99
- this.jira = this.processPaths(jira.paths);
100
- this.confluence = this.processPaths(confluence.paths);
107
+ const [jiraSwagger, jsmSwagger, jswSwagger, confluenceSwagger] = await Promise.all(swaggerFiles);
108
+ this.jira = this.processPaths(Object.assign(Object.assign(Object.assign({}, jiraSwagger.paths), jsmSwagger.paths), jswSwagger.paths));
109
+ this.confluence = this.processPaths(confluenceSwagger.paths);
101
110
  this.nodeVisitors = [
102
111
  new visitors_1.ProductNodeVisitor(),
103
112
  new visitors_1.UIHookNodeVisitor(),
@@ -176,4 +185,6 @@ class PermissionLinter extends base_linter_1.default {
176
185
  }
177
186
  exports.PermissionLinter = PermissionLinter;
178
187
  PermissionLinter.JIRA_CACHE_KEY = 'permissions-jira-cache-key';
188
+ PermissionLinter.JSM_CACHE_KEY = 'permissions-jsm-cache-key';
189
+ PermissionLinter.JSW_CACHE_KEY = 'permissions-jsw-cache-key';
179
190
  PermissionLinter.CONFLUENCE_CACHE_KEY = 'permissions-confluence-cache-key';
package/out/lint/linters/permission-linter/verifiers/external-fetch-verifier.d.ts CHANGED
@@ -3,7 +3,6 @@ import { LintClass, LintResultRule } from '../../../linter-interface';
3
3
  import { BaseLintIssueVerifier, LintIssueVerifier } from '../../verifier-interface';
4
4
  import { ExternalApiCall } from '../api-call-interface';
5
5
  export declare class ExternalFetchVerifier extends BaseLintIssueVerifier implements LintIssueVerifier<ExternalApiCall[]> {
6
- private egressFilteringService;
7
6
  constructor(environment: string, manifest: Manifest);
8
7
  protected getLintClass(): LintClass;
9
8
  private extractDomain;
package/out/lint/linters/permission-linter/verifiers/external-fetch-verifier.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"external-fetch-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/external-fetch-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAGlE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAIxD,qBAAa,qBAAsB,SAAQ,qBAAsB,YAAW,iBAAiB,CAAC,eAAe,EAAE,CAAC;IAC9G,OAAO,CAAC,sBAAsB,CAAyB;gBAE3C,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAenD,SAAS,CAAC,YAAY,IAAI,SAAS;IAInC,OAAO,CAAC,aAAa,CAMnB;IAEW,OAAO,CAAC,UAAU,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAc/E"}
1
+ {"version":3,"file":"external-fetch-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/external-fetch-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAElE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAIxD,qBAAa,qBAAsB,SAAQ,qBAAsB,YAAW,iBAAiB,CAAC,eAAe,EAAE,CAAC;gBAClG,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAInD,SAAS,CAAC,YAAY,IAAI,SAAS;IAInC,OAAO,CAAC,aAAa,CAMnB;IAEW,OAAO,CAAC,UAAU,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;CAY/E"}
package/out/lint/linters/permission-linter/verifiers/external-fetch-verifier.js CHANGED
@@ -1,14 +1,12 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ExternalFetchVerifier = void 0;
4
- const csp_1 = require("@forge/csp");
5
4
  const linter_interface_1 = require("../../../linter-interface");
6
5
  const verifier_interface_1 = require("../../verifier-interface");
7
6
  const text_1 = require("../../../text");
8
7
  const url_1 = require("url");
9
8
  class ExternalFetchVerifier extends verifier_interface_1.BaseLintIssueVerifier {
10
9
  constructor(environment, manifest) {
11
- var _a, _b, _c, _d, _e, _f, _g;
12
10
  super(environment, manifest);
13
11
  this.extractDomain = (fetchCall) => {
14
12
  try {
@@ -18,21 +16,12 @@ class ExternalFetchVerifier extends verifier_interface_1.BaseLintIssueVerifier {
18
16
  return fetchCall.url;
19
17
  }
20
18
  };
21
- const allowList = (_e = (_d = (_c = (_b = (_a = this.manifest) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.external) === null || _c === void 0 ? void 0 : _c.fetch) === null || _d === void 0 ? void 0 : _d.backend) !== null && _e !== void 0 ? _e : [];
22
- const remoteList = (_g = (_f = this.manifest) === null || _f === void 0 ? void 0 : _f.remotes) !== null && _g !== void 0 ? _g : [];
23
- const collectedUrls = allowList.filter((item) => typeof item === 'string');
24
- const collectedRemotes = allowList
25
- .map((item) => { var _a; return typeof item !== 'string' && ((_a = remoteList.find((remoteItem) => remoteItem.key === item.remote)) === null || _a === void 0 ? void 0 : _a.baseUrl); })
26
- .filter((x) => typeof x === 'string');
27
- this.egressFilteringService = new csp_1.EgressFilteringService(collectedUrls.concat(collectedRemotes));
28
19
  }
29
20
  getLintClass() {
30
21
  return linter_interface_1.LintClass.Error;
31
22
  }
32
23
  async process(fetchCalls) {
33
- return fetchCalls
34
- .filter(({ url }) => !this.egressFilteringService.isValidUrl(url))
35
- .map((fetchCall) => ({
24
+ return fetchCalls.map((fetchCall) => ({
36
25
  class: this.getLintClass(),
37
26
  message: text_1.messages.verifiers.externalFetch.message(fetchCall.url),
38
27
  reference: text_1.messages.verifiers.externalFetch.reference,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/lint",
3
- "version": "0.0.0-experimental-29a2cc1",
3
+ "version": "0.0.0-experimental-c3effe3",
4
4
  "description": "Linting for forge apps",
5
5
  "main": "out/index.js",
6
6
  "license": "UNLICENSED",
@@ -15,9 +15,8 @@
15
15
  "@types/node-fetch": "^2.5.7"
16
16
  },
17
17
  "dependencies": {
18
- "@forge/cli-shared": "0.0.0-experimental-29a2cc1",
19
- "@forge/csp": "1.11.0",
20
- "@forge/manifest": "0.0.0-experimental-29a2cc1",
18
+ "@forge/cli-shared": "0.0.0-experimental-c3effe3",
19
+ "@forge/manifest": "0.0.0-experimental-c3effe3",
21
20
  "@typescript-eslint/typescript-estree": "^3.5.0",
22
21
  "cross-spawn": "^7.0.1",
23
22
  "node-fetch": "2.6.1",