From f5fd2dc3fc8b2d980b04d4369fe3339489c1212b Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Thu, 15 Jul 2021 05:49:05 +0000 Subject: [PATCH] CodeGen from PR 15006 in Azure/azure-rest-api-specs [SignalR]update default value for (#15006) --- .../2018-03-01-preview/signalr/CHANGELOG.md | 7 +- .../2018-03-01-preview/signalr/_meta.json | 2 +- .../2020-07-01-preview/signalr/CHANGELOG.md | 6 +- .../2020-07-01-preview/signalr/_meta.json | 2 +- .../mgmt/2020-07-01-preview/signalr/models.go | 70 +++++++++++-------- .../2020-07-01-preview/signalr/signalr.go | 18 ++--- .../signalr/signalrapi/interfaces.go | 16 ++--- .../mgmt/2020-07-01-preview/signalr/usages.go | 2 +- .../2021-04-01-preview/signalr/CHANGELOG.md | 11 +-- .../2021-04-01-preview/signalr/_meta.json | 2 +- .../2021-06-01-preview/signalr/CHANGELOG.md | 2 +- .../2021-06-01-preview/signalr/_meta.json | 2 +- .../mgmt/2021-06-01-preview/signalr/models.go | 2 +- .../2021-04-01-preview/webpubsub/CHANGELOG.md | 11 +-- .../2021-04-01-preview/webpubsub/_meta.json | 2 +- .../2021-06-01-preview/webpubsub/CHANGELOG.md | 2 +- .../2021-06-01-preview/webpubsub/_meta.json | 2 +- .../mgmt/2018-10-01/signalr/CHANGELOG.md | 7 +- .../mgmt/2018-10-01/signalr/_meta.json | 2 +- .../mgmt/2020-05-01/signalr/CHANGELOG.md | 6 +- .../mgmt/2020-05-01/signalr/_meta.json | 2 +- .../signalr/mgmt/2020-05-01/signalr/models.go | 44 ++++++++++-- 22 files changed, 117 insertions(+), 103 deletions(-) diff --git a/services/preview/signalr/mgmt/2018-03-01-preview/signalr/CHANGELOG.md b/services/preview/signalr/mgmt/2018-03-01-preview/signalr/CHANGELOG.md index f817772e217f..a1ecf841edb0 100644 --- a/services/preview/signalr/mgmt/2018-03-01-preview/signalr/CHANGELOG.md +++ b/services/preview/signalr/mgmt/2018-03-01-preview/signalr/CHANGELOG.md @@ -1,7 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. Resource.MarshalJSON() ([]byte, error) diff --git a/services/preview/signalr/mgmt/2018-03-01-preview/signalr/_meta.json b/services/preview/signalr/mgmt/2018-03-01-preview/signalr/_meta.json index 99302a157700..f50f139270c2 100644 --- a/services/preview/signalr/mgmt/2018-03-01-preview/signalr/_meta.json +++ b/services/preview/signalr/mgmt/2018-03-01-preview/signalr/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "18361831247437e8823805689710ace878c195ee", "readme": "/_/azure-rest-api-specs/specification/signalr/resource-manager/readme.md", "tag": "package-2018-03-01-preview", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/CHANGELOG.md b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/CHANGELOG.md index 01d9141d8f96..a7be6eef1105 100644 --- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/CHANGELOG.md +++ b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/CHANGELOG.md @@ -1,9 +1,7 @@ -# Change History +# Unreleased ## Additive Changes ### New Funcs -1. ProxyResource.MarshalJSON() ([]byte, error) -1. Resource.MarshalJSON() ([]byte, error) -1. UserAssignedIdentityProperty.MarshalJSON() ([]byte, error) +1. ResourceSku.MarshalJSON() ([]byte, error) diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/_meta.json b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/_meta.json index 28b3980b84c8..e638507f27ff 100644 --- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/_meta.json +++ b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "18361831247437e8823805689710ace878c195ee", "readme": "/_/azure-rest-api-specs/specification/signalr/resource-manager/readme.md", "tag": "package-2020-07-01-preview", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/models.go b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/models.go index fed48d35529a..0560bb4e0be9 100644 --- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/models.go +++ b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/models.go @@ -179,16 +179,16 @@ func (f Feature) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// Keys a class represents the access keys of SignalR service. +// Keys a class represents the access keys of the resource. type Keys struct { autorest.Response `json:"-"` // PrimaryKey - The primary access key. PrimaryKey *string `json:"primaryKey,omitempty"` // SecondaryKey - The secondary access key. SecondaryKey *string `json:"secondaryKey,omitempty"` - // PrimaryConnectionString - SignalR connection string constructed via the primaryKey + // PrimaryConnectionString - Connection string constructed via the primaryKey PrimaryConnectionString *string `json:"primaryConnectionString,omitempty"` - // SecondaryConnectionString - SignalR connection string constructed via the secondaryKey + // SecondaryConnectionString - Connection string constructed via the secondaryKey SecondaryConnectionString *string `json:"secondaryConnectionString,omitempty"` } @@ -269,7 +269,7 @@ type NameAvailability struct { // NameAvailabilityParameters data POST-ed to the nameAvailability action type NameAvailabilityParameters struct { - // Type - The resource type. Should be always "Microsoft.SignalRService/SignalR". + // Type - The resource type. Can be "Microsoft.SignalRService/SignalR" or "Microsoft.SignalRService/webPubSub" Type *string `json:"type,omitempty"` // Name - The SignalR service name to validate. e.g."my-signalR-name-here" Name *string `json:"name,omitempty"` @@ -283,7 +283,7 @@ type NetworkACL struct { Deny *[]RequestType `json:"deny,omitempty"` } -// NetworkACLs network ACLs for SignalR +// NetworkACLs network ACLs for the resource type NetworkACLs struct { // DefaultAction - Default action when no other rule matches. Possible values include: 'Allow', 'Deny' DefaultAction ACLAction `json:"defaultAction,omitempty"` @@ -293,7 +293,7 @@ type NetworkACLs struct { PrivateEndpoints *[]PrivateEndpointACL `json:"privateEndpoints,omitempty"` } -// Operation REST API operation supported by SignalR resource provider. +// Operation REST API operation supported by resource provider. type Operation struct { // Name - Name of the operation with format: {provider}/{resource}/{operation} Name *string `json:"name,omitempty"` @@ -886,22 +886,21 @@ type PrivateLinkServiceConnectionState struct { ActionsRequired *string `json:"actionsRequired,omitempty"` } -// Properties a class that describes the properties of the SignalR service that should contain more -// read-only properties than AzSignalR.Models.SignalRCreateOrUpdateProperties +// Properties a class that describes the properties of the resource type Properties struct { // ProvisioningState - READ-ONLY; Provisioning state of the resource. Possible values include: 'Unknown', 'Succeeded', 'Failed', 'Canceled', 'Running', 'Creating', 'Updating', 'Deleting', 'Moving' ProvisioningState ProvisioningState `json:"provisioningState,omitempty"` - // ExternalIP - READ-ONLY; The publicly accessible IP of the SignalR service. + // ExternalIP - READ-ONLY; The publicly accessible IP of the resource. ExternalIP *string `json:"externalIP,omitempty"` - // HostName - READ-ONLY; FQDN of the SignalR service instance. Format: xxx.service.signalr.net + // HostName - READ-ONLY; FQDN of the service instance. HostName *string `json:"hostName,omitempty"` - // PublicPort - READ-ONLY; The publicly accessible port of the SignalR service which is designed for browser/client side usage. + // PublicPort - READ-ONLY; The publicly accessible port of the resource which is designed for browser/client side usage. PublicPort *int32 `json:"publicPort,omitempty"` - // ServerPort - READ-ONLY; The publicly accessible port of the SignalR service which is designed for customer server side usage. + // ServerPort - READ-ONLY; The publicly accessible port of the resource which is designed for customer server side usage. ServerPort *int32 `json:"serverPort,omitempty"` - // Version - READ-ONLY; Version of the SignalR resource. Probably you need the same or higher version of client SDKs. + // Version - READ-ONLY; Version of the resource. Probably you need the same or higher version of client SDKs. Version *string `json:"version,omitempty"` - // PrivateEndpointConnections - READ-ONLY; Private endpoint connections to the SignalR resource. + // PrivateEndpointConnections - READ-ONLY; Private endpoint connections to the resource. PrivateEndpointConnections *[]PrivateEndpointConnection `json:"privateEndpointConnections,omitempty"` // TLS - TLS settings. TLS *TLSSettings `json:"tls,omitempty"` @@ -1023,10 +1022,10 @@ func (r Resource) MarshalJSON() ([]byte, error) { return json.Marshal(objectMap) } -// ResourceList object that includes an array of SignalR services and a possible link for next set. +// ResourceList object that includes an array of resources and a possible link for next set. type ResourceList struct { autorest.Response `json:"-"` - // Value - List of SignalR services + // Value - List of the resources Value *[]ResourceType `json:"value,omitempty"` // NextLink - The URL the client should use to fetch the next page (per server side paging). // It's null for now, added for future use. @@ -1183,7 +1182,7 @@ func NewResourceListPage(cur ResourceList, getNextPage func(context.Context, Res } } -// ResourceSku the billing information of the SignalR resource. +// ResourceSku the billing information of the resource. type ResourceSku struct { // Name - The name of the SKU. Required. // @@ -1193,9 +1192,9 @@ type ResourceSku struct { // // `Basic` is deprecated, use `Standard` instead. Possible values include: 'Free', 'Basic', 'Standard', 'Premium' Tier SkuTier `json:"tier,omitempty"` - // Size - Optional string. For future use. + // Size - READ-ONLY; Not used. Retained for future use. Size *string `json:"size,omitempty"` - // Family - Optional string. For future use. + // Family - READ-ONLY; Not used. Retained for future use. Family *string `json:"family,omitempty"` // Capacity - Optional, integer. The unit count of SignalR resource. 1 by default. // @@ -1205,18 +1204,33 @@ type ResourceSku struct { Capacity *int32 `json:"capacity,omitempty"` } -// ResourceType a class represent a SignalR service resource. +// MarshalJSON is the custom marshaler for ResourceSku. +func (rs ResourceSku) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if rs.Name != nil { + objectMap["name"] = rs.Name + } + if rs.Tier != "" { + objectMap["tier"] = rs.Tier + } + if rs.Capacity != nil { + objectMap["capacity"] = rs.Capacity + } + return json.Marshal(objectMap) +} + +// ResourceType a class represent a resource. type ResourceType struct { autorest.Response `json:"-"` // Sku - The billing information of the resource.(e.g. Free, Standard) Sku *ResourceSku `json:"sku,omitempty"` // Properties - Settings used to provision or configure the resource *Properties `json:"properties,omitempty"` - // Kind - The kind of the service - e.g. "SignalR", or "RawWebSockets" for "Microsoft.SignalRService/SignalR". Possible values include: 'SignalR', 'RawWebSockets' + // Kind - The kind of the service - e.g. "SignalR" for "Microsoft.SignalRService/SignalR". Possible values include: 'SignalR', 'RawWebSockets' Kind ServiceKind `json:"kind,omitempty"` // Identity - The managed identity response Identity *ManagedIdentity `json:"identity,omitempty"` - // Location - The GEO location of the SignalR service. e.g. West US | East US | North Central US | South Central US. + // Location - The GEO location of the resource. e.g. West US | East US | North Central US | South Central US. Location *string `json:"location,omitempty"` // Tags - Tags of the service which is a list of key value pairs that describe the resource. Tags map[string]*string `json:"tags"` @@ -1384,7 +1398,7 @@ func (future *RestartFuture) result(client Client) (ar autorest.Response, err er return } -// ServerlessUpstreamSettings the settings for the Upstream when the Azure SignalR is in server-less mode. +// ServerlessUpstreamSettings the settings for the Upstream when the service is in server-less mode. type ServerlessUpstreamSettings struct { // Templates - Gets or sets the list of Upstream URL templates. Order matters, and the first matching template takes effects. Templates *[]UpstreamTemplate `json:"templates,omitempty"` @@ -1398,7 +1412,7 @@ type ServiceSpecification struct { LogSpecifications *[]LogSpecification `json:"logSpecifications,omitempty"` } -// TLSSettings TLS settings for SignalR +// TLSSettings TLS settings for the resource type TLSSettings struct { // ClientCertEnabled - Request client certificate during TLS handshake if enabled ClientCertEnabled *bool `json:"clientCertEnabled,omitempty"` @@ -1406,7 +1420,7 @@ type TLSSettings struct { // TrackedResource the resource model definition for a ARM tracked top level resource. type TrackedResource struct { - // Location - The GEO location of the SignalR service. e.g. West US | East US | North Central US | South Central US. + // Location - The GEO location of the resource. e.g. West US | East US | North Central US | South Central US. Location *string `json:"location,omitempty"` // Tags - Tags of the service which is a list of key value pairs that describe the resource. Tags map[string]*string `json:"tags"` @@ -1509,7 +1523,7 @@ type UpstreamTemplate struct { Auth *UpstreamAuthSettings `json:"auth,omitempty"` } -// Usage object that describes a specific usage of SignalR resources. +// Usage object that describes a specific usage of the resources. type Usage struct { // ID - Fully qualified ARM resource id ID *string `json:"id,omitempty"` @@ -1523,10 +1537,10 @@ type Usage struct { Unit *string `json:"unit,omitempty"` } -// UsageList object that includes an array of SignalR resource usages and a possible link for next set. +// UsageList object that includes an array of the resource usages and a possible link for next set. type UsageList struct { autorest.Response `json:"-"` - // Value - List of SignalR usages + // Value - List of the resource usages Value *[]Usage `json:"value,omitempty"` // NextLink - The URL the client should use to fetch the next page (per server side paging). // It's null for now, added for future use. diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalr.go b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalr.go index 71dc50651fbf..8f29ada9f0bc 100644 --- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalr.go +++ b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalr.go @@ -31,7 +31,7 @@ func NewClientWithBaseURI(baseURI string, subscriptionID string) Client { return Client{NewWithBaseURI(baseURI, subscriptionID)} } -// CheckNameAvailability checks that the SignalR name is valid and is not already in use. +// CheckNameAvailability checks that the resource name is valid and is not already in use. // Parameters: // location - the region // parameters - parameters supplied to the operation. @@ -120,7 +120,7 @@ func (client Client) CheckNameAvailabilityResponder(resp *http.Response) (result return } -// CreateOrUpdate create a new SignalR service and update an exiting SignalR service. +// CreateOrUpdate create or update a resource. // Parameters: // resourceGroupName - the name of the resource group that contains the resource. You can obtain this value // from the Azure Resource Manager API or the portal. @@ -214,7 +214,7 @@ func (client Client) CreateOrUpdateResponder(resp *http.Response) (result Resour return } -// Delete operation to delete a SignalR service. +// Delete operation to delete a resource. // Parameters: // resourceGroupName - the name of the resource group that contains the resource. You can obtain this value // from the Azure Resource Manager API or the portal. @@ -292,7 +292,7 @@ func (client Client) DeleteResponder(resp *http.Response) (result autorest.Respo return } -// Get get the SignalR service and its properties. +// Get get the resource and its properties. // Parameters: // resourceGroupName - the name of the resource group that contains the resource. You can obtain this value // from the Azure Resource Manager API or the portal. @@ -599,7 +599,7 @@ func (client Client) ListBySubscriptionComplete(ctx context.Context) (result Res return } -// ListKeys get the access keys of the SignalR resource. +// ListKeys get the access keys of the resource. // Parameters: // resourceGroupName - the name of the resource group that contains the resource. You can obtain this value // from the Azure Resource Manager API or the portal. @@ -676,8 +676,8 @@ func (client Client) ListKeysResponder(resp *http.Response) (result Keys, err er return } -// RegenerateKey regenerate SignalR service access key. PrimaryKey and SecondaryKey cannot be regenerated at the same -// time. +// RegenerateKey regenerate the access key for the resource. PrimaryKey and SecondaryKey cannot be regenerated at the +// same time. // Parameters: // resourceGroupName - the name of the resource group that contains the resource. You can obtain this value // from the Azure Resource Manager API or the portal. @@ -762,7 +762,7 @@ func (client Client) RegenerateKeyResponder(resp *http.Response) (result Keys, e return } -// Restart operation to restart a SignalR service. +// Restart operation to restart a resource. // Parameters: // resourceGroupName - the name of the resource group that contains the resource. You can obtain this value // from the Azure Resource Manager API or the portal. @@ -840,7 +840,7 @@ func (client Client) RestartResponder(resp *http.Response) (result autorest.Resp return } -// Update operation to update an exiting SignalR service. +// Update operation to update an exiting resource. // Parameters: // resourceGroupName - the name of the resource group that contains the resource. You can obtain this value // from the Azure Resource Manager API or the portal. diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalrapi/interfaces.go b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalrapi/interfaces.go index ca92e501063b..fa9d82760344 100644 --- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalrapi/interfaces.go +++ b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/signalrapi/interfaces.go @@ -37,6 +37,14 @@ type ClientAPI interface { var _ ClientAPI = (*signalr.Client)(nil) +// UsagesClientAPI contains the set of methods on the UsagesClient type. +type UsagesClientAPI interface { + List(ctx context.Context, location string) (result signalr.UsageListPage, err error) + ListComplete(ctx context.Context, location string) (result signalr.UsageListIterator, err error) +} + +var _ UsagesClientAPI = (*signalr.UsagesClient)(nil) + // PrivateEndpointConnectionsClientAPI contains the set of methods on the PrivateEndpointConnectionsClient type. type PrivateEndpointConnectionsClientAPI interface { Delete(ctx context.Context, privateEndpointConnectionName string, resourceGroupName string, resourceName string) (result signalr.PrivateEndpointConnectionsDeleteFuture, err error) @@ -53,11 +61,3 @@ type PrivateLinkResourcesClientAPI interface { } var _ PrivateLinkResourcesClientAPI = (*signalr.PrivateLinkResourcesClient)(nil) - -// UsagesClientAPI contains the set of methods on the UsagesClient type. -type UsagesClientAPI interface { - List(ctx context.Context, location string) (result signalr.UsageListPage, err error) - ListComplete(ctx context.Context, location string) (result signalr.UsageListIterator, err error) -} - -var _ UsagesClientAPI = (*signalr.UsagesClient)(nil) diff --git a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/usages.go b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/usages.go index 38c88b18f9cf..e5c82a5d4f68 100644 --- a/services/preview/signalr/mgmt/2020-07-01-preview/signalr/usages.go +++ b/services/preview/signalr/mgmt/2020-07-01-preview/signalr/usages.go @@ -30,7 +30,7 @@ func NewUsagesClientWithBaseURI(baseURI string, subscriptionID string) UsagesCli return UsagesClient{NewWithBaseURI(baseURI, subscriptionID)} } -// List list usage quotas for Azure SignalR service by location. +// List list resource usage quotas by location. // Parameters: // location - the location like "eastus" func (client UsagesClient) List(ctx context.Context, location string) (result UsageListPage, err error) { diff --git a/services/preview/signalr/mgmt/2021-04-01-preview/signalr/CHANGELOG.md b/services/preview/signalr/mgmt/2021-04-01-preview/signalr/CHANGELOG.md index 35dd4e58b82b..a1ecf841edb0 100644 --- a/services/preview/signalr/mgmt/2021-04-01-preview/signalr/CHANGELOG.md +++ b/services/preview/signalr/mgmt/2021-04-01-preview/signalr/CHANGELOG.md @@ -1,11 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. ErrorAdditionalInfo.MarshalJSON() ([]byte, error) -1. ErrorDetail.MarshalJSON() ([]byte, error) -1. ProxyResource.MarshalJSON() ([]byte, error) -1. Resource.MarshalJSON() ([]byte, error) -1. UserAssignedIdentityProperty.MarshalJSON() ([]byte, error) diff --git a/services/preview/signalr/mgmt/2021-04-01-preview/signalr/_meta.json b/services/preview/signalr/mgmt/2021-04-01-preview/signalr/_meta.json index 5470b59f4a61..2770f533e1ea 100644 --- a/services/preview/signalr/mgmt/2021-04-01-preview/signalr/_meta.json +++ b/services/preview/signalr/mgmt/2021-04-01-preview/signalr/_meta.json @@ -1,5 +1,5 @@ { - "commit": "ea5bc27ee9cadeb67767d774c82095be2420bcad", + "commit": "18361831247437e8823805689710ace878c195ee", "readme": "/_/azure-rest-api-specs/specification/signalr/resource-manager/readme.md", "tag": "package-2021-04-01-preview", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/preview/signalr/mgmt/2021-06-01-preview/signalr/CHANGELOG.md b/services/preview/signalr/mgmt/2021-06-01-preview/signalr/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/preview/signalr/mgmt/2021-06-01-preview/signalr/CHANGELOG.md +++ b/services/preview/signalr/mgmt/2021-06-01-preview/signalr/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/preview/signalr/mgmt/2021-06-01-preview/signalr/_meta.json b/services/preview/signalr/mgmt/2021-06-01-preview/signalr/_meta.json index 0570a17719bb..6a1c6656295b 100644 --- a/services/preview/signalr/mgmt/2021-06-01-preview/signalr/_meta.json +++ b/services/preview/signalr/mgmt/2021-06-01-preview/signalr/_meta.json @@ -1,5 +1,5 @@ { - "commit": "b548283ea6f4b3d797e85432fcc6e3ff2a2ac224", + "commit": "18361831247437e8823805689710ace878c195ee", "readme": "/_/azure-rest-api-specs/specification/signalr/resource-manager/readme.md", "tag": "package-2021-06-01-preview", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/preview/signalr/mgmt/2021-06-01-preview/signalr/models.go b/services/preview/signalr/mgmt/2021-06-01-preview/signalr/models.go index 2917ffc18c13..567d7ebe51a3 100644 --- a/services/preview/signalr/mgmt/2021-06-01-preview/signalr/models.go +++ b/services/preview/signalr/mgmt/2021-06-01-preview/signalr/models.go @@ -1107,7 +1107,7 @@ type Properties struct { // Enable or disable local auth with AccessKey // When set as true, connection with AccessKey=xxx won't work. DisableLocalAuth *bool `json:"disableLocalAuth,omitempty"` - // DisableAadAuth - disableAadAuth + // DisableAadAuth - DisableLocalAuth // Enable or disable aad auth // When set as true, connection with AuthType=aad won't work. DisableAadAuth *bool `json:"disableAadAuth,omitempty"` diff --git a/services/preview/webpubsub/mgmt/2021-04-01-preview/webpubsub/CHANGELOG.md b/services/preview/webpubsub/mgmt/2021-04-01-preview/webpubsub/CHANGELOG.md index 35dd4e58b82b..a1ecf841edb0 100644 --- a/services/preview/webpubsub/mgmt/2021-04-01-preview/webpubsub/CHANGELOG.md +++ b/services/preview/webpubsub/mgmt/2021-04-01-preview/webpubsub/CHANGELOG.md @@ -1,11 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. ErrorAdditionalInfo.MarshalJSON() ([]byte, error) -1. ErrorDetail.MarshalJSON() ([]byte, error) -1. ProxyResource.MarshalJSON() ([]byte, error) -1. Resource.MarshalJSON() ([]byte, error) -1. UserAssignedIdentityProperty.MarshalJSON() ([]byte, error) diff --git a/services/preview/webpubsub/mgmt/2021-04-01-preview/webpubsub/_meta.json b/services/preview/webpubsub/mgmt/2021-04-01-preview/webpubsub/_meta.json index 821c30c72afe..d71143d0efc9 100644 --- a/services/preview/webpubsub/mgmt/2021-04-01-preview/webpubsub/_meta.json +++ b/services/preview/webpubsub/mgmt/2021-04-01-preview/webpubsub/_meta.json @@ -1,5 +1,5 @@ { - "commit": "e5839301dfd424559851119c99ef0a2699fbd228", + "commit": "18361831247437e8823805689710ace878c195ee", "readme": "/_/azure-rest-api-specs/specification/webpubsub/resource-manager/readme.md", "tag": "package-2021-04-01-preview", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/preview/webpubsub/mgmt/2021-06-01-preview/webpubsub/CHANGELOG.md b/services/preview/webpubsub/mgmt/2021-06-01-preview/webpubsub/CHANGELOG.md index 52911e4cc5e4..a1ecf841edb0 100644 --- a/services/preview/webpubsub/mgmt/2021-06-01-preview/webpubsub/CHANGELOG.md +++ b/services/preview/webpubsub/mgmt/2021-06-01-preview/webpubsub/CHANGELOG.md @@ -1,2 +1,2 @@ -# Change History +# Unreleased diff --git a/services/preview/webpubsub/mgmt/2021-06-01-preview/webpubsub/_meta.json b/services/preview/webpubsub/mgmt/2021-06-01-preview/webpubsub/_meta.json index 5fcfd56617ce..601418044a2c 100644 --- a/services/preview/webpubsub/mgmt/2021-06-01-preview/webpubsub/_meta.json +++ b/services/preview/webpubsub/mgmt/2021-06-01-preview/webpubsub/_meta.json @@ -1,5 +1,5 @@ { - "commit": "b548283ea6f4b3d797e85432fcc6e3ff2a2ac224", + "commit": "18361831247437e8823805689710ace878c195ee", "readme": "/_/azure-rest-api-specs/specification/webpubsub/resource-manager/readme.md", "tag": "package-2021-06-01-preview", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/signalr/mgmt/2018-10-01/signalr/CHANGELOG.md b/services/signalr/mgmt/2018-10-01/signalr/CHANGELOG.md index f817772e217f..a1ecf841edb0 100644 --- a/services/signalr/mgmt/2018-10-01/signalr/CHANGELOG.md +++ b/services/signalr/mgmt/2018-10-01/signalr/CHANGELOG.md @@ -1,7 +1,2 @@ -# Change History +# Unreleased -## Additive Changes - -### New Funcs - -1. Resource.MarshalJSON() ([]byte, error) diff --git a/services/signalr/mgmt/2018-10-01/signalr/_meta.json b/services/signalr/mgmt/2018-10-01/signalr/_meta.json index 7053f3ced76f..c4d95db94af1 100644 --- a/services/signalr/mgmt/2018-10-01/signalr/_meta.json +++ b/services/signalr/mgmt/2018-10-01/signalr/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "18361831247437e8823805689710ace878c195ee", "readme": "/_/azure-rest-api-specs/specification/signalr/resource-manager/readme.md", "tag": "package-2018-10-01", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/signalr/mgmt/2020-05-01/signalr/CHANGELOG.md b/services/signalr/mgmt/2020-05-01/signalr/CHANGELOG.md index c1bbea5cc91f..e9ef2054d06f 100644 --- a/services/signalr/mgmt/2020-05-01/signalr/CHANGELOG.md +++ b/services/signalr/mgmt/2020-05-01/signalr/CHANGELOG.md @@ -1,8 +1,8 @@ -# Change History +# Unreleased ## Additive Changes ### New Funcs -1. ProxyResource.MarshalJSON() ([]byte, error) -1. Resource.MarshalJSON() ([]byte, error) +1. CreateOrUpdateProperties.MarshalJSON() ([]byte, error) +1. ResourceSku.MarshalJSON() ([]byte, error) diff --git a/services/signalr/mgmt/2020-05-01/signalr/_meta.json b/services/signalr/mgmt/2020-05-01/signalr/_meta.json index 045fb37badee..375d1ade3ae4 100644 --- a/services/signalr/mgmt/2020-05-01/signalr/_meta.json +++ b/services/signalr/mgmt/2020-05-01/signalr/_meta.json @@ -1,5 +1,5 @@ { - "commit": "3c764635e7d442b3e74caf593029fcd440b3ef82", + "commit": "18361831247437e8823805689710ace878c195ee", "readme": "/_/azure-rest-api-specs/specification/signalr/resource-manager/readme.md", "tag": "package-2020-05-01", "use": "@microsoft.azure/autorest.go@2.1.183", diff --git a/services/signalr/mgmt/2020-05-01/signalr/models.go b/services/signalr/mgmt/2020-05-01/signalr/models.go index 5083df3069fc..3232d0a53a52 100644 --- a/services/signalr/mgmt/2020-05-01/signalr/models.go +++ b/services/signalr/mgmt/2020-05-01/signalr/models.go @@ -70,7 +70,7 @@ func (future *CreateOrUpdateFuture) result(client Client) (rt ResourceType, err // CreateOrUpdateProperties settings used to provision or configure the resource. type CreateOrUpdateProperties struct { - // HostNamePrefix - Prefix for the hostName of the SignalR service. Retained for future use. + // HostNamePrefix - READ-ONLY; Prefix for the hostName of the SignalR service. Retained for future use. // The hostname will be of format: <hostNamePrefix>.service.signalr.net. HostNamePrefix *string `json:"hostNamePrefix,omitempty"` // Features - List of SignalR featureFlags. e.g. ServiceMode. @@ -88,6 +88,24 @@ type CreateOrUpdateProperties struct { NetworkACLs *NetworkACLs `json:"networkACLs,omitempty"` } +// MarshalJSON is the custom marshaler for CreateOrUpdateProperties. +func (coup CreateOrUpdateProperties) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if coup.Features != nil { + objectMap["features"] = coup.Features + } + if coup.Cors != nil { + objectMap["cors"] = coup.Cors + } + if coup.Upstream != nil { + objectMap["upstream"] = coup.Upstream + } + if coup.NetworkACLs != nil { + objectMap["networkACLs"] = coup.NetworkACLs + } + return json.Marshal(objectMap) +} + // DeleteFuture an abstraction for monitoring and retrieving the results of a long-running operation. type DeleteFuture struct { azure.FutureAPI @@ -873,7 +891,7 @@ type Properties struct { Version *string `json:"version,omitempty"` // PrivateEndpointConnections - READ-ONLY; Private endpoint connections to the SignalR resource. PrivateEndpointConnections *[]PrivateEndpointConnection `json:"privateEndpointConnections,omitempty"` - // HostNamePrefix - Prefix for the hostName of the SignalR service. Retained for future use. + // HostNamePrefix - READ-ONLY; Prefix for the hostName of the SignalR service. Retained for future use. // The hostname will be of format: <hostNamePrefix>.service.signalr.net. HostNamePrefix *string `json:"hostNamePrefix,omitempty"` // Features - List of SignalR featureFlags. e.g. ServiceMode. @@ -894,9 +912,6 @@ type Properties struct { // MarshalJSON is the custom marshaler for Properties. func (p Properties) MarshalJSON() ([]byte, error) { objectMap := make(map[string]interface{}) - if p.HostNamePrefix != nil { - objectMap["hostNamePrefix"] = p.HostNamePrefix - } if p.Features != nil { objectMap["features"] = p.Features } @@ -1164,9 +1179,9 @@ type ResourceSku struct { // // `Basic` is deprecated, use `Standard` instead. Possible values include: 'Free', 'Basic', 'Standard', 'Premium' Tier SkuTier `json:"tier,omitempty"` - // Size - Optional string. For future use. + // Size - READ-ONLY; Not used. Retained for future use. Size *string `json:"size,omitempty"` - // Family - Optional string. For future use. + // Family - READ-ONLY; Not used. Retained for future use. Family *string `json:"family,omitempty"` // Capacity - Optional, integer. The unit count of SignalR resource. 1 by default. // @@ -1176,6 +1191,21 @@ type ResourceSku struct { Capacity *int32 `json:"capacity,omitempty"` } +// MarshalJSON is the custom marshaler for ResourceSku. +func (rs ResourceSku) MarshalJSON() ([]byte, error) { + objectMap := make(map[string]interface{}) + if rs.Name != nil { + objectMap["name"] = rs.Name + } + if rs.Tier != "" { + objectMap["tier"] = rs.Tier + } + if rs.Capacity != nil { + objectMap["capacity"] = rs.Capacity + } + return json.Marshal(objectMap) +} + // ResourceType a class represent a SignalR service resource. type ResourceType struct { autorest.Response `json:"-"`