From a7a8099a93d07d1e606c72f5904d186060fa379a Mon Sep 17 00:00:00 2001 From: Jan-Henrik Damaschke Date: Sun, 10 Jul 2022 17:24:52 +0200 Subject: [PATCH] fix(documentdb): Leave out not supported throughput field when cosmosdb is deployed serverless --- .../databaseAccounts/gremlinDatabases/deploy.bicep | 2 +- .../databaseAccounts/mongodbDatabases/collections/deploy.bicep | 2 +- .../databaseAccounts/mongodbDatabases/deploy.bicep | 2 +- .../databaseAccounts/sqlDatabases/containers/deploy.bicep | 2 +- .../databaseAccounts/sqlDatabases/deploy.bicep | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/deploy.bicep index 956bb758f5..216c5dd7ec 100644 --- a/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/deploy.bicep +++ b/modules/Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/deploy.bicep @@ -50,7 +50,7 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2022-02-15-previ name: databaseAccountName } -var databaseOptions = contains(databaseAccount.properties.capabilities, 'EnableServerless') ? {} : { +var databaseOptions = contains(databaseAccount.properties.capabilities, { name: 'EnableServerless' }) ? {} : { autoscaleSettings: throughput == -1 ? { maxThroughput: maxThroughput } : null diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep index 803a5ccaf7..a64540e599 100644 --- a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep +++ b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/collections/deploy.bicep @@ -43,7 +43,7 @@ resource collection 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/coll name: name parent: databaseAccount::mongodbDatabase properties: { - options: { + options: contains(databaseAccount.properties.capabilities, { name: 'EnableServerless' }) ? null : { throughput: throughput } resource: { diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep index 7ec003f4fd..235b51fc40 100644 --- a/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep +++ b/modules/Microsoft.DocumentDB/databaseAccounts/mongodbDatabases/deploy.bicep @@ -42,7 +42,7 @@ resource mongodbDatabase 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases resource: { id: name } - options: { + options: contains(databaseAccount.properties.capabilities, { name: 'EnableServerless' }) ? null : { throughput: throughput } } diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep index ca00dbe99e..f832a93fc6 100644 --- a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep +++ b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/deploy.bicep @@ -59,7 +59,7 @@ resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/container kind: kind } } - options: { + options: contains(databaseAccount.properties.capabilities, { name: 'EnableServerless' }) ? null : { throughput: throughput } } diff --git a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep index 23a662b0ae..e0e8fff996 100644 --- a/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep +++ b/modules/Microsoft.DocumentDB/databaseAccounts/sqlDatabases/deploy.bicep @@ -42,7 +42,7 @@ resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-06 resource: { id: name } - options: { + options: contains(databaseAccount.properties.capabilities, { name: 'EnableServerless' }) ? null : { throughput: throughput } }