Skip to content

Commit 219d3c4

Browse files
authored
Revert "Feature/provision proj conn (#219)" (#221)
This reverts commit 5982562.
1 parent 5982562 commit 219d3c4

File tree

8 files changed

+29
-1634
lines changed

8 files changed

+29
-1634
lines changed

azure.yaml

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
name: azd-get-started-with-ai-agents
66
metadata:
7-
template: azd-get-started-with-ai-agents@2.2.0
7+
template: azd-get-started-with-ai-agents@2.1.1
88
requiredVersions:
99
azd: ">=1.14.0"
1010

@@ -20,12 +20,6 @@ hooks:
2020
run: ./scripts/validate_env_vars.ps1
2121
interactive: true
2222
continueOnError: false
23-
preprovision:
24-
windows:
25-
shell: pwsh
26-
run: ./scripts/sync_root_env_to_azd_env.ps1; ./scripts/prompt_sub_reg_mod.ps1
27-
interactive: true
28-
continueOnError: false
2923
postdeploy:
3024
windows:
3125
shell: pwsh
@@ -81,12 +75,3 @@ pipeline:
8175
- AZURE_EXISTING_AGENT_ID
8276
- ENABLE_AZURE_MONITOR_TRACING
8377
- OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT
84-
- PROJ_CONN_SHAREPOINT_KEY
85-
- PROJ_CONN_SHAREPOINT_TARGET
86-
- PROJ_CONN_BROWSER_AUTOMATION_KEY
87-
- PROJ_CONN_BROWSER_AUTOMATION_TARGET
88-
- PROJ_CONN_OPEN_API_KEY
89-
- PROJ_CONN_FABRIC_WORKSPACE_ID
90-
- PROJ_CONN_FABRIC_ARTIFACT_ID
91-
- PROJ_CONN_MCP_KEY
92-
- PROJ_CONN_A2A_TARGET

infra/core/ai/cognitiveservices.bicep

Lines changed: 0 additions & 196 deletions
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,6 @@ param aoaiConnectionName string
1414
param storageAccountId string
1515
param storageAccountConnectionName string
1616
param storageAccountBlobEndpoint string
17-
param sharepointConnectionTarget string = ''
18-
@secure()
19-
param bingConnectionKey string = ''
20-
param bingConnectionTarget string = ''
21-
param bingConnectionResourceId string = ''
22-
@secure()
23-
param bingCustomConnectionKey string = ''
24-
param bingCustomConnectionTarget string = ''
25-
param bingCustomConnectionResourceId string = ''
26-
@secure()
27-
param browserAutomationConnectionKey string = ''
28-
param browserAutomationConnectionTarget string = ''
29-
@secure()
30-
param openApiConnectionKey string = ''
31-
@secure()
32-
param fabricConnectionWorkspaceId string = ''
33-
@secure()
34-
param fabricConnectionArtifactId string = ''
35-
@secure()
36-
param mcpConnectionKey string = ''
37-
param a2aConnectionTarget string = ''
3817

3918
@allowed([ 'Enabled', 'Disabled' ])
4019
param publicNetworkAccess string = 'Enabled'
@@ -119,181 +98,6 @@ resource storageAccountConnection 'Microsoft.CognitiveServices/accounts/connecti
11998
}
12099
}
121100

122-
module sharepointConnection './connection.bicep' = if (!empty(sharepointConnectionTarget)) {
123-
name: 'sharepoint-connection'
124-
dependsOn: [aiProject]
125-
params: {
126-
aiServicesAccountName: aiServiceName
127-
aiProjectName: aiProjectName
128-
connectionConfig: {
129-
name: 'sharepoint'
130-
category: 'CustomKeys'
131-
target: '_'
132-
authType: 'CustomKeys'
133-
isSharedToAll: true
134-
metadata: {
135-
type: 'sharepoint_grounding'
136-
}
137-
credentials: {
138-
site_url: sharepointConnectionTarget
139-
}
140-
}
141-
}
142-
}
143-
144-
module bingConnection './connection.bicep' = if (!empty(bingConnectionKey) && !empty(bingConnectionTarget)) {
145-
name: 'bing-connection'
146-
dependsOn: [aiProject]
147-
params: {
148-
aiServicesAccountName: aiServiceName
149-
aiProjectName: aiProjectName
150-
connectionConfig: {
151-
name: 'bing'
152-
category: 'GroundingWithBingSearch'
153-
target: bingConnectionTarget
154-
authType: 'ApiKey'
155-
isSharedToAll: false
156-
metadata: {
157-
ApiType: 'Azure'
158-
ResourceId: bingConnectionResourceId
159-
type: 'bing_grounding'
160-
}
161-
}
162-
apiKey: bingConnectionKey
163-
}
164-
}
165-
166-
module bingCustomConnection './connection.bicep' = if (!empty(bingCustomConnectionKey) && !empty(bingCustomConnectionTarget)) {
167-
name: 'bing-custom-connection'
168-
dependsOn: [aiProject]
169-
params: {
170-
aiServicesAccountName: aiServiceName
171-
aiProjectName: aiProjectName
172-
connectionConfig: {
173-
name: 'bing-custom'
174-
category: 'GroundingWithCustomSearch'
175-
target: bingCustomConnectionTarget
176-
authType: 'ApiKey'
177-
isSharedToAll: false
178-
metadata: {
179-
ApiType: 'Azure'
180-
ResourceId: bingCustomConnectionResourceId
181-
type: 'bing_custom_search'
182-
}
183-
}
184-
apiKey: bingCustomConnectionKey
185-
}
186-
}
187-
188-
module browserAutomationConnection './connection.bicep' = if (!empty(browserAutomationConnectionKey) && !empty(browserAutomationConnectionTarget)) {
189-
name: 'browser-automation-connection'
190-
dependsOn: [aiProject]
191-
params: {
192-
aiServicesAccountName: aiServiceName
193-
aiProjectName: aiProjectName
194-
connectionConfig: {
195-
name: 'browser-automation'
196-
category: 'Serverless'
197-
target: browserAutomationConnectionTarget
198-
authType: 'ApiKey'
199-
isSharedToAll: false
200-
metadata: {
201-
type: 'browser_automation_preview'
202-
}
203-
}
204-
apiKey: browserAutomationConnectionKey
205-
}
206-
}
207-
208-
module openApiConnection './connection.bicep' = if (!empty(openApiConnectionKey)) {
209-
name: 'openapi-connection'
210-
dependsOn: [aiProject]
211-
params: {
212-
aiServicesAccountName: aiServiceName
213-
aiProjectName: aiProjectName
214-
connectionConfig: {
215-
name: 'openapi'
216-
category: 'CustomKeys'
217-
target: '_'
218-
authType: 'CustomKeys'
219-
isSharedToAll: false
220-
metadata: {
221-
type: 'openapi'
222-
}
223-
credentials: {
224-
key: openApiConnectionKey
225-
}
226-
}
227-
}
228-
}
229-
230-
module fabricConnection './connection.bicep' = if (!empty(fabricConnectionWorkspaceId) && !empty(fabricConnectionArtifactId)) {
231-
name: 'fabric-connection'
232-
dependsOn: [aiProject]
233-
params: {
234-
aiServicesAccountName: aiServiceName
235-
aiProjectName: aiProjectName
236-
connectionConfig: {
237-
name: 'fabric'
238-
category: 'CustomKeys'
239-
target: '_'
240-
authType: 'CustomKeys'
241-
isSharedToAll: false
242-
metadata: {
243-
type: 'fabric_dataagent_preview'
244-
}
245-
credentials: {
246-
'workspace-id': fabricConnectionWorkspaceId
247-
'artifact-id': fabricConnectionArtifactId
248-
workspaceId: fabricConnectionWorkspaceId
249-
artifactId: fabricConnectionArtifactId
250-
}
251-
sharedUserList: []
252-
}
253-
}
254-
}
255-
256-
module mcpConnection './connection.bicep' = if (!empty(mcpConnectionKey)) {
257-
name: 'mcp-connection'
258-
dependsOn: [aiProject]
259-
params: {
260-
aiServicesAccountName: aiServiceName
261-
aiProjectName: aiProjectName
262-
connectionConfig: {
263-
name: 'mcp'
264-
category: 'RemoteTool'
265-
target: 'https://api.githubcopilot.com/mcp'
266-
authType: 'CustomKeys'
267-
isSharedToAll: false
268-
metadata: {
269-
type: 'custom_MCP'
270-
}
271-
credentials: {
272-
Authorization: 'Bearer github_pat_${mcpConnectionKey}'
273-
}
274-
}
275-
}
276-
}
277-
278-
module a2aConnection './connection.bicep' = if (!empty(a2aConnectionTarget)) {
279-
name: 'a2a-connection'
280-
dependsOn: [aiProject]
281-
params: {
282-
aiServicesAccountName: aiServiceName
283-
aiProjectName: aiProjectName
284-
connectionConfig: {
285-
name: 'a2a'
286-
category: 'RemoteA2A'
287-
target: a2aConnectionTarget
288-
authType: 'None'
289-
isSharedToAll: false
290-
metadata: {
291-
type: 'custom_A2A'
292-
}
293-
}
294-
}
295-
}
296-
297101
resource aiProject 'Microsoft.CognitiveServices/accounts/projects@2025-04-01-preview' = {
298102
parent: account
299103
name: aiProjectName

infra/core/ai/connection.bicep

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)