@forge/lint 2.0.1-next.3 → 3.0.0-next.11

package/CHANGELOG.md

@@ -1,10 +1,79 @@
 # @forge/lint
 
+## 3.0.0-next.11
+
+### Patch Changes
+
+- Updated dependencies [8aaa65c]
+  - @forge/manifest@3.1.0-next.9
+  - @forge/cli-shared@2.2.1-next.9
+
+## 3.0.0-next.10
+
+### Patch Changes
+
+- f5d4a636: Fix unhandled error when invalid method used for Product REST API endpoint.
+- Updated dependencies [67d2e17c]
+  - @forge/manifest@3.1.0-next.8
+  - @forge/cli-shared@2.2.1-next.8
+
+## 3.0.0-next.9
+
+### Minor Changes
+
+- 037c31a: Upgrade webpack from 4 to 5 and other relavent packages to fix the issue for node17+ (openssl change)
+
+### Patch Changes
+
+- Updated dependencies [037c31a]
+  - @forge/manifest@3.1.0-next.7
+  - @forge/cli-shared@2.2.1-next.7
+
+## 3.0.0-next.8
+
+### Minor Changes
+
+- 83ca609e: Adding environment variables to override production swagger with local files.
+
+## 3.0.0-next.7
+
+### Patch Changes
+
+- Updated dependencies [7b2d17a]
+  - @forge/manifest@3.1.0-next.6
+  - @forge/cli-shared@2.2.1-next.6
+
+## 3.0.0-next.6
+
+### Major Changes
+
+- 4922d09: Only errors set the process exitCode to 1, warnings do not anymore.
+
+## 2.0.1-next.5
+
+### Patch Changes
+
+- Updated dependencies [f6901fd]
+  - @forge/manifest@3.1.0-next.5
+  - @forge/cli-shared@2.2.1-next.5
+
+## 2.0.1-next.4
+
+### Patch Changes
+
+- 2e70a0b: Accept both granular and deprecated scopes when verifying scopes required for Content Properties.
+- Updated dependencies [d3ccc04]
+  - @forge/manifest@3.1.0-next.4
+  - @forge/cli-shared@2.2.1-next.4
+
 ## 2.0.1-next.3
 
 ### Patch Changes
 
 - 1f7c428: Accept both deprecated scopes and granular scopes when verifying scopes required for REST product endpoints.
+- Updated dependencies [debe251]
+  - @forge/manifest@3.1.0-next.3
+  - @forge/cli-shared@2.2.1-next.3
 
 ## 2.0.1-next.2
 

package/out/lint/lint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/lint/lint.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,MAAM,IAAI,CAAC;AAIpB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAkB,MAAM,oBAAoB,CAAC;AAQxG,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;AAE/C,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,iBAAiB,WAAY,UAAU,eAAe,UAAU,EAAE,4BAAuB,IA6CrG,CAAC;AAEF,eAAO,MAAM,YAAY,gBAAiB,UAAU,EAAE,KAAG,YAQxD,CAAC;AAEF,eAAO,MAAM,eAAe,aAChB,MAAM,UACR,OAAO,QAAQ,oBACN,OAAO,EAAE,CAAC,QAAQ,CAAC,aAAa,KAChD,OAAO,CAAC,SAAS,CAOnB,CAAC;AAEF,eAAO,MAAM,IAAI,gBACF,MAAM,EAAE,YACX,QAAQ,eACL,MAAM,UACX,UAAU,6BAhBR,MAAM,UACR,OAAO,QAAQ,oBACN,OAAO,EAAE,CAAC,QAAQ,CAAC,aAAa,KAChD,OAAO,CAAC,SAAS,CAAC,YAeV,eAAe,EAAE,KAOzB,OAAO,CAAC,UAAU,EAAE,CAmCtB,CAAC;AAEF,eAAO,MAAM,QAAQ,WACX,UAAU,WACV,eAAe,KACtB,OAAO,CAAC,UAAU,EAAE,CAGtB,CAAC"}
+{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/lint/lint.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,MAAM,IAAI,CAAC;AAIpB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAkB,MAAM,oBAAoB,CAAC;AAQxG,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;AAE/C,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,iBAAiB,WAAY,UAAU,eAAe,UAAU,EAAE,4BAAuB,IA+CrG,CAAC;AAEF,eAAO,MAAM,YAAY,gBAAiB,UAAU,EAAE,KAAG,YAQxD,CAAC;AAEF,eAAO,MAAM,eAAe,aAChB,MAAM,UACR,OAAO,QAAQ,oBACN,OAAO,EAAE,CAAC,QAAQ,CAAC,aAAa,KAChD,OAAO,CAAC,SAAS,CAOnB,CAAC;AAEF,eAAO,MAAM,IAAI,gBACF,MAAM,EAAE,YACX,QAAQ,eACL,MAAM,UACX,UAAU,6BAhBR,MAAM,UACR,OAAO,QAAQ,oBACN,OAAO,EAAE,CAAC,QAAQ,CAAC,aAAa,KAChD,OAAO,CAAC,SAAS,CAAC,YAeV,eAAe,EAAE,KAOzB,OAAO,CAAC,UAAU,EAAE,CAmCtB,CAAC;AAEF,eAAO,MAAM,QAAQ,WACX,UAAU,WACV,eAAe,KACtB,OAAO,CAAC,UAAU,EAAE,CAGtB,CAAC"}

package/out/lint/lint.js

@@ -55,7 +55,9 @@ exports.reportLintResults = (logger, lintResults, showSummary = true) => {
                 logger.info(cli_shared_1.Text.lint.noFixableProblems);
             }
         }
