Skip to content

fix: removal of the cosmosThroughput parameter and the addition of the EnableServerless capability. #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 24, 2025
Merged

fix: removal of the cosmosThroughput parameter and the addition of the EnableServerless capability. #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2396302
Cosmos made as serverless
Roopan-Microsoft Mar 4, 2025
8b50482
Merge pull request #81 from microsoft/psl-cosmos-update
Roopan-Microsoft Mar 4, 2025
1d19b29
Merge branch 'main' into dev
Roopan-Microsoft Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions deploy/macae-continer-oc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"metadata": {
"_generator": {
"name": "bicep",
"version": "0.32.4.45862",
"templateHash": "14272651486454797588"
"version": "0.33.93.31351",
"templateHash": "9524414973084491660"
}
},
"parameters": {
Expand Down Expand Up @@ -44,9 +44,6 @@
"gpt4oCapacity": {
"type": "int"
},
"cosmosThroughput": {
"type": "int"
},
"containerAppSize": {
"type": "object",
"properties": {
Expand All @@ -67,7 +64,6 @@
},
"defaultValue": {
"gpt4oCapacity": 50,
"cosmosThroughput": 1000,
"containerAppSize": {
"cpu": "2.0",
"memory": "4.0Gi",
Expand Down Expand Up @@ -147,9 +143,6 @@
"resource": {
"id": "autogen",
"createMode": "Default"
},
"options": {
"throughput": "[parameters('resourceSize').cosmosThroughput]"
}
},
"dependsOn": [
Expand Down Expand Up @@ -244,6 +237,11 @@
"failoverPriority": 0,
"locationName": "[parameters('location')]"
}
],
"capabilities": [
{
"name": "EnableServerless"
}
]
}
},
Expand Down
6 changes: 1 addition & 5 deletions deploy/macae-continer.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ param tags object = {}
@description('The size of the resources to deploy, defaults to a mini size')
param resourceSize {
gpt4oCapacity: int
cosmosThroughput: int
containerAppSize: {
cpu: string
memory: string
Expand All @@ -24,7 +23,6 @@ param resourceSize {
}
} = {
gpt4oCapacity: 50
cosmosThroughput: 1000
containerAppSize: {
cpu: '2.0'
memory: '4.0Gi'
Expand Down Expand Up @@ -124,6 +122,7 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
locationName: location
}
]
capabilities: [ { name: 'EnableServerless' } ]
}

resource contributorRoleDefinition 'sqlRoleDefinitions' existing = {
Expand All @@ -137,9 +136,6 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
id: 'autogen'
createMode: 'Default'
}
options: {
throughput: resourceSize.cosmosThroughput
}
}

resource memoryContainer 'containers' = {
Expand Down
4 changes: 1 addition & 3 deletions deploy/macae-dev.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
locationName: cosmosLocation
}
]
capabilities: [ { name: 'EnableServerless' } ]
}

resource contributorRoleDefinition 'sqlRoleDefinitions' existing = {
Expand All @@ -99,9 +100,6 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
id: 'autogen'
createMode: 'Default'
}
options: {
throughput: 400
}
}

resource memoryContainer 'containers' = {
Expand Down
1 change: 0 additions & 1 deletion deploy/macae-large.bicepparam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ using './macae.bicep'

param resourceSize = {
gpt4oCapacity: 50
cosmosThroughput: 1000
containerAppSize: {
cpu: '2.0'
memory: '4.0Gi'
Expand Down
1 change: 0 additions & 1 deletion deploy/macae-mini.bicepparam
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ using './macae.bicep'

param resourceSize = {
gpt4oCapacity: 15
cosmosThroughput: 400
containerAppSize: {
cpu: '1.0'
memory: '2.0Gi'
Expand Down
6 changes: 1 addition & 5 deletions deploy/macae.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ param tags object = {}
@description('The size of the resources to deploy, defaults to a mini size')
param resourceSize {
gpt4oCapacity: int
cosmosThroughput: int
containerAppSize: {
cpu: string
memory: string
Expand All @@ -27,7 +26,6 @@ param resourceSize {
}
} = {
gpt4oCapacity: 50
cosmosThroughput: 1000
containerAppSize: {
cpu: '2.0'
memory: '4.0Gi'
Expand Down Expand Up @@ -154,6 +152,7 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
locationName: cosmosLocation
}
]
capabilities: [ { name: 'EnableServerless' } ]
}

resource contributorRoleDefinition 'sqlRoleDefinitions' existing = {
Expand All @@ -167,9 +166,6 @@ resource cosmos 'Microsoft.DocumentDB/databaseAccounts@2024-05-15' = {
id: 'autogen'
createMode: 'Default'
}
options: {
throughput: resourceSize.cosmosThroughput
}
}

resource memoryContainer 'containers' = {
Expand Down
Loading