Skip to content

Commit 7b8b1de

Browse files
fix(ipa): refactor, rename pluralization ignore list (#929)
1 parent 7ce2ba8 commit 7b8b1de

15 files changed

+39
-38
lines changed

tools/spectral/ipa/rulesets/IPA-104.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ rules:
112112
##### Configuration
113113
This rule includes two configuration options:
114114
- `methodName`: The verb to be used in the OperationIds
115-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
115+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
116116
message: '{{error}} https://mdb.link/mongodb-atlas-openapi-validation#xgen-IPA-104-valid-operation-id'
117117
severity: warn
118118
given: '#GetOperationObject'
119119
then:
120120
function: 'IPA104ValidOperationID'
121121
functionOptions:
122122
methodName: 'get'
123-
ignorePluralizationList:
123+
ignoreSingularizationList:
124124
- 'Fts'

tools/spectral/ipa/rulesets/IPA-105.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,13 @@ rules:
9292
##### Configuration
9393
This rule includes two configuration options:
9494
- `methodName`: The verb to be used in the OperationIds
95-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
95+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
9696
message: '{{error}} https://mdb.link/mongodb-atlas-openapi-validation#xgen-IPA-105-valid-operation-id'
9797
severity: warn
9898
given: '#GetOperationObject'
9999
then:
100100
function: 'IPA105ValidOperationID'
101101
functionOptions:
102102
methodName: 'list'
103-
ignorePluralizationList:
103+
ignoreSingularizationList:
104104
- 'Fts'

tools/spectral/ipa/rulesets/IPA-106.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ rules:
126126
##### Configuration
127127
This rule includes two configuration options:
128128
- `methodName`: The verb to be used in the OperationIds
129-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
129+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
130130
message: '{{error}} https://mdb.link/mongodb-atlas-openapi-validation#xgen-IPA-106-valid-operation-id'
131131
severity: warn
132132
given: '#CreateOperationObject'
133133
then:
134134
function: 'IPA106ValidOperationID'
135135
functionOptions:
136136
methodName: 'create'
137-
ignorePluralizationList:
137+
ignoreSingularizationList:
138138
- 'Fts'

tools/spectral/ipa/rulesets/IPA-107.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,13 +127,13 @@ rules:
127127
##### Configuration
128128
This rule includes two configuration options:
129129
- `methodName`: The verb to be used in the OperationIds
130-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
130+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
131131
message: '{{error}} https://mdb.link/mongodb-atlas-openapi-validation#xgen-IPA-107-valid-operation-id'
132132
severity: warn
133133
given: '#UpdateOperationObject'
134134
then:
135135
function: 'IPA107ValidOperationID'
136136
functionOptions:
137137
methodName: 'update'
138-
ignorePluralizationList:
138+
ignoreSingularizationList:
139139
- 'Fts'

tools/spectral/ipa/rulesets/IPA-108.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,15 +67,15 @@ rules:
6767
##### Configuration
6868
This rule includes two configuration options:
6969
- `methodName`: The verb to be used in the OperationIds
70-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
70+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
7171
message: '{{error}} https://mdb.link/mongodb-atlas-openapi-validation#xgen-IPA-108-valid-operation-id'
7272
severity: warn
7373
given: '#DeleteOperationObject'
7474
then:
7575
function: 'IPA108ValidOperationID'
7676
functionOptions:
7777
methodName: 'delete'
78-
ignorePluralizationList:
78+
ignoreSingularizationList:
7979
- 'Fts'
8080

8181
functions:

tools/spectral/ipa/rulesets/IPA-109.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,12 +77,12 @@ rules:
7777
7878
##### Configuration
7979
This rule includes one configuration options:
80-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
80+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
8181
message: '{{error}} https://mdb.link/mongodb-atlas-openapi-validation#xgen-IPA-109-valid-operation-id'
8282
severity: warn
8383
given: '#OperationObject'
8484
then:
8585
function: 'IPA109ValidOperationID'
8686
functionOptions:
87-
ignorePluralizationList:
87+
ignoreSingularizationList:
8888
- 'Fts'

tools/spectral/ipa/rulesets/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Rule checks for the following conditions:
158158
##### Configuration
159159
This rule includes two configuration options:
160160
- `methodName`: The verb to be used in the OperationIds
161-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
161+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
162162

163163

164164

@@ -229,7 +229,7 @@ Rule checks for the following conditions:
229229
##### Configuration
230230
This rule includes two configuration options:
231231
- `methodName`: The verb to be used in the OperationIds
232-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
232+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
233233

234234

235235

@@ -325,7 +325,7 @@ Rule checks for the following conditions:
325325
##### Configuration
326326
This rule includes two configuration options:
327327
- `methodName`: The verb to be used in the OperationIds
328-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
328+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
329329

330330

331331

@@ -413,7 +413,7 @@ Rule checks for the following conditions:
413413
##### Configuration
414414
This rule includes two configuration options:
415415
- `methodName`: The verb to be used in the OperationIds
416-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
416+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
417417

418418

419419

@@ -472,7 +472,7 @@ Rule checks for the following conditions:
472472
##### Configuration
473473
This rule includes two configuration options:
474474
- `methodName`: The verb to be used in the OperationIds
475-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
475+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
476476

477477

478478

@@ -536,7 +536,7 @@ Rule checks for the following conditions:
536536

537537
##### Configuration
538538
This rule includes one configuration options:
539-
- `ignorePluralizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
539+
- `ignoreSingularizationList`: Words that are allowed to maintain their assumed plurality (e.g., "Fts")
540540

541541

542542

tools/spectral/ipa/rulesets/functions/IPA104ValidOperationID.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { hasCustomMethodOverride, hasMethodVerbOverride, VERB_OVERRIDE_EXTENSION
44
import { isInvalidGetMethod } from './utils/methodLogic.js';
55
import { validateOperationIdAndReturnErrors } from './utils/validations/validateOperationIdAndReturnErrors.js';
66

7-
export default (input, { methodName, ignorePluralizationList }, { path, documentInventory, rule }) => {
7+
export default (input, { methodName, ignoreSingularizationList }, { path, documentInventory, rule }) => {
88
const ruleName = rule.name;
99
const resourcePath = path[1];
1010
const oas = documentInventory.resolved;
@@ -22,7 +22,7 @@ export default (input, { methodName, ignorePluralizationList }, { path, document
2222
if (hasMethodVerbOverride(input, methodName)) {
2323
methodName = input[VERB_OVERRIDE_EXTENSION].verb;
2424
}
25-
const errors = validateOperationIdAndReturnErrors(methodName, resourcePath, input, path, ignorePluralizationList);
25+
const errors = validateOperationIdAndReturnErrors(methodName, resourcePath, input, path, ignoreSingularizationList);
2626

2727
return evaluateAndCollectAdoptionStatus(errors, ruleName, input, path);
2828
} catch (e) {

tools/spectral/ipa/rulesets/functions/IPA105ValidOperationID.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { isInvalidListMethod } from './utils/methodLogic.js';
44
import { hasCustomMethodOverride, hasMethodVerbOverride, VERB_OVERRIDE_EXTENSION } from './utils/extensions.js';
55
import { validateOperationIdAndReturnErrors } from './utils/validations/validateOperationIdAndReturnErrors.js';
66

7-
export default (input, { methodName, ignorePluralizationList }, { path, documentInventory, rule }) => {
7+
export default (input, { methodName, ignoreSingularizationList }, { path, documentInventory, rule }) => {
88
const ruleName = rule.name;
99
const resourcePath = path[1];
1010
const oas = documentInventory.resolved;
@@ -23,7 +23,7 @@ export default (input, { methodName, ignorePluralizationList }, { path, document
2323
}
2424

2525
try {
26-
const errors = validateOperationIdAndReturnErrors(methodName, resourcePath, input, path, ignorePluralizationList);
26+
const errors = validateOperationIdAndReturnErrors(methodName, resourcePath, input, path, ignoreSingularizationList);
2727
return evaluateAndCollectAdoptionStatus(errors, ruleName, input, path);
2828
} catch (e) {
2929
return handleInternalError(ruleName, path, e);

tools/spectral/ipa/rulesets/functions/IPA106ValidOperationID.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { isCustomMethodIdentifier } from './utils/resourceEvaluation.js';
33
import { hasCustomMethodOverride, hasMethodVerbOverride, VERB_OVERRIDE_EXTENSION } from './utils/extensions.js';
44
import { validateOperationIdAndReturnErrors } from './utils/validations/validateOperationIdAndReturnErrors.js';
55

6-
export default (input, { methodName, ignorePluralizationList }, { path, rule }) => {
6+
export default (input, { methodName, ignoreSingularizationList }, { path, rule }) => {
77
const ruleName = rule.name;
88
const resourcePath = path[1];
99

@@ -16,7 +16,7 @@ export default (input, { methodName, ignorePluralizationList }, { path, rule })
1616
}
1717

1818
try {
19-
const errors = validateOperationIdAndReturnErrors(methodName, resourcePath, input, path, ignorePluralizationList);
19+
const errors = validateOperationIdAndReturnErrors(methodName, resourcePath, input, path, ignoreSingularizationList);
2020
return evaluateAndCollectAdoptionStatus(errors, ruleName, input, path);
2121
} catch (e) {
2222
return handleInternalError(ruleName, path, e);

0 commit comments

Comments
 (0)