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..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 @@ -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,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", @@ -4230,7 +4163,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": { @@ -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", @@ -4305,7 +4259,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": { @@ -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", diff --git a/specification/iotoperations/resource-manager/readme.md b/specification/iotoperations/resource-manager/readme.md index d223a75c844a..6335d57f3037 100644 --- a/specification/iotoperations/resource-manager/readme.md +++ b/specification/iotoperations/resource-manager/readme.md @@ -49,6 +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 ``` ### Basic Information