From 48f755ed0a1eab7df0ab33baebc84a397324d490 Mon Sep 17 00:00:00 2001 From: Tamer Sherif Date: Mon, 6 Feb 2023 15:22:19 -0800 Subject: [PATCH 1/5] removed item suffix --- .../azqueue/internal/generated/autorest.md | 26 ++++++++++++++ .../azqueue/internal/generated/zz_models.go | 32 ++++++++--------- .../internal/generated/zz_models_serde.go | 36 +++++++++---------- .../internal/generated/zz_response_types.go | 4 +-- sdk/storage/azqueue/models.go | 12 +++---- sdk/storage/azqueue/service_client_test.go | 4 +-- 6 files changed, 70 insertions(+), 44 deletions(-) diff --git a/sdk/storage/azqueue/internal/generated/autorest.md b/sdk/storage/azqueue/internal/generated/autorest.md index 9792acb724e9..9196124ef190 100644 --- a/sdk/storage/azqueue/internal/generated/autorest.md +++ b/sdk/storage/azqueue/internal/generated/autorest.md @@ -99,4 +99,30 @@ directive: transform: >- return $. replace(/xml:"CORS>CORSRule"/g, "xml:\"Cors>CorsRule\""); +``` + +### Remove `Item` suffix + +``` yaml +directive: +- rename-model: + from: DequeuedMessageItem + to: DequeuedMessage +- rename-model: + from: QueueItem + to: Queue +- rename-model: + from: PeekedMessageItem + to: PeekedMessage +``` + +### Remove `Item` suffix + +``` yaml +directive: + - from: source-file-go + where: $ + transform: >- + return $. + replace(/QueueItems/g, "QueuesList"); ``` \ No newline at end of file diff --git a/sdk/storage/azqueue/internal/generated/zz_models.go b/sdk/storage/azqueue/internal/generated/zz_models.go index a5b6c9cd7d76..4efa55ffe70d 100644 --- a/sdk/storage/azqueue/internal/generated/zz_models.go +++ b/sdk/storage/azqueue/internal/generated/zz_models.go @@ -48,8 +48,8 @@ type CORSRule struct { MaxAgeInSeconds *int32 `xml:"MaxAgeInSeconds"` } -// DequeuedMessageItem - The object returned in the QueueMessageList array when calling Get Messages on a Queue. -type DequeuedMessageItem struct { +// DequeuedMessage - The object returned in the QueueMessageList array when calling Get Messages on a Queue. +type DequeuedMessage struct { // REQUIRED; The number of times the message has been dequeued. DequeueCount *int64 `xml:"DequeueCount"` @@ -114,9 +114,9 @@ type ListQueuesSegmentResponse struct { Prefix *string `xml:"Prefix"` // REQUIRED - ServiceEndpoint *string `xml:"ServiceEndpoint,attr"` - Marker *string `xml:"Marker"` - QueueItems []*QueueItem `xml:"Queues>Queue"` + ServiceEndpoint *string `xml:"ServiceEndpoint,attr"` + Marker *string `xml:"Marker"` + QueuesList []*Queue `xml:"Queues>Queue"` } // Logging - Azure Analytics Logging settings. @@ -235,8 +235,8 @@ type Metrics struct { Version *string `xml:"Version"` } -// PeekedMessageItem - The object returned in the QueueMessageList array when calling Peek Messages on a Queue -type PeekedMessageItem struct { +// PeekedMessage - The object returned in the QueueMessageList array when calling Peek Messages on a Queue +type PeekedMessage struct { // REQUIRED; The number of times the message has been dequeued. DequeueCount *int64 `xml:"DequeueCount"` @@ -253,6 +253,15 @@ type PeekedMessageItem struct { MessageText *string `xml:"MessageText"` } +// Queue - An Azure Storage Queue. +type Queue struct { + // REQUIRED; The name of the Queue. + Name *string `xml:"Name"` + + // Dictionary of + Metadata map[string]*string `xml:"Metadata"` +} + // QueueClientCreateOptions contains the optional parameters for the QueueClient.Create method. type QueueClientCreateOptions struct { // Optional. Include this parameter to specify that the queue's metadata be returned as part of the response body. Note that @@ -317,15 +326,6 @@ type QueueClientSetMetadataOptions struct { Timeout *int32 } -// QueueItem - An Azure Storage Queue. -type QueueItem struct { - // REQUIRED; The name of the Queue. - Name *string `xml:"Name"` - - // Dictionary of - Metadata map[string]*string `xml:"Metadata"` -} - // QueueMessage - A Message object which can be stored in a Queue type QueueMessage struct { // REQUIRED; The content of the message diff --git a/sdk/storage/azqueue/internal/generated/zz_models_serde.go b/sdk/storage/azqueue/internal/generated/zz_models_serde.go index ee8b8be5e6ff..076aaafe9348 100644 --- a/sdk/storage/azqueue/internal/generated/zz_models_serde.go +++ b/sdk/storage/azqueue/internal/generated/zz_models_serde.go @@ -51,9 +51,9 @@ func (a *AccessPolicy) UnmarshalXML(dec *xml.Decoder, start xml.StartElement) er return nil } -// MarshalXML implements the xml.Marshaller interface for type DequeuedMessageItem. -func (d DequeuedMessageItem) MarshalXML(enc *xml.Encoder, start xml.StartElement) error { - type alias DequeuedMessageItem +// MarshalXML implements the xml.Marshaller interface for type DequeuedMessage. +func (d DequeuedMessage) MarshalXML(enc *xml.Encoder, start xml.StartElement) error { + type alias DequeuedMessage aux := &struct { *alias ExpirationTime *timeRFC1123 `xml:"ExpirationTime"` @@ -68,9 +68,9 @@ func (d DequeuedMessageItem) MarshalXML(enc *xml.Encoder, start xml.StartElement return enc.EncodeElement(aux, start) } -// UnmarshalXML implements the xml.Unmarshaller interface for type DequeuedMessageItem. -func (d *DequeuedMessageItem) UnmarshalXML(dec *xml.Decoder, start xml.StartElement) error { - type alias DequeuedMessageItem +// UnmarshalXML implements the xml.Unmarshaller interface for type DequeuedMessage. +func (d *DequeuedMessage) UnmarshalXML(dec *xml.Decoder, start xml.StartElement) error { + type alias DequeuedMessage aux := &struct { *alias ExpirationTime *timeRFC1123 `xml:"ExpirationTime"` @@ -159,19 +159,19 @@ func (l ListQueuesSegmentResponse) MarshalXML(enc *xml.Encoder, start xml.StartE type alias ListQueuesSegmentResponse aux := &struct { *alias - QueueItems *[]*QueueItem `xml:"Queues>Queue"` + QueuesList *[]*Queue `xml:"Queues>Queue"` }{ alias: (*alias)(&l), } - if l.QueueItems != nil { - aux.QueueItems = &l.QueueItems + if l.QueuesList != nil { + aux.QueuesList = &l.QueuesList } return enc.EncodeElement(aux, start) } -// MarshalXML implements the xml.Marshaller interface for type PeekedMessageItem. -func (p PeekedMessageItem) MarshalXML(enc *xml.Encoder, start xml.StartElement) error { - type alias PeekedMessageItem +// MarshalXML implements the xml.Marshaller interface for type PeekedMessage. +func (p PeekedMessage) MarshalXML(enc *xml.Encoder, start xml.StartElement) error { + type alias PeekedMessage aux := &struct { *alias ExpirationTime *timeRFC1123 `xml:"ExpirationTime"` @@ -184,9 +184,9 @@ func (p PeekedMessageItem) MarshalXML(enc *xml.Encoder, start xml.StartElement) return enc.EncodeElement(aux, start) } -// UnmarshalXML implements the xml.Unmarshaller interface for type PeekedMessageItem. -func (p *PeekedMessageItem) UnmarshalXML(dec *xml.Decoder, start xml.StartElement) error { - type alias PeekedMessageItem +// UnmarshalXML implements the xml.Unmarshaller interface for type PeekedMessage. +func (p *PeekedMessage) UnmarshalXML(dec *xml.Decoder, start xml.StartElement) error { + type alias PeekedMessage aux := &struct { *alias ExpirationTime *timeRFC1123 `xml:"ExpirationTime"` @@ -202,9 +202,9 @@ func (p *PeekedMessageItem) UnmarshalXML(dec *xml.Decoder, start xml.StartElemen return nil } -// UnmarshalXML implements the xml.Unmarshaller interface for type QueueItem. -func (q *QueueItem) UnmarshalXML(dec *xml.Decoder, start xml.StartElement) error { - type alias QueueItem +// UnmarshalXML implements the xml.Unmarshaller interface for type Queue. +func (q *Queue) UnmarshalXML(dec *xml.Decoder, start xml.StartElement) error { + type alias Queue aux := &struct { *alias Metadata additionalProperties `xml:"Metadata"` diff --git a/sdk/storage/azqueue/internal/generated/zz_response_types.go b/sdk/storage/azqueue/internal/generated/zz_response_types.go index 4f632ac9e99c..bd5811c144e9 100644 --- a/sdk/storage/azqueue/internal/generated/zz_response_types.go +++ b/sdk/storage/azqueue/internal/generated/zz_response_types.go @@ -59,7 +59,7 @@ type MessagesClientDequeueResponse struct { Date *time.Time `xml:"Date"` // The object returned when calling Get Messages on a Queue - QueueMessagesList []*DequeuedMessageItem `xml:"QueueMessage"` + QueueMessagesList []*DequeuedMessage `xml:"QueueMessage"` // RequestID contains the information returned from the x-ms-request-id header response. RequestID *string `xml:"RequestID"` @@ -89,7 +89,7 @@ type MessagesClientPeekResponse struct { Date *time.Time `xml:"Date"` // The object returned when calling Peek Messages on a Queue - QueueMessagesList []*PeekedMessageItem `xml:"QueueMessage"` + QueueMessagesList []*PeekedMessage `xml:"QueueMessage"` // RequestID contains the information returned from the x-ms-request-id header response. RequestID *string `xml:"RequestID"` diff --git a/sdk/storage/azqueue/models.go b/sdk/storage/azqueue/models.go index 550ee0c8c7b5..008b4d204285 100644 --- a/sdk/storage/azqueue/models.go +++ b/sdk/storage/azqueue/models.go @@ -65,17 +65,17 @@ type SignedIdentifier = generated.SignedIdentifier // EnqueuedMessage - enqueued message type EnqueuedMessage = generated.EnqueuedMessage -// DequeuedMessageItem - dequeued message -type DequeuedMessageItem = generated.DequeuedMessageItem +// DequeuedMessage - dequeued message +type DequeuedMessage = generated.DequeuedMessage -// PeekedMessageItem - peeked message -type PeekedMessageItem = generated.PeekedMessageItem +// PeekedMessage - peeked message +type PeekedMessage = generated.PeekedMessage // ListQueuesSegmentResponse - response segment type ListQueuesSegmentResponse = generated.ListQueuesSegmentResponse -// QueueItem - queue item -type QueueItem = generated.QueueItem +// Queue - queue item +type Queue = generated.Queue // AccessPolicy - An Access policy type AccessPolicy = generated.AccessPolicy diff --git a/sdk/storage/azqueue/service_client_test.go b/sdk/storage/azqueue/service_client_test.go index b5366d8d9d8a..e960c496392f 100644 --- a/sdk/storage/azqueue/service_client_test.go +++ b/sdk/storage/azqueue/service_client_test.go @@ -281,7 +281,7 @@ func (s *RecordedTestSuite) TestServiceListQueuesWithMetadata() { for pager.More() { resp, err := pager.NextPage(context.Background()) _require.Nil(err) - for _, queue := range resp.QueueItems { + for _, queue := range resp.QueuesList { _require.NotNil(queue.Name) if *queue.Name == queueName { _require.NotNil(queue.Metadata) @@ -335,7 +335,7 @@ func (s *RecordedTestSuite) TestServiceListQueuesPagination() { for pager.More() { resp, err := pager.NextPage(context.Background()) _require.Nil(err) - for _, queue := range resp.QueueItems { + for _, queue := range resp.QueuesList { _require.NotNil(queue.Name) count += 1 } From 54100a71b837839790226d4a792571ac8060ca8e Mon Sep 17 00:00:00 2001 From: Tamer Sherif Date: Mon, 6 Feb 2023 16:14:12 -0800 Subject: [PATCH 2/5] test resources file --- sdk/storage/azqueue/test-resources.json | 516 ++++++++++++++++++++++++ 1 file changed, 516 insertions(+) create mode 100644 sdk/storage/azqueue/test-resources.json diff --git a/sdk/storage/azqueue/test-resources.json b/sdk/storage/azqueue/test-resources.json new file mode 100644 index 000000000000..5912abdc0a7c --- /dev/null +++ b/sdk/storage/azqueue/test-resources.json @@ -0,0 +1,516 @@ +{ + "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", + "contentVersion": "1.0.0.0", + "parameters": { + "baseName": { + "type": "String" + }, + "tenantId": { + "type": "string", + "defaultValue": "72f988bf-86f1-41af-91ab-2d7cd011db47", + "metadata": { + "description": "The tenant ID to which the application and resources belong." + } + }, + "testApplicationOid": { + "type": "string", + "metadata": { + "description": "The principal to assign the role to. This is application object id." + } + } + }, + "variables": { + "mgmtApiVersion": "2022-09-01", + "authorizationApiVersion": "2018-09-01-preview", + "blobDataContributorRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/ba92f5b4-2d11-453d-a403-e96b0029c9fe')]", + "contributorRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/b24988ac-6180-42a0-ab88-20f7382dd24c')]", + "blobDataOwnerRoleId": "[concat('/subscriptions/', subscription().subscriptionId, '/providers/Microsoft.Authorization/roleDefinitions/b7e6dc6d-f1e8-4753-8033-0f276bb0955b')]", + "primaryAccountName": "[concat(parameters('baseName'), 'prim')]", + "immutableAccountName": "[concat(parameters('baseName'), 'imm')]", + "primaryEncryptionScopeName": "encryptionScope", + "primaryEncryptionScope": "[concat(parameters('baseName'), 'prim', concat('/', variables('primaryEncryptionScopeName')))]", + "secondaryAccountName": "[concat(parameters('baseName'), 'sec')]", + "premiumAccountName": "[concat(parameters('baseName'), 'prem')]", + "dataLakeAccountName": "[concat(parameters('baseName'), 'dtlk')]", + "softDeleteAccountName": "[concat(parameters('baseName'), 'sftdl')]", + "premiumFileAccountName": "[concat(parameters('baseName'), 'pfile')]", + "webjobsPrimaryAccountName": "[concat(parameters('baseName'), 'wjprim')]", + "webjobsSecondaryAccountName": "[concat(parameters('baseName'), 'wjsec')]", + "location": "[resourceGroup().location]", + "resourceGroupName": "[resourceGroup().name]", + "subscriptionId": "[subscription().subscriptionId]", + "encryption": { + "services": { + "file": { + "enabled": true + }, + "blob": { + "enabled": true + } + }, + "keySource": "Microsoft.Storage" + }, + "networkAcls": { + "bypass": "AzureServices", + "virtualNetworkRules": [], + "ipRules": [], + "defaultAction": "Allow" + } + }, + "resources": [ + { + "type": "Microsoft.Authorization/roleAssignments", + "apiVersion": "[variables('authorizationApiVersion')]", + "name": "[guid(concat('dataContributorRoleId', resourceGroup().id))]", + "properties": { + "roleDefinitionId": "[variables('blobDataContributorRoleId')]", + "principalId": "[parameters('testApplicationOid')]" + } + }, + { + "type": "Microsoft.Authorization/roleAssignments", + "apiVersion": "[variables('authorizationApiVersion')]", + "name": "[guid(concat('contributorRoleId', resourceGroup().id))]", + "properties": { + "roleDefinitionId": "[variables('contributorRoleId')]", + "principalId": "[parameters('testApplicationOid')]" + } + }, + { + "type": "Microsoft.Authorization/roleAssignments", + "apiVersion": "[variables('authorizationApiVersion')]", + "name": "[guid(concat('blobDataOwnerRoleId', resourceGroup().id))]", + "properties": { + "roleDefinitionId": "[variables('blobDataOwnerRoleId')]", + "principalId": "[parameters('testApplicationOid')]" + } + }, + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[variables('primaryAccountName')]", + "location": "[variables('location')]", + "sku": { + "name": "Standard_RAGRS", + "tier": "Standard" + }, + "kind": "StorageV2", + "properties": { + "networkAcls": "[variables('networkAcls')]", + "supportsHttpsTrafficOnly": true, + "encryption": "[variables('encryption')]", + "accessTier": "Hot" + } + }, + { + "type": "Microsoft.Storage/storageAccounts/blobServices", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[concat(variables('primaryAccountName'), '/default')]", + "properties": { + "isVersioningEnabled": true, + "lastAccessTimeTrackingPolicy": { + "enable": true, + "name": "AccessTimeTracking", + "trackingGranularityInDays": 1, + "blobType": [ + "blockBlob" + ] + } + }, + "dependsOn": [ + "[variables('primaryAccountName')]" + ] + }, + { + "type": "Microsoft.Storage/storageAccounts/encryptionScopes", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[variables('primaryEncryptionScope')]", + "properties": { + "source": "Microsoft.Storage", + "state": "Enabled" + }, + "dependsOn": [ + "[variables('primaryAccountName')]" + ] + }, + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[variables('secondaryAccountName')]", + "location": "[variables('location')]", + "sku": { + "name": "Standard_RAGRS", + "tier": "Standard" + }, + "kind": "StorageV2", + "properties": { + "networkAcls": "[variables('networkAcls')]", + "supportsHttpsTrafficOnly": true, + "encryption": "[variables('encryption')]", + "accessTier": "Hot" + } + }, + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[variables('premiumAccountName')]", + "location": "[variables('location')]", + "sku": { + "name": "Premium_LRS", + "tier": "Premium" + }, + "kind": "StorageV2", + "properties": { + "networkAcls": "[variables('networkAcls')]", + "supportsHttpsTrafficOnly": true, + "encryption": "[variables('encryption')]", + "accessTier": "Hot" + } + }, + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[variables('dataLakeAccountName')]", + "location": "[variables('location')]", + "sku": { + "name": "Standard_RAGRS", + "tier": "Standard" + }, + "kind": "StorageV2", + "properties": { + "isHnsEnabled": true, + "networkAcls": "[variables('networkAcls')]", + "supportsHttpsTrafficOnly": true, + "encryption": "[variables('encryption')]", + "accessTier": "Hot" + } + }, + { + "type": "Microsoft.Storage/storageAccounts/blobServices", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[concat(variables('dataLakeAccountName'), '/default')]", + "properties": { + "containerDeleteRetentionPolicy": { + "enabled": true, + "days": 1 + } + }, + "dependsOn": [ + "[variables('dataLakeAccountName')]" + ] + }, + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[variables('softDeleteAccountName')]", + "location": "[variables('location')]", + "sku": { + "name": "Standard_RAGRS", + "tier": "Standard" + }, + "kind": "StorageV2", + "properties": { + "networkAcls": "[variables('networkAcls')]", + "supportsHttpsTrafficOnly": true, + "encryption": "[variables('encryption')]", + "accessTier": "Hot" + } + }, + { + "type": "Microsoft.Storage/storageAccounts/blobServices", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[concat(variables('softDeleteAccountName'), '/default')]", + "properties": { + "isVersioningEnabled": true, + "deleteRetentionPolicy": { + "allowPermanentDelete": true, + "enabled": true, + "days": 1 + }, + "containerDeleteRetentionPolicy": { + "enabled": true, + "days": 1 + } + }, + "dependsOn": [ + "[variables('softDeleteAccountName')]" + ] + }, + { + "type": "Microsoft.Storage/storageAccounts/fileServices", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[concat(variables('softDeleteAccountName'), '/default')]", + "properties": { + "shareDeleteRetentionPolicy": { + "enabled": true, + "days": 1 + } + }, + "dependsOn": [ + "[variables('softDeleteAccountName')]" + ] + }, + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[variables('premiumFileAccountName')]", + "location": "[variables('location')]", + "sku": { + "name": "Premium_LRS", + "tier": "Premium" + }, + "kind": "FileStorage", + "properties": { + "networkAcls": "[variables('networkAcls')]", + "supportsHttpsTrafficOnly": true, + "encryption": "[variables('encryption')]", + "accessTier": "Hot" + } + }, + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[variables('webjobsPrimaryAccountName')]", + "location": "[variables('location')]", + "sku": { + "name": "Standard_RAGRS", + "tier": "Standard" + }, + "kind": "StorageV2", + "properties": { + "networkAcls": "[variables('networkAcls')]", + "supportsHttpsTrafficOnly": true, + "encryption": "[variables('encryption')]", + "accessTier": "Hot" + } + }, + { + "type": "Microsoft.Storage/storageAccounts", + "apiVersion": "[variables('mgmtApiVersion')]", + "name": "[variables('webjobsSecondaryAccountName')]", + "location": "[variables('location')]", + "sku": { + "name": "Standard_RAGRS", + "tier": "Standard" + }, + "kind": "StorageV2", + "properties": { + "networkAcls": "[variables('networkAcls')]", + "supportsHttpsTrafficOnly": true, + "encryption": "[variables('encryption')]", + "accessTier": "Hot" + } + } + ], + "functions": [ + { + "namespace": "url", + "members": { + "serviceEndpointSuffix": { + "parameters": [ + { + "name": "endpoint", + "type": "string" + } + ], + "output": { + "type": "string", + "value": "[substring(parameters('endpoint'), add(indexOf(parameters('endpoint'), '.'),1), sub(length(parameters('endpoint')), add(indexOf(parameters('endpoint'), '.'),2)))]" + } + } + } + }, + { + "namespace": "connectionString", + "members": { + "create": { + "parameters": [ + { + "name": "accountName", + "type": "string" + }, + { + "name": "accountKey", + "type": "string" + }, + { + "name": "blobEndpoint", + "type": "string" + }, + { + "name": "queueEndpoint", + "type": "string" + }, + { + "name": "fileEndpoint", + "type": "string" + }, + { + "name": "tableEndpoint", + "type": "string" + } + ], + "output": { + "type": "string", + "value": "[concat('DefaultEndpointsProtocol=https;AccountName=', parameters('accountName'), ';AccountKey=', parameters('accountKey'), ';BlobEndpoint=', parameters('blobEndpoint'), ';QueueEndpoint=', parameters('queueEndpoint'), ';FileEndpoint=', parameters('fileEndpoint'), ';TableEndpoint=', parameters('tableEndpoint'))]" + } + } + } + } + ], + "outputs": { + "AZURE_STORAGE_ACCOUNT_NAME": { + "type": "string", + "value": "[variables('primaryAccountName')]" + }, + "AZURE_STORAGE_ACCOUNT_KEY": { + "type": "string", + "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('primaryAccountName')), variables('mgmtApiVersion')).keys[0].value]" + }, + "PRIMARY_STORAGE_ACCOUNT_BLOB_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('primaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.blob)]" + }, + "PRIMARY_STORAGE_ACCOUNT_FILE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('primaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.file)]" + }, + "PRIMARY_STORAGE_ACCOUNT_QUEUE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('primaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.queue)]" + }, + "PRIMARY_STORAGE_ACCOUNT_TABLE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('primaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.table)]" + }, + "SECONDARY_AZURE_STORAGE_ACCOUNT_NAME": { + "type": "string", + "value": "[variables('secondaryAccountName')]" + }, + "SECONDARY_AZURE_STORAGE_ACCOUNT_KEY": { + "type": "string", + "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('secondaryAccountName')), variables('mgmtApiVersion')).keys[0].value]" + }, + "SECONDARY_STORAGE_ACCOUNT_BLOB_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('secondaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.blob)]" + }, + "SECONDARY_STORAGE_ACCOUNT_FILE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('secondaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.file)]" + }, + "SECONDARY_STORAGE_ACCOUNT_QUEUE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('secondaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.queue)]" + }, + "SECONDARY_STORAGE_ACCOUNT_TABLE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('secondaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.table)]" + }, + "BLOB_STORAGE_ACCOUNT_NAME": { + "type": "string", + "value": "[variables('secondaryAccountName')]" + }, + "BLOB_STORAGE_ACCOUNT_KEY": { + "type": "string", + "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('secondaryAccountName')), variables('mgmtApiVersion')).keys[0].value]" + }, + "PREMIUM_AZURE_STORAGE_ACCOUNT_NAME": { + "type": "string", + "value": "[variables('premiumAccountName')]" + }, + "PREMIUM_AZURE_STORAGE_ACCOUNT_KEY": { + "type": "string", + "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('premiumAccountName')), variables('mgmtApiVersion')).keys[0].value]" + }, + "PREMIUM_STORAGE_ACCOUNT_BLOB_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('premiumAccountName')), variables('mgmtApiVersion')).primaryEndpoints.blob)]" + }, + "DATALAKE_AZURE_STORAGE_ACCOUNT_NAME": { + "type": "string", + "value": "[variables('dataLakeAccountName')]" + }, + "DATALAKE_AZURE_STORAGE_ACCOUNT_KEY": { + "type": "string", + "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('dataLakeAccountName')), variables('mgmtApiVersion')).keys[0].value]" + }, + "DATALAKE_STORAGE_ACCOUNT_BLOB_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('dataLakeAccountName')), variables('mgmtApiVersion')).primaryEndpoints.blob)]" + }, + "DATALAKE_STORAGE_ACCOUNT_FILE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('dataLakeAccountName')), variables('mgmtApiVersion')).primaryEndpoints.file)]" + }, + "DATALAKE_STORAGE_ACCOUNT_QUEUE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('dataLakeAccountName')), variables('mgmtApiVersion')).primaryEndpoints.queue)]" + }, + "DATALAKE_STORAGE_ACCOUNT_TABLE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('dataLakeAccountName')), variables('mgmtApiVersion')).primaryEndpoints.table)]" + }, + "SOFT_DELETE_AZURE_STORAGE_ACCOUNT_NAME": { + "type": "string", + "value": "[variables('softDeleteAccountName')]" + }, + "SOFT_DELETE_AZURE_STORAGE_ACCOUNT_KEY": { + "type": "string", + "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('softDeleteAccountName')), variables('mgmtApiVersion')).keys[0].value]" + }, + "SOFT_DELETE_AZURE_STORAGE_ACCOUNT_BLOB_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('softDeleteAccountName')), variables('mgmtApiVersion')).primaryEndpoints.blob)]" + }, + "SOFT_DELETE_AZURE_STORAGE_ACCOUNT_FILE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('softDeleteAccountName')), variables('mgmtApiVersion')).primaryEndpoints.file)]" + }, + "SOFT_DELETE_AZURE_STORAGE_ACCOUNT_QUEUE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('softDeleteAccountName')), variables('mgmtApiVersion')).primaryEndpoints.queue)]" + }, + "SOFT_DELETE_AZURE_STORAGE_ACCOUNT_TABLE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('softDeleteAccountName')), variables('mgmtApiVersion')).primaryEndpoints.table)]" + }, + "PREMIUM_FILE_STORAGE_ACCOUNT_NAME": { + "type": "string", + "value": "[variables('premiumFileAccountName')]" + }, + "PREMIUM_FILE_STORAGE_ACCOUNT_KEY": { + "type": "string", + "value": "[listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('premiumFileAccountName')), variables('mgmtApiVersion')).keys[0].value]" + }, + "PREMIUM_FILE_STORAGE_ACCOUNT_FILE_ENDPOINT_SUFFIX": { + "type": "string", + "value": "[url.serviceEndpointSuffix(reference(resourceId('Microsoft.Storage/storageAccounts', variables('premiumFileAccountName')), variables('mgmtApiVersion')).primaryEndpoints.file)]" + }, + "AZUREWEBJOBSSTORAGE": { + "type": "string", + "value": "[connectionString.create(variables('webjobsPrimaryAccountName'), listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('webjobsPrimaryAccountName')), variables('mgmtApiVersion')).keys[0].value, reference(resourceId('Microsoft.Storage/storageAccounts', variables('webjobsPrimaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.blob, reference(resourceId('Microsoft.Storage/storageAccounts', variables('webjobsPrimaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.queue, reference(resourceId('Microsoft.Storage/storageAccounts', variables('webjobsPrimaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.file, reference(resourceId('Microsoft.Storage/storageAccounts', variables('webjobsPrimaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.table)]" + }, + "AZUREWEBJOBSSECONDARYSTORAGE": { + "type": "string", + "value": "[connectionString.create(variables('webjobsSecondaryAccountName'), listKeys(resourceId('Microsoft.Storage/storageAccounts', variables('webjobsSecondaryAccountName')), variables('mgmtApiVersion')).keys[0].value, reference(resourceId('Microsoft.Storage/storageAccounts', variables('webjobsSecondaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.blob, reference(resourceId('Microsoft.Storage/storageAccounts', variables('webjobsSecondaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.queue, reference(resourceId('Microsoft.Storage/storageAccounts', variables('webjobsSecondaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.file, reference(resourceId('Microsoft.Storage/storageAccounts', variables('webjobsSecondaryAccountName')), variables('mgmtApiVersion')).primaryEndpoints.table)]" + }, + "RESOURCE_GROUP_NAME": { + "type": "string", + "value": "[variables('resourceGroupName')]" + }, + "SUBSCRIPTION_ID": { + "type": "string", + "value": "[variables('subscriptionId')]" + }, + "LOCATION": { + "type": "string", + "value": "[variables('location')]" + }, + "AZURE_STORAGE_ENCRYPTION_SCOPE": { + "type": "string", + "value": "[variables('primaryEncryptionScopeName')]" + } + } + } + \ No newline at end of file From 8af30586a8d881fbec46f5240545e987a214bb4c Mon Sep 17 00:00:00 2001 From: Tamer Sherif Date: Mon, 6 Feb 2023 17:22:32 -0800 Subject: [PATCH 3/5] lint fix --- sdk/storage/azqueue/sas/account.go | 1 - 1 file changed, 1 deletion(-) diff --git a/sdk/storage/azqueue/sas/account.go b/sdk/storage/azqueue/sas/account.go index bca78f84fff4..bcd0487aabc1 100644 --- a/sdk/storage/azqueue/sas/account.go +++ b/sdk/storage/azqueue/sas/account.go @@ -28,7 +28,6 @@ type AccountSignatureValues struct { ExpiryTime time.Time `param:"se"` // Not specified if IsZero Permissions string `param:"sp"` // Create by initializing a AccountSASPermissions and then call String() IPRange IPRange `param:"sip"` - services string `param:"ss"` // Create by initializing AccountSASServices and then call String() ResourceTypes string `param:"srt"` // Create by initializing AccountSASResourceTypes and then call String() } From fd1ceb39bfd3416af7b8e8d2b46e5f62a0bc2294 Mon Sep 17 00:00:00 2001 From: Tamer Sherif Date: Thu, 9 Feb 2023 11:42:19 -0800 Subject: [PATCH 4/5] renamed queues list --- sdk/storage/azqueue/internal/generated/autorest.md | 2 +- sdk/storage/azqueue/internal/generated/zz_models.go | 2 +- sdk/storage/azqueue/internal/generated/zz_models_serde.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/storage/azqueue/internal/generated/autorest.md b/sdk/storage/azqueue/internal/generated/autorest.md index 9196124ef190..595b2fdbc494 100644 --- a/sdk/storage/azqueue/internal/generated/autorest.md +++ b/sdk/storage/azqueue/internal/generated/autorest.md @@ -124,5 +124,5 @@ directive: where: $ transform: >- return $. - replace(/QueueItems/g, "QueuesList"); + replace(/QueueItems/g, "Queues"); ``` \ No newline at end of file diff --git a/sdk/storage/azqueue/internal/generated/zz_models.go b/sdk/storage/azqueue/internal/generated/zz_models.go index 4efa55ffe70d..d3ef194c7a35 100644 --- a/sdk/storage/azqueue/internal/generated/zz_models.go +++ b/sdk/storage/azqueue/internal/generated/zz_models.go @@ -116,7 +116,7 @@ type ListQueuesSegmentResponse struct { // REQUIRED ServiceEndpoint *string `xml:"ServiceEndpoint,attr"` Marker *string `xml:"Marker"` - QueuesList []*Queue `xml:"Queues>Queue"` + Queues []*Queue `xml:"Queues>Queue"` } // Logging - Azure Analytics Logging settings. diff --git a/sdk/storage/azqueue/internal/generated/zz_models_serde.go b/sdk/storage/azqueue/internal/generated/zz_models_serde.go index 076aaafe9348..b3db14904ead 100644 --- a/sdk/storage/azqueue/internal/generated/zz_models_serde.go +++ b/sdk/storage/azqueue/internal/generated/zz_models_serde.go @@ -159,12 +159,12 @@ func (l ListQueuesSegmentResponse) MarshalXML(enc *xml.Encoder, start xml.StartE type alias ListQueuesSegmentResponse aux := &struct { *alias - QueuesList *[]*Queue `xml:"Queues>Queue"` + Queues *[]*Queue `xml:"Queues>Queue"` }{ alias: (*alias)(&l), } - if l.QueuesList != nil { - aux.QueuesList = &l.QueuesList + if l.Queues != nil { + aux.Queues = &l.Queues } return enc.EncodeElement(aux, start) } From 74990b764201c4d945e18d27f035f9d3373eb50c Mon Sep 17 00:00:00 2001 From: Tamer Sherif Date: Thu, 9 Feb 2023 11:46:11 -0800 Subject: [PATCH 5/5] fix --- sdk/storage/azqueue/service_client_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/storage/azqueue/service_client_test.go b/sdk/storage/azqueue/service_client_test.go index e960c496392f..6510ccc6d213 100644 --- a/sdk/storage/azqueue/service_client_test.go +++ b/sdk/storage/azqueue/service_client_test.go @@ -281,7 +281,7 @@ func (s *RecordedTestSuite) TestServiceListQueuesWithMetadata() { for pager.More() { resp, err := pager.NextPage(context.Background()) _require.Nil(err) - for _, queue := range resp.QueuesList { + for _, queue := range resp.Queues { _require.NotNil(queue.Name) if *queue.Name == queueName { _require.NotNil(queue.Metadata) @@ -335,7 +335,7 @@ func (s *RecordedTestSuite) TestServiceListQueuesPagination() { for pager.More() { resp, err := pager.NextPage(context.Background()) _require.Nil(err) - for _, queue := range resp.QueuesList { + for _, queue := range resp.Queues { _require.NotNil(queue.Name) count += 1 }