Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(service-spec): allow having type object in reference types and having anyOf or oneOf in RecordLikeObject #1369

Merged
merged 8 commits into from
Oct 17, 2024
+49 −0
Merged

fix(service-spec): allow having type object in reference types and having anyOf or oneOf in RecordLikeObject #1369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c62ec8e
fix(dms): add a temporary patch to fix the missing Settings property
moelasmar Oct 17, 2024
ba1af10
test
moelasmar Oct 17, 2024
26cc128
chore: self mutation
invalid-email-address Oct 17, 2024
b4fc14e
fix schema
moelasmar Oct 17, 2024
09b5c27
Merge remote-tracking branch 'origin/melasmar/dms-fix' into melasmar/…
moelasmar Oct 17, 2024
a01be51
fix schema by adding anyOf property to RecordLikeObject
moelasmar Oct 17, 2024
ad8a8ad
chore: self mutation
invalid-email-address Oct 17, 2024
5b2cbf3
revert dms temp patch
moelasmar Oct 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions packages/@aws-cdk/service-spec-importers/schemas/CloudFormationRegistryResource.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,19 @@
"description": "FIXME: should be required but some service teams have omitted it.",
"type": "boolean"
},
"anyOf": {
"items": {
"anyOf": [
{
"$ref": "#/definitions/CommonTypeCombinatorFields"
},
{
"$ref": "#/definitions/jsonschema.RecordLikeObject"
}
]
},
"type": "array"
},
"description": {
"type": "string"
},
Expand Down Expand Up @@ -634,6 +647,10 @@
},
"title": {
"type": "string"
},
"type": {
"const": "object",
"type": "string"
}
},
"required": [
Expand Down
30 changes: 30 additions & 0 deletions packages/@aws-cdk/service-spec-importers/schemas/SamTemplateSchema.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,19 @@
"description": "FIXME: should be required but some service teams have omitted it.",
"type": "boolean"
},
"anyOf": {
"items": {
"anyOf": [
{
"$ref": "#/definitions/CommonTypeCombinatorFields"
},
{
"$ref": "#/definitions/jsonschema.RecordLikeObject"
}
]
},
"type": "array"
},
"description": {
"type": "string"
},
Expand Down Expand Up @@ -392,6 +405,10 @@
},
"title": {
"type": "string"
},
"type": {
"const": "object",
"type": "string"
}
},
"required": [
Expand Down Expand Up @@ -483,6 +500,19 @@
"description": "FIXME: should be required but some service teams have omitted it.",
"type": "boolean"
},
"anyOf": {
"items": {
"anyOf": [
{
"$ref": "#/definitions/CommonTypeCombinatorFields"
},
{
"$ref": "#/definitions/jsonschema.RecordLikeObject"
}
]
},
"type": "array"
},
"definitions": {
"additionalProperties": {
"$ref": "#/definitions/jsonschema.Schema"
Expand Down
2 changes: 2 additions & 0 deletions packages/@aws-cdk/service-spec-importers/src/types/registry-schema/JsonSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ export namespace jsonschema {
}

export interface Reference extends Annotatable {
readonly type?: 'object';
readonly $ref: string;

/**
Expand Down Expand Up @@ -161,6 +162,7 @@ export namespace jsonschema {
readonly properties: ObjectProperties;
readonly required?: string[];
readonly oneOf?: (CommonTypeCombinatorFields | RecordLikeObject)[];
readonly anyOf?: (CommonTypeCombinatorFields | RecordLikeObject)[];
/**
* FIXME: should be required but some service teams have omitted it.
*/
Expand Down
Loading