Skip to content

Commit 41103f1

Browse files
ZhidaLiumatferrari-msft
authored and
markcowl
committed
Fix Account Key Type and CogServices SKU Location (Azure#29025)
* Account Key Type * Account key Preview Spec * "Sku Updates" * Remove Endpoint Type from Schema * Add x-ms-secret to account key property --------- Co-authored-by: Matthew Ferrari <[email protected]> Co-authored-by: Matthew Ferrari <[email protected]>
1 parent 84bd8f2 commit 41103f1

File tree

9 files changed

+30
-75
lines changed

9 files changed

+30
-75
lines changed

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/create.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"api-version": "2024-04-01-preview",
99
"body": {
1010
"properties": {
11-
"type": "Azure.OpenAI",
1211
"model": {
1312
"format": "OpenAI",
1413
"name": "text-davinci-003",
@@ -31,7 +30,6 @@
3130
"name": "text-davinci-003",
3231
"type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
3332
"properties": {
34-
"type": "Azure.OpenAI",
3533
"model": {
3634
"format": "OpenAI",
3735
"name": "text-davinci-003",

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/get.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"name": "text-davinci-003",
2121
"type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
2222
"properties": {
23-
"type": "Azure.OpenAI",
2423
"model": {
2524
"format": "OpenAI",
2625
"name": "text-davinci-003",

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getDeployments.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"name": "text-davinci-003",
2222
"type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
2323
"properties": {
24-
"type": "Azure.OpenAI",
2524
"model": {
2625
"format": "OpenAI",
2726
"name": "text-davinci-003",

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/Endpoint/Deployment/getInWorkspace.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"name": "text-davinci-003",
2121
"type": "Microsoft.MachineLearningServices/workspaces/endpoints/deployments",
2222
"properties": {
23-
"type": "Azure.OpenAI",
2423
"model": {
2524
"format": "OpenAI",
2625
"name": "text-davinci-003",

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/createDeployment.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
"api-version": "2024-04-01-preview",
99
"body": {
1010
"properties": {
11-
"type": "Azure.OpenAI",
1211
"model": {
1312
"format": "OpenAI",
1413
"name": "text-davinci-003",
@@ -31,7 +30,6 @@
3130
"name": "text-davinci-003",
3231
"type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
3332
"properties": {
34-
"type": "Azure.OpenAI",
3533
"model": {
3634
"format": "OpenAI",
3735
"name": "text-davinci-003",
@@ -56,7 +54,6 @@
5654
"name": "text-davinci-003",
5755
"type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
5856
"properties": {
59-
"type": "Azure.OpenAI",
6057
"model": {
6158
"format": "OpenAI",
6259
"name": "text-davinci-003",

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/getDeployment.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
"name": "text-davinci-003",
2121
"type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
2222
"properties": {
23-
"type": "Azure.OpenAI",
2423
"model": {
2524
"format": "OpenAI",
2625
"name": "text-davinci-003",

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/examples/WorkspaceConnection/listDeployments.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"name": "text-davinci-003",
2222
"type": "Microsoft.MachineLearningServices/workspaces/connections/deployments",
2323
"properties": {
24-
"type": "Azure.OpenAI",
2524
"model": {
2625
"format": "OpenAI",
2726
"name": "text-davinci-003",

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/preview/2024-04-01-preview/workspaceRP.json

Lines changed: 19 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -3756,7 +3756,7 @@
37563756
],
37573757
"properties": {
37583758
"credentials": {
3759-
"$ref": "#/definitions/WorkspaceConnectionSharedAccessSignature"
3759+
"$ref": "#/definitions/WorkspaceConnectionAccountKey"
37603760
}
37613761
},
37623762
"x-ms-discriminator-value": "AccountKey"
@@ -3928,9 +3928,6 @@
39283928
"type": "string",
39293929
"description": "The name of RAI policy."
39303930
},
3931-
"sku": {
3932-
"$ref": "#/definitions/CognitiveServicesSku"
3933-
},
39343931
"versionUpgradeOption": {
39353932
"description": "Deployment model version upgrade option.",
39363933
"type": "string",
@@ -4125,18 +4122,6 @@
41254122
"modelAsString": true
41264123
}
41274124
},
4128-
"ContentSafetyEndpointDeploymentResourceProperties": {
4129-
"type": "object",
4130-
"allOf": [
4131-
{
4132-
"$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
4133-
},
4134-
{
4135-
"$ref": "#/definitions/EndpointDeploymentResourceProperties"
4136-
}
4137-
],
4138-
"x-ms-discriminator-value": "Azure.ContentSafety"
4139-
},
41404125
"ContentSafetyEndpointResourceProperties": {
41414126
"type": "object",
41424127
"allOf": [
@@ -4518,27 +4503,18 @@
45184503
}
45194504
},
45204505
"EndpointDeploymentResourceProperties": {
4521-
"required": [
4522-
"type"
4523-
],
45244506
"type": "object",
4507+
"allOf": [
4508+
{
4509+
"$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
4510+
}
4511+
],
45254512
"properties": {
4526-
"failureReason": {
4527-
"description": "The failure reason if the creation failed.",
4528-
"type": "string"
4529-
},
45304513
"provisioningState": {
45314514
"description": "Read-only provision state status property.",
45324515
"$ref": "#/definitions/DefaultResourceProvisioningState"
4533-
},
4534-
"type": {
4535-
"description": "Kind of the deployment.",
4536-
"minLength": 1,
4537-
"pattern": "[a-zA-Z0-9._]",
4538-
"type": "string"
45394516
}
4540-
},
4541-
"discriminator": "type"
4517+
}
45424518
},
45434519
"EndpointDeploymentResourcePropertiesBasicResource": {
45444520
"required": [
@@ -4553,6 +4529,9 @@
45534529
"properties": {
45544530
"properties": {
45554531
"$ref": "#/definitions/EndpointDeploymentResourceProperties"
4532+
},
4533+
"sku": {
4534+
"$ref": "#/definitions/CognitiveServicesSku"
45564535
}
45574536
}
45584537
},
@@ -4975,15 +4954,6 @@
49754954
"modelAsString": true
49764955
}
49774956
},
4978-
"ManagedOnlineEndpointDeploymentResourceProperties": {
4979-
"type": "object",
4980-
"allOf": [
4981-
{
4982-
"$ref": "#/definitions/EndpointDeploymentResourceProperties"
4983-
}
4984-
],
4985-
"x-ms-discriminator-value": "managedOnlineEndpoint"
4986-
},
49874957
"ManagedOnlineEndpointResourceProperties": {
49884958
"type": "object",
49894959
"allOf": [
@@ -5164,18 +5134,6 @@
51645134
},
51655135
"x-ms-discriminator-value": "OAuth2"
51665136
},
5167-
"OpenAIEndpointDeploymentResourceProperties": {
5168-
"type": "object",
5169-
"allOf": [
5170-
{
5171-
"$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
5172-
},
5173-
{
5174-
"$ref": "#/definitions/EndpointDeploymentResourceProperties"
5175-
}
5176-
],
5177-
"x-ms-discriminator-value": "Azure.OpenAI"
5178-
},
51795137
"OpenAIEndpointResourceProperties": {
51805138
"type": "object",
51815139
"allOf": [
@@ -5992,18 +5950,6 @@
59925950
}
59935951
}
59945952
},
5995-
"SpeechEndpointDeploymentResourceProperties": {
5996-
"type": "object",
5997-
"allOf": [
5998-
{
5999-
"$ref": "#/definitions/CognitiveServiceEndpointDeploymentResourceProperties"
6000-
},
6001-
{
6002-
"$ref": "#/definitions/EndpointDeploymentResourceProperties"
6003-
}
6004-
],
6005-
"x-ms-discriminator-value": "Azure.Speech"
6006-
},
60075953
"SpeechEndpointResourceProperties": {
60085954
"type": "object",
60095955
"allOf": [
@@ -6279,6 +6225,15 @@
62796225
}
62806226
}
62816227
},
6228+
"WorkspaceConnectionAccountKey": {
6229+
"type": "object",
6230+
"properties": {
6231+
"key": {
6232+
"type": "string",
6233+
"x-ms-secret": true
6234+
}
6235+
}
6236+
},
62826237
"WorkspaceConnectionUpdateParameter": {
62836238
"description": "The properties that the machine learning workspace connection will be updated with.",
62846239
"type": "object",

‎specification/machinelearningservices/resource-manager/Microsoft.MachineLearningServices/stable/2024-04-01/machineLearningServices.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6692,6 +6692,16 @@
66926692
},
66936693
"additionalProperties": false
66946694
},
6695+
"WorkspaceConnectionAccountKey": {
6696+
"type": "object",
6697+
"properties": {
6698+
"key": {
6699+
"type": "string",
6700+
"x-ms-secret": true
6701+
}
6702+
},
6703+
"additionalProperties": false
6704+
},
66956705
"SASAuthTypeWorkspaceConnectionProperties": {
66966706
"type": "object",
66976707
"allOf": [
@@ -7103,7 +7113,7 @@
71037113
],
71047114
"properties": {
71057115
"credentials": {
7106-
"$ref": "#/definitions/WorkspaceConnectionSharedAccessSignature"
7116+
"$ref": "#/definitions/WorkspaceConnectionAccountKey"
71077117
}
71087118
},
71097119
"x-ms-discriminator-value": "AccountKey"

0 commit comments

Comments
 (0)