Skip to content

Commit

Permalink
Merge branch 'Azure:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
wanlwanl authored Jan 24, 2025
2 parents e1764dc + e84c20e commit 6134567
Show file tree
Hide file tree
Showing 9 changed files with 254 additions and 22 deletions.
48 changes: 36 additions & 12 deletions specification/computeschedule/ComputeSchedule.Management/client.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -85,21 +85,45 @@ using Microsoft.ComputeSchedule;
);
@@clientName(StartResourceOperationResponse.type, "ResourceType", "csharp");

@@clientName(SubmitDeallocateRequest.correlationid, "correlationId", "csharp");
@@clientName(SubmitStartRequest.correlationid, "correlationId", "csharp");
@@clientName(SubmitHibernateRequest.correlationid, "correlationId", "csharp");
@@clientName(ExecuteDeallocateRequest.correlationid, "correlationId", "csharp");
@@clientName(ExecuteHibernateRequest.correlationid, "correlationId", "csharp");
@@clientName(ExecuteStartRequest.correlationid, "correlationId", "csharp");
@@clientName(SubmitDeallocateRequest.correlationid,
"correlationId",
"csharp,javascript"
);
@@clientName(SubmitStartRequest.correlationid,
"correlationId",
"csharp,javascript"
);
@@clientName(SubmitHibernateRequest.correlationid,
"correlationId",
"csharp,javascript"
);
@@clientName(ExecuteDeallocateRequest.correlationid,
"correlationId",
"csharp,javascript"
);
@@clientName(ExecuteHibernateRequest.correlationid,
"correlationId",
"csharp,javascript"
);
@@clientName(ExecuteStartRequest.correlationid,
"correlationId",
"csharp,javascript"
);
@@clientName(GetOperationStatusRequest.correlationid,
"correlationId",
"csharp"
"csharp,javascript"
);
@@clientName(CancelOperationsRequest.correlationid,
"correlationId",
"csharp,javascript"
);
@@clientName(Schedule.deadLine, "userRequestDeadline", "csharp,javascript");
@@clientName(Schedule.timeZone, "userRequestTimezone", "csharp,javascript");
@@clientName(ResourceOperationDetails.timeZone,
"operationTimezone",
"csharp,javascript"
);
@@clientName(CancelOperationsRequest.correlationid, "correlationId", "csharp");
@@clientName(Schedule.deadLine, "userRequestDeadline", "csharp");
@@clientName(Schedule.timeZone, "userRequestTimezone", "csharp");
@@clientName(ResourceOperationDetails.timeZone, "operationTimezone", "csharp");
@@clientName(OperationErrorDetails.timeStamp,
"errorDetailsTimestamp",
"csharp"
"csharp,javascript"
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import "./main.tsp";
import "@azure-tools/typespec-client-generator-core";

using Azure.ClientGenerator.Core;

@@clientName(Microsoft.DatabaseWatcher, "DatabaseWatcherMgmt", "python");
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,95 @@ import "./main.tsp";
import "@azure-tools/typespec-client-generator-core";

using Azure.ClientGenerator.Core;
using Microsoft.DeviceRegistry;

// Java Client configuration
@@clientNamespace(Microsoft.DeviceRegistry,
"com.azure.resourcemanager.deviceregistry",
"java"
);
@@clientName(Microsoft.DeviceRegistry, "DeviceRegistryMgmt", "python");

@@clientName(Microsoft.DeviceRegistry,
"DeviceRegistryManagementClient",
"java"
);

// Python Client configuration
@@clientName(Microsoft.DeviceRegistry, "DeviceRegistryMgmt", "python");

// CSharp Client configuration
@@scope(OperationStatus.get, "!csharp");

@@clientName(Asset, "DeviceRegistryAsset", "csharp");
@@clientName(AssetProperties.enabled, "IsEnabled", "csharp");
@@clientName(AssetStatus, "DeviceRegistryAssetStatus", "csharp");
@@clientName(AssetStatusDataset, "DeviceRegistryAssetStatusDataset", "csharp");
@@clientName(AssetStatusError, "DeviceRegistryAssetStatusError", "csharp");
@@clientName(AssetStatusEvent, "DeviceRegistryAssetStatusEvent", "csharp");
@@clientName(AssetEndpointProfile,
"DeviceRegistryAssetEndpointProfile",
"csharp"
);
@@clientName(AssetEndpointProfileProperties,
"DeviceRegistryAssetEndpointProfileProperties",
"csharp"
);
@@clientName(DataPoint, "DeviceRegistryDataPoint", "csharp");
@@clientName(DataPointBase, "DeviceRegistryDataPointBase", "csharp");
@@clientName(Dataset, "DeviceRegistryDataset", "csharp");
@@clientName(DiscoveredAsset, "DeviceRegistryDiscoveredAsset", "csharp");
@@clientName(DiscoveredAssetProperties,
"DeviceRegistryDiscoveredAssetProperties",
"csharp"
);
@@clientName(DiscoveredAssetEndpointProfile,
"DeviceRegistryDiscoveredAssetEndpointProfile",
"csharp"
);
@@clientName(Event, "DeviceRegistryEvent", "csharp");
@@clientName(EventBase, "DeviceRegistryEventBase", "csharp");
@@clientName(Format, "DeviceRegistrySchemaFormat", "csharp");
@@clientName(Schema, "DeviceRegistrySchema", "csharp");
@@clientName(SchemaProperties, "DeviceRegistrySchemaProperties", "csharp");
@@clientName(SchemaRegistry, "DeviceRegistrySchemaRegistry", "csharp");
@@clientName(SchemaRegistryProperties,
"DeviceRegistrySchemaRegistryProperties",
"csharp"
);
@@clientName(SchemaType, "DeviceRegistrySchemaType", "csharp");
@@clientName(SchemaVersion, "DeviceRegistrySchemaVersion", "csharp");
@@clientName(SchemaVersionProperties,
"DeviceRegistrySchemaVersionProperties",
"csharp"
);
@@clientName(BillingContainer, "DeviceRegistryBillingContainer", "csharp");
@@clientName(ExtendedLocation, "DeviceRegistryExtendedLocation", "csharp");
@@clientName(ExtendedLocation.type, "ExtendedLocationType", "csharp");
@@clientName(TopicRetainType, "DeviceRegistryTopicRetainType", "csharp");
@@clientName(ProvisioningState, "DeviceRegistryProvisioningState", "csharp");
@@clientName(Authentication, "DeviceRegistryAuthentication", "csharp");
@@clientName(Topic, "DeviceRegistryTopic", "csharp");
@@clientName(UsernamePasswordCredentials,
"DeviceRegistryUsernamePasswordCredentials",
"csharp"
);
@@clientName(X509Credentials, "DeviceRegistryX509Credentials", "csharp");

@@alternateType(SchemaRegistryProperties.storageAccountContainerUrl,
url,
"csharp"
);
@@alternateType(AssetProperties.manufacturerUri, url, "csharp");
@@alternateType(AssetProperties.documentationUri, url, "csharp");
@@alternateType(BillingContainer.etag, Azure.Core.eTag, "csharp");
@@alternateType(DiscoveredAssetProperties.manufacturerUri, url, "csharp");
@@alternateType(DiscoveredAssetProperties.documentationUri, url, "csharp");
@@alternateType(SchemaRegistryProperties.storageAccountContainerUrl,
url,
"csharp"
);

// JavaScript Client configuration
@@clientName(Microsoft.DeviceRegistry,
"DeviceRegistryManagementClient",
"javascript"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,19 @@ namespace Microsoft.DeviceRegistry;
enum Versions {
@doc("Microsoft.DeviceRegistry Resource Provider management API version 2023-11-01-preview.")
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
@useDependency(Azure.Core.Versions.v1_0_Preview_2)
@armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v3)
v2023_11_01_preview: "2023-11-01-preview",

@doc("Microsoft.DeviceRegistry Resource Provider management API version 2024-09-01-preview.")
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
@useDependency(Azure.Core.Versions.v1_0_Preview_2)
@armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5)
v2024_09_01_preview: "2024-09-01-preview",

@doc("Microsoft.DeviceRegistry Resource Provider management API version 2024-11-01.")
@useDependency(Azure.ResourceManager.Versions.v1_0_Preview_1)
@useDependency(Azure.Core.Versions.v1_0_Preview_2)
@armCommonTypesVersion(Azure.ResourceManager.CommonTypes.Versions.v5)
v2024_11_01: "2024-11-01",
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ options:
output-file: "{azure-resource-provider-folder}/{service-name}/{version-status}/{version}/deviceregistry.json"
use-read-only-status-schema: true
omit-unreachable-types: true
"@azure-tools/typespec-csharp":
package-dir: "Azure.ResourceManager.DeviceRegistry"
flavor: azure
clear-output-folder: true
use-write-core: true
namespace: "{package-dir}"
api-version: "2024-09-01-preview"
"@azure-tools/typespec-java":
package-dir: "azure-resourcemanager-deviceregistry"
flavor: "azure"
Expand Down
7 changes: 7 additions & 0 deletions specification/impact/Impact.Management/client.tsp
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import "./main.tsp";
import "@azure-tools/typespec-client-generator-core";

using Azure.ClientGenerator.Core;

@@clientName(Microsoft.Impact, "ImpactReportingMgmtClient", "java");
@@clientName(Microsoft.Impact, "ImpactReportingMgmtClient", "python");
33 changes: 32 additions & 1 deletion specification/impact/Impact.Management/tspconfig.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
parameters:
service-dir:
default: "sdk/impact"
default: "sdk/impactreporting"
emit:
- "@azure-tools/typespec-autorest"
linter:
Expand All @@ -18,3 +18,34 @@ options:
clear-output-folder: true
model-namespace: false
namespace: "{package-dir}"
"@azure-tools/typespec-python":
package-dir: "azure-mgmt-impactreporting"
package-name: "{package-dir}"
generate-test: true
generate-sample: true
flavor: "azure"
"@azure-tools/typespec-java":
package-dir: "azure-resourcemanager-impactreporting"
namespace: "com.azure.resourcemanager.impactreporting"
service-name: "Impact Reporting"
flavor: azure
"@azure-tools/typespec-go":
service-dir: "sdk/resourcemanager/impactreporting"
package-dir: "armimpactreporting"
module: "github.com/Azure/azure-sdk-for-go/{service-dir}/{package-dir}"
fix-const-stuttering: true
flavor: "azure"
generate-examples: true
generate-fakes: true
head-as-boolean: true
inject-spans: true
"@azure-tools/typespec-ts":
flavor: "azure"
isModularLibrary: true
hierarchyClient: false
experimentalExtensibleEnums: true
enableOperationGroup: true
generateSample: true
package-dir: "arm-impactreporting"
packageDetails:
name: "@azure/arm-impactreporting"
85 changes: 79 additions & 6 deletions specification/iotoperations/IoTOperations.Management/client.tsp
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,86 @@ import "./main.tsp";
import "@azure-tools/typespec-client-generator-core";

using Azure.ClientGenerator.Core;
using Microsoft.IoTOperations;

#suppress "@azure-tools/typespec-azure-core/casing-style"
@@clientName(Microsoft.IoTOperations, "IoTOperationsMgmt", "python");
@@clientName(Microsoft.IoTOperations, "IoTOperationsManagementClient", "java");

#suppress "@azure-tools/typespec-azure-core/casing-style"
namespace Microsoft.IoTOperations {
@@clientName(CertManagerCertOptions, "CertManagerCertConfig", "csharp");
@@clientName(DataflowOperation, "DataflowAction", "csharp");
@@clientName(PrincipalDefinition, "PrincipalConfig", "csharp");
}
// CSharp Client configuration
@@clientName(BrokerAuthenticationResource,
"IotOperationsBrokerAuthentication",
"csharp"
);
@@clientName(BrokerAuthenticationProperties,
"IotOperationsBrokerAuthenticationProperties",
"csharp"
);
@@clientName(BrokerAuthorizationResource,
"IotOperationsBrokerAuthorization",
"csharp"
);
@@clientName(BrokerAuthorizationProperties,
"IotOperationsBrokerAuthorizationProperties",
"csharp"
);
@@clientName(BrokerListenerResource, "IotOperationsBrokerListener", "csharp");
@@clientName(BrokerListenerProperties,
"IotOperationsBrokerListenerProperties",
"csharp"
);
@@clientName(BrokerResource, "IotOperationsBroker", "csharp");
@@clientName(BrokerProperties, "IotOperationsBrokerProperties", "csharp");
@@clientName(DataflowEndpointResource,
"IotOperationsDataflowEndpoint",
"csharp"
);
@@clientName(DataflowEndpointProperties,
"IotOperationsDataflowEndpointProperties",
"csharp"
);
@@clientName(DataflowProfileResource, "IotOperationsDataflowProfile", "csharp");
@@clientName(DataflowProfileProperties,
"IotOperationsDataflowProfileProperties",
"csharp"
);
@@clientName(DataflowResource, "IotOperationsDataflow", "csharp");
@@clientName(DataflowProperties, "IotOperationsDataflowProperties", "csharp");
@@clientName(InstanceResource, "IotOperationsInstance", "csharp");
@@clientName(InstanceProperties, "IotOperationsInstanceProperties", "csharp");
@@clientName(AdvancedSettings, "BrokerAdvancedSettings", "csharp");
@@clientName(AuthorizationConfig, "BrokerAuthorizationConfig", "csharp");
@@clientName(AuthorizationRule, "BrokerAuthorizationRule", "csharp");
@@clientName(BackendChain, "BrokerBackendChain", "csharp");
@@clientName(BatchingConfiguration, "IotOperationsBatchingConfig", "csharp");
@@clientName(Cardinality, "BrokerCardinality", "csharp");
@@clientName(CertManagerCertOptions, "CertManagerCertConfig", "csharp");
@@clientName(ClientConfig, "BrokerClientConfig", "csharp");
@@clientName(DataflowOperation, "DataflowOperationProperties", "csharp");
@@clientName(EndpointType, "DataflowEndpointType", "csharp");
@@clientName(ExtendedLocation, "IotOperationsExtendedLocation", "csharp");
@@clientName(ExtendedLocationType,
"IotOperationsExtendedLocationType",
"csharp"
);
@@clientName(FilterType, "DataflowFilterType", "csharp");
@@clientName(Frontend, "BrokerFrontend", "csharp");
@@clientName(ListenerPort, "BrokerListenerPort", "csharp");
@@clientName(Metrics, "IotOperationsMetrics", "csharp");
@@clientName(MetricProperties, "IotOperationsMetricsProperties", "csharp");
@@clientName(OperationalMode, "IotOperationsOperationalMode", "csharp");
@@clientName(OperationType, "DataflowOperationType", "csharp");
@@clientName(OperatorValues, "BrokerOperatorValues", "csharp");
@@clientName(PrincipalDefinition, "PrincipalConfig", "csharp");
@@clientName(ProfileDiagnostics, "DataflowProfileDiagnostics", "csharp");
@@clientName(ProvisioningState, "IotOperationsProvisioningState", "csharp");
@@clientName(SelfCheck, "BrokerDiagnosticSelfCheck", "csharp");
@@clientName(SelfTracing, "DiagnosticSelfTracing", "csharp");
@@clientName(ServiceType, "BlockerListenerServiceType", "csharp");
@@clientName(SourceSerializationFormat,
"DataflowSourceSerializationFormat",
"csharp"
);
@@clientName(TlsCertMethod, "ListenerPortTlsCertMethod", "csharp");
@@clientName(TlsProperties, "IotOperationsTlsProperties", "csharp");
@@clientName(Traces, "BrokerDiagnosticTraces", "csharp");
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@ options:
use-read-only-status-schema: true
"@azure-tools/typespec-csharp":
flavor: azure
package-dir: "Azure.ResourceManager.IoTOperations"
package-dir: "Azure.ResourceManager.IotOperations"
clear-output-folder: true
model-namespace: false
use-write-core: true
namespace: "{package-dir}"
# Disable generate samples until CodGen fix collection initialization issue https://github.com/Azure/azure-sdk-for-net/issues/47929
generate-sample-project: false
"@azure-tools/typespec-python":
package-dir: "azure-mgmt-iotoperations"
package-name: "{package-dir}"
Expand Down

0 comments on commit 6134567

Please sign in to comment.