diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 0081dc7..5f19168 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -62,8 +62,10 @@ jobs: - run: az cosmosdb create --kind GlobalDocumentDB --locations regionName=$Location failoverPriority=0 isZoneRedundant=False --resource-group $ResourceGroup --name $CosmosAccount --capabilities EnableServerless --backup-policy-type Continuous - run: az cosmosdb sql database create --account-name $CosmosAccount --name $CosmosDatabase --resource-group $ResourceGroup - run: az cosmosdb sql container create --account-name $CosmosAccount --database-name $CosmosDatabase --name $CosmosCollection --partition-key-path "/id" --resource-group $ResourceGroup - #- run: az cosmosdb sql role assignment create --account-name $CosmosAccount --resource-group $ResourceGroup --scope "/" --role-definition-name "Contributor" --principal-id $(az functionapp identity show --name $FunctionApp --resource-group $ResourceGroup --query principalId) - - run: az functionapp config appsettings set --name $FunctionApp --resource-group $ResourceGroup --settings "CosmosDBConnectionString=$(az cosmosdb keys list --type connection-strings --name $CosmosAccount --resource-group $ResourceGroup --query connectionStrings[0].connectionString --output tsv)" --query "[name]" + - run: az functionapp config appsettings set --name $FunctionApp --resource-group $ResourceGroup --settings "CosmosDBConnection__accountEndpoint=https://$CosmosAccount.documents.azure.com:443" --query "[name]" + - run: az cosmosdb sql role assignment create --account-name $CosmosAccount --resource-group $ResourceGroup --scope "/" --role-definition-name "Cosmos DB Built-in Data Contributor" --principal-id $(az functionapp identity show --name $FunctionApp --resource-group $ResourceGroup --query principalId --output tsv) + - run: az cosmosdb update --name $CosmosAccount --resource-group $ResourceGroup --disable-key-based-metadata-write-access true + #- run: az functionapp config appsettings set --name $FunctionApp --resource-group $ResourceGroup --settings "CosmosDBConnectionString=$(az cosmosdb keys list --type connection-strings --name $CosmosAccount --resource-group $ResourceGroup --query connectionStrings[0].connectionString --output tsv)" --query "[name]" - uses: actions/download-artifact@v3 - uses: Azure/functions-action@v1 with: @@ -120,8 +122,10 @@ jobs: - run: az cosmosdb create --kind GlobalDocumentDB --locations regionName=$Location failoverPriority=0 isZoneRedundant=False --resource-group $ResourceGroup --name $CosmosAccount --capabilities EnableServerless --backup-policy-type Continuous - run: az cosmosdb sql database create --account-name $CosmosAccount --name $CosmosDatabase --resource-group $ResourceGroup - run: az cosmosdb sql container create --account-name $CosmosAccount --database-name $CosmosDatabase --name $CosmosCollection --partition-key-path "/id" --resource-group $ResourceGroup - #- run: az cosmosdb sql role assignment create --account-name $CosmosAccount --resource-group $ResourceGroup --scope "/" --role-definition-name "Contributor" --principal-id $(az functionapp identity show --name $FunctionApp --resource-group $ResourceGroup --query principalId) - - run: az functionapp config appsettings set --name $FunctionApp --resource-group $ResourceGroup --settings "CosmosDBConnectionString=$(az cosmosdb keys list --type connection-strings --name $CosmosAccount --resource-group $ResourceGroup --query connectionStrings[0].connectionString --output tsv)" --query "[name]" + - run: az functionapp config appsettings set --name $FunctionApp --resource-group $ResourceGroup --settings "CosmosDBConnection__accountEndpoint=https://$CosmosAccount.documents.azure.com:443" --query "[name]" + - run: az cosmosdb sql role assignment create --account-name $CosmosAccount --resource-group $ResourceGroup --scope "/" --role-definition-name "Cosmos DB Built-in Data Contributor" --principal-id $(az functionapp identity show --name $FunctionApp --resource-group $ResourceGroup --query principalId --output tsv) + - run: az cosmosdb update --name $CosmosAccount --resource-group $ResourceGroup --disable-key-based-metadata-write-access true + #- run: az functionapp config appsettings set --name $FunctionApp --resource-group $ResourceGroup --settings "CosmosDBConnectionString=$(az cosmosdb keys list --type connection-strings --name $CosmosAccount --resource-group $ResourceGroup --query connectionStrings[0].connectionString --output tsv)" --query "[name]" - uses: actions/download-artifact@v3 - uses: Azure/functions-action@v1 with: diff --git a/HttpExample/function.json b/HttpExample/function.json index acae8b7..607717b 100644 --- a/HttpExample/function.json +++ b/HttpExample/function.json @@ -18,7 +18,7 @@ "direction": "out", "databaseName": "mydatabase", "collectionName": "mycollection", - "connectionStringSetting": "CosmosDBConnectionString" + "connection": "CosmosDBConnection" } ] -} \ No newline at end of file +} diff --git a/host.json b/host.json index 9343914..ddfa0d4 100644 --- a/host.json +++ b/host.json @@ -1,8 +1,8 @@ { "version": "2.0", "extensionBundle": { - "id": "Microsoft.Azure.Functions.ExtensionBundle", - "version": "[2.*, 3.0.0)" + "id": "Microsoft.Azure.Functions.ExtensionBundle.Preview", + "version": "[4.0.0, 5.0.0)" }, "customHandler": { "description": { @@ -12,11 +12,7 @@ }, "extensions": { "cosmosDB": { - "connectionMode": "Gateway", - "protocol": "Https", - "leaseOptions": { - "leasePrefix": "prefix1" - } + "connectionMode": "Gateway" } } -} \ No newline at end of file +}