CodeGen from PR 12384 in Azure/azure-rest-api-specs

Merge 3a2659165cc04a5e10148c09a0f7ba560e15a3d2 into 03d81a5e4328decf233aef667d323a22600807c9
AzureSDKAutomation · Jan 12, 2021 · 05c6a41 · 05c6a41
1 parent 6935382
commit 05c6a41
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 6 deletions.
diff --git a/schemas/2017-09-01-preview/Microsoft.DataFactory.json b/schemas/2017-09-01-preview/Microsoft.DataFactory.json
@@ -12175,4 +12175,4 @@
       "description": "Zoho server dataset."
     }
   }
-}
+}
diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json
@@ -15790,6 +15790,10 @@
         "catalogServerEndpoint": {
           "type": "string",
           "description": "The catalog database server URL."
+        },
+        "dualStandbyPairName": {
+          "type": "string",
+          "description": "The dual standby pair name of Azure-SSIS Integration Runtimes to support SSISDB failover."
         }
       },
       "description": "Catalog information for managed dedicated integration runtime."
@@ -17137,6 +17141,17 @@
     "ManagedIntegrationRuntime": {
       "type": "object",
       "properties": {
+        "managedVirtualNetwork": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/ManagedVirtualNetworkReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Managed Virtual Network reference type."
+        },
         "type": {
           "type": "string",
           "enum": [
@@ -17266,6 +17281,34 @@
       },
       "description": "A managed Virtual Network associated with the Azure Data Factory"
     },
+    "ManagedVirtualNetworkReference": {
+      "type": "object",
+      "properties": {
+        "referenceName": {
+          "type": "string",
+          "description": "Reference ManagedVirtualNetwork name."
+        },
+        "type": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "ManagedVirtualNetworkReference"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Managed Virtual Network reference type."
+        }
+      },
+      "required": [
+        "referenceName",
+        "type"
+      ],
+      "description": "Managed Virtual Network reference type."
+    },
     "MappingDataFlow": {
       "type": "object",
       "properties": {
@@ -27289,16 +27332,18 @@
           "description": "The base definition of a secret type."
         },
         "resource": {
-          "type": "string",
-          "description": "Resource for which Azure Auth token will be requested when using MSI Authentication."
+          "type": "object",
+          "properties": {},
+          "description": "Resource for which Azure Auth token will be requested when using MSI Authentication. Type: string (or Expression with resultType string)."
         },
         "type": {
           "type": "string",
           "description": "Web activity authentication (Basic/ClientCertificate/MSI)"
         },
         "username": {
-          "type": "string",
-          "description": "Web activity authentication user name for basic authentication."
+          "type": "object",
+          "properties": {},
+          "description": "Web activity authentication user name for basic authentication. Type: string (or Expression with resultType string)."
         }
       },
       "required": [
@@ -28150,4 +28195,4 @@
       "description": "A copy activity Zoho server source."
     }
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -12175,4 +12175,4 @@ @@
           "description": "Zoho server dataset."
         }
       }
-    }
+    }