Skip to content

Commit 9dc1e86

Browse files
committed
chore: remove APIM and App Registration from deployment
- Comment out API Management service deployment (not used in lab) - Comment out App Registration module (only needed for APIM) - Remove all APIM-related outputs - Update allowed regions to remove 'westus' (westus2, westus3, eastus2 only) This simplifies the deployment by removing unused infrastructure components.
1 parent 3c78f9e commit 9dc1e86

File tree

1 file changed

+55
-52
lines changed

1 file changed

+55
-52
lines changed

infra/main.bicep

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ param environmentName string
77

88
@minLength(1)
99
@description('Primary location for all resources')
10-
@allowed([ 'westus', 'westus2', 'westus3', 'eastus2'])
10+
@allowed([ 'westus2', 'westus3', 'eastus2'])
1111
@metadata({
1212
azd: {
1313
type: 'location'
@@ -40,15 +40,17 @@ param chatModelName string = 'gpt-4o-mini'
4040
@allowed(['text-embedding-3-small'])
4141
param embeddingModelName string = 'text-embedding-3-small'
4242

43-
param apimServiceName string = ''
44-
param apimPublisherName string = 'Snippy API'
45-
param apimPublisherEmail string = '[email protected]'
43+
// APIM is not used in the lab - commented out to reduce deployment complexity
44+
// param apimServiceName string = ''
45+
// param apimPublisherName string = 'Snippy API'
46+
// param apimPublisherEmail string = '[email protected]'
4647

4748
// App registration parameters - values set by preprovision hook (scripts/setup-app-registration.sh)
48-
param appRegistrationDisplayName string = '' // Set automatically: snippy-mcp-server-{resourceToken}
49-
param appRegistrationClientId string = '' // Set via 'azd env set APP_REGISTRATION_CLIENT_ID <value>'
50-
param appRegistrationObjectId string = ''
51-
param appRegistrationScopeId string = '' // Set via 'azd env set APP_REGISTRATION_SCOPE_ID <value>'
49+
// NOTE: App registration is only needed for APIM integration, which is currently disabled
50+
// param appRegistrationDisplayName string = '' // Set automatically: snippy-mcp-server-{resourceToken}
51+
// param appRegistrationClientId string = '' // Set via 'azd env set APP_REGISTRATION_CLIENT_ID <value>'
52+
// param appRegistrationObjectId string = ''
53+
// param appRegistrationScopeId string = '' // Set via 'azd env set APP_REGISTRATION_SCOPE_ID <value>'
5254

5355
import * as regionSelector from './app/util/region-selector.bicep'
5456
var abbrs = loadJsonContent('./abbreviations.json')
@@ -253,36 +255,36 @@ module api './app/api.bicep' = {
253255
]
254256
}
255257

256-
// API Management service
257-
module apim './app/apim.bicep' = {
258-
name: 'apim'
259-
scope: rg
260-
params: {
261-
name: !empty(apimServiceName) ? apimServiceName : '${abbrs.apiManagementService}${resourceToken}-${actualSuffix}'
262-
location: regionSelector.getApimBasicV2Region(location)
263-
tags: tags
264-
publisherName: apimPublisherName
265-
publisherEmail: apimPublisherEmail
266-
skuName: 'BasicV2'
267-
skuCapacity: 1
268-
appRegistrationClientId: appRegistrationClientId
269-
}
270-
dependsOn: [
271-
appRegistration
272-
]
273-
}
274-
275-
// App Registration for MCP Server
276-
module appRegistration './app/app-registration.bicep' = if (!empty(appRegistrationClientId) && !empty(appRegistrationScopeId)) {
277-
name: 'appRegistration'
278-
scope: rg
279-
params: {
280-
displayName: appRegistrationDisplayName
281-
applicationId: appRegistrationClientId
282-
objectId: appRegistrationObjectId
283-
scopeId: appRegistrationScopeId
284-
}
285-
}
258+
// API Management service - Not used in the lab, commented out to simplify deployment
259+
// module apim './app/apim.bicep' = {
260+
// name: 'apim'
261+
// scope: rg
262+
// params: {
263+
// name: !empty(apimServiceName) ? apimServiceName : '${abbrs.apiManagementService}${resourceToken}-${actualSuffix}'
264+
// location: regionSelector.getApimBasicV2Region(location)
265+
// tags: tags
266+
// publisherName: apimPublisherName
267+
// publisherEmail: apimPublisherEmail
268+
// skuName: 'BasicV2'
269+
// skuCapacity: 1
270+
// appRegistrationClientId: appRegistrationClientId
271+
// }
272+
// dependsOn: [
273+
// appRegistration
274+
// ]
275+
// }
276+
277+
// App Registration for MCP Server - Only needed for APIM, commented out
278+
// module appRegistration './app/app-registration.bicep' = if (!empty(appRegistrationClientId) && !empty(appRegistrationScopeId)) {
279+
// name: 'appRegistration'
280+
// scope: rg
281+
// params: {
282+
// displayName: appRegistrationDisplayName
283+
// applicationId: appRegistrationClientId
284+
// objectId: appRegistrationObjectId
285+
// scopeId: appRegistrationScopeId
286+
// }
287+
// }
286288

287289
// Durable Task Scheduler
288290
module dts './app/dts.bicep' = {
@@ -346,23 +348,24 @@ output AZURE_FUNCTION_NAME string = api.outputs.SERVICE_API_NAME // Function App
346348
@description('Connection string for the Azure Storage Account. Output name matches the AzureWebJobsStorage key in local settings.')
347349
output AZUREWEBJOBSSTORAGE string = storage.outputs.primaryBlobEndpoint
348350

349-
@description('API Management gateway URL for external API access.')
350-
output APIM_GATEWAY_URL string = apim.outputs.gatewayUrl
351+
// APIM-related outputs - Not used in the lab, commented out
352+
// @description('API Management gateway URL for external API access.')
353+
// output APIM_GATEWAY_URL string = apim.outputs.gatewayUrl
351354

352-
@description('API Management service name.')
353-
output APIM_SERVICE_NAME string = apim.outputs.apiManagementName
355+
// @description('API Management service name.')
356+
// output APIM_SERVICE_NAME string = apim.outputs.apiManagementName
354357

355-
@description('API Management management API URL.')
356-
output APIM_MANAGEMENT_URL string = apim.outputs.managementApiUrl
358+
// @description('API Management management API URL.')
359+
// output APIM_MANAGEMENT_URL string = apim.outputs.managementApiUrl
357360

358-
@description('App Registration Application ID (Client ID).')
359-
output APP_REGISTRATION_CLIENT_ID string = !empty(appRegistrationClientId) ? appRegistrationClientId : ''
361+
// @description('App Registration Application ID (Client ID).')
362+
// output APP_REGISTRATION_CLIENT_ID string = !empty(appRegistrationClientId) ? appRegistrationClientId : ''
360363

361-
@description('App Registration Application ID URI.')
362-
output APP_REGISTRATION_ID_URI string = !empty(appRegistrationClientId) ? 'api://${appRegistrationClientId}' : ''
364+
// @description('App Registration Application ID URI.')
365+
// output APP_REGISTRATION_ID_URI string = !empty(appRegistrationClientId) ? 'api://${appRegistrationClientId}' : ''
363366

364-
@description('App Registration Scope ID.')
365-
output APP_REGISTRATION_SCOPE_ID string = !empty(appRegistrationScopeId) ? appRegistrationScopeId : ''
367+
// @description('App Registration Scope ID.')
368+
// output APP_REGISTRATION_SCOPE_ID string = !empty(appRegistrationScopeId) ? appRegistrationScopeId : ''
366369

367-
@description('App Registration Display Name.')
368-
output APP_REGISTRATION_DISPLAY_NAME string = appRegistrationDisplayName
370+
// @description('App Registration Display Name.')
371+
// output APP_REGISTRATION_DISPLAY_NAME string = appRegistrationDisplayName

0 commit comments

Comments
 (0)