Generated from 2da79367adae3517963059dc007244eefd256ab6

Azure · Oct 16, 2020 · 30f4b78 · 30f4b78
1 parent f7d440f
commit 30f4b78
Show file tree

Hide file tree

Showing 2 changed files with 128 additions and 4 deletions.
diff --git a/schemas/2018-06-01/Microsoft.DataFactory.json b/schemas/2018-06-01/Microsoft.DataFactory.json
@@ -1138,6 +1138,11 @@
           "properties": {},
           "description": "The access key identifier of the Amazon S3 Identity and Access Management (IAM) user. Type: string (or Expression with resultType string)."
         },
+        "authenticationType": {
+          "type": "object",
+          "properties": {},
+          "description": "The authentication type of S3. Allowed value: AccessKey (default) or TemporarySecurityCredentials. Type: string (or Expression with resultType string)."
+        },
         "encryptedCredential": {
           "type": "object",
           "properties": {},
@@ -1158,6 +1163,17 @@
           "type": "object",
           "properties": {},
           "description": "This value specifies the endpoint to access with the S3 Connector. This is an optional property; change it only if you want to try a different service endpoint or want to switch between https and http. Type: string (or Expression with resultType string)."
+        },
+        "sessionToken": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/SecretBase"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "The base definition of a secret type."
         }
       },
       "description": "Amazon S3 linked service properties."
@@ -6239,6 +6255,11 @@
           "properties": {},
           "description": "Application client_id supplied by Concur App Management."
         },
+        "connectionProperties": {
+          "type": "object",
+          "properties": {},
+          "description": "Properties used to connect to Concur. It is mutually exclusive with any other properties in the linked service. Type: object."
+        },
         "encryptedCredential": {
           "type": "object",
           "properties": {},
@@ -6438,6 +6459,22 @@
       ],
       "description": "Copy activity."
     },
+    "CopyActivityLogSettings": {
+      "type": "object",
+      "properties": {
+        "enableReliableLogging": {
+          "type": "object",
+          "properties": {},
+          "description": "Specifies whether to enable reliable logging. Type: boolean (or Expression with resultType boolean)."
+        },
+        "logLevel": {
+          "type": "object",
+          "properties": {},
+          "description": "Gets or sets the log level, support: Info, Warning. Type: string (or Expression with resultType string)."
+        }
+      },
+      "description": "Settings for copy activity log."
+    },
     "CopyActivityTypeProperties": {
       "type": "object",
       "properties": {
@@ -6456,6 +6493,17 @@
           "properties": {},
           "description": "Specifies whether to copy data via an interim staging. Default value is false. Type: boolean (or Expression with resultType boolean)."
         },
+        "logSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LogSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Log settings."
+        },
         "logStorageSettings": {
           "oneOf": [
             {
@@ -6465,7 +6513,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Log storage settings."
+          "description": "(Deprecated. Please use LogSettings) Log storage settings."
         },
         "parallelCopies": {
           "type": "object",
@@ -8947,7 +8995,7 @@
               "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
             }
           ],
-          "description": "Log storage settings."
+          "description": "(Deprecated. Please use LogSettings) Log storage settings."
         },
         "maxConcurrentConnections": {
           "oneOf": [
@@ -11481,6 +11529,21 @@
           ],
           "description": "Definition of all parameters for an entity."
         },
+        "publicNetworkAccess": {
+          "oneOf": [
+            {
+              "type": "string",
+              "enum": [
+                "Enabled",
+                "Disabled"
+              ]
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Whether or not public network access is allowed for the data factory."
+        },
         "repoConfiguration": {
           "oneOf": [
             {
@@ -16720,6 +16783,67 @@
       ],
       "description": "Linked service reference type."
     },
+    "LogLocationSettings": {
+      "type": "object",
+      "properties": {
+        "linkedServiceName": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LinkedServiceReference"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Linked service reference type."
+        },
+        "path": {
+          "type": "object",
+          "properties": {},
+          "description": "The path to storage for storing detailed logs of activity execution. Type: string (or Expression with resultType string)."
+        }
+      },
+      "required": [
+        "linkedServiceName"
+      ],
+      "description": "Log location settings."
+    },
+    "LogSettings": {
+      "type": "object",
+      "properties": {
+        "copyActivityLogSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/CopyActivityLogSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Settings for copy activity log."
+        },
+        "enableCopyActivityLog": {
+          "type": "object",
+          "properties": {},
+          "description": "Specifies whether to enable copy activity log. Type: boolean (or Expression with resultType boolean)."
+        },
+        "logLocationSettings": {
+          "oneOf": [
+            {
+              "$ref": "#/definitions/LogLocationSettings"
+            },
+            {
+              "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
+            }
+          ],
+          "description": "Log location settings."
+        }
+      },
+      "required": [
+        "logLocationSettings"
+      ],
+      "description": "Log settings."
+    },
     "LogStorageSettings": {
       "type": "object",
       "properties": {
@@ -16769,7 +16893,7 @@
       "required": [
         "linkedServiceName"
       ],
-      "description": "Log storage settings."
+      "description": "(Deprecated. Please use LogSettings) Log storage settings."
     },
     "LookupActivity": {
       "type": "object",

diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
@@ -5329,4 +5329,4 @@
       ]
     }
   ]
-}
+}