-
Notifications
You must be signed in to change notification settings - Fork 38
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat(config): add support for restrictionKeys (#2602)
## Proposed change As a developer I want to be able to flag a configuration property as sensitive. It was decided to have an array of restriction, named `restrictionKeys` for each property, to support potential future use case with different level of restriction based on the role of the user configuring the property value. This PR includes: - the update of the metadata schema - the extraction of `restrictionKeys` from the jsdoc tags `@o3rRestrictionKeys` - a linter to limit the possible keys used with `@o3rRestrictionKeys` ## Related issues <!-- Please make sure to follow the [contribution guidelines](https://github.com/amadeus-digital/Otter/blob/main/CONTRIBUTING.md) --> *- No issue associated -* <!-- * 🐛 Fix #issue --> <!-- * 🐛 Fix resolves #issue --> <!-- * 🚀 Feature #issue --> <!-- * 🚀 Feature resolves #issue --> <!-- * Pull Request #issue -->
- Loading branch information
Showing
16 changed files
with
428 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
65 changes: 65 additions & 0 deletions
65
docs/linter/eslint-plugin/rules/o3r-restriction-key-tags.md
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
# @o3r/o3r-restriction-key-tags | ||
|
||
Ensures that the tags `@o3rRestrictionKey` are used with correct values. | ||
|
||
> [!WARNING] | ||
> This rule must be configured to be used. | ||
## How to use | ||
|
||
```json | ||
{ | ||
"@o3r/o3r-restriction-key-tags": [ | ||
"error", | ||
{ | ||
"supportedInterfaceNames": ["NestedConfiguration", "Configuration", "CustomConfigurationInterface"], | ||
"supportedKeys": ["restriction", "restriction_with_underscores", "restriction with spaces"] | ||
} | ||
] | ||
} | ||
``` | ||
|
||
## Valid code example | ||
|
||
```typescript | ||
export interface ConfigExample extends Configuration { | ||
/** | ||
* @o3rRestrictionKey restriction_with_underscores | ||
*/ | ||
prop1: string; | ||
/** | ||
* @o3rRestrictionKey restriction | ||
* @o3rRestrictionKey "restriction with spaces" | ||
*/ | ||
prop2: string; | ||
} | ||
``` | ||
|
||
## Invalid code example | ||
|
||
```typescript | ||
export interface ConfigExample extends Configuration { | ||
/** | ||
* @o3rRestrictionKey restriction with spaces | ||
*/ | ||
prop: string; | ||
} | ||
``` | ||
|
||
```typescript | ||
export interface ConfigExample extends Configuration { | ||
/** | ||
* @o3rRestrictionKey unknownRestriction | ||
*/ | ||
prop: string | number; | ||
} | ||
``` | ||
|
||
```typescript | ||
export interface NotAConfigInterface { | ||
/** | ||
* @o3rRestrictionKey restriction | ||
*/ | ||
prop: string; | ||
} | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
131 changes: 131 additions & 0 deletions
131
...int-plugin/src/rules/typescript/o3r-restriction-key-tags/o3r-restriction-key-tags.spec.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,131 @@ | ||
import o3rRestrictionKeyRule, { | ||
O3rRestrictionKeyTagsRuleOption, | ||
} from './o3r-restriction-key-tags'; | ||
const { | ||
RuleTester | ||
} = require('@typescript-eslint/rule-tester'); | ||
|
||
const ruleTester = new RuleTester(); | ||
|
||
const code = ` | ||
export interface Config extends Configuration { | ||
/** | ||
* @o3rRestrictionKey valid | ||
* @o3rRestrictionKey valid_with_underscore | ||
* @o3rRestrictionKey 'valid with space (single quote)' | ||
* @o3rRestrictionKey "valid with space (double quote)" | ||
* @o3rRestrictionKey '"valid" with double quote inside' | ||
* @o3rRestrictionKey "'valid' with single quote inside" | ||
* @o3rRestrictionKey valid_with_number_1 | ||
*/ | ||
prop: string; | ||
} | ||
`; | ||
|
||
const supportedKeys = [ | ||
'valid', | ||
'valid_with_underscore', | ||
'valid with space', | ||
'valid with space (single quote)', | ||
'valid with space (double quote)', | ||
'"valid" with double quote inside', | ||
"'valid' with single quote inside", | ||
'valid_with_number_1' | ||
]; | ||
|
||
const options = [{ supportedKeys }] as const satisfies Readonly<[O3rRestrictionKeyTagsRuleOption]>; | ||
|
||
const unknownKeys = [ | ||
`unknown_restriction`, | ||
`"invalid quote'`, | ||
`'another invalid quote"`, | ||
`'unknown with single quote'`, | ||
`"unknown with double quote"` | ||
]; | ||
|
||
const getCodeFor = (key: string) => ` | ||
export interface Config extends Configuration { | ||
/** | ||
* @o3rRestrictionKey ${key} | ||
*/ | ||
prop: string; | ||
} | ||
`; | ||
|
||
const getSuggestionFor = (actualKey: string) => supportedKeys.map((supportedKey) => ({ | ||
messageId: 'suggestUseSupportedKey', | ||
data: { | ||
actualKey, | ||
supportedKey | ||
}, | ||
output: getCodeFor(/[^\w]/.test(supportedKey) ? `"${supportedKey}"` : supportedKey) | ||
})); | ||
|
||
ruleTester.run('o3r-restriction-key-tags', o3rRestrictionKeyRule, { | ||
valid: [ | ||
{ | ||
code, | ||
options | ||
}, | ||
{ | ||
code: ` | ||
export interface Config extends Configuration { | ||
/** | ||
* Property without restriction | ||
*/ | ||
prop: string; | ||
}`, | ||
options | ||
} | ||
], | ||
invalid: [ | ||
{ | ||
code: getCodeFor('"at least one key provided"'), | ||
options: [{}], | ||
errors: [ | ||
{ messageId: 'noRestrictionKeyProvided' } | ||
] | ||
}, | ||
{ | ||
code: code.replace(' extends Configuration', ''), | ||
options, | ||
errors: [ | ||
{ | ||
messageId: 'notInConfigurationInterface' | ||
} | ||
] | ||
}, | ||
{ | ||
code: getCodeFor('valid with space'), | ||
options, | ||
output: getCodeFor(`"valid with space"`), | ||
errors: [ | ||
{ | ||
messageId: 'notWrapWithQuotes', | ||
data: { | ||
actualKey: 'valid with space' | ||
}, | ||
suggestions: [{ | ||
messageId: 'suggestWrapWithQuotes', | ||
data: { | ||
actualKey: 'valid with space' | ||
}, | ||
output: getCodeFor(`"valid with space"`) | ||
}] | ||
} | ||
] | ||
}, | ||
...unknownKeys.map((key) => ({ | ||
code: getCodeFor(key), | ||
options, | ||
errors: [{ | ||
messageId: 'notSupportedKey', | ||
data: { | ||
actualKey: key, | ||
supportedKeys: supportedKeys.join(', ') | ||
}, | ||
suggestions: getSuggestionFor(key) | ||
}] | ||
})) | ||
] | ||
}); |
Oops, something went wrong.