Merge pull request #98753 from Samantha-Yu/adfupdate1212

ShannonLeavitt · web-flow · commit a9b5a60aac82 · 2019-12-16T14:45:15.000+04:00
Updated connectionString settings for remaining articles
diff --git a/articles/data-factory/concepts-linked-services.md b/articles/data-factory/concepts-linked-services.md
@@ -72,10 +72,7 @@ The following linked service is an Azure Storage linked service. Notice that the
     "properties": {
         "type": "AzureStorage",
         "typeProperties": {
-            "connectionString": {
-                "type": "SecureString",
-                "value": "DefaultEndpointsProtocol=https;AccountName=<accountname>;AccountKey=<accountkey>"
-            }
+            "connectionString": "DefaultEndpointsProtocol=https;AccountName=<accountname>;AccountKey=<accountkey>"
         },
         "connectVia": {
             "referenceName": "<name of Integration Runtime>",
diff --git a/articles/data-factory/control-flow-execute-pipeline-activity.md b/articles/data-factory/control-flow-execute-pipeline-activity.md
@@ -163,10 +163,7 @@ This scenario has two pipelines:
     "properties": {
     "type": "AzureStorage",
     "typeProperties": {
-      "connectionString": {
-        "value": "DefaultEndpointsProtocol=https;AccountName=*****",
-        "type": "SecureString"
-      }
+      "connectionString": "DefaultEndpointsProtocol=https;AccountName=*****;AccountKey=*****"
     }
   }
 }
diff --git a/articles/data-factory/control-flow-if-condition-activity.md b/articles/data-factory/control-flow-if-condition-activity.md
@@ -191,10 +191,7 @@ Another example for expression is:
     "properties": {
         "type": "AzureStorage",
         "typeProperties": {
-            "connectionString": {
-                "value": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>",
-                "type": "SecureString"
-            }
+            "connectionString": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>"
         }
     }
 }
diff --git a/articles/data-factory/control-flow-lookup-activity.md b/articles/data-factory/control-flow-lookup-activity.md
@@ -233,10 +233,7 @@ This storage account contains the JSON file with the names of the SQL tables.
     "properties": {
         "type": "AzureStorage",
         "typeProperties": {
-            "connectionString": {
-                "value": "DefaultEndpointsProtocol=https;AccountName=<StorageAccountName>;AccountKey=<StorageAccountKey>",
-                "type": "SecureString"
-            }
+            "connectionString": "DefaultEndpointsProtocol=https;AccountName=<StorageAccountName>;AccountKey=<StorageAccountKey>"
         }
     },
         "name": "AzureStorageLinkedService"
@@ -253,10 +250,7 @@ This Azure SQL Database instance contains the data to be copied to Blob storage.
         "type": "AzureSqlDatabase",
         "description": "",
 		"typeProperties": {
-			"connectionString": {
-				"value": "Server=<server>;Initial Catalog=<database>;User ID=<user>;Password=<password>;",
-				"type": "SecureString"
-			}
+			"connectionString": "Server=<server>;Initial Catalog=<database>;User ID=<user>;Password=<password>;"
 		}
 	}
 }
diff --git a/articles/data-factory/control-flow-switch-activity.md b/articles/data-factory/control-flow-switch-activity.md
@@ -231,10 +231,7 @@ The pipeline in this example copies data from an input folder to an output folde
     "properties": {
         "type": "AzureStorage",
         "typeProperties": {
-            "connectionString": {
-                "value": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>",
-                "type": "SecureString"
-            }
+            "connectionString": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>"
         }
     }
 }
diff --git a/articles/data-factory/control-flow-until-activity.md b/articles/data-factory/control-flow-until-activity.md
@@ -194,10 +194,7 @@ The pipeline in this sample copies data from an input folder to an output folder
     "properties": {
         "type": "AzureStorage",
         "typeProperties": {
-            "connectionString": {
-                "value": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>",
-                "type": "SecureString"
-            }
+            "connectionString": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>"
         }
     }
 }
diff --git a/articles/data-factory/create-azure-integration-runtime.md b/articles/data-factory/create-azure-integration-runtime.md
@@ -44,10 +44,7 @@ Once an Azure IR is created, you can reference it in your Linked Service definit
     "properties": {
       "type": "AzureStorage",
       "typeProperties": {
-        "connectionString": {
-          "value": "DefaultEndpointsProtocol=https;AccountName=myaccountname;AccountKey=...",
-          "type": "SecureString"
-        }
+        "connectionString": "DefaultEndpointsProtocol=https;AccountName=myaccountname;AccountKey=..."
       },
       "connectVia": {
         "referenceName": "MySampleAzureIR",
diff --git a/articles/data-factory/encrypt-credentials-self-hosted-integration-runtime.md b/articles/data-factory/encrypt-credentials-self-hosted-integration-runtime.md
@@ -34,10 +34,7 @@ Replace `<servername>`, `<databasename>`, `<username>`, and `<password>` with va
 	"properties": {
 		"type": "SqlServer",
 		"typeProperties": {
-			"connectionString": {
-				"type": "SecureString",
-				"value": "Server=<servername>;Database=<databasename>;User ID=<username>;Password=<password>;Timeout=60"
-			}
+			"connectionString": "Server=<servername>;Database=<databasename>;User ID=<username>;Password=<password>;Timeout=60"
 		},
 		"connectVia": {
 			"type": "integrationRuntimeReference",
diff --git a/articles/data-factory/how-to-invoke-ssis-package-stored-procedure-activity.md b/articles/data-factory/how-to-invoke-ssis-package-stored-procedure-activity.md
@@ -200,10 +200,7 @@ Create a linked service to link your Azure SQL database that hosts the SSIS cata
         "properties": {
             "type": "AzureSqlDatabase",
             "typeProperties": {
-                "connectionString": {
-                    "type": "SecureString",
-                    "value": "Server=tcp:<servername>.database.windows.net,1433;Database=SSISDB;User ID=<username>;Password=<password>;Trusted_Connection=False;Encrypt=True;Connection Timeout=30"
-                }
+                "connectionString": "Server=tcp:<servername>.database.windows.net,1433;Database=SSISDB;User ID=<username>;Password=<password>;Trusted_Connection=False;Encrypt=True;Connection Timeout=30"
             }
         }
     }
diff --git a/articles/data-factory/parameterize-linked-services.md b/articles/data-factory/parameterize-linked-services.md
@@ -16,7 +16,7 @@ manager: anandsub
 
 You can now parameterize a linked service and pass dynamic values at run time. For example, if you want to connect to different databases on the same Azure SQL Database server, you can now parameterize the database name in the linked service definition. This prevents you from having to create a linked service for each database on the Azure SQL database server. You can parameterize other properties in the linked service definition as well - for example, *User name.*
 
-You can use the Data Factory UI in the Azure Portal or a programming interface to parameterize linked services.
+You can use the Data Factory UI in the Azure portal or a programming interface to parameterize linked services.
 
 > [!TIP]
 > We recommend not to parameterize passwords or secrets. Store all connection strings in Azure Key Vault instead, and parameterize the *Secret Name*.
@@ -51,10 +51,7 @@ At this time, linked service parameterization is supported in the Data Factory U
 	"properties": {
 		"type": "AzureSqlDatabase",
 		"typeProperties": {
-			"connectionString": {
-				"value": "Server=tcp:myserver.database.windows.net,1433;Database=@{linkedService().DBName};User ID=user;Password=fake;Trusted_Connection=False;Encrypt=True;Connection Timeout=30",
-				"type": "SecureString"
-			}
+			"connectionString": "Server=tcp:myserver.database.windows.net,1433;Database=@{linkedService().DBName};User ID=user;Password=fake;Trusted_Connection=False;Encrypt=True;Connection Timeout=30"
 		},
 		"connectVia": null,
 		"parameters": {
diff --git a/articles/data-factory/transform-data-using-dotnet-custom-activity.md b/articles/data-factory/transform-data-using-dotnet-custom-activity.md
@@ -169,7 +169,7 @@ This sample shows how you can use the referenceObjects and extendedProperties to
             "type": "LinkedServiceReference"
           }]
         },
-        "extendedProperties": {
+        "extendedProperties": {          
           "connectionString": {
             "type": "SecureString",
             "value": "aSampleSecureString"
diff --git a/articles/data-factory/tutorial-bulk-copy.md b/articles/data-factory/tutorial-bulk-copy.md
@@ -123,10 +123,7 @@ In this tutorial, you create three linked services for source, sink, and staging
         "properties": {
             "type": "AzureSqlDatabase",
             "typeProperties": {
-                "connectionString": {
-                    "type": "SecureString",
-                    "value": "Server=tcp:<servername>.database.windows.net,1433;Database=<databasename>;User ID=<username>@<servername>;Password=<password>;Trusted_Connection=False;Encrypt=True;Connection Timeout=30"
-                }
+                "connectionString": "Server=tcp:<servername>.database.windows.net,1433;Database=<databasename>;User ID=<username>@<servername>;Password=<password>;Trusted_Connection=False;Encrypt=True;Connection Timeout=30"
             }
         }
     }
@@ -162,10 +159,7 @@ In this tutorial, you create three linked services for source, sink, and staging
         "properties": {
             "type": "AzureSqlDW",
             "typeProperties": {
-                "connectionString": {
-                    "type": "SecureString",
-                    "value": "Server=tcp:<servername>.database.windows.net,1433;Database=<databasename>;User ID=<username>@<servername>;Password=<password>;Trusted_Connection=False;Encrypt=True;Connection Timeout=30"
-            }
+                "connectionString": "Server=tcp:<servername>.database.windows.net,1433;Database=<databasename>;User ID=<username>@<servername>;Password=<password>;Trusted_Connection=False;Encrypt=True;Connection Timeout=30"
             }
         }
     }
@@ -201,10 +195,7 @@ In this tutorial, you use Azure Blob storage as an interim staging area to enabl
         "properties": {
             "type": "AzureStorage",
             "typeProperties": {
-                "connectionString": {
-                    "type": "SecureString",
-                    "value": "DefaultEndpointsProtocol=https;AccountName=<accountName>;AccountKey=<accountKey>"
-                }
+                "connectionString": "DefaultEndpointsProtocol=https;AccountName=<accountName>;AccountKey=<accountKey>"
             }
         }
     }
diff --git a/articles/data-factory/tutorial-control-flow.md b/articles/data-factory/tutorial-control-flow.md
@@ -603,10 +603,7 @@ Creating linked service AzureStorageLinkedService...
 {
   "type": "AzureStorage",
   "typeProperties": {
-    "connectionString": {
-      "type": "SecureString",
-      "value": "DefaultEndpointsProtocol=https;AccountName=***;AccountKey=***"
-    }
+    "connectionString": "DefaultEndpointsProtocol=https;AccountName=***;AccountKey=***"
   }
 }
 Creating dataset SourceStorageDataset...
diff --git a/articles/data-factory/tutorial-incremental-copy-change-tracking-feature-powershell.md b/articles/data-factory/tutorial-incremental-copy-change-tracking-feature-powershell.md
@@ -203,10 +203,7 @@ In this step, you link your Azure Storage Account to the data factory.
         "properties": {
             "type": "AzureStorage",
             "typeProperties": {
-                "connectionString": {
-                    "value": "DefaultEndpointsProtocol=https;AccountName=<accountName>;AccountKey=<accountKey>",
-                    "type": "SecureString"
-                }
+                "connectionString": "DefaultEndpointsProtocol=https;AccountName=<accountName>;AccountKey=<accountKey>"
             }
         }
     }
@@ -238,10 +235,7 @@ In this step, you link your Azure SQL database to the data factory.
     	"properties": {
     		"type": "AzureSqlDatabase",
     		"typeProperties": {
-    			"connectionString": {
-    				"value": "Server = tcp:<server>.database.windows.net,1433;Initial Catalog=<database name>; Persist Security Info=False; User ID=<user name>; Password=<password>; MultipleActiveResultSets = False; Encrypt = True; TrustServerCertificate = False; Connection Timeout = 30;",
-    				"type": "SecureString"
-    			}
+    			"connectionString": "Server = tcp:<server>.database.windows.net,1433;Initial Catalog=<database name>; Persist Security Info=False; User ID=<user name>; Password=<password>; MultipleActiveResultSets = False; Encrypt = True; TrustServerCertificate = False; Connection Timeout = 30;"
     		}
     	}
     }
diff --git a/articles/data-factory/tutorial-incremental-copy-powershell.md b/articles/data-factory/tutorial-incremental-copy-powershell.md
@@ -200,10 +200,7 @@ You create linked services in a data factory to link your data stores and comput
         "properties": {
             "type": "AzureStorage",
             "typeProperties": {
-                "connectionString": {
-                    "value": "DefaultEndpointsProtocol=https;AccountName=<accountName>;AccountKey=<accountKey>",
-                    "type": "SecureString"
-                }
+                "connectionString": "DefaultEndpointsProtocol=https;AccountName=<accountName>;AccountKey=<accountKey>"
             }
         }
     }
@@ -234,10 +231,7 @@ You create linked services in a data factory to link your data stores and comput
     	"properties": {
     		"type": "AzureSqlDatabase",
     		"typeProperties": {
-    			"connectionString": {
-    				"value": "Server = tcp:<server>.database.windows.net,1433;Initial Catalog=<database>; Persist Security Info=False; User ID=<user> ; Password=<password>; MultipleActiveResultSets = False; Encrypt = True; TrustServerCertificate = False; Connection Timeout = 30;",
-    				"type": "SecureString"
-    			}
+    			"connectionString": "Server = tcp:<server>.database.windows.net,1433;Initial Catalog=<database>; Persist Security Info=False; User ID=<user> ; Password=<password>; MultipleActiveResultSets = False; Encrypt = True; TrustServerCertificate = False; Connection Timeout = 30;"
     		}
     	}
     }
diff --git a/articles/data-factory/tutorial-transform-data-hive-virtual-network.md b/articles/data-factory/tutorial-transform-data-hive-virtual-network.md
@@ -171,10 +171,7 @@ Create a JSON file using your preferred editor, copy the following JSON definiti
     "properties": {
       "type": "AzureStorage",
       "typeProperties": {
-        "connectionString": {
-          "value": "DefaultEndpointsProtocol=https;AccountName=<storageAccountName>;AccountKey=<storageAccountKey>",
-          "type": "SecureString"
-        }
+        "connectionString": "DefaultEndpointsProtocol=https;AccountName=<storageAccountName>;AccountKey=<storageAccountKey>"
       },
       "connectVia": {
         "referenceName": "MySelfhostedIR",
diff --git a/articles/data-factory/tutorial-transform-data-spark-powershell.md b/articles/data-factory/tutorial-transform-data-spark-powershell.md
@@ -85,10 +85,7 @@ Create a JSON file using your preferred editor, copy the following JSON definiti
     "properties": {
       "type": "AzureStorage",
       "typeProperties": {
-        "connectionString": {
-          "value": "DefaultEndpointsProtocol=https;AccountName=<storageAccountName>;AccountKey=<storageAccountKey>",
-          "type": "SecureString"
-        }
+        "connectionString": "DefaultEndpointsProtocol=https;AccountName=<storageAccountName>;AccountKey=<storageAccountKey>"
       }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -163,10 +163,7 @@ This scenario has two pipelines:`
`163`	`163`	`"properties": {`
`164`	`164`	`"type": "AzureStorage",`
`165`	`165`	`"typeProperties": {`
`166`		`- "connectionString": {`
`167`		`- "value": "DefaultEndpointsProtocol=https;AccountName=*****",`
`168`		`- "type": "SecureString"`
`169`		`- }`
	`166`	`+ "connectionString": "DefaultEndpointsProtocol=https;AccountName=***;AccountKey=***"`
`170`	`167`	`}`
`171`	`168`	`}`
`172`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,10 +191,7 @@ Another example for expression is:`
`191`	`191`	`"properties": {`
`192`	`192`	`"type": "AzureStorage",`
`193`	`193`	`"typeProperties": {`
`194`		`- "connectionString": {`
`195`		`- "value": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>",`
`196`		`- "type": "SecureString"`
`197`		`- }`
	`194`	`+ "connectionString": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>"`
`198`	`195`	`}`
`199`	`196`	`}`
`200`	`197`	`}`
Original file line number	Diff line number	Diff line change
`@@ -233,10 +233,7 @@ This storage account contains the JSON file with the names of the SQL tables.`
`233`	`233`	`"properties": {`
`234`	`234`	`"type": "AzureStorage",`
`235`	`235`	`"typeProperties": {`
`236`		`- "connectionString": {`
`237`		`- "value": "DefaultEndpointsProtocol=https;AccountName=<StorageAccountName>;AccountKey=<StorageAccountKey>",`
`238`		`- "type": "SecureString"`
`239`		`- }`
	`236`	`+ "connectionString": "DefaultEndpointsProtocol=https;AccountName=<StorageAccountName>;AccountKey=<StorageAccountKey>"`
`240`	`237`	`}`
`241`	`238`	`},`
`242`	`239`	`"name": "AzureStorageLinkedService"`
`@@ -253,10 +250,7 @@ This Azure SQL Database instance contains the data to be copied to Blob storage.`
`253`	`250`	`"type": "AzureSqlDatabase",`
`254`	`251`	`"description": "",`
`255`	`252`	`"typeProperties": {`
`256`		`- "connectionString": {`
`257`		`- "value": "Server=<server>;Initial Catalog=<database>;User ID=<user>;Password=<password>;",`
`258`		`- "type": "SecureString"`
`259`		`- }`
	`253`	`+ "connectionString": "Server=<server>;Initial Catalog=<database>;User ID=<user>;Password=<password>;"`
`260`	`254`	`}`
`261`	`255`	`}`
`262`	`256`	`}`
Original file line number	Diff line number	Diff line change
`@@ -231,10 +231,7 @@ The pipeline in this example copies data from an input folder to an output folde`
`231`	`231`	`"properties": {`
`232`	`232`	`"type": "AzureStorage",`
`233`	`233`	`"typeProperties": {`
`234`		`- "connectionString": {`
`235`		`- "value": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>",`
`236`		`- "type": "SecureString"`
`237`		`- }`
	`234`	`+ "connectionString": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>"`
`238`	`235`	`}`
`239`	`236`	`}`
`240`	`237`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,10 +194,7 @@ The pipeline in this sample copies data from an input folder to an output folder`
`194`	`194`	`"properties": {`
`195`	`195`	`"type": "AzureStorage",`
`196`	`196`	`"typeProperties": {`
`197`		`- "connectionString": {`
`198`		`- "value": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>",`
`199`		`- "type": "SecureString"`
`200`		`- }`
	`197`	`+ "connectionString": "DefaultEndpointsProtocol=https;AccountName=<Azure Storage account name>;AccountKey=<Azure Storage account key>"`
`201`	`198`	`}`
`202`	`199`	`}`
`203`	`200`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,10 +200,7 @@ Create a linked service to link your Azure SQL database that hosts the SSIS cata`
`200`	`200`	`"properties": {`
`201`	`201`	`"type": "AzureSqlDatabase",`
`202`	`202`	`"typeProperties": {`
`203`		`- "connectionString": {`
`204`		`- "type": "SecureString",`
`205`		`- "value": "Server=tcp:<servername>.database.windows.net,1433;Database=SSISDB;User ID=<username>;Password=<password>;Trusted_Connection=False;Encrypt=True;Connection Timeout=30"`
`206`		`- }`
	`203`	`+ "connectionString": "Server=tcp:<servername>.database.windows.net,1433;Database=SSISDB;User ID=<username>;Password=<password>;Trusted_Connection=False;Encrypt=True;Connection Timeout=30"`
`207`	`204`	`}`
`208`	`205`	`}`
`209`	`206`	`}`