Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = #{
Expand Down Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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": {
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions specification/iotoperations/resource-manager/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down