Merged PR 189422: Various REST API doc fixes

1. Import state values
2. Document UseEndUserOAuth2Credentials in Gateway_GetDatasource

sdk/PowerBI.Api/Source/Models/GatewayDatasource.cs

@@ -37,14 +37,18 @@ public GatewayDatasource()
         /// <param name="datasourceType">The type of the datasource</param>
         /// <param name="connectionDetails">Connection details in json
         /// format</param>
-        public GatewayDatasource(System.Guid id, System.Guid gatewayId, CredentialType credentialType, string datasourceName = default(string), string datasourceType = default(string), string connectionDetails = default(string))
+        /// <param name="credentialDetails">The connection details of the
+        /// datasource that need to be updated. This is mandataory when the
+        /// dataset has more than one datasource.</param>
+        public GatewayDatasource(System.Guid id, System.Guid gatewayId, CredentialType credentialType, string datasourceName = default(string), string datasourceType = default(string), string connectionDetails = default(string), GatewayDatasourceCredentialDetails credentialDetails = default(GatewayDatasourceCredentialDetails))
         {
             Id = id;
             GatewayId = gatewayId;
             DatasourceName = datasourceName;
             DatasourceType = datasourceType;
             ConnectionDetails = connectionDetails;
             CredentialType = credentialType;
+            CredentialDetails = credentialDetails;
             CustomInit();
         }
 
@@ -93,6 +97,14 @@ public GatewayDatasource()
         [JsonProperty(PropertyName = "credentialType")]
         public CredentialType CredentialType { get; set; }
 
+        /// <summary>
+        /// Gets or sets the connection details of the datasource that need to
+        /// be updated. This is mandataory when the dataset has more than one
+        /// datasource.
+        /// </summary>
+        [JsonProperty(PropertyName = "credentialDetails")]
+        public GatewayDatasourceCredentialDetails CredentialDetails { get; set; }
+
         /// <summary>
         /// Validate the object.
         /// </summary>

sdk/PowerBI.Api/Source/Models/GatewayDatasourceCredentialDetails.cs

@@ -0,0 +1,52 @@
+// <auto-generated>
+// Code generated by Microsoft (R) AutoRest Code Generator.
+// Changes may cause incorrect behavior and will be lost if the code is
+// regenerated.
+// </auto-generated>
+
+namespace Microsoft.PowerBI.Api.Models
+{
+    using Newtonsoft.Json;
+    using System.Linq;
+
+    /// <summary>
+    /// The datasource credential details
+    /// </summary>
+    public partial class GatewayDatasourceCredentialDetails
+    {
+        /// <summary>
+        /// Initializes a new instance of the
+        /// GatewayDatasourceCredentialDetails class.
+        /// </summary>
+        public GatewayDatasourceCredentialDetails()
+        {
+            CustomInit();
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the
+        /// GatewayDatasourceCredentialDetails class.
+        /// </summary>
+        /// <param name="useEndUserOAuth2Credentials">Indicates if the end-user
+        /// OAuth2 credentials are used for connecting to the datasource in
+        /// DirectQuery mode.</param>
+        public GatewayDatasourceCredentialDetails(bool? useEndUserOAuth2Credentials = default(bool?))
+        {
+            UseEndUserOAuth2Credentials = useEndUserOAuth2Credentials;
+            CustomInit();
+        }
+
+        /// <summary>
+        /// An initialization method that performs custom operations like setting defaults
+        /// </summary>
+        partial void CustomInit();
+
+        /// <summary>
+        /// Gets or sets indicates if the end-user OAuth2 credentials are used
+        /// for connecting to the datasource in DirectQuery mode.
+        /// </summary>
+        [JsonProperty(PropertyName = "useEndUserOAuth2Credentials")]
+        public bool? UseEndUserOAuth2Credentials { get; set; }
+
+    }
+}

sdk/PowerBI.Api/Source/Models/Import.cs

@@ -29,7 +29,8 @@ public Import()
         /// </summary>
         /// <param name="id">The import id</param>
         /// <param name="name">The import name</param>
-        /// <param name="importState">The import upload state</param>
+        /// <param name="importState">The import upload state. Possible values
+        /// include: 'Publishing', 'Succeeded', 'Failed'</param>
         /// <param name="reports">The reports associated with this
         /// import</param>
         /// <param name="datasets">The datasets associated with this
@@ -66,7 +67,8 @@ public Import()
         public string Name { get; set; }
 
         /// <summary>
-        /// Gets or sets the import upload state
+        /// Gets or sets the import upload state. Possible values include:
+        /// 'Publishing', 'Succeeded', 'Failed'
         /// </summary>
         [JsonProperty(PropertyName = "importState")]
         public string ImportState { get; set; }

sdk/swaggers/swagger.json

@@ -16090,7 +16090,12 @@
                 },
                 "importState": {
                     "type": "string",
-                    "description": "The import upload state"
+                    "description": "The import upload state",
+                    "enum": [
+                        "Publishing",
+                        "Succeeded",
+                        "Failed"
+                    ]
                 },
                 "reports": {
                     "type": "array",
@@ -16786,6 +16791,10 @@
                         "name": "credentialType",
                         "modelAsExtensible": true
                     }
+                },
+                "credentialDetails": {
+                    "$ref": "#/definitions/GatewayDatasourceCredentialDetails",
+                    "description": "The connection details of the datasource that need to be updated. This is mandataory when the dataset has more than one datasource."
                 }
             }
         },
@@ -17552,6 +17561,15 @@
                 }
             }
         },
+        "GatewayDatasourceCredentialDetails": {
+            "description": "The datasource credential details",
+            "properties": {
+                "useEndUserOAuth2Credentials": {
+                    "type": "boolean",
+                    "description": "Indicates if the end-user OAuth2 credentials are used for connecting to the datasource in DirectQuery mode."
+                }
+            }
+        },
         "UpdateDatasourceRequest": {
             "required": [
                 "credentialDetails"