Updating PUT operation requirements for SourceControls and SourceControlSyncJobs, updating streams’ value property, and updating examples.

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"
       }
     }

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"
       }
     }

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",

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",

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",

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 . . .} }"
+            }
+          }
         }
       }
     }

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
+          }
+        }
+      }
     }
   }
 }