diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControl/createOrUpdateSourceControl.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControl/createOrUpdateSourceControl.json index 7add0ac35022..38cfc2721be8 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControl/createOrUpdateSourceControl.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControl/createOrUpdateSourceControl.json @@ -13,7 +13,10 @@ "autoSync": true, "publishRunbook": true, "sourceType": "VsoGit", - "securityToken": "3a326f7a0dcd343ea58fee21f2fd5fb4c1234567", + "securityToken": { + "accessToken":"3a326f7a0dcd343ea58fee21f2fd5fb4c1234567", + "tokenType": "PersonalAccessToken" + }, "description": "my description" } } diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControl/updateSourceControl_patch.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControl/updateSourceControl_patch.json index e0fe97eb1e02..99322b752d4c 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControl/updateSourceControl_patch.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControl/updateSourceControl_patch.json @@ -11,7 +11,10 @@ "folderPath": "/folderOne/folderTwo", "autoSync": true, "publishRunbook": true, - "securityToken": "3a326f7a0dcd343ea58fee21f2fd5fb4c1234567", + "securityToken": { + "accessToken":"3a326f7a0dcd343ea58fee21f2fd5fb4c1234567", + "tokenType": "PersonalAccessToken" + }, "description": "my description" } } diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/createSourceControlSyncJob.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/createSourceControlSyncJob.json index 90175d63460c..f7f772229794 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/createSourceControlSyncJob.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/createSourceControlSyncJob.json @@ -18,7 +18,7 @@ "body": { "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/sourceControls/MySourceControl/sourceControlSyncJobs/ce6fe3e3-9db3-4096-a6b4-82bfb4c10a9a", "properties": { - "syncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a9a", + "sourceControlSyncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a9a", "creationTime": "2017-03-28T23:14:26.903+00:00", "provisioningState": "Completed", "startTime": "2017-03-28T23:14:27.903+00:00", diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/getAllSourceControlSyncJobs.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/getAllSourceControlSyncJobs.json index bd96d01f9f63..23e2630d67ca 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/getAllSourceControlSyncJobs.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/getAllSourceControlSyncJobs.json @@ -14,7 +14,7 @@ { "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/sourceControls/MySourceControl/sourceControlSyncJobs/ce6fe3e3-9db3-4096-a6b4-82bfb4c10a1a", "properties": { - "syncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a1a", + "sourceControlSyncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a1a", "creationTime": "2017-03-28T23:14:26.903+00:00", "provisioningState": "Completed", "startTime": "2017-03-28T23:14:27.903+00:00", @@ -25,7 +25,7 @@ { "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/sourceControls/MySourceControl/sourceControlSyncJobs/ce6fe3e3-9db3-4096-a6b4-82bfb4c10a2a", "properties": { - "syncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a2a", + "sourceControlSyncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a2a", "creationTime": "2017-03-28T23:14:26.903+00:00", "provisioningState": "Completed", "startTime": "2017-03-28T23:14:27.903+00:00", @@ -36,7 +36,7 @@ { "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/sourceControls/MySourceControl/sourceControlSyncJobs/ce6fe3e3-9db3-4096-a6b4-82bfb4c10a3a", "properties": { - "syncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a3a", + "sourceControlSyncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a3a", "creationTime": "2017-03-28T23:14:26.903+00:00", "provisioningState": "Completed", "startTime": "2017-03-28T23:14:27.903+00:00", @@ -47,7 +47,7 @@ { "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/sourceControls/MySourceControl/sourceControlSyncJobs/ce6fe3e3-9db3-4096-a6b4-82bfb4c10a4a", "properties": { - "syncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a4a", + "sourceControlSyncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a4a", "creationTime": "2017-03-28T23:14:26.903+00:00", "provisioningState": "Completed", "startTime": "2017-03-28T23:14:27.903+00:00", @@ -58,7 +58,7 @@ { "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/sourceControls/MySourceControl/sourceControlSyncJobs/ce6fe3e3-9db3-4096-a6b4-82bfb4c10a5a", "properties": { - "syncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a5a", + "sourceControlSyncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a5a", "creationTime": "2017-03-28T23:14:26.903+00:00", "provisioningState": "Completed", "startTime": "2017-03-28T23:14:27.903+00:00", diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/getSourceControlSyncJob.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/getSourceControlSyncJob.json index 8486118c6a79..4f2b2783e676 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/getSourceControlSyncJob.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJob/getSourceControlSyncJob.json @@ -13,7 +13,7 @@ "body": { "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/myAutomationAccount33/sourceControls/MySourceControl/sourceControlSyncJobs/ce6fe3e3-9db3-4096-a6b4-82bfb4c10a9a", "properties": { - "syncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a9a", + "sourceControlSyncJobId": "ce6fe3e3-9db3-4096-a6b4-82bfb4c10a9a", "creationTime": "2017-03-28T23:14:26.903+00:00", "provisioningState": "Completed", "startTime": "2017-03-28T23:14:27.903+00:00", diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJobStreams/getSourceControlSyncJobStreamsByStreamId.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJobStreams/getSourceControlSyncJobStreamsByStreamId.json index 9e246ba197e3..2ab748eba323 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJobStreams/getSourceControlSyncJobStreamsByStreamId.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/examples/sourceControlSyncJobStreams/getSourceControlSyncJobStreamsByStreamId.json @@ -19,7 +19,11 @@ "time": "2017-03-28T23:14:26.903+00:00", "streamType": "Error", "streamText": "New-AzureAffinityGroup : Cannot validate argument on parameter 'Location'. The argument is null or empty. Provide an \r\nargument that is not null or empty, and then try the command again.\r\nAt DatabaseExportImport1fba401e-0:69 char:69\r\n+ \r\n + CategoryInfo : InvalidData: . . . .", - "value": "{ 'Exception': {'Message':'System.Management.Automation.ParameterBindingValidationException: Cannot validate argument on parameter 'Location'. The argument is null or empty . . .} }" + "value": { + "Exception": { + "Message":"System.Management.Automation.ParameterBindingValidationException: Cannot validate argument on parameter 'Location'. The argument is null or empty . . .} }" + } + } } } } diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControl.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControl.json index b903ce1436a7..5020260f31a6 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControl.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControl.json @@ -323,11 +323,11 @@ "items": { "$ref": "#/definitions/SourceControl" }, - "description": "Gets or sets a list of souce controls." + "description": "The list of souce controls." }, "nextLink": { "type": "string", - "description": "Gets or sets the next link." + "description": "The next link." } }, "description": "The response model for the list source controls operation." @@ -336,27 +336,27 @@ "properties": { "branch": { "type": "string", - "description": "Gets or sets the repo branch of the source control." + "description": "The repo branch of the source control." }, "folderPath": { "type": "string", - "description": "Gets or sets the folder path of the source control. Path must be relative." + "description": "The folder path of the source control. Path must be relative." }, "autoSync": { "type": "boolean", - "description": "Gets or sets auto async of the source control. Default is false." + "description": "The auto sync of the source control. Default is false." }, "publishRunbook": { "type": "boolean", - "description": "Gets or sets the auto publish of the source control. Default is true." + "description": "The auto publish of the source control. Default is true." }, "securityToken": { - "type": "string", - "description": "Gets or sets the authorization token for the repo of the source control." + "description": "The authorization token for the repo of the source control.", + "$ref": "#/definitions/SourceControlSecurityTokenProperties" }, "description": { "type": "string", - "description": "Gets or sets the user description of the source control." + "description": "The user description of the source control." } }, "description": "The properties of the update source control" @@ -366,7 +366,7 @@ "properties": { "$ref": "#/definitions/SourceControlUpdateProperties", "x-ms-client-flatten": true, - "description": "Gets or sets the value of the source control." + "description": "The value of the source control." } }, "description": "The parameters supplied to the update source control operation." @@ -376,7 +376,7 @@ "properties": { "$ref": "#/definitions/SourceControlProperties", "x-ms-client-flatten": true, - "description": "Gets or sets the properties of the source control." + "description": "The properties of the source control." } }, "allOf": [ @@ -390,23 +390,23 @@ "properties": { "repoUrl": { "type": "string", - "description": "Gets or sets the repo url of the source control." + "description": "The repo url of the source control." }, "branch": { "type": "string", - "description": "Gets or sets the repo branch of the source control. Include branch as empty string for VsoTfvc." + "description": "The repo branch of the source control. Include branch as empty string for VsoTfvc." }, "folderPath": { "type": "string", - "description": "Gets or sets the folder path of the source control." + "description": "The folder path of the source control." }, "autoSync": { "type": "boolean", - "description": "Gets or sets auto async of the source control. Default is false." + "description": "The auto sync of the source control. Default is false." }, "publishRunbook": { "type": "boolean", - "description": "Gets or sets the auto publish of the source control. Default is true." + "description": "The auto publish of the source control. Default is true." }, "sourceType": { "type": "string", @@ -423,19 +423,19 @@ }, "description": { "type": "string", - "description": "Gets or sets the description." + "description": "The description." }, "creationTime": { "type": "string", "format": "date-time", "x-nullable": false, - "description": "Gets or sets the creation time." + "description": "The creation time." }, "lastModifiedTime": { "type": "string", "format": "date-time", "x-nullable": false, - "description": "Gets or sets the last modified time." + "description": "The last modified time." } }, "description": "Definition of the source control properties" @@ -445,7 +445,7 @@ "properties": { "$ref": "#/definitions/SourceControlCreateOrUpdateProperties", "x-ms-client-flatten": true, - "description": "Gets or sets the properties of the source control." + "description": "The properties of the source control." } }, "required": [ @@ -458,25 +458,25 @@ "repoUrl": { "type": "string", "maxLength": 2000, - "description": "Gets or sets the repo url of the source control." + "description": "The repo url of the source control." }, "branch": { "type": "string", "maxLength": 255, - "description": "Gets or sets the repo branch of the source control. Include branch as empty string for VsoTfvc." + "description": "The repo branch of the source control. Include branch as empty string for VsoTfvc." }, "folderPath": { "type": "string", "maxLength": 255, - "description": "Gets or sets the folder path of the source control. Path must be relative." + "description": "The folder path of the source control. Path must be relative." }, "autoSync": { "type": "boolean", - "description": "Gets or sets auto async of the source control. Default is false." + "description": "The auto async of the source control. Default is false." }, "publishRunbook": { "type": "boolean", - "description": "Gets or sets the auto publish of the source control. Default is true." + "description": "The auto publish of the source control. Default is true." }, "sourceType": { "type": "string", @@ -492,17 +492,42 @@ } }, "securityToken": { - "type": "string", - "maxLength": 1024, - "description": "Gets or sets the authorization token for the repo of the source control." + "description": "The authorization token for the repo of the source control.", + "$ref": "#/definitions/SourceControlSecurityTokenProperties" }, "description": { "type": "string", "maxLength": 512, - "description": "Gets or sets the user description of the source control." + "description": "The user description of the source control." } }, "description": "The properties of the create source control operation." + }, + "SourceControlSecurityTokenProperties": { + "properties":{ + "accessToken":{ + "type":"string", + "maxLength":1024, + "description":"The access token." + }, + "refreshToken":{ + "type":"string", + "maxLength":1024, + "description":"The refresh token." + }, + "tokenType":{ + "type": "string", + "description": "The token type. Must be either PersonalAccessToken or Oauth.", + "enum": [ + "PersonalAccessToken", + "Oauth" + ], + "x-ms-enum": { + "name": "tokenType", + "modelAsString": true + } + } + } } } } \ No newline at end of file diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJob.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJob.json index 9b0c17794233..4b7f9abf1ff7 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJob.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJob.json @@ -234,11 +234,11 @@ "items": { "$ref": "#/definitions/SourceControlSyncJob" }, - "description": "Gets a list of source control sync jobs." + "description": "The list of source control sync jobs." }, "nextLink": { "type": "string", - "description": "Gets or sets the next link." + "description": "The next link." } }, "description": "The response model for the list source control sync jobs operation." @@ -248,7 +248,7 @@ "properties": { "$ref": "#/definitions/SourceControlSyncJobCreateProperties", "x-ms-client-flatten": true, - "description": "Sets the properties of the source control sync job." + "description": "The properties of the source control sync job." } }, "required": [ @@ -260,41 +260,45 @@ "properties": { "commitId": { "type": "string", - "description": "Sets the commit id of the source control sync job." + "description": "The commit id of the source control sync job. If not syncing to a commitId, enter an empty string.", + "minLength": 0 } }, + "required": [ + "commitId" + ], "description": "Definition of create source control sync job properties." }, "SourceControlSyncJobById": { "properties": { "id": { "type": "string", - "description": "Gets the id of the job." + "description": "The id of the job." }, "properties": { "$ref": "#/definitions/SourceControlSyncJobByIdProperties", "x-ms-client-flatten": true, - "description": "Gets the properties of the source control sync job." + "description": "The properties of the source control sync job." } }, "description": "Definition of the source control sync job." }, "SourceControlSyncJobByIdProperties": { "properties": { - "syncJobId": { + "sourceControlSyncJobId": { "type": "string", - "description": "Gets the source control sync job id." + "description": "The source control sync job id." }, "creationTime": { "type": "string", "format": "date-time", "x-nullable": false, "readOnly": true, - "description": "Gets the creation time of the job." + "description": "The creation time of the job." }, "provisioningState": { "type": "string", - "description": "Gets the provisioning state of the job.", + "description": "The provisioning state of the job.", "enum": [ "Completed", "Failed", @@ -310,18 +314,18 @@ "format": "date-time", "x-nullable": true, "readOnly": true, - "description": "Gets the start time of the job." + "description": "The start time of the job." }, "endTime": { "type": "string", "format": "date-time", "x-nullable": true, "readOnly": true, - "description": "Gets the end time of the job." + "description": "The end time of the job." }, "startType": { "type": "string", - "description": "Gets the type of start for the sync job.", + "description": "The type of start for the sync job.", "enum": [ "AutoSync", "ManualSync" @@ -333,7 +337,7 @@ }, "exception": { "type": "string", - "description": "Gets the exceptions that occured while running the sync job." + "description": "The exceptions that occured while running the sync job." } }, "description": "Definition of source control sync job properties." @@ -358,27 +362,27 @@ "properties": { "$ref": "#/definitions/SourceControlSyncJobProperties", "x-ms-client-flatten": true, - "description": "Gets the properties of the source control sync job." + "description": "The properties of the source control sync job." } }, "description": "Definition of the source control sync job." }, "SourceControlSyncJobProperties": { "properties": { - "syncJobId": { + "sourceControlSyncJobId": { "type": "string", - "description": "Gets the source control sync job id." + "description": "The source control sync job id." }, "creationTime": { "type": "string", "format": "date-time", "x-nullable": false, "readOnly": true, - "description": "Gets the creation time of the job." + "description": "The creation time of the job." }, "provisioningState": { "type": "string", - "description": "Gets the provisioning state of the job.", + "description": "The provisioning state of the job.", "enum": [ "Completed", "Failed", @@ -394,18 +398,18 @@ "format": "date-time", "x-nullable": true, "readOnly": true, - "description": "Gets the start time of the job." + "description": "The start time of the job." }, "endTime": { "type": "string", "format": "date-time", "x-nullable": true, "readOnly": true, - "description": "Gets the end time of the job." + "description": "The end time of the job." }, "startType": { "type": "string", - "description": "Gets the type of start for the sync job.", + "description": "The type of start for the sync job.", "enum": [ "AutoSync", "ManualSync" diff --git a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJobStreams.json b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJobStreams.json index 6673f57e315e..475e87b0efde 100644 --- a/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJobStreams.json +++ b/specification/automation/resource-manager/Microsoft.Automation/preview/2017-05-15-preview/sourceControlSyncJobStreams.json @@ -182,12 +182,12 @@ "items": { "$ref": "#/definitions/SourceControlSyncJobStream" }, - "description": "Gets a list of source control sync job streams." + "description": "The list of source control sync job streams." }, "nextLink": { "type": "string", "readOnly": true, - "description": "Gets or sets the next link." + "description": "The next link." } }, "description": "The response model for the list source control sync job streams operation." @@ -202,7 +202,7 @@ "properties": { "$ref": "#/definitions/SourceControlSyncJobStreamProperties", "x-ms-client-flatten": true, - "description": "Gets the properties of the source control sync job stream." + "description": "The properties of the source control sync job stream." } }, "description": "Definition of the source control sync job stream." @@ -211,22 +211,22 @@ "properties": { "syncJobStreamId": { "type": "string", - "description": "Gets the sync job stream id." + "description": "The sync job stream id." }, "summary": { "type": "string", - "description": "Gets the summary of the sync job stream." + "description": "The summary of the sync job stream." }, "time": { "type": "string", "format": "date-time", "x-nullable": true, "readOnly": true, - "description": "Gets the time of the sync job stream." + "description": "The time of the sync job stream." }, "streamType": { "type": "string", - "description": "Gets the type of the sync job stream.", + "description": "The type of the sync job stream.", "enum": [ "Error", "Output" @@ -249,7 +249,7 @@ "properties": { "$ref": "#/definitions/SourceControlSyncJobStreamByIdProperties", "x-ms-client-flatten": true, - "description": "Gets the properties of the source control sync job stream." + "description": "The properties of the source control sync job stream." } }, "description": "Definition of the source control sync job stream by id." @@ -258,22 +258,22 @@ "properties": { "syncJobStreamId": { "type": "string", - "description": "Gets the sync job stream id." + "description": "The sync job stream id." }, "summary": { "type": "string", - "description": "Gets the summary of the sync job stream." + "description": "The summary of the sync job stream." }, "time": { "type": "string", "format": "date-time", "x-nullable": true, "readOnly": true, - "description": "Gets the time of the sync job stream." + "description": "The time of the sync job stream." }, "streamType": { "type": "string", - "description": "Gets the type of the sync job stream.", + "description": "The type of the sync job stream.", "enum": [ "Error", "Output" @@ -285,11 +285,14 @@ }, "streamText": { "type": "string", - "description": "Gets the text of the sync job stream." + "description": "The text of the sync job stream." }, "value": { - "type": "string", - "description": "Gets the value of the sync job stream." + "type": "object", + "additionalProperties": { + "type": "object" + }, + "description": "The values of the job stream." } }, "description": "Definition of source control sync job stream by id properties."