Merge pull request #3420 from microsoft/darrenj/usecosmosdbfix

lauren-mills · web-flow · commit 6a242fa83a42 · 2020-05-27T11:09:10.000-07:00
Fix to ARM Template to respect useComosDb on database
diff --git a/samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/Deployment/Resources/template.json b/samples/csharp/assistants/virtual-assistant/VirtualAssistantSample/Deployment/Resources/template.json
@@ -216,7 +216,8 @@
         "options": {
           "throughput": "[parameters('cosmosDbDatabaseThroughput')]"
         }
-      }
+      },
+      "condition": "[parameters('useCosmosDb')]"
     },
     {
       "comments": "storage account",
diff --git a/samples/csharp/skill/SkillSample/Deployment/Resources/template.json b/samples/csharp/skill/SkillSample/Deployment/Resources/template.json
@@ -166,7 +166,8 @@
         "options": {
           "throughput": "[parameters('cosmosDbDatabaseThroughput')]"
         }
-      }
+      },
+      "condition": "[parameters('useCosmosDb')]"
     },
     {
       "comments": "storage account",

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,8 @@`
`216`	`216`	`"options": {`
`217`	`217`	`"throughput": "[parameters('cosmosDbDatabaseThroughput')]"`
`218`	`218`	`}`
`219`		`- }`
	`219`	`+ },`
	`220`	`+ "condition": "[parameters('useCosmosDb')]"`
`220`	`221`	`},`
`221`	`222`	`{`
`222`	`223`	`"comments": "storage account",`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,8 @@`
`166`	`166`	`"options": {`
`167`	`167`	`"throughput": "[parameters('cosmosDbDatabaseThroughput')]"`
`168`	`168`	`}`
`169`		`- }`
	`169`	`+ },`
	`170`	`+ "condition": "[parameters('useCosmosDb')]"`
`170`	`171`	`},`
`171`	`172`	`{`
`172`	`173`	`"comments": "storage account",`