-        process.exitCode = 1;
+        if (numErrors) {
+            process.exitCode = 1;
+        }
     }
 };
 exports.problemCount = (lintResults) => {

package/out/lint/linters/permission-linter/permission-linter.d.ts

@@ -32,6 +32,7 @@ export declare class PermissionLinter extends BaseLinter<ApiCall, PermissionLint
     protected getFixer(): ((errors: LintResultRule[], warnings: LintResultRule[], state: LintFixState) => Promise<LintFixState>) | undefined;
     protected addLintCriteriaMatch(apiCall: ApiCall, filepath: string): void;
     getProductPaths(cacheKey: string, url: string): Promise<SwaggerFormat>;
+    getProductPathsFile(url: string): Promise<SwaggerFormat>;
     private processPaths;
 }
 export {};

package/out/lint/linters/permission-linter/permission-linter.d.ts.map

@@ -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;AASrB,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;IAmCvC,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;IAWnF,OAAO,CAAC,YAAY;CAarB"}
+{"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"}

package/out/lint/linters/permission-linter/permission-linter.js

@@ -8,6 +8,7 @@ const base_linter_1 = tslib_1.__importDefault(require("../../base-linter"));
 const api_call_interface_1 = require("./api-call-interface");
 const verifiers_1 = require("./verifiers");
 const visitors_1 = require("./visitors");
+const fs_1 = tslib_1.__importDefault(require("fs"));
 exports.NON_FWD_SLASH_REGEX = '[^\\/\\s]*';
 const CACHE_KEY = 'PERMISSIONS_LINTER';
 const ONE_HOUR_MS = 1000 * 60 * 60;
@@ -81,10 +82,20 @@ class PermissionLinter extends base_linter_1.default {
     }
     async bootstrap() {
         this.cache = cli_shared_1.CachedConf.getCache(CACHE_KEY);
-        const [jira, confluence] = await Promise.all([
-            this.getProductPaths(PermissionLinter.JIRA_CACHE_KEY, 'https://developer.atlassian.com/cloud/jira/platform/swagger-v3.v3.json'),
-            this.getProductPaths(PermissionLinter.CONFLUENCE_CACHE_KEY, 'https://developer.atlassian.com/cloud/confluence/swagger.v3.json')
-        ]);
+        const LOCAL_CONF_SWAGGER = process.env.LOCAL_CONF_SWAGGER;
+        const LOCAL_JIRA_SWAGGER = process.env.LOCAL_JIRA_SWAGGER;
+        const USE_LOCAL_SWAGGER = process.env.USE_LOCAL_SWAGGER;
+        let swaggerFiles;
+        if (USE_LOCAL_SWAGGER && LOCAL_CONF_SWAGGER && LOCAL_JIRA_SWAGGER) {
+            swaggerFiles = [this.getProductPathsFile(LOCAL_JIRA_SWAGGER), this.getProductPathsFile(LOCAL_CONF_SWAGGER)];
+        }
+        else {
+            swaggerFiles = [
+                this.getProductPaths(PermissionLinter.JIRA_CACHE_KEY, 'https://developer.atlassian.com/cloud/jira/platform/swagger-v3.v3.json'),
+                this.getProductPaths(PermissionLinter.CONFLUENCE_CACHE_KEY, 'https://developer.atlassian.com/cloud/confluence/swagger.v3.json')
+            ];
+        }
+        const [jira, confluence] = await Promise.all(swaggerFiles);
         this.jira = this.processPaths(jira.paths);
         this.confluence = this.processPaths(confluence.paths);
         this.nodeVisitors = [
@@ -150,6 +161,10 @@ class PermissionLinter extends base_linter_1.default {
         }
         return cached;
     }
+    async getProductPathsFile(url) {
+        const response = fs_1.default.readFileSync(url);
+        return JSON.parse(response.toString());
+    }
     processPaths(paths) {
         const pathMap = new Map();
         Object.keys(paths).forEach((path) => {

package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts

@@ -1,10 +1,15 @@
 import { LintClass, LintResultRule } from '../../../linter-interface';
 import { BaseLintIssueVerifier, LintIssueVerifier } from '../../verifier-interface';
 import { ContentPropertyApiCall } from '../api-call-interface';
-export declare const CONTENT_PROPERTY_PERMISSIONS_MAP: Record<string, Record<string, string[]>>;
+declare type ContentPropertyPermissions = {
+    current: string[];
+    deprecated: string[];
+};
+export declare const CONTENT_PROPERTY_PERMISSIONS_MAP: Record<string, Record<string, ContentPropertyPermissions>>;
 export declare class ContentPropertyVerifier extends BaseLintIssueVerifier implements LintIssueVerifier<ContentPropertyApiCall[]> {
     protected getLintClass(): LintClass;
     process(apiCalls: ContentPropertyApiCall[]): Promise<LintResultRule[]>;
     private getMissingScopes;
 }
+export {};
 //# sourceMappingURL=content-property-verifier.d.ts.map

package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content-property-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/content-property-verifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,eAAO,MAAM,gCAAgC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAqBrF,CAAC;AAEF,qBAAa,uBACX,SAAQ,qBACR,YAAW,iBAAiB,CAAC,sBAAsB,EAAE,CAAC;IACtD,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAuBnF,OAAO,CAAC,gBAAgB;CAQzB"}
+{"version":3,"file":"content-property-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/content-property-verifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAE/D,aAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAyDvG,CAAC;AAEF,qBAAa,uBACX,SAAQ,qBACR,YAAW,iBAAiB,CAAC,sBAAsB,EAAE,CAAC;IACtD,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAuBnF,OAAO,CAAC,gBAAgB;CAyBzB"}

package/out/lint/linters/permission-linter/verifiers/content-property-verifier.js

@@ -7,24 +7,60 @@ const text_1 = require("../../../text");
 const verifier_interface_1 = require("../../verifier-interface");
 exports.CONTENT_PROPERTY_PERMISSIONS_MAP = {
     onJiraIssue: {
-        get: ['read:jira-work'],
-        set: ['write:jira-work'],
-        delete: ['write:jira-work']
+        get: {
+            current: ['read:issue.property:jira'],
+            deprecated: ['read:jira-work']
+        },
+        set: {
+            current: ['write:issue.property:jira'],
+            deprecated: ['write:jira-work']
+        },
+        delete: {
+            current: ['delete:issue.property:jira'],
+            deprecated: ['write:jira-work']
+        }
     },
     onJiraProject: {
-        get: ['read:jira-work'],
-        set: ['manage:jira-project'],
-        delete: ['manage:jira-project']
+        get: {
+            current: ['read:project.property:jira'],
+            deprecated: ['read:jira-work']
+        },
+        set: {
+            current: ['write:project.property:jira'],
+            deprecated: ['manage:jira-project']
+        },
+        delete: {
+            current: ['delete:project.property:jira'],
+            deprecated: ['manage:jira-project']
+        }
     },
     onConfluencePage: {
-        get: ['read:confluence-props'],
-        set: ['read:confluence-props', 'write:confluence-props'],
-        delete: ['write:confluence-props']
+        get: {
+            current: ['read:content-details:confluence'],
+            deprecated: ['read:confluence-props']
+        },
+        set: {
+            current: ['read:content.property:confluence', 'write:content.property:confluence'],
+            deprecated: ['read:confluence-props', 'write:confluence-props']
+        },
+        delete: {
+            current: ['write:content.property:confluence'],
+            deprecated: ['write:confluence-props']
+        }
     },
     onConfluenceSpace: {
-        get: ['read:confluence-props'],
-        set: ['read:confluence-props', 'write:confluence-props'],
-        delete: ['write:confluence-props']
+        get: {
+            current: ['read:content-details:confluence'],
+            deprecated: ['read:confluence-props']
+        },
+        set: {
+            current: ['read:space.property:confluence', 'write:space.property:confluence'],
+            deprecated: ['read:confluence-props', 'write:confluence-props']
+        },
+        delete: {
+            current: ['write:space.property:confluence'],
+            deprecated: ['write:confluence-props']
+        }
     }
 };
 class ContentPropertyVerifier extends verifier_interface_1.BaseLintIssueVerifier {
@@ -50,10 +86,24 @@ class ContentPropertyVerifier extends verifier_interface_1.BaseLintIssueVerifier
     getMissingScopes({ context, method }) {
         var _a, _b;
         const existingScopes = (_b = (_a = this.manifest) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.scopes;
-        const requiredScopes = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method];
-        if (!existingScopes)
-            return requiredScopes;
-        return requiredScopes.filter((requiredScope) => !existingScopes.includes(requiredScope));
+        const requiredScopesCurrent = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method]['current'];
+        const requiredScopesDeprecated = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method]['deprecated'];
+        const missingCurrentPerms = requiredScopesCurrent.filter((perm) => !(existingScopes === null || existingScopes === void 0 ? void 0 : existingScopes.includes(perm)));
+        if (missingCurrentPerms.length == 0)
+            return [];
+        let missingDeprecatedPerms = null;
+        if (requiredScopesDeprecated) {
+            missingDeprecatedPerms = requiredScopesDeprecated.filter((perm) => !(existingScopes === null || existingScopes === void 0 ? void 0 : existingScopes.includes(perm)));
+            if (missingDeprecatedPerms.length == 0)
+                return [];
+        }
+        if (missingCurrentPerms.length < requiredScopesCurrent.length) {
+            return missingCurrentPerms;
+        }
+        if (missingDeprecatedPerms && missingDeprecatedPerms.length < requiredScopesDeprecated.length) {
+            return missingDeprecatedPerms;
+        }
+        return requiredScopesCurrent;
     }
 }
 exports.ContentPropertyVerifier = ContentPropertyVerifier;

package/out/lint/linters/permission-linter/verifiers/product-verifier.js

@@ -73,23 +73,23 @@ class ProductVerifier extends verifier_interface_1.BaseLintIssueVerifier {
         return missingCurrentScopes;
     }
     getRequiredScopes({ regex, method }) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         if (!regex)
             return [];
-        const oAuth2Scopes = (_a = this.pathMap.get(regex)) === null || _a === void 0 ? void 0 : _a.methods[method]['x-atlassian-oauth2-scopes'];
+        const oAuth2Scopes = (_b = (_a = this.pathMap.get(regex)) === null || _a === void 0 ? void 0 : _a.methods[method]) === null || _b === void 0 ? void 0 : _b['x-atlassian-oauth2-scopes'];
         if (oAuth2Scopes) {
             return array_prototype_flatmap_1.default(oAuth2Scopes.filter((scope) => scope.state === 'Current').map((scope) => scope.scopes), (x) => x);
         }
-        const swaggerEntries = (_c = (_b = this.pathMap.get(regex)) === null || _b === void 0 ? void 0 : _b.methods[method]) === null || _c === void 0 ? void 0 : _c.security;
+        const swaggerEntries = (_d = (_c = this.pathMap.get(regex)) === null || _c === void 0 ? void 0 : _c.methods[method]) === null || _d === void 0 ? void 0 : _d.security;
         if (!swaggerEntries)
             return [];
         return swaggerEntries === null || swaggerEntries === void 0 ? void 0 : swaggerEntries.reduce((prev, curr) => [...prev, ...(curr['OAuth2'] || []), ...(curr['oAuthDefinitions'] || [])], []);
     }
     getRequiredDeprecatedScopes({ regex, method }) {
-        var _a;
+        var _a, _b;
         if (!regex)
             return [];
-        const oAuth2Scopes = (_a = this.pathMap.get(regex)) === null || _a === void 0 ? void 0 : _a.methods[method]['x-atlassian-oauth2-scopes'];
+        const oAuth2Scopes = (_b = (_a = this.pathMap.get(regex)) === null || _a === void 0 ? void 0 : _a.methods[method]) === null || _b === void 0 ? void 0 : _b['x-atlassian-oauth2-scopes'];
         if (!oAuth2Scopes)
             return [];
         return array_prototype_flatmap_1.default(oAuth2Scopes.filter((scope) => scope.state === 'Deprecated').map((scope) => scope.scopes), (x) => x);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/lint",
-  "version": "2.0.1-next.3",
+  "version": "3.0.0-next.11",
   "description": "Linting for forge apps",
   "main": "out/index.js",
   "license": "UNLICENSED",
@@ -11,16 +11,16 @@
   },
   "devDependencies": {
     "@types/cross-spawn": "^6.0.1",
-    "@types/eslint": "^6.8.0",
+    "@types/eslint": "8.2.2",
     "@types/node-fetch": "^2.5.7"
   },
   "dependencies": {
-    "@forge/cli-shared": "2.2.1-next.2",
+    "@forge/cli-shared": "2.2.1-next.9",
     "@forge/csp": "1.9.0",
-    "@forge/manifest": "3.1.0-next.2",
+    "@forge/manifest": "3.1.0-next.9",
     "@typescript-eslint/typescript-estree": "^3.5.0",
     "cross-spawn": "^7.0.1",
-    "node-fetch": "^2.6.1",
+    "node-fetch": "2.6.1",
     "atlassian-openapi": "^1.0.13"
   }
 }