Skip to content

Commit 675a3a2

Browse files
authored
Merge pull request #94 from microsoft/ckm-v2-dev
Bug 4931 - clean update debug code and comments
2 parents d982844 + 9d53aa8 commit 675a3a2

File tree

3 files changed

+0
-112
lines changed

3 files changed

+0
-112
lines changed

Deployment/bicep/deploy_azure_open_ai.bicep

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,25 +24,6 @@ resource accounts_ckm_openai_name_resource 'Microsoft.CognitiveServices/accounts
2424
}
2525
}
2626

27-
// resource accounts_ckm_openai_name_gpt_35_turbo 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = {
28-
// parent: accounts_ckm_openai_name_resource
29-
// name: 'gpt-35-turbo-16k'
30-
// sku: {
31-
// name: 'Standard'
32-
// capacity: 30
33-
// }
34-
// properties: {
35-
// model: {
36-
// format: 'OpenAI'
37-
// name: 'gpt-35-turbo-16k'
38-
// version: '0613'
39-
// }
40-
// versionUpgradeOption: 'OnceNewDefaultVersionAvailable'
41-
// raiPolicyName: 'Microsoft.Default'
42-
// }
43-
// //dependsOn:[accounts_ckm_openai_name_resource]
44-
// }
45-
4627
resource accounts_ckm_openai_name_gpt_4 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = {
4728
parent: accounts_ckm_openai_name_resource
4829
name: 'gpt-4'

Deployment/bicep/deploy_keyvault.bicep

Lines changed: 0 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -232,55 +232,6 @@ resource azureOpenAIEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-
232232
}
233233
}
234234

235-
// resource azureSearchAdminKeyEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
236-
// parent: keyVault
237-
// name: 'AZURE-SEARCH-KEY'
238-
// properties: {
239-
// value: azureSearchAdminKey
240-
// }
241-
// }
242-
243-
// resource azureSearchServiceEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
244-
// parent: keyVault
245-
// name: 'AZURE-SEARCH-ENDPOINT'
246-
// properties: {
247-
// value: azureSearchServiceEndpoint
248-
// }
249-
// }
250-
251-
// resource azureSearchServiceEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
252-
// parent: keyVault
253-
// name: 'AZURE-SEARCH-SERVICE'
254-
// properties: {
255-
// value: azureSearchServiceName
256-
// }
257-
// }
258-
259-
// resource azureSearchArticlesIndexEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
260-
// parent: keyVault
261-
// name: 'AZURE-SEARCH-INDEX-ARTICLES'
262-
// properties: {
263-
// value: azureSearchArticlesIndex
264-
// }
265-
// }
266-
267-
// resource azureSearchGrantsIndexEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
268-
// parent: keyVault
269-
// name: 'AZURE-SEARCH-INDEX-GRANTS'
270-
// properties: {
271-
// value: azureSearchGrantsIndex
272-
// }
273-
// }
274-
275-
// resource azureSearchDraftsIndexEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
276-
// parent: keyVault
277-
// name: 'AZURE-SEARCH-INDEX-DRAFTS'
278-
// properties: {
279-
// value: azureSearchDraftsIndex
280-
// }
281-
// }
282-
283-
284235
resource cogServiceEndpointEntry 'Microsoft.KeyVault/vaults/secrets@2021-11-01-preview' = {
285236
parent: keyVault
286237
name: 'COG-SERVICES-ENDPOINT'

Deployment/bicep/deploy_managed_identity.bicep

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -41,50 +41,6 @@ resource roleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
4141
}
4242
}
4343

44-
// @description('Array of actions for the roleDefinition')
45-
// param actions array = [
46-
// 'Microsoft.Synapse/workspaces/write'
47-
// 'Microsoft.Synapse/workspaces/read'
48-
// ]
49-
50-
// @description('Array of notActions for the roleDefinition')
51-
// param notActions array = []
52-
53-
// @description('Friendly name of the role definition')
54-
// param roleName string = 'Synapse Administrator-${solutionName}'
55-
56-
// @description('Detailed description of the role definition')
57-
// param roleDescription string = 'Synapse Administrator-${solutionName}'
58-
59-
// var roleDefName = guid(resourceGroup().id, string(actions), string(notActions))
60-
61-
// resource synadminRoleDef 'Microsoft.Authorization/roleDefinitions@2018-07-01' = {
62-
// name: roleDefName
63-
// properties: {
64-
// roleName: roleName
65-
// description: roleDescription
66-
// type: 'customRole'
67-
// permissions: [
68-
// {
69-
// actions: actions
70-
// notActions: notActions
71-
// }
72-
// ]
73-
// assignableScopes: [
74-
// resourceGroup().id
75-
// ]
76-
// }
77-
// }
78-
79-
// resource synAdminroleAssignment 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
80-
// name: guid(resourceGroup().id, managedIdentity.id, synadminRoleDef.id)
81-
// properties: {
82-
// principalId: managedIdentity.properties.principalId
83-
// roleDefinitionId: synadminRoleDef.id
84-
// principalType: 'ServicePrincipal'
85-
// }
86-
// }
87-
8844
output managedIdentityOutput object = {
8945
id: managedIdentity.id
9046
objectId: managedIdentity.properties.principalId

0 commit comments

Comments
 (0)