From 671c3cb98190edb6964d4d12fff408710b29bd53 Mon Sep 17 00:00:00 2001 From: Nonso Chukwuogor Date: Thu, 15 Aug 2024 08:36:33 -0700 Subject: [PATCH 1/7] fix: Lowercase d in dataflow --- .../models/dataflows/dataflowEndpoints.tsp | 8 ++++---- .../IoTOperations.Management/models/instance.tsp | 6 +++--- .../preview/2024-08-15-preview/iotoperations.json | 14 +++++++------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/specification/iotoperations/IoTOperations.Management/models/dataflows/dataflowEndpoints.tsp b/specification/iotoperations/IoTOperations.Management/models/dataflows/dataflowEndpoints.tsp index 829c03108276..6a6da31b4cd1 100644 --- a/specification/iotoperations/IoTOperations.Management/models/dataflows/dataflowEndpoints.tsp +++ b/specification/iotoperations/IoTOperations.Management/models/dataflows/dataflowEndpoints.tsp @@ -147,7 +147,7 @@ union DataLakeStorageAuthMethod { @doc("Microsoft Fabric endpoint properties") model DataflowEndpointFabricOneLake { @doc("Authentication configuration. NOTE - only one authentication property is allowed per entry.") - authentication: DataFlowEndpointFabricOneLakeAuthentication; + authentication: DataflowEndpointFabricOneLakeAuthentication; @doc("Names of the workspace and lakehouse.") names: DataflowEndpointFabricOneLakeNames; @@ -164,7 +164,7 @@ model DataflowEndpointFabricOneLake { } @doc("Microsoft Fabric endpoint. Authentication properties. NOTE - Only one method is supported for one entry") -model DataFlowEndpointFabricOneLakeAuthentication { +model DataflowEndpointFabricOneLakeAuthentication { @doc("Mode of Authentication.") method: FabricOneLakeAuthMethod; @@ -200,7 +200,7 @@ union DataflowEndpointFabricPathType { @doc("Kafka endpoint properties") model DataflowEndpointKafka { @doc("Authentication configuration. NOTE - only authentication property is allowed per entry.") - authentication: DataFlowEndpointKafkaAuthentication; + authentication: DataflowEndpointKafkaAuthentication; @doc("Consumer group ID.") consumerGroupId?: string; @@ -231,7 +231,7 @@ model DataflowEndpointKafka { } @doc("Kafka endpoint Authentication properties. NOTE - only authentication property is allowed per entry") -model DataFlowEndpointKafkaAuthentication { +model DataflowEndpointKafkaAuthentication { @doc("Mode of Authentication.") method: KafkaAuthMethod; diff --git a/specification/iotoperations/IoTOperations.Management/models/instance.tsp b/specification/iotoperations/IoTOperations.Management/models/instance.tsp index 57c75a835cc1..de89df9f4ae9 100644 --- a/specification/iotoperations/IoTOperations.Management/models/instance.tsp +++ b/specification/iotoperations/IoTOperations.Management/models/instance.tsp @@ -73,7 +73,7 @@ model Components { }; @doc("The properties of the dataflows instance.") - dataflows?: DataFlowInstanceProperties = #{ state: OperationalMode.Enabled }; + dataflows?: DataflowInstanceProperties = #{ state: OperationalMode.Enabled }; @doc("The properties of the device provisioning instance.") schemaRegistry?: SchemaRegistryInstanceProperties = #{ @@ -101,8 +101,8 @@ model ConnectorInstanceProperties { state: OperationalMode; } -@doc("The properties of an DataFlow instance.") -model DataFlowInstanceProperties { +@doc("The properties of an Dataflow instance.") +model DataflowInstanceProperties { @doc("This determines if the Dataflow service is enabled.") @visibility("create", "read") state: OperationalMode; diff --git a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json index 755d46b43cc7..b9be0daf08d3 100644 --- a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json +++ b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json @@ -3681,7 +3681,7 @@ "description": "The properties of the connectors instance." }, "dataflows": { - "$ref": "#/definitions/DataFlowInstanceProperties", + "$ref": "#/definitions/DataflowInstanceProperties", "description": "The properties of the dataflows instance." }, "schemaRegistry": { @@ -3711,7 +3711,7 @@ "$ref": "#/definitions/ManagedIdentityMethod", "x-nullable": false }, - "DataFlowEndpointFabricOneLakeAuthentication": { + "DataflowEndpointFabricOneLakeAuthentication": { "type": "object", "description": "Microsoft Fabric endpoint. Authentication properties. NOTE - Only one method is supported for one entry", "properties": { @@ -3732,7 +3732,7 @@ "method" ] }, - "DataFlowEndpointKafkaAuthentication": { + "DataflowEndpointKafkaAuthentication": { "type": "object", "description": "Kafka endpoint Authentication properties. NOTE - only authentication property is allowed per entry", "properties": { @@ -3761,9 +3761,9 @@ "method" ] }, - "DataFlowInstanceProperties": { + "DataflowInstanceProperties": { "type": "object", - "description": "The properties of an DataFlow instance.", + "description": "The properties of an Dataflow instance.", "properties": { "state": { "$ref": "#/definitions/OperationalMode", @@ -4230,7 +4230,7 @@ "description": "Microsoft Fabric endpoint properties", "properties": { "authentication": { - "$ref": "#/definitions/DataFlowEndpointFabricOneLakeAuthentication", + "$ref": "#/definitions/DataflowEndpointFabricOneLakeAuthentication", "description": "Authentication configuration. NOTE - only one authentication property is allowed per entry." }, "names": { @@ -4305,7 +4305,7 @@ "description": "Kafka endpoint properties", "properties": { "authentication": { - "$ref": "#/definitions/DataFlowEndpointKafkaAuthentication", + "$ref": "#/definitions/DataflowEndpointKafkaAuthentication", "description": "Authentication configuration. NOTE - only authentication property is allowed per entry." }, "consumerGroupId": { From 9f522fd126d27a36a1ea95605032da7d97ed625d Mon Sep 17 00:00:00 2001 From: Nonso Chukwuogor Date: Thu, 15 Aug 2024 08:42:50 -0700 Subject: [PATCH 2/7] uncomment supression --- specification/iotoperations/resource-manager/readme.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/specification/iotoperations/resource-manager/readme.md b/specification/iotoperations/resource-manager/readme.md index d223a75c844a..0795c43a3dff 100644 --- a/specification/iotoperations/resource-manager/readme.md +++ b/specification/iotoperations/resource-manager/readme.md @@ -47,8 +47,9 @@ directive: reason: User defined properties that are not subject to any validations. - suppress: BodyTopLevelProperties reason: Temporary suppression due to failing pipeline. - - suppress: PatchBodyParametersSchema - reason: Type is required because it is a part of managed identity. + # - suppress: PatchBodyParametersSchema + # reason: Type is required because it is a part of managed identity. + # where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTOperations/instance/{iotOperationName}"].patch.parameters[0] ``` ### Basic Information From 005f0d1f68e4ac9c771ca4ba4bafc3f4d41bbd83 Mon Sep 17 00:00:00 2001 From: Nonso Chukwuogor Date: Thu, 15 Aug 2024 09:00:38 -0700 Subject: [PATCH 3/7] supress path --- specification/iotoperations/resource-manager/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/iotoperations/resource-manager/readme.md b/specification/iotoperations/resource-manager/readme.md index 0795c43a3dff..4c30a9bce971 100644 --- a/specification/iotoperations/resource-manager/readme.md +++ b/specification/iotoperations/resource-manager/readme.md @@ -47,9 +47,9 @@ directive: reason: User defined properties that are not subject to any validations. - suppress: BodyTopLevelProperties reason: Temporary suppression due to failing pipeline. - # - suppress: PatchBodyParametersSchema - # reason: Type is required because it is a part of managed identity. - # where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTOperations/instance/{iotOperationName}"].patch.parameters[0] + - suppress: PatchBodyParametersSchema + reason: Type is required because it is a part of managed identity. + where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTOperations/instances/{instanceName}"].patch.parameters ``` ### Basic Information From c6329972da1d3f816fff0bada4b09d669340ebb5 Mon Sep 17 00:00:00 2001 From: Nonso Chukwuogor Date: Thu, 15 Aug 2024 09:14:51 -0700 Subject: [PATCH 4/7] schema --- specification/iotoperations/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/iotoperations/resource-manager/readme.md b/specification/iotoperations/resource-manager/readme.md index 4c30a9bce971..2da64df2b38a 100644 --- a/specification/iotoperations/resource-manager/readme.md +++ b/specification/iotoperations/resource-manager/readme.md @@ -49,7 +49,7 @@ directive: reason: Temporary suppression due to failing pipeline. - suppress: PatchBodyParametersSchema reason: Type is required because it is a part of managed identity. - where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTOperations/instances/{instanceName}"].patch.parameters + where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTOperations/instances/{instanceName}"].patch.parameters[4].schema ``` ### Basic Information From 2dc1a50254fe878e95c02e04afc3a6590f8a5e9e Mon Sep 17 00:00:00 2001 From: Nonso Chukwuogor Date: Thu, 15 Aug 2024 09:39:03 -0700 Subject: [PATCH 5/7] drill down --- specification/iotoperations/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/iotoperations/resource-manager/readme.md b/specification/iotoperations/resource-manager/readme.md index 2da64df2b38a..8e7e4cd41961 100644 --- a/specification/iotoperations/resource-manager/readme.md +++ b/specification/iotoperations/resource-manager/readme.md @@ -49,7 +49,7 @@ directive: reason: Temporary suppression due to failing pipeline. - suppress: PatchBodyParametersSchema reason: Type is required because it is a part of managed identity. - where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTOperations/instances/{instanceName}"].patch.parameters[4].schema + where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTOperations/instances/{instanceName}"].patch.parameters[4].schema.properties.identity.properties.type ``` ### Basic Information From 402f2844a98b1223c754f3cc81bf21674adc7cdb Mon Sep 17 00:00:00 2001 From: Nonso Chukwuogor Date: Thu, 15 Aug 2024 09:44:34 -0700 Subject: [PATCH 6/7] stop at identity --- specification/iotoperations/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/iotoperations/resource-manager/readme.md b/specification/iotoperations/resource-manager/readme.md index 8e7e4cd41961..6335d57f3037 100644 --- a/specification/iotoperations/resource-manager/readme.md +++ b/specification/iotoperations/resource-manager/readme.md @@ -49,7 +49,7 @@ directive: reason: Temporary suppression due to failing pipeline. - suppress: PatchBodyParametersSchema reason: Type is required because it is a part of managed identity. - where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTOperations/instances/{instanceName}"].patch.parameters[4].schema.properties.identity.properties.type + where: $.paths["/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.IoTOperations/instances/{instanceName}"].patch.parameters[4].schema.properties.identity ``` ### Basic Information From 88da949f2a429be9364ac4c7de96ef647331444d Mon Sep 17 00:00:00 2001 From: Nonso Chukwuogor Date: Thu, 15 Aug 2024 09:49:50 -0700 Subject: [PATCH 7/7] run gen --- .../2024-08-15-preview/iotoperations.json | 134 +++++++++--------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json index b9be0daf08d3..0f037174bb61 100644 --- a/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json +++ b/specification/iotoperations/resource-manager/Microsoft.IoTOperations/preview/2024-08-15-preview/iotoperations.json @@ -3711,73 +3711,6 @@ "$ref": "#/definitions/ManagedIdentityMethod", "x-nullable": false }, - "DataflowEndpointFabricOneLakeAuthentication": { - "type": "object", - "description": "Microsoft Fabric endpoint. Authentication properties. NOTE - Only one method is supported for one entry", - "properties": { - "method": { - "$ref": "#/definitions/FabricOneLakeAuthMethod", - "description": "Mode of Authentication." - }, - "systemAssignedManagedIdentitySettings": { - "$ref": "#/definitions/DataflowEndpointAuthenticationSystemAssignedManagedIdentity", - "description": "System-assigned managed identity authentication." - }, - "userAssignedManagedIdentitySettings": { - "$ref": "#/definitions/DataflowEndpointAuthenticationUserAssignedManagedIdentity", - "description": "User-assigned managed identity authentication." - } - }, - "required": [ - "method" - ] - }, - "DataflowEndpointKafkaAuthentication": { - "type": "object", - "description": "Kafka endpoint Authentication properties. NOTE - only authentication property is allowed per entry", - "properties": { - "method": { - "$ref": "#/definitions/KafkaAuthMethod", - "description": "Mode of Authentication." - }, - "systemAssignedManagedIdentitySettings": { - "$ref": "#/definitions/DataflowEndpointAuthenticationSystemAssignedManagedIdentity", - "description": "System-assigned managed identity authentication." - }, - "userAssignedManagedIdentitySettings": { - "$ref": "#/definitions/DataflowEndpointAuthenticationUserAssignedManagedIdentity", - "description": "User-assigned managed identity authentication." - }, - "saslSettings": { - "$ref": "#/definitions/DataflowEndpointAuthenticationSasl", - "description": "SASL authentication." - }, - "x509CertificateSettings": { - "$ref": "#/definitions/DataflowEndpointAuthenticationX509", - "description": "X.509 certificate authentication." - } - }, - "required": [ - "method" - ] - }, - "DataflowInstanceProperties": { - "type": "object", - "description": "The properties of an Dataflow instance.", - "properties": { - "state": { - "$ref": "#/definitions/OperationalMode", - "description": "This determines if the Dataflow service is enabled.", - "x-ms-mutability": [ - "read", - "create" - ] - } - }, - "required": [ - "state" - ] - }, "DataLakeStorageAuthMethod": { "type": "string", "description": "DataflowEndpoint Data Lake Storage Authentication Method properties", @@ -4258,6 +4191,27 @@ "host" ] }, + "DataflowEndpointFabricOneLakeAuthentication": { + "type": "object", + "description": "Microsoft Fabric endpoint. Authentication properties. NOTE - Only one method is supported for one entry", + "properties": { + "method": { + "$ref": "#/definitions/FabricOneLakeAuthMethod", + "description": "Mode of Authentication." + }, + "systemAssignedManagedIdentitySettings": { + "$ref": "#/definitions/DataflowEndpointAuthenticationSystemAssignedManagedIdentity", + "description": "System-assigned managed identity authentication." + }, + "userAssignedManagedIdentitySettings": { + "$ref": "#/definitions/DataflowEndpointAuthenticationUserAssignedManagedIdentity", + "description": "User-assigned managed identity authentication." + } + }, + "required": [ + "method" + ] + }, "DataflowEndpointFabricOneLakeNames": { "type": "object", "description": "Microsoft Fabric endpoint Names properties", @@ -4493,6 +4447,35 @@ ] } }, + "DataflowEndpointKafkaAuthentication": { + "type": "object", + "description": "Kafka endpoint Authentication properties. NOTE - only authentication property is allowed per entry", + "properties": { + "method": { + "$ref": "#/definitions/KafkaAuthMethod", + "description": "Mode of Authentication." + }, + "systemAssignedManagedIdentitySettings": { + "$ref": "#/definitions/DataflowEndpointAuthenticationSystemAssignedManagedIdentity", + "description": "System-assigned managed identity authentication." + }, + "userAssignedManagedIdentitySettings": { + "$ref": "#/definitions/DataflowEndpointAuthenticationUserAssignedManagedIdentity", + "description": "User-assigned managed identity authentication." + }, + "saslSettings": { + "$ref": "#/definitions/DataflowEndpointAuthenticationSasl", + "description": "SASL authentication." + }, + "x509CertificateSettings": { + "$ref": "#/definitions/DataflowEndpointAuthenticationX509", + "description": "X.509 certificate authentication." + } + }, + "required": [ + "method" + ] + }, "DataflowEndpointKafkaBatching": { "type": "object", "description": "Kafka endpoint Batching properties", @@ -4860,6 +4843,23 @@ "value" ] }, + "DataflowInstanceProperties": { + "type": "object", + "description": "The properties of an Dataflow instance.", + "properties": { + "state": { + "$ref": "#/definitions/OperationalMode", + "description": "This determines if the Dataflow service is enabled.", + "x-ms-mutability": [ + "read", + "create" + ] + } + }, + "required": [ + "state" + ] + }, "DataflowMappingType": { "type": "string", "description": "Dataflow type mapping properties",