From f4756eb5d14c7fcbc29e9f5b7197808d23f7cae4 Mon Sep 17 00:00:00 2001 From: Jason Stirnaman Date: Tue, 17 Jan 2023 11:03:28 -0600 Subject: [PATCH] fix: nullable property requires a type: - A nullable property requires a type. - If the property may use one or more subschemas with different types, make each subschema nullable. --- contracts/cloud.json | 26 ++++++++++++-------- contracts/cloud.yml | 10 ++++++-- contracts/common.yml | 10 ++++++-- contracts/oss.json | 26 ++++++++++++-------- contracts/oss.yml | 10 ++++++-- contracts/ref/cloud.yml | 26 ++++++++++++-------- contracts/ref/oss.yml | 26 ++++++++++++-------- src/common/schemas/TemplateEnvReferences.yml | 10 ++++++-- 8 files changed, 96 insertions(+), 48 deletions(-) diff --git a/contracts/cloud.json b/contracts/cloud.json index 64abffc5..c7c6da4a 100644 --- a/contracts/cloud.json +++ b/contracts/cloud.json @@ -15324,37 +15324,43 @@ }, "value": { "description": "Value provided to fulfill reference", - "nullable": true, "oneOf": [ { - "type": "string" + "type": "string", + "nullable": true }, { - "type": "integer" + "type": "integer", + "nullable": true }, { - "type": "number" + "type": "number", + "nullable": true }, { - "type": "boolean" + "type": "boolean", + "nullable": true } ] }, "defaultValue": { "description": "Default value that will be provided for the reference when no value is provided", - "nullable": true, "oneOf": [ { - "type": "string" + "type": "string", + "nullable": true }, { - "type": "integer" + "type": "integer", + "nullable": true }, { - "type": "number" + "type": "number", + "nullable": true }, { - "type": "boolean" + "type": "boolean", + "nullable": true } ] } diff --git a/contracts/cloud.yml b/contracts/cloud.yml index 3c248d8f..c46f66d4 100644 --- a/contracts/cloud.yml +++ b/contracts/cloud.yml @@ -12769,20 +12769,26 @@ components: description: Key identified as environment reference and is the key identified in the template value: description: Value provided to fulfill reference - nullable: true oneOf: - type: string + nullable: true - type: integer + nullable: true - type: number + nullable: true - type: boolean + nullable: true defaultValue: description: Default value that will be provided for the reference when no value is provided - nullable: true oneOf: - type: string + nullable: true - type: integer + nullable: true - type: number + nullable: true - type: boolean + nullable: true required: - resourceField - envRefKey diff --git a/contracts/common.yml b/contracts/common.yml index d0b216f9..746c0cea 100644 --- a/contracts/common.yml +++ b/contracts/common.yml @@ -10934,20 +10934,26 @@ components: description: Key identified as environment reference and is the key identified in the template value: description: Value provided to fulfill reference - nullable: true oneOf: - type: string + nullable: true - type: integer + nullable: true - type: number + nullable: true - type: boolean + nullable: true defaultValue: description: Default value that will be provided for the reference when no value is provided - nullable: true oneOf: - type: string + nullable: true - type: integer + nullable: true - type: number + nullable: true - type: boolean + nullable: true required: - resourceField - envRefKey diff --git a/contracts/oss.json b/contracts/oss.json index 6d27e3e7..75d1d0d6 100644 --- a/contracts/oss.json +++ b/contracts/oss.json @@ -17705,37 +17705,43 @@ }, "value": { "description": "Value provided to fulfill reference", - "nullable": true, "oneOf": [ { - "type": "string" + "type": "string", + "nullable": true }, { - "type": "integer" + "type": "integer", + "nullable": true }, { - "type": "number" + "type": "number", + "nullable": true }, { - "type": "boolean" + "type": "boolean", + "nullable": true } ] }, "defaultValue": { "description": "Default value that will be provided for the reference when no value is provided", - "nullable": true, "oneOf": [ { - "type": "string" + "type": "string", + "nullable": true }, { - "type": "integer" + "type": "integer", + "nullable": true }, { - "type": "number" + "type": "number", + "nullable": true }, { - "type": "boolean" + "type": "boolean", + "nullable": true } ] } diff --git a/contracts/oss.yml b/contracts/oss.yml index b5db1576..644f3e39 100644 --- a/contracts/oss.yml +++ b/contracts/oss.yml @@ -14350,20 +14350,26 @@ components: description: Key identified as environment reference and is the key identified in the template value: description: Value provided to fulfill reference - nullable: true oneOf: - type: string + nullable: true - type: integer + nullable: true - type: number + nullable: true - type: boolean + nullable: true defaultValue: description: Default value that will be provided for the reference when no value is provided - nullable: true oneOf: - type: string + nullable: true - type: integer + nullable: true - type: number + nullable: true - type: boolean + nullable: true required: - resourceField - envRefKey diff --git a/contracts/ref/cloud.yml b/contracts/ref/cloud.yml index afdbd5a3..7a0e5a16 100644 --- a/contracts/ref/cloud.yml +++ b/contracts/ref/cloud.yml @@ -5478,12 +5478,15 @@ components: defaultValue: description: Default value that will be provided for the reference when no value is provided - nullable: true oneOf: - - type: string - - type: integer - - type: number - - type: boolean + - nullable: true + type: string + - nullable: true + type: integer + - nullable: true + type: number + - nullable: true + type: boolean envRefKey: description: Key identified as environment reference and is the key identified in the template @@ -5493,12 +5496,15 @@ components: type: string value: description: Value provided to fulfill reference - nullable: true oneOf: - - type: string - - type: integer - - type: number - - type: boolean + - nullable: true + type: string + - nullable: true + type: integer + - nullable: true + type: number + - nullable: true + type: boolean required: - resourceField - envRefKey diff --git a/contracts/ref/oss.yml b/contracts/ref/oss.yml index 20793253..5bb3b9b7 100644 --- a/contracts/ref/oss.yml +++ b/contracts/ref/oss.yml @@ -5533,12 +5533,15 @@ components: defaultValue: description: Default value that will be provided for the reference when no value is provided - nullable: true oneOf: - - type: string - - type: integer - - type: number - - type: boolean + - nullable: true + type: string + - nullable: true + type: integer + - nullable: true + type: number + - nullable: true + type: boolean envRefKey: description: Key identified as environment reference and is the key identified in the template @@ -5548,12 +5551,15 @@ components: type: string value: description: Value provided to fulfill reference - nullable: true oneOf: - - type: string - - type: integer - - type: number - - type: boolean + - nullable: true + type: string + - nullable: true + type: integer + - nullable: true + type: number + - nullable: true + type: boolean required: - resourceField - envRefKey diff --git a/src/common/schemas/TemplateEnvReferences.yml b/src/common/schemas/TemplateEnvReferences.yml index b6172504..3648eec3 100644 --- a/src/common/schemas/TemplateEnvReferences.yml +++ b/src/common/schemas/TemplateEnvReferences.yml @@ -10,18 +10,24 @@ description: Key identified as environment reference and is the key identified in the template value: description: Value provided to fulfill reference - nullable: true oneOf: - type: string + nullable: true - type: integer + nullable: true - type: number + nullable: true - type: boolean + nullable: true defaultValue: description: Default value that will be provided for the reference when no value is provided - nullable: true oneOf: - type: string + nullable: true - type: integer + nullable: true - type: number + nullable: true - type: boolean + nullable: true required: [resourceField, envRefKey]