Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove useref and Fleet update changes #29493

Merged
merged 32 commits into from
Jul 19, 2024
Merged

Remove useref and Fleet update changes #29493

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2293fca
Remove useref and Fleet update changes
Jun 19, 2024
d715112
Remove useref
Jun 19, 2024
fa8a914
fix spell check
Jun 20, 2024
1c5b140
Fix validation errors
Jun 20, 2024
27ad781
suppress casing errors
Jun 20, 2024
29c1092
Fix formatting
Jun 20, 2024
401e566
Refactor
Jun 20, 2024
43cf0f4
Remove Fleet Forbidden values
Jun 20, 2024
84d6157
Add additional property suppression.
Jun 20, 2024
ce2786d
edit suppressions
Jun 20, 2024
f557502
Add Suppression for camel casing
Jun 20, 2024
f7ffca0
Make confidential fields to have create and update visibility only.
Jun 26, 2024
1be10aa
Merge branch 'main' into update-azurefleet-useref-and-scvmm
Jun 26, 2024
1f08689
update docs
Jul 2, 2024
6883950
remove format decorator and use url type
Jul 2, 2024
31bffb4
Merge branch 'main' into update-azurefleet-useref-and-scvmm
Jul 2, 2024
c39e954
Merge branch 'main' into update-azurefleet-useref-and-scvmm
msyyc Jul 4, 2024
c1cfc08
Address comments
Jul 9, 2024
81f8c12
revert settings change as it is visible.
Jul 9, 2024
d3ecaad
Address comments
Jul 9, 2024
b6a0f63
configReference is visible in response.
Jul 9, 2024
c35779f
Add arm-id format to resource ids
Jul 11, 2024
52f6c72
Address comments
Jul 11, 2024
372ee03
update provisioningState in examples
Jul 11, 2024
9704381
update examples
Jul 12, 2024
1dfaf26
Merge branch 'main' into update-azurefleet-useref-and-scvmm
Jul 15, 2024
4ac7e1f
Update location in examples
Jul 15, 2024
12a9609
Update example
Jul 16, 2024
8066c15
Update security posture reference to the latest compute api version.
Jul 16, 2024
fed0a29
Merge branch 'main' into update-azurefleet-useref-and-scvmm
Jul 17, 2024
3e52d47
Fix merge conflicts
Jul 17, 2024
c73bd48
Update and add more examples
Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2,518 changes: 2,518 additions & 0 deletions specification/azurefleet/AzureFleet.Management/baseVirtualMachineProfile.tsp
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 29 additions & 4 deletions specification/azurefleet/AzureFleet.Management/common.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,44 @@
import "@typespec/http";
import "@typespec/rest";
import "@typespec/versioning";
import "@azure-tools/typespec-autorest";
MaryGao marked this conversation as resolved.
Show resolved Hide resolved
import "@azure-tools/typespec-azure-core";
import "@azure-tools/typespec-azure-resource-manager";

using TypeSpec.Http;
using TypeSpec.Rest;
using TypeSpec.Versioning;
using Autorest;
using Azure.ResourceManager;
using OpenAPI;

namespace Microsoft.AzureFleet;

@doc("ApiError for Fleet")
@useRef("../../../../../compute/resource-manager/Microsoft.Compute/common-types/v1/common.json#/definitions/ApiError")
model ApiError {}
model ApiError is ApiErrorBase {
SahilArora92 marked this conversation as resolved.
Show resolved Hide resolved
@extension("x-ms-identifiers", ["message", "target"])
@doc("The Api error details")
Copy link
Member

@TimLovellSmith TimLovellSmith Jul 5, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Api

nit please capitalize acronyms like API as such, in documentation (but not in type names)

details?: Array<ApiErrorBase>;

@doc("The Api inner error")
innererror?: InnerError;
}

@doc("Api error base.")
model ApiErrorBase {
@doc("The error code.")
code?: string;

@doc("The target of the particular error.")
target?: string;

@doc("The error message.")
message?: string;
}

@doc("Inner error details.")
model InnerError {
@doc("The exception type.")
exceptionType?: string;

@doc("The internal error message or exception dump.")
SahilArora92 marked this conversation as resolved.
Show resolved Hide resolved
errorDetail?: string;
SahilArora92 marked this conversation as resolved.
Show resolved Hide resolved
}
9 changes: 1 addition & 8 deletions specification/azurefleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"osProfile": {
"computerNamePrefix": "o",
"adminUsername": "nrgzqciiaaxjrqldbmjbqkyhntp",
"customData": "xjjib",
"windowsConfiguration": {
"provisionVMAgent": true,
"enableAutomaticUpdates": true,
Expand All @@ -45,8 +44,7 @@
{
"passName": "OobeSystem",
"componentName": "Microsoft-Windows-Shell-Setup",
"settingName": "AutoLogon",
"content": "bubmqbxjkj"
"settingName": "AutoLogon"
}
],
"patchSettings": {
Expand Down Expand Up @@ -314,11 +312,6 @@
"extensionsTimeBudget": "mbhjahtdygwgyszdwjtvlvtgchdwil"
},
"licenseType": "v",
"priority": "Regular",
SahilArora92 marked this conversation as resolved.
Show resolved Hide resolved
"evictionPolicy": "Deallocate",
"billingProfile": {
"maxPrice": 2
},
"scheduledEventsProfile": {
"terminateNotificationProfile": {
"notBeforeTimeout": "iljppmmw",
Expand Down
4 changes: 1 addition & 3 deletions ...refleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_ListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"osProfile": {
"computerNamePrefix": "o",
"adminUsername": "nrgzqciiaaxjrqldbmjbqkyhntp",
"customData": "xjjib",
"windowsConfiguration": {
"provisionVMAgent": true,
"enableAutomaticUpdates": true,
Expand All @@ -46,8 +45,7 @@
{
"passName": "OobeSystem",
"componentName": "Microsoft-Windows-Shell-Setup",
"settingName": "AutoLogon",
"content": "bubmqbxjkj"
"settingName": "AutoLogon"
}
],
"patchSettings": {
Expand Down
4 changes: 1 addition & 3 deletions ...urefleet/AzureFleet.Management/examples/2024-05-01-preview/Fleets_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
"osProfile": {
"computerNamePrefix": "o",
"adminUsername": "nrgzqciiaaxjrqldbmjbqkyhntp",
"customData": "xjjib",
"windowsConfiguration": {
"provisionVMAgent": true,
"enableAutomaticUpdates": true,
Expand All @@ -45,8 +44,7 @@
{
"passName": "OobeSystem",
"componentName": "Microsoft-Windows-Shell-Setup",
"settingName": "AutoLogon",
"content": "bubmqbxjkj"
"settingName": "AutoLogon"
}
],
"patchSettings": {
Expand Down
4 changes: 2 additions & 2 deletions ...AzureFleet.Management/examples/2024-05-01-preview/Fleets_ListVirtualMachineScaleSets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
}
],
"innererror": {
"exceptiontype": "sfaomfpoaptnbxchrfskm",
"errordetail": "ihjwbwykq"
"exceptionType": "sfaomfpoaptnbxchrfskm",
"errorDetail": "ihjwbwykq"
},
"code": "OverconstrainedAllocationRequest",
"target": "nhaj",
Expand Down
7 changes: 1 addition & 6 deletions specification/azurefleet/AzureFleet.Management/fleet.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
import "@typespec/http";
import "@typespec/rest";
import "@typespec/versioning";
import "@azure-tools/typespec-autorest";
import "@azure-tools/typespec-azure-core";
import "@azure-tools/typespec-azure-resource-manager";

using TypeSpec.Http;
using TypeSpec.Rest;
using TypeSpec.Versioning;
using Autorest;
using Azure.ResourceManager;
using OpenAPI;

Expand Down Expand Up @@ -114,10 +112,6 @@ model ComputeProfile {
platformFaultDomainCount?: int32;
}

@doc("BaseVirtualMachineProfile")
@useRef("../../../../../compute/resource-manager/Microsoft.Compute/ComputeRP/stable/2023-09-01/virtualMachineScaleSet.json#/definitions/VirtualMachineScaleSetVMProfile")
model BaseVirtualMachineProfile {}

@doc("Specifications about a VM Size. This will also contain the corresponding rank and weight in future.")
model VmSizeProfile {
@doc("The Sku name (e.g. 'Standard_DS1_v2')")
Expand Down Expand Up @@ -218,6 +212,7 @@ interface Fleets {
Fleet,
LroHeaders = Azure.Core.Foundations.RetryAfterHeader
>;
@parameterVisibility
update is ArmCustomPatchAsync<Fleet, FleetUpdate>;
delete is ArmResourceDeleteWithoutOkAsync<Fleet>;
listByResourceGroup is ArmResourceListByParent<Fleet>;
Expand Down
1 change: 1 addition & 0 deletions specification/azurefleet/AzureFleet.Management/main.tsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import "@azure-tools/typespec-azure-core";
import "@azure-tools/typespec-azure-resource-manager";
import "./common.tsp";
import "./fleet.tsp";
import "./baseVirtualMachineProfile.tsp";
import "./virtualMachineScaleSet.tsp";

using TypeSpec.Http;
Expand Down
Loading