Skip to content

Commit 1eab7eb

Browse files
Molly IversonCopilot
andcommitted
Revert linkingProperties wrapper; use flat linkingState
Reverts commit 7e4f4f8 (Wrap linkingState in linkingProperties). Restores the flat linkingState property on DeviceRegistryNamespaceDescription and removes the LinkingProperties and LinkingError models. Updates source examples and regenerates the swagger and copied examples via tsp compile. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 4ae595a commit 1eab7eb

6 files changed

Lines changed: 9 additions & 99 deletions

File tree

specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/DeviceProvisioningServices/examples/2026-06-01-preview/DPSGet.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
"namespaceUuid": "1c0f6ad0-9b13-4f0f-9b98-7a3a64a8c5e1",
4141
"dataAddress": "eastus.api.deviceregistry.com",
4242
"location": "eastus",
43-
"linkingProperties": {
44-
"state": "Succeeded"
45-
}
43+
"linkingState": "Succeeded"
4644
}
4745
]
4846
},

specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/DeviceProvisioningServices/examples/2026-06-01-preview/DPSGet_UserAssignedNamespaceIdentity.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
"namespaceUuid": "1c0f6ad0-9b13-4f0f-9b98-7a3a64a8c5e1",
4242
"dataAddress": "eastus.api.deviceregistry.com",
4343
"location": "eastus",
44-
"linkingProperties": {
45-
"state": "Succeeded"
46-
}
44+
"linkingState": "Succeeded"
4745
}
4846
]
4947
},

specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/DeviceProvisioningServices/models.tsp

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -616,11 +616,10 @@ model DeviceRegistryNamespaceDescription {
616616
location?: Azure.Core.azureLocation;
617617

618618
/**
619-
* Properties related to linking this provisioning service with the Azure Device Registry namespace.
619+
* The linking state of this namespace.
620620
*/
621621
@added(Versions.v2026_06_01_preview)
622-
@visibility(Lifecycle.Read)
623-
linkingProperties?: LinkingProperties;
622+
linkingState?: LinkingState;
624623
}
625624

626625
/**
@@ -989,44 +988,6 @@ model CertificateBodyDescription {
989988
isVerified?: boolean;
990989
}
991990

992-
/**
993-
* The last error encountered when linking the provisioning service with an Azure Device Registry.
994-
* Mirrors the shape used by the IoT Hub Device Registry linking error model.
995-
*/
996-
@added(Versions.v2026_06_01_preview)
997-
model LinkingError {
998-
/** The error code. */
999-
@visibility(Lifecycle.Read)
1000-
code?: string;
1001-
1002-
/** The HTTP status code. */
1003-
@visibility(Lifecycle.Read)
1004-
httpStatusCode?: string;
1005-
1006-
/** The error message. */
1007-
@visibility(Lifecycle.Read)
1008-
message?: string;
1009-
1010-
/** The error details. */
1011-
@visibility(Lifecycle.Read)
1012-
details?: string;
1013-
}
1014-
1015-
/**
1016-
* Properties related to linking the provisioning service with an Azure Device Registry namespace.
1017-
* Read-only; populated by the service as the linking lifecycle progresses.
1018-
*/
1019-
@added(Versions.v2026_06_01_preview)
1020-
model LinkingProperties {
1021-
/** Indicates whether the provisioning service is linked with an Azure Device Registry. */
1022-
@visibility(Lifecycle.Read)
1023-
state?: LinkingState;
1024-
1025-
/** The last error encountered when linking with the Azure Device Registry. */
1026-
@visibility(Lifecycle.Read)
1027-
error?: LinkingError;
1028-
}
1029-
1030991
/**
1031992
* The state of ADR linking for a provisioning service.
1032993
*/

specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/DeviceProvisioningServices/preview/2026-06-01-preview/examples/DPSGet.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,7 @@
4040
"namespaceUuid": "1c0f6ad0-9b13-4f0f-9b98-7a3a64a8c5e1",
4141
"dataAddress": "eastus.api.deviceregistry.com",
4242
"location": "eastus",
43-
"linkingProperties": {
44-
"state": "Succeeded"
45-
}
43+
"linkingState": "Succeeded"
4644
}
4745
]
4846
},

specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/DeviceProvisioningServices/preview/2026-06-01-preview/examples/DPSGet_UserAssignedNamespaceIdentity.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,7 @@
4141
"namespaceUuid": "1c0f6ad0-9b13-4f0f-9b98-7a3a64a8c5e1",
4242
"dataAddress": "eastus.api.deviceregistry.com",
4343
"location": "eastus",
44-
"linkingProperties": {
45-
"state": "Succeeded"
46-
}
44+
"linkingState": "Succeeded"
4745
}
4846
]
4947
},

specification/deviceprovisioningservices/resource-manager/Microsoft.Devices/DeviceProvisioningServices/preview/2026-06-01-preview/iotdps.json

Lines changed: 3 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1889,10 +1889,9 @@
18891889
"$ref": "#/definitions/Azure.Core.azureLocation",
18901890
"description": "Azure location of the linked Device Registry namespace."
18911891
},
1892-
"linkingProperties": {
1893-
"$ref": "#/definitions/LinkingProperties",
1894-
"description": "Properties related to linking this provisioning service with the Azure Device Registry namespace.",
1895-
"readOnly": true
1892+
"linkingState": {
1893+
"$ref": "#/definitions/LinkingState",
1894+
"description": "The linking state of this namespace."
18961895
}
18971896
},
18981897
"required": [
@@ -2278,48 +2277,6 @@
22782277
"modelAsString": false
22792278
}
22802279
},
2281-
"LinkingError": {
2282-
"type": "object",
2283-
"description": "The last error encountered when linking the provisioning service with an Azure Device Registry.\nMirrors the shape used by the IoT Hub Device Registry linking error model.",
2284-
"properties": {
2285-
"code": {
2286-
"type": "string",
2287-
"description": "The error code.",
2288-
"readOnly": true
2289-
},
2290-
"httpStatusCode": {
2291-
"type": "string",
2292-
"description": "The HTTP status code.",
2293-
"readOnly": true
2294-
},
2295-
"message": {
2296-
"type": "string",
2297-
"description": "The error message.",
2298-
"readOnly": true
2299-
},
2300-
"details": {
2301-
"type": "string",
2302-
"description": "The error details.",
2303-
"readOnly": true
2304-
}
2305-
}
2306-
},
2307-
"LinkingProperties": {
2308-
"type": "object",
2309-
"description": "Properties related to linking the provisioning service with an Azure Device Registry namespace.\nRead-only; populated by the service as the linking lifecycle progresses.",
2310-
"properties": {
2311-
"state": {
2312-
"$ref": "#/definitions/LinkingState",
2313-
"description": "Indicates whether the provisioning service is linked with an Azure Device Registry.",
2314-
"readOnly": true
2315-
},
2316-
"error": {
2317-
"$ref": "#/definitions/LinkingError",
2318-
"description": "The last error encountered when linking with the Azure Device Registry.",
2319-
"readOnly": true
2320-
}
2321-
}
2322-
},
23232280
"LinkingState": {
23242281
"type": "string",
23252282
"description": "The state of ADR linking for a provisioning service.",

0 commit comments

Comments
 (0)