Skip to content

Commit

Permalink
Remove useref and Fleet update changes (#29493)
Browse files Browse the repository at this point in the history 
* Remove useref and Fleet update changes

* Remove useref

* fix spell check

* Fix validation errors

* suppress casing errors

* Fix formatting

* Refactor

* Remove Fleet Forbidden values

* Add additional property suppression.

* edit suppressions

* Add Suppression for camel casing

* Make confidential fields to have create and update visibility only.

* update docs

* remove format decorator and use url type

* Address comments

* revert settings change as it is visible.

* Address comments

* configReference is visible in response.

* Add arm-id format to resource ids

* Address comments

* update provisioningState in examples

* update examples

* Update location in examples

* Update example

* Update security posture reference to the latest compute api version.

* Fix merge conflicts

* Update and add more examples

---------

Co-authored-by: Sahil Arora <arorasahil@microsoft.com>
Co-authored-by: Yuchao Yan <yuchaoyan@microsoft.com>
  • Loading branch information
@SahilArora92 @msyyc
3 people authored Jul 19, 2024
1 parent 50ed446 commit 83f13c5
Show file tree
Hide file tree
Showing 32 changed files with 8,516 additions and 2,643 deletions.
2,340 changes: 2,340 additions & 0 deletions specification/azurefleet/AzureFleet.Management/baseVirtualMachineProfile.tsp
View file

Large diffs are not rendered by default.

33 changes: 29 additions & 4 deletions specification/azurefleet/AzureFleet.Management/common.tsp
View file
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";
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 {
@extension("x-ms-identifiers", ["message", "target"])
@doc("The API error details")
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.")
errorDetail?: string;
}
328 changes: 100 additions & 228 deletions ...t/AzureFleet.Management/examples/2023-11-01-preview/Fleets_CreateOrUpdate_MaximumSet.json
View file

Large diffs are not rendered by default.

114 changes: 35 additions & 79 deletions ...n/azurefleet/AzureFleet.Management/examples/2023-11-01-preview/Fleets_Get_MaximumSet.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@
"secrets": [
{
"sourceVault": {
"id": "ihxrocoahkxxjrbmbhmaahzi"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}"
},
"vaultCertificates": [
{
Expand All @@ -109,7 +109,7 @@
"exactVersion": "hfph",
"sharedGalleryImageId": "mkfpnxoxmkyrwpab",
"communityGalleryImageId": "ujhxcd",
"id": "eouuvblwiuykzebjh"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/images/{imageName}/versions/{versionName}"
},
"osDisk": {
"name": "qzchzeaaxupl",
Expand All @@ -131,12 +131,12 @@
"managedDisk": {
"storageAccountType": "Standard_LRS",
"diskEncryptionSet": {
"id": "hinhonboozgfbrfwyy"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{diskEncryptionSetName}"
},
"securityProfile": {
"securityEncryptionType": "VMGuestStateOnly",
"diskEncryptionSet": {
"id": "hinhonboozgfbrfwyy"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{diskEncryptionSetName}"
}
}
},
Expand All @@ -153,12 +153,12 @@
"managedDisk": {
"storageAccountType": "Standard_LRS",
"diskEncryptionSet": {
"id": "hinhonboozgfbrfwyy"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{diskEncryptionSetName}"
},
"securityProfile": {
"securityEncryptionType": "VMGuestStateOnly",
"diskEncryptionSet": {
"id": "hinhonboozgfbrfwyy"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/diskEncryptionSets/{diskEncryptionSetName}"
}
}
},
Expand All @@ -171,7 +171,7 @@
},
"networkProfile": {
"healthProbe": {
"id": "puulsdoecyaooqmhz"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/probes/{probeName}"
},
"networkInterfaceConfigurations": [
{
Expand All @@ -182,7 +182,7 @@
"disableTcpStateTracking": true,
"enableFpga": true,
"networkSecurityGroup": {
"id": "ihxrocoahkxxjrbmbhmaahzi"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkSecurityGroups/{networkSecurityGroupName}"
},
"dnsSettings": {
"dnsServers": [
Expand All @@ -194,7 +194,7 @@
"name": "et",
"properties": {
"subnet": {
"id": "puulsdoecyaooqmhz"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}"
},
"primary": true,
"publicIPAddressConfiguration": {
Expand All @@ -212,7 +212,7 @@
}
],
"publicIPPrefix": {
"id": "ihxrocoahkxxjrbmbhmaahzi"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/publicIPPrefixes/{publicIPPrefixName}"
},
"publicIPAddressVersion": "IPv4",
"deleteOption": "Delete"
Expand All @@ -225,22 +225,22 @@
"privateIPAddressVersion": "IPv4",
"applicationGatewayBackendAddressPools": [
{
"id": "ihxrocoahkxxjrbmbhmaahzi"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationGateways/{applicationGatewayName}/backendAddressPools/{backendAddressPoolName}"
}
],
"applicationSecurityGroups": [
{
"id": "ihxrocoahkxxjrbmbhmaahzi"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/applicationSecurityGroups/{applicationSecurityGroupName}"
}
],
"loadBalancerBackendAddressPools": [
{
"id": "ihxrocoahkxxjrbmbhmaahzi"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/backendAddressPools/{backendAddressPoolName}"
}
],
"loadBalancerInboundNatPools": [
{
"id": "ihxrocoahkxxjrbmbhmaahzi"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/loadBalancers/{loadBalancerName}/inboundNatPools/{inboundNatPoolName}"
}
]
}
Expand All @@ -263,7 +263,7 @@
"encryptionAtHost": true,
"securityType": "TrustedLaunch",
"encryptionIdentity": {
"userAssignedIdentityResourceId": "ymhqsov"
"userAssignedIdentityResourceId": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{userAssignedIdentityName}"
},
"proxyAgentSettings": {
"enabled": true,
Expand All @@ -290,20 +290,19 @@
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"settings": {},
"protectedSettings": {},
"provisioningState": "kauilerjryyvizdqoazz",
"provisioningState": "Succeeded",
"provisionAfterExtensions": [
"babgtjyllusylxsnfvepitrkmkcx"
],
"suppressFailures": true,
"protectedSettingsFromKeyVault": {
"secretUrl": "qmjoynsytvnjzutetnkog",
"sourceVault": {
"id": "ihxrocoahkxxjrbmbhmaahzi"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.KeyVault/vaults/{vaultName}"
}
}
},
"id": "qx"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/virtualMachines/{vmName}/extensions/{extensionName}"
}
],
"extensionsTimeBudget": "srvemetinivyy"
Expand All @@ -322,16 +321,15 @@
"userData": "jhlyuc",
"capacityReservation": {
"capacityReservationGroup": {
"id": "ihxrocoahkxxjrbmbhmaahzi"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/capacityReservationGroups/{capacityReservationGroupName}"
}
},
"applicationProfile": {
"galleryApplications": [
{
"tags": "bevijlsuchspoihzlfjczuqttaqz",
"order": 4,
"packageReferenceId": "aabkcborasmyowocjceldewmkci",
"configurationReference": "auikpeahpgodbqdih",
"packageReferenceId": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/applications/{applicationName}/versions/{versionName}",
"treatFailureAsDeploymentFailure": true,
"enableAutomaticUpgrade": true
}
Expand All @@ -344,78 +342,36 @@
}
},
"serviceArtifactReference": {
"id": "qqqxnjehbgcepcfldzifjkwlzusn"
"id": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Compute/galleries/{galleryName}/serviceArtifacts/{serviceArtifactsName}/vmArtifactsProfiles/{vmArtifactsProfileName}"
},
"securityPostureReference": {
"id": "zwtxjdjwedxmhpcoii",
"id": "/CommunityGalleries/{communityGalleryName}/securityPostures/{securityPostureName}/versions/{major.minor.patch}|{major.*}|latest",
"excludeExtensions": [
{
"properties": {
"forceUpdateTag": "eleagpulycjgvscuulb",
"publisher": "rwaucnzfffywlsaoqltkmsynni",
"type": "rgnq",
"typeHandlerVersion": "hyyj",
"autoUpgradeMinorVersion": true,
"enableAutomaticUpgrade": true,
"settings": {},
"protectedSettings": {},
"provisioningState": "rmhlppcusvaiepeqafd",
"instanceView": {
"name": "xxnjefzqotctmujsqpmyleaie",
"type": "cycepellfcdujniys",
"typeHandlerVersion": "jefntwzzgxsbzncchhefqiqbs",
"substatuses": [
{
"code": "cbzjpwcbfodkqjnd",
"level": "Info",
"displayStatus": "oxhrtqv",
"message": "uldcsnhprfe",
"time": "2024-01-28T09:08:15.992Z"
}
],
"statuses": [
{
"code": "cbzjpwcbfodkqjnd",
"level": "Info",
"displayStatus": "oxhrtqv",
"message": "uldcsnhprfe",
"time": "2024-01-28T09:08:15.992Z"
}
]
},
"suppressFailures": true,
"protectedSettingsFromKeyVault": {
"secretUrl": "qmjoynsytvnjzutetnkog",
"sourceVault": {
"id": "ihxrocoahkxxjrbmbhmaahzi"
}
},
"provisionAfterExtensions": [
"aysdon"
]
},
"location": "jzecxhirbtegqxpyk",
"id": "vlgmhpmsbktwfzbioynslximoohfc",
"name": "qchtvtoulax",
"type": "shqqxyvbipxzaxjbsesymzgrfybww",
"tags": {
"key4849": "hqnzzgyumfzflmyjxklwslb"
}
}
]
"{securityPostureVMExtensionName}"
],
"isOverridable": true
},
"timeCreated": "2024-01-28T09:08:15.995Z"
},
"computeApiVersion": "2023-07-01"
},
"provisioningState": "Succeeded"
"provisioningState": "Succeeded",
"timeCreated": "2024-07-10T00:16:34.8590555+00:00",
"uniqueId": "a2f7fabd-bbc2-4a20-afe1-49fdb3885a28"
},
"zones": [
"zone1",
"zone2"
],
"tags": {},
"location": "westus",
"plan": {
"name": "jwgrcrnrtfoxn",
"publisher": "iozjbiqqckqm",
"product": "cgopbyvdyqikahwyxfpzwaqk",
"promotionCode": "naglezezplcaruqogtxnuizslqnnbr",
"version": "wa"
},
"identity": {
"principalId": "4d508e5b-374b-4382-9a1c-01fb8b6cb37c",
"tenantId": "5d508e5b-374b-4382-9a1c-01fb8b6cb37c",
Expand Down
Loading

0 comments on commit 83f13c5

Please sign in to comment.