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 circular reference 2023-10-01 #25879

Merged
merged 4 commits into from
Sep 22, 2023
Merged

Fix circular reference 2023-10-01 #25879

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
313f5d0
TriggerType->ComputeTriggerType
Sep 20, 2023
ab76d75
RecurrenceFrequency->ComputeRecurrenceFrequency
Sep 20, 2023
f5cdd00
RecurrenceSchedule->ComputeRecurrenceSchedule
Sep 20, 2023
ebc072f
description
Sep 21, 2023
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
156 changes: 153 additions & 3 deletions ...-manager/Microsoft.MachineLearningServices/stable/2023-10-01/machineLearningServices.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5490,7 +5490,7 @@
},
"triggerType": {
"description": "[Required] The schedule trigger type.",
"$ref": "./mfe.json#/definitions/TriggerType"
"$ref": "#/definitions/ComputeTriggerType"
},
"recurrence": {
"description": "Required if triggerType is Recurrence.",
Expand All @@ -5506,6 +5506,27 @@
}
}
},
"ComputeTriggerType": {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add description for this type definition here.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

"enum": [
"Recurrence",
"Cron"
],
"description": "Is the trigger type recurrence or cron.",
"type": "string",
"x-ms-enum": {
"name": "ComputeTriggerType",
"modelAsString": true,
"values": [
{
"value": "Recurrence"
},
{
"value": "Cron"
}
]
},
"additionalProperties": false
},
"ScheduleBase": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -5587,7 +5608,7 @@
"properties": {
"frequency": {
"description": "[Required] The frequency to trigger schedule.",
"$ref": "./mfe.json#/definitions/RecurrenceFrequency"
"$ref": "#/definitions/ComputeRecurrenceFrequency"
},
"interval": {
"description": "[Required] Specifies schedule interval in conjunction with frequency",
Expand All @@ -5606,10 +5627,139 @@
},
"schedule": {
"description": "[Required] The recurrence schedule.",
"$ref": "./mfe.json#/definitions/RecurrenceSchedule"
"$ref": "#/definitions/ComputeRecurrenceSchedule"
}
}
},
"ComputeRecurrenceFrequency": {
"description": "Enum to describe the frequency of a compute recurrence schedule",
"enum": [
"Minute",
"Hour",
"Day",
"Week",
"Month"
],
"type": "string",
"x-ms-enum": {
"name": "ComputeRecurrenceFrequency",
"modelAsString": true,
"values": [
{
"value": "Minute",
"description": "Minute frequency"
},
{
"value": "Hour",
"description": "Hour frequency"
},
{
"value": "Day",
"description": "Day frequency"
},
{
"value": "Week",
"description": "Week frequency"
},
{
"value": "Month",
"description": "Month frequency"
}
]
},
"additionalProperties": false
},
"ComputeRecurrenceSchedule": {
"required": [
"hours",
"minutes"
],
"type": "object",
"properties": {
"hours": {
"description": "[Required] List of hours for the schedule.",
"type": "array",
"items": {
"format": "int32",
"type": "integer"
}
},
"minutes": {
"description": "[Required] List of minutes for the schedule.",
"type": "array",
"items": {
"format": "int32",
"type": "integer"
}
},
"monthDays": {
"description": "List of month days for the schedule",
"type": "array",
"items": {
"format": "int32",
"type": "integer"
},
"x-nullable": true
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just FYI, either required or x-ms-nullable does the job.

},
"weekDays": {
"description": "List of days for the schedule.",
"type": "array",
"items": {
"$ref": "#/definitions/ComputeWeekDay"
},
"x-nullable": true
}
},
"additionalProperties": false
},
"ComputeWeekDay": {
"description": "Enum of weekday",
"enum": [
"Monday",
"Tuesday",
"Wednesday",
"Thursday",
"Friday",
"Saturday",
"Sunday"
],
"type": "string",
"x-ms-enum": {
"name": "ComputeWeekDay",
"modelAsString": true,
"values": [
{
"value": "Monday",
"description": "Monday weekday"
},
{
"value": "Tuesday",
"description": "Tuesday weekday"
},
{
"value": "Wednesday",
"description": "Wednesday weekday"
},
{
"value": "Thursday",
"description": "Thursday weekday"
},
{
"value": "Friday",
"description": "Friday weekday"
},
{
"value": "Saturday",
"description": "Saturday weekday"
},
{
"value": "Sunday",
"description": "Sunday weekday"
}
]
},
"additionalProperties": false
},
"Cron": {
"type": "object",
"description": "The workflow trigger cron for ComputeStartStop schedule type.",
Expand Down