From 1382d5d9fa052c7fc4b0671310a198b7d01259d2 Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Thu, 20 Oct 2022 16:49:23 +0200 Subject: [PATCH 01/19] Updated Service Fabric Clusters --- .../workflows/ms.servicefabric.clusters.yml | 3 +- .../clusters/.test/cert/deploy.test.bicep | 61 ++++++ .../clusters/.test/common/deploy.test.bicep | 207 ++++++++++++++++++ .../clusters/.test/min/deploy.test.bicep | 57 +++++ 4 files changed, 326 insertions(+), 2 deletions(-) create mode 100644 modules/Microsoft.ServiceFabric/clusters/.test/cert/deploy.test.bicep create mode 100644 modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep create mode 100644 modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep diff --git a/.github/workflows/ms.servicefabric.clusters.yml b/.github/workflows/ms.servicefabric.clusters.yml index 5c4866bb99..4c79ac4382 100644 --- a/.github/workflows/ms.servicefabric.clusters.yml +++ b/.github/workflows/ms.servicefabric.clusters.yml @@ -106,8 +106,7 @@ jobs: - name: 'Using test file [${{ matrix.moduleTestFilePaths }}]' uses: ./.github/actions/templates/validateModuleDeployment with: - templateFilePath: '${{ env.modulePath }}/deploy.bicep' - parameterFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' + templateFilePath: '${{ env.modulePath }}/${{ matrix.moduleTestFilePaths }}' location: '${{ env.location }}' resourceGroupName: '${{ env.resourceGroupName }}' subscriptionId: '${{ secrets.ARM_SUBSCRIPTION_ID }}' diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/cert/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/cert/deploy.test.bicep new file mode 100644 index 0000000000..c52d0424e1 --- /dev/null +++ b/modules/Microsoft.ServiceFabric/clusters/.test/cert/deploy.test.bicep @@ -0,0 +1,61 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for testing purposes.') +@maxLength(90) +param resourceGroupName string = 'ms.servicefabric.clusters-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to.') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') +param serviceShort string = 'sfccer' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + managementEndpoint: 'https://<>${serviceShort}001.westeurope.cloudapp.azure.com:19080' + reliabilityLevel: 'None' + certificate: { + thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' // Mutual exclusive with the other cert specs + x509StoreName: 'My' + } + nodeTypes: [ + { + applicationPorts: { + endPort: 30000 + startPort: 20000 + } + clientConnectionEndpointPort: 19000 + durabilityLevel: 'Bronze' + ephemeralPorts: { + endPort: 65534 + startPort: 49152 + } + httpGatewayEndpointPort: 19080 + isPrimary: true + name: 'Node01' + } + ] + + } +} diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep new file mode 100644 index 0000000000..4f406f3a25 --- /dev/null +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep @@ -0,0 +1,207 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for testing purposes.') +@maxLength(90) +param resourceGroupName string = 'ms.servicefabric.clusters-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to.') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') +param serviceShort string = 'sfccom' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + lock: 'CanNotDelete' + tags: { + resourceType: 'Service Fabric' + clusterName: '<>${serviceShort}001' + + } + addOnFeatures: [ + 'RepairManager' + 'DnsService' + 'BackupRestoreService' + 'ResourceMonitorService' + ] + maxUnusedVersionsToKeep: 2 + azureActiveDirectory: { + clientApplication: '<>' + clusterApplication: 'cf33fea8-b30f-424f-ab73-c48d99e0b222' + tenantId: '<>' + } + certificateCommonNames: { + commonNames: [ + { + certificateCommonName: 'certcommon' + certificateIssuerThumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' + } + ] + x509StoreName: '' + } + clientCertificateCommonNames: [ + { + certificateCommonName: 'clientcommoncert1' + certificateIssuerThumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' + isAdmin: false + } + { + certificateCommonName: 'clientcommoncert2' + certificateIssuerThumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC131' + isAdmin: false + } + ] + clientCertificateThumbprints: [ + { + certificateThumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' + isAdmin: false + } + { + certificateThumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC131' + 'isAdmin': false + } + ] + diagnosticsStorageAccountConfig: { + blobEndpoint: 'https://adp<>azsaweux001.blob.core.windows.net/' + protectedAccountKeyName: 'StorageAccountKey1' + queueEndpoint: 'https://adp<>azsaweux001.queue.core.windows.net/' + storageAccountName: 'adp<>azsaweux001' + tableEndpoint: 'https://adp<>azsaweux001.table.core.windows.net/' + } + fabricSettings: [ + { + name: 'Security' + parameters: [ + { + name: 'ClusterProtectionLevel' + value: 'EncryptAndSign' + } + ] + } + { + name: 'UpgradeService' + parameters: [ + { + name: 'AppPollIntervalInSeconds' + value: '60' + } + ] + } + ] + managementEndpoint: 'https://<>${serviceShort}001.westeurope.cloudapp.azure.com:19080' + reliabilityLevel: 'Silver' + certificate: { + thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' // Mutual exclusive with the other cert specs + x509StoreName: 'My' + } + nodeTypes: [ + { + applicationPorts: { + endPort: 30000 + startPort: 20000 + } + clientConnectionEndpointPort: 19000 + durabilityLevel: 'Silver' + ephemeralPorts: { + endPort: 65534 + startPort: 49152 + } + httpGatewayEndpointPort: 19080 + isPrimary: true + name: 'Node01' + + isStateless: false + multipleAvailabilityZones: false + + placementProperties: {} + reverseProxyEndpointPort: '' + vmInstanceCount: 5 + } + { + applicationPorts: { + endPort: 30000 + startPort: 20000 + } + clientConnectionEndpointPort: 19000 + durabilityLevel: 'Bronze' + ephemeralPorts: { + endPort: 64000 + startPort: 49000 + httpGatewayEndpointPort: 19007 + isPrimary: true + name: 'Node02' + vmInstanceCount: 5 + } + } + ] + notifications: [ + { + isEnabled: true + notificationCategory: 'WaveProgress' + notificationLevel: 'Critical' + notificationTargets: [ + { + notificationChannel: 'EmailUser' + receivers: [ + 'SomeReceiver' + ] + } + ] + } + ] + upgradeDescription: { + forceRestart: false + upgradeReplicaSetCheckTimeout: '1.00:00:00' + healthCheckWaitDuration: '00:00:30' + healthCheckStableDuration: '00:01:00' + healthCheckRetryTimeout: '00:45:00' + upgradeTimeout: '02:00:00' + upgradeDomainTimeout: '02:00:00' + healthPolicy: { + maxPercentUnhealthyNodes: 0 + maxPercentUnhealthyApplications: 0 + } + deltaHealthPolicy: { + maxPercentDeltaUnhealthyNodes: 0 + maxPercentUpgradeDomainDeltaUnhealthyNodes: 0 + maxPercentDeltaUnhealthyApplications: 0 + } + + } + vmImage: 'Linux' + roleAssignments: [ + { + roleDefinitionIdOrName: 'Reader' + principalIds: [ + '<>' + ] + } + ] + applicationTypes: [ + { + name: 'WordCount' // not idempotent + } + ] + } +} diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep new file mode 100644 index 0000000000..f2c97a2f38 --- /dev/null +++ b/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep @@ -0,0 +1,57 @@ +targetScope = 'subscription' + +// ========== // +// Parameters // +// ========== // +@description('Optional. The name of the resource group to deploy for testing purposes.') +@maxLength(90) +param resourceGroupName string = 'ms.servicefabric.clusters-${serviceShort}-rg' + +@description('Optional. The location to deploy resources to.') +param location string = deployment().location + +@description('Optional. A short identifier for the kind of deployment. Should be kept short to not run into resource-name length-constraints.') +param serviceShort string = 'sfcmin' + +// =========== // +// Deployments // +// =========== // + +// General resources +// ================= +resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { + name: resourceGroupName + location: location +} + +// ============== // +// Test Execution // +// ============== // + +module testDeployment '../../deploy.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name)}-test-${serviceShort}' + params: { + name: '<>${serviceShort}001' + managementEndpoint: 'https://<>${serviceShort}001.westeurope.cloudapp.azure.com:19080' + reliabilityLevel: 'None' + nodeTypes: [ + { + applicationPorts: { + endPort: 30000 + startPort: 20000 + } + clientConnectionEndpointPort: 19000 + durabilityLevel: 'Bronze' + ephemeralPorts: { + endPort: 65534 + startPort: 49152 + } + httpGatewayEndpointPort: 19080 + isPrimary: true + name: 'Node01' + } + ] + + } +} From 5216e9957454e565f0e79c77fe68c7066a4a6ad2 Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Thu, 20 Oct 2022 16:49:46 +0200 Subject: [PATCH 02/19] removed json params files --- .../clusters/.test/cert.parameters.json | 40 ---- .../clusters/.test/full.parameters.json | 208 ------------------ .../clusters/.test/min.parameters.json | 34 --- 3 files changed, 282 deletions(-) delete mode 100644 modules/Microsoft.ServiceFabric/clusters/.test/cert.parameters.json delete mode 100644 modules/Microsoft.ServiceFabric/clusters/.test/full.parameters.json delete mode 100644 modules/Microsoft.ServiceFabric/clusters/.test/min.parameters.json diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/cert.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.test/cert.parameters.json deleted file mode 100644 index 668b6d8d12..0000000000 --- a/modules/Microsoft.ServiceFabric/clusters/.test/cert.parameters.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-sfc-cert-001" - }, - "managementEndpoint": { - "value": "https://<>-az-sfc-cert-001.westeurope.cloudapp.azure.com:19080" - }, - "reliabilityLevel": { - "value": "None" - }, - "certificate": { - "value": { - "thumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130", // Mutual exclusive with the other cert specs - "x509StoreName": "My" - } - }, - "nodeTypes": { - "value": [ - { - "applicationPorts": { - "endPort": 30000, - "startPort": 20000 - }, - "clientConnectionEndpointPort": 19000, - "durabilityLevel": "Bronze", - "ephemeralPorts": { - "endPort": 65534, - "startPort": 49152 - }, - "httpGatewayEndpointPort": 19080, - "isPrimary": true, - "name": "Node01" - } - ] - } - } -} diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/full.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.test/full.parameters.json deleted file mode 100644 index 46c19ee885..0000000000 --- a/modules/Microsoft.ServiceFabric/clusters/.test/full.parameters.json +++ /dev/null @@ -1,208 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-sfc-full-001" - }, - "lock": { - "value": "CanNotDelete" - }, - "tags": { - "value": { - "resourceType": "Service Fabric", - "clusterName": "<>-az-sfc-full-001" - } - }, - "addOnFeatures": { - "value": [ - "RepairManager", - "DnsService", - "BackupRestoreService", - "ResourceMonitorService" - ] - }, - "maxUnusedVersionsToKeep": { - "value": 2 - }, - "azureActiveDirectory": { - "value": { - "clientApplication": "<>", - "clusterApplication": "cf33fea8-b30f-424f-ab73-c48d99e0b222", - "tenantId": "<>" - } - }, - "certificateCommonNames": { - "value": { - "commonNames": [ - { - "certificateCommonName": "certcommon", - "certificateIssuerThumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130" - } - ], - "x509StoreName": "" - } - }, - "clientCertificateCommonNames": { - "value": [ - { - "certificateCommonName": "clientcommoncert1", - "certificateIssuerThumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130", - "isAdmin": false - }, - { - "certificateCommonName": "clientcommoncert2", - "certificateIssuerThumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC131", - "isAdmin": false - } - ] - }, - "clientCertificateThumbprints": { - "value": [ - { - "certificateThumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130", - "isAdmin": false - }, - { - "certificateThumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC131", - "isAdmin": false - } - ] - }, - "diagnosticsStorageAccountConfig": { - "value": { - "blobEndpoint": "https://adp<>azsaweux001.blob.core.windows.net/", - "protectedAccountKeyName": "StorageAccountKey1", - "queueEndpoint": "https://adp<>azsaweux001.queue.core.windows.net/", - "storageAccountName": "adp<>azsaweux001", - "tableEndpoint": "https://adp<>azsaweux001.table.core.windows.net/" - } - }, - "fabricSettings": { - "value": [ - { - "name": "Security", - "parameters": [ - { - "name": "ClusterProtectionLevel", - "value": "EncryptAndSign" - } - ] - }, - { - "name": "UpgradeService", - "parameters": [ - { - "name": "AppPollIntervalInSeconds", - "value": "60" - } - ] - } - ] - }, - "managementEndpoint": { - "value": "https://<>-az-sfc-full-001.westeurope.cloudapp.azure.com:19080" - }, - "nodeTypes": { - "value": [ - { - "applicationPorts": { - "endPort": 30000, - "startPort": 20000 - }, - "capacities": {}, - "clientConnectionEndpointPort": 19000, - "durabilityLevel": "Silver", - "ephemeralPorts": { - "endPort": 65534, - "startPort": 49152 - }, - "httpGatewayEndpointPort": 19080, - "isPrimary": true, - "isStateless": false, - "multipleAvailabilityZones": false, - "name": "Node01", - "placementProperties": {}, - "reverseProxyEndpointPort": "", - "vmInstanceCount": 5 - }, - { - "applicationPorts": { - "endPort": 30000, - "startPort": 20000 - }, - "clientConnectionEndpointPort": 19000, - "durabilityLevel": "Bronze", - "ephemeralPorts": { - "endPort": 64000, - "startPort": 49000 - }, - "httpGatewayEndpointPort": 19007, - "isPrimary": true, - "name": "Node02", - "vmInstanceCount": 5 - } - ] - }, - "notifications": { - "value": [ - { - "isEnabled": true, - "notificationCategory": "WaveProgress", - "notificationLevel": "Critical", - "notificationTargets": [ - { - "notificationChannel": "EmailUser", - "receivers": [ - "SomeReceiver" - ] - } - ] - } - ] - }, - "upgradeDescription": { - "value": { - "forceRestart": false, - "upgradeReplicaSetCheckTimeout": "1.00:00:00", - "healthCheckWaitDuration": "00:00:30", - "healthCheckStableDuration": "00:01:00", - "healthCheckRetryTimeout": "00:45:00", - "upgradeTimeout": "02:00:00", - "upgradeDomainTimeout": "02:00:00", - "healthPolicy": { - "maxPercentUnhealthyNodes": 0, - "maxPercentUnhealthyApplications": 0 - }, - "deltaHealthPolicy": { - "maxPercentDeltaUnhealthyNodes": 0, - "maxPercentUpgradeDomainDeltaUnhealthyNodes": 0, - "maxPercentDeltaUnhealthyApplications": 0 - } - } - }, - "reliabilityLevel": { - "value": "Silver" - }, - "vmImage": { - "value": "Linux" - }, - "roleAssignments": { - "value": [ - { - "roleDefinitionIdOrName": "Reader", - "principalIds": [ - "<>" - ] - } - ] - }, - "applicationTypes": { - "value": [ - { - "name": "WordCount" // not idempotent - } - ] - } - } -} diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/min.parameters.json b/modules/Microsoft.ServiceFabric/clusters/.test/min.parameters.json deleted file mode 100644 index b7673a725b..0000000000 --- a/modules/Microsoft.ServiceFabric/clusters/.test/min.parameters.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "$schema": "https://schema.management.azure.com/schemas/2019-04-01/deploymentParameters.json#", - "contentVersion": "1.0.0.0", - "parameters": { - "name": { - "value": "<>-az-sfc-min-001" - }, - "managementEndpoint": { - "value": "https://<>-az-sfc-min-001.westeurope.cloudapp.azure.com:19080" - }, - "reliabilityLevel": { - "value": "None" - }, - "nodeTypes": { - "value": [ - { - "applicationPorts": { - "endPort": 30000, - "startPort": 20000 - }, - "clientConnectionEndpointPort": 19000, - "durabilityLevel": "Bronze", - "ephemeralPorts": { - "endPort": 65534, - "startPort": 49152 - }, - "httpGatewayEndpointPort": 19080, - "isPrimary": true, - "name": "Node01" - } - ] - } - } -} From a430ecd180a8b0abc4233b89aedec58999874b3d Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Fri, 21 Oct 2022 10:32:10 +0200 Subject: [PATCH 03/19] Set-ModuleReadme --- .../clusters/.test/cert/deploy.test.bicep | 2 +- .../clusters/.test/common/deploy.test.bicep | 4 +- .../clusters/readme.md | 72 ++++++++++--------- 3 files changed, 44 insertions(+), 34 deletions(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/cert/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/cert/deploy.test.bicep index c52d0424e1..b0ebd137ed 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/cert/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/cert/deploy.test.bicep @@ -36,7 +36,7 @@ module testDeployment '../../deploy.bicep' = { managementEndpoint: 'https://<>${serviceShort}001.westeurope.cloudapp.azure.com:19080' reliabilityLevel: 'None' certificate: { - thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' // Mutual exclusive with the other cert specs + thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' x509StoreName: 'My' } nodeTypes: [ diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep index 4f406f3a25..89bc9381f5 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep @@ -112,8 +112,10 @@ module testDeployment '../../deploy.bicep' = { managementEndpoint: 'https://<>${serviceShort}001.westeurope.cloudapp.azure.com:19080' reliabilityLevel: 'Silver' certificate: { - thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' // Mutual exclusive with the other cert specs + + thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' x509StoreName: 'My' + } nodeTypes: [ { diff --git a/modules/Microsoft.ServiceFabric/clusters/readme.md b/modules/Microsoft.ServiceFabric/clusters/readme.md index 49326b0e0c..deedd0d50d 100644 --- a/modules/Microsoft.ServiceFabric/clusters/readme.md +++ b/modules/Microsoft.ServiceFabric/clusters/readme.md @@ -248,11 +248,11 @@ The following module usage examples are retrieved from the content of the files ```bicep module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-Clusters' + name: '${uniqueString(deployment().name)}-test-sfccer' params: { // Required parameters - managementEndpoint: 'https://<>-az-sfc-cert-001.westeurope.cloudapp.azure.com:19080' - name: '<>-az-sfc-cert-001' + managementEndpoint: 'https://<>sfccer001.westeurope.cloudapp.azure.com:19080' + name: '<>sfccer001' reliabilityLevel: 'None' // Non-required parameters certificate: { @@ -294,10 +294,10 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "parameters": { // Required parameters "managementEndpoint": { - "value": "https://<>-az-sfc-cert-001.westeurope.cloudapp.azure.com:19080" + "value": "https://<>sfccer001.westeurope.cloudapp.azure.com:19080" }, "name": { - "value": "<>-az-sfc-cert-001" + "value": "<>sfccer001" }, "reliabilityLevel": { "value": "None" @@ -335,7 +335,7 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = {

-

Example 2: Full

+

Example 2: Common

@@ -343,11 +343,11 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { ```bicep module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-Clusters' + name: '${uniqueString(deployment().name)}-test-sfccom' params: { // Required parameters - managementEndpoint: 'https://<>-az-sfc-full-001.westeurope.cloudapp.azure.com:19080' - name: '<>-az-sfc-full-001' + managementEndpoint: 'https://<>sfccom001.westeurope.cloudapp.azure.com:19080' + name: '<>sfccom001' reliabilityLevel: 'Silver' // Non-required parameters addOnFeatures: [ @@ -366,6 +366,10 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { clusterApplication: 'cf33fea8-b30f-424f-ab73-c48d99e0b222' tenantId: '<>' } + certificate: { + thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' + x509StoreName: 'My' + } certificateCommonNames: { commonNames: [ { @@ -432,7 +436,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { endPort: 30000 startPort: 20000 } - capacities: {} clientConnectionEndpointPort: 19000 durabilityLevel: 'Silver' ephemeralPorts: { @@ -457,12 +460,12 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { durabilityLevel: 'Bronze' ephemeralPorts: { endPort: 64000 + httpGatewayEndpointPort: 19007 + isPrimary: true + name: 'Node02' startPort: 49000 + vmInstanceCount: 5 } - httpGatewayEndpointPort: 19007 - isPrimary: true - name: 'Node02' - vmInstanceCount: 5 } ] notifications: [ @@ -489,7 +492,7 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { } ] tags: { - clusterName: '<>-az-sfc-full-001' + clusterName: '<>sfccom001' resourceType: 'Service Fabric' } upgradeDescription: { @@ -507,7 +510,7 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { maxPercentUnhealthyNodes: 0 } upgradeDomainTimeout: '02:00:00' - upgradeReplicaSetCheckTimeout: '1.00:00:00' + upgradeReplicaSetCheckTimeout: '' upgradeTimeout: '02:00:00' } vmImage: 'Linux' @@ -529,10 +532,10 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "parameters": { // Required parameters "managementEndpoint": { - "value": "https://<>-az-sfc-full-001.westeurope.cloudapp.azure.com:19080" + "value": "https://<>sfccom001.westeurope.cloudapp.azure.com:19080" }, "name": { - "value": "<>-az-sfc-full-001" + "value": "<>sfccom001" }, "reliabilityLevel": { "value": "Silver" @@ -560,6 +563,12 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "tenantId": "<>" } }, + "certificate": { + "value": { + "thumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130", + "x509StoreName": "My" + } + }, "certificateCommonNames": { "value": { "commonNames": [ @@ -641,7 +650,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "endPort": 30000, "startPort": 20000 }, - "capacities": {}, "clientConnectionEndpointPort": 19000, "durabilityLevel": "Silver", "ephemeralPorts": { @@ -666,12 +674,12 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "durabilityLevel": "Bronze", "ephemeralPorts": { "endPort": 64000, - "startPort": 49000 - }, - "httpGatewayEndpointPort": 19007, - "isPrimary": true, - "name": "Node02", - "vmInstanceCount": 5 + "httpGatewayEndpointPort": 19007, + "isPrimary": true, + "name": "Node02", + "startPort": 49000, + "vmInstanceCount": 5 + } } ] }, @@ -704,7 +712,7 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { }, "tags": { "value": { - "clusterName": "<>-az-sfc-full-001", + "clusterName": "<>sfccom001", "resourceType": "Service Fabric" } }, @@ -724,7 +732,7 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "maxPercentUnhealthyNodes": 0 }, "upgradeDomainTimeout": "02:00:00", - "upgradeReplicaSetCheckTimeout": "1.00:00:00", + "upgradeReplicaSetCheckTimeout": "", "upgradeTimeout": "02:00:00" } }, @@ -746,11 +754,11 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { ```bicep module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { - name: '${uniqueString(deployment().name)}-Clusters' + name: '${uniqueString(deployment().name)}-test-sfcmin' params: { // Required parameters - managementEndpoint: 'https://<>-az-sfc-min-001.westeurope.cloudapp.azure.com:19080' - name: '<>-az-sfc-min-001' + managementEndpoint: 'https://<>sfcmin001.westeurope.cloudapp.azure.com:19080' + name: '<>sfcmin001' reliabilityLevel: 'None' // Non-required parameters nodeTypes: [ @@ -788,10 +796,10 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "parameters": { // Required parameters "managementEndpoint": { - "value": "https://<>-az-sfc-min-001.westeurope.cloudapp.azure.com:19080" + "value": "https://<>sfcmin001.westeurope.cloudapp.azure.com:19080" }, "name": { - "value": "<>-az-sfc-min-001" + "value": "<>sfcmin001" }, "reliabilityLevel": { "value": "None" From 5ab60100d73e7a955a6c490d4ce625f7c0bf328d Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Fri, 21 Oct 2022 10:52:52 +0200 Subject: [PATCH 04/19] removed certificate common --- .../clusters/.test/common/deploy.test.bicep | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep index 89bc9381f5..4ef7d2463c 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep @@ -111,12 +111,6 @@ module testDeployment '../../deploy.bicep' = { ] managementEndpoint: 'https://<>${serviceShort}001.westeurope.cloudapp.azure.com:19080' reliabilityLevel: 'Silver' - certificate: { - - thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' - x509StoreName: 'My' - - } nodeTypes: [ { applicationPorts: { From 4de429988484f0e9b1aaa17d30d5758975823c8b Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Fri, 21 Oct 2022 10:58:16 +0200 Subject: [PATCH 05/19] Updated readme --- modules/Microsoft.ServiceFabric/clusters/readme.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/readme.md b/modules/Microsoft.ServiceFabric/clusters/readme.md index deedd0d50d..7bdaed5193 100644 --- a/modules/Microsoft.ServiceFabric/clusters/readme.md +++ b/modules/Microsoft.ServiceFabric/clusters/readme.md @@ -366,10 +366,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { clusterApplication: 'cf33fea8-b30f-424f-ab73-c48d99e0b222' tenantId: '<>' } - certificate: { - thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' - x509StoreName: 'My' - } certificateCommonNames: { commonNames: [ { @@ -563,12 +559,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "tenantId": "<>" } }, - "certificate": { - "value": { - "thumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130", - "x509StoreName": "My" - } - }, "certificateCommonNames": { "value": { "commonNames": [ From 857612510ea16b9dea8cf03dda38ad749aae69ac Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Fri, 21 Oct 2022 14:16:06 +0200 Subject: [PATCH 06/19] Removed nodes from min test --- .../clusters/.test/min/deploy.test.bicep | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep index f2c97a2f38..69318830db 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep @@ -35,23 +35,5 @@ module testDeployment '../../deploy.bicep' = { name: '<>${serviceShort}001' managementEndpoint: 'https://<>${serviceShort}001.westeurope.cloudapp.azure.com:19080' reliabilityLevel: 'None' - nodeTypes: [ - { - applicationPorts: { - endPort: 30000 - startPort: 20000 - } - clientConnectionEndpointPort: 19000 - durabilityLevel: 'Bronze' - ephemeralPorts: { - endPort: 65534 - startPort: 49152 - } - httpGatewayEndpointPort: 19080 - isPrimary: true - name: 'Node01' - } - ] - } } From c8bb63fe4122f3bd3ed0682ec8b2d1aa57ccc428 Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Fri, 28 Oct 2022 13:46:24 +0200 Subject: [PATCH 07/19] Added dependencies --- .../clusters/.test/common/dependencies.bicep | 13 ++++++++++ .../clusters/.test/common/deploy.test.bicep | 24 ++++++++++++++++++- .../clusters/deploy.bicep | 2 +- 3 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep new file mode 100644 index 0000000000..a7f42aee7b --- /dev/null +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep @@ -0,0 +1,13 @@ +@description('Optional. The location to deploy to.') +param location string = resourceGroup().location + +@description('Required. The name of the Managed Identity to create.') +param managedIdentityName string + +resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { + name: managedIdentityName + location: location +} + +@description('The principal ID of the created Managed Identity.') +output managedIdentityPrincipalId string = managedIdentity.properties.principalId diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep index 4ef7d2463c..71916e1ebe 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep @@ -24,6 +24,28 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2021-04-01' = { location: location } +module resourceGroupResources 'dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-paramNested' + params: { + managedIdentityName: 'dep-<>-msi-${serviceShort}' + } +} + +// Diagnostics +// =========== +module diagnosticDependencies '../../../../.shared/dependencyConstructs/diagnostic.dependencies.bicep' = { + scope: resourceGroup + name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' + params: { + storageAccountName: 'dep<>diasa${serviceShort}01' + logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' + eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' + eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' + location: location + } +} + // ============== // // Test Execution // // ============== // @@ -190,7 +212,7 @@ module testDeployment '../../deploy.bicep' = { { roleDefinitionIdOrName: 'Reader' principalIds: [ - '<>' + resourceGroupResources.outputs.managedIdentityPrincipalId ] } ] diff --git a/modules/Microsoft.ServiceFabric/clusters/deploy.bicep b/modules/Microsoft.ServiceFabric/clusters/deploy.bicep index 48773b0cf6..1e51969f9c 100644 --- a/modules/Microsoft.ServiceFabric/clusters/deploy.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/deploy.bicep @@ -76,7 +76,7 @@ param notifications array = [] 'Platinum' 'Silver' ]) -@description('Optional. The reliability level sets the replica set size of system services. Learn about ReliabilityLevel (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. - Gold - Run the System services with a target replica set count of 7. - Platinum - Run the System services with a target replica set count of 9.') +@description('Required. The reliability level sets the replica set size of system services. Learn about ReliabilityLevel (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. - Gold - Run the System services with a target replica set count of 7. - Platinum - Run the System services with a target replica set count of 9.') param reliabilityLevel string @description('Optional. Describes the certificate details.') From b38558764f665828c83167748538b23c13c4660d Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Fri, 28 Oct 2022 13:50:27 +0200 Subject: [PATCH 08/19] Updated readme --- .../clusters/readme.md | 52 +++---------------- 1 file changed, 7 insertions(+), 45 deletions(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/readme.md b/modules/Microsoft.ServiceFabric/clusters/readme.md index 7bdaed5193..ce1615fa2a 100644 --- a/modules/Microsoft.ServiceFabric/clusters/readme.md +++ b/modules/Microsoft.ServiceFabric/clusters/readme.md @@ -23,10 +23,11 @@ This module deploys a Service Fabric Cluster. **Required parameters** -| Parameter Name | Type | Description | -| :-- | :-- | :-- | -| `managementEndpoint` | string | The http management endpoint of the cluster. | -| `name` | string | Name of the Service Fabric cluster. | +| Parameter Name | Type | Allowed Values | Description | +| :-- | :-- | :-- | :-- | +| `managementEndpoint` | string | | The http management endpoint of the cluster. | +| `name` | string | | Name of the Service Fabric cluster. | +| `reliabilityLevel` | string | `[Bronze, Gold, None, Platinum, Silver]` | The reliability level sets the replica set size of system services. Learn about ReliabilityLevel (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. - Gold - Run the System services with a target replica set count of 7. - Platinum - Run the System services with a target replica set count of 9. | **Optional parameters** @@ -50,7 +51,6 @@ This module deploys a Service Fabric Cluster. | `maxUnusedVersionsToKeep` | int | `3` | | Number of unused versions per application type to keep. | | `nodeTypes` | array | `[]` | | The list of node types in the cluster. | | `notifications` | array | `[]` | | Indicates a list of notification channels for cluster events. | -| `reliabilityLevel` | string | | `[Bronze, Gold, None, Platinum, Silver]` | The reliability level sets the replica set size of system services. Learn about ReliabilityLevel (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. - Gold - Run the System services with a target replica set count of 7. - Platinum - Run the System services with a target replica set count of 9. | | `reverseProxyCertificate` | object | `{object}` | | Describes the certificate details. | | `reverseProxyCertificateCommonNames` | object | `{object}` | | Describes a list of server certificates referenced by common name that are used to secure the cluster. | | `roleAssignments` | array | `[]` | | Array of role assignment objects that contain the 'roleDefinitionIdOrName' and 'principalId' to define RBAC role assignments on this resource. In the roleDefinitionIdOrName attribute, you can provide either the display name of the role definition, or its fully qualified ID in the following format: '/providers/Microsoft.Authorization/roleDefinitions/c2f4ef07-c644-48eb-af81-4b1b4947fb11'. | @@ -482,7 +482,7 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { roleAssignments: [ { principalIds: [ - '<>' + '' ] roleDefinitionIdOrName: 'Reader' } @@ -694,7 +694,7 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "value": [ { "principalIds": [ - "<>" + "" ], "roleDefinitionIdOrName": "Reader" } @@ -750,24 +750,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { managementEndpoint: 'https://<>sfcmin001.westeurope.cloudapp.azure.com:19080' name: '<>sfcmin001' reliabilityLevel: 'None' - // Non-required parameters - nodeTypes: [ - { - applicationPorts: { - endPort: 30000 - startPort: 20000 - } - clientConnectionEndpointPort: 19000 - durabilityLevel: 'Bronze' - ephemeralPorts: { - endPort: 65534 - startPort: 49152 - } - httpGatewayEndpointPort: 19080 - isPrimary: true - name: 'Node01' - } - ] } } ``` @@ -793,26 +775,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { }, "reliabilityLevel": { "value": "None" - }, - // Non-required parameters - "nodeTypes": { - "value": [ - { - "applicationPorts": { - "endPort": 30000, - "startPort": 20000 - }, - "clientConnectionEndpointPort": 19000, - "durabilityLevel": "Bronze", - "ephemeralPorts": { - "endPort": 65534, - "startPort": 49152 - }, - "httpGatewayEndpointPort": 19080, - "isPrimary": true, - "name": "Node01" - } - ] } } } From 6374d9c25f8d8051a5ab69525b4fc44e2ef236bf Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Fri, 28 Oct 2022 14:06:23 +0200 Subject: [PATCH 09/19] added nodes in min --- .../clusters/.test/min/deploy.test.bicep | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep index 69318830db..ce7ea12a80 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep @@ -35,5 +35,24 @@ module testDeployment '../../deploy.bicep' = { name: '<>${serviceShort}001' managementEndpoint: 'https://<>${serviceShort}001.westeurope.cloudapp.azure.com:19080' reliabilityLevel: 'None' + nodeTypes: [ + { + applicationPorts: { + endPort: 30000 + startPort: 20000 + } + clientConnectionEndpointPort: 19000 + durabilityLevel: 'Bronze' + ephemeralPorts: { + endPort: 65534 + startPort: 49152 + } + httpGatewayEndpointPort: 19080 + isPrimary: true + name: 'Node01' + } + ] + } } +} From b382c5dab3f2ba8e85ffad49c48f5870041956a9 Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Fri, 28 Oct 2022 14:06:50 +0200 Subject: [PATCH 10/19] updated readme --- .../clusters/readme.md | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/modules/Microsoft.ServiceFabric/clusters/readme.md b/modules/Microsoft.ServiceFabric/clusters/readme.md index ce1615fa2a..90669c4f1c 100644 --- a/modules/Microsoft.ServiceFabric/clusters/readme.md +++ b/modules/Microsoft.ServiceFabric/clusters/readme.md @@ -750,6 +750,24 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { managementEndpoint: 'https://<>sfcmin001.westeurope.cloudapp.azure.com:19080' name: '<>sfcmin001' reliabilityLevel: 'None' + // Non-required parameters + nodeTypes: [ + { + applicationPorts: { + endPort: 30000 + startPort: 20000 + } + clientConnectionEndpointPort: 19000 + durabilityLevel: 'Bronze' + ephemeralPorts: { + endPort: 65534 + startPort: 49152 + } + httpGatewayEndpointPort: 19080 + isPrimary: true + name: 'Node01' + } + ] } } ``` @@ -775,6 +793,26 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { }, "reliabilityLevel": { "value": "None" + }, + // Non-required parameters + "nodeTypes": { + "value": [ + { + "applicationPorts": { + "endPort": 30000, + "startPort": 20000 + }, + "clientConnectionEndpointPort": 19000, + "durabilityLevel": "Bronze", + "ephemeralPorts": { + "endPort": 65534, + "startPort": 49152 + }, + "httpGatewayEndpointPort": 19080, + "isPrimary": true, + "name": "Node01" + } + ] } } } From 80bc2de947109d7e761e736b69e43faa2e57b2ce Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Fri, 28 Oct 2022 14:07:17 +0200 Subject: [PATCH 11/19] fixed typo --- .../Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep | 1 - 1 file changed, 1 deletion(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep index ce7ea12a80..f2c97a2f38 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/min/deploy.test.bicep @@ -55,4 +55,3 @@ module testDeployment '../../deploy.bicep' = { } } -} From 0376e72ead3fe1b52d55adc7c7cd915eef5fedc0 Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Fri, 28 Oct 2022 14:10:22 +0200 Subject: [PATCH 12/19] set nodeTypes to required as it is required by the resource --- .../clusters/deploy.bicep | 4 +- .../clusters/readme.md | 200 +++++++++--------- 2 files changed, 101 insertions(+), 103 deletions(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/deploy.bicep b/modules/Microsoft.ServiceFabric/clusters/deploy.bicep index 1e51969f9c..4d02835b42 100644 --- a/modules/Microsoft.ServiceFabric/clusters/deploy.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/deploy.bicep @@ -63,8 +63,8 @@ param infrastructureServiceManager bool = false @description('Required. The http management endpoint of the cluster.') param managementEndpoint string -@description('Optional. The list of node types in the cluster.') -param nodeTypes array = [] +@description('Required. The list of node types in the cluster.') +param nodeTypes array @description('Optional. Indicates a list of notification channels for cluster events.') param notifications array = [] diff --git a/modules/Microsoft.ServiceFabric/clusters/readme.md b/modules/Microsoft.ServiceFabric/clusters/readme.md index 90669c4f1c..c62f81640e 100644 --- a/modules/Microsoft.ServiceFabric/clusters/readme.md +++ b/modules/Microsoft.ServiceFabric/clusters/readme.md @@ -27,6 +27,7 @@ This module deploys a Service Fabric Cluster. | :-- | :-- | :-- | :-- | | `managementEndpoint` | string | | The http management endpoint of the cluster. | | `name` | string | | Name of the Service Fabric cluster. | +| `nodeTypes` | array | | The list of node types in the cluster. | | `reliabilityLevel` | string | `[Bronze, Gold, None, Platinum, Silver]` | The reliability level sets the replica set size of system services. Learn about ReliabilityLevel (https://docs.microsoft.com/en-us/azure/service-fabric/service-fabric-cluster-capacity). - None - Run the System services with a target replica set count of 1. This should only be used for test clusters. - Bronze - Run the System services with a target replica set count of 3. This should only be used for test clusters. - Silver - Run the System services with a target replica set count of 5. - Gold - Run the System services with a target replica set count of 7. - Platinum - Run the System services with a target replica set count of 9. | **Optional parameters** @@ -49,7 +50,6 @@ This module deploys a Service Fabric Cluster. | `location` | string | `[resourceGroup().location]` | | Location for all resources. | | `lock` | string | `''` | `['', CanNotDelete, ReadOnly]` | Specify the type of lock. | | `maxUnusedVersionsToKeep` | int | `3` | | Number of unused versions per application type to keep. | -| `nodeTypes` | array | `[]` | | The list of node types in the cluster. | | `notifications` | array | `[]` | | Indicates a list of notification channels for cluster events. | | `reverseProxyCertificate` | object | `{object}` | | Describes the certificate details. | | `reverseProxyCertificateCommonNames` | object | `{object}` | | Describes a list of server certificates referenced by common name that are used to secure the cluster. | @@ -253,12 +253,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { // Required parameters managementEndpoint: 'https://<>sfccer001.westeurope.cloudapp.azure.com:19080' name: '<>sfccer001' - reliabilityLevel: 'None' - // Non-required parameters - certificate: { - thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' - x509StoreName: 'My' - } nodeTypes: [ { applicationPorts: { @@ -276,6 +270,12 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { name: 'Node01' } ] + reliabilityLevel: 'None' + // Non-required parameters + certificate: { + thumbprint: '0AC113D5E1D94C401DDEB0EE2B1B96CC130' + x509StoreName: 'My' + } } } ``` @@ -299,16 +299,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "name": { "value": "<>sfccer001" }, - "reliabilityLevel": { - "value": "None" - }, - // Non-required parameters - "certificate": { - "value": { - "thumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130", - "x509StoreName": "My" - } - }, "nodeTypes": { "value": [ { @@ -327,6 +317,16 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "name": "Node01" } ] + }, + "reliabilityLevel": { + "value": "None" + }, + // Non-required parameters + "certificate": { + "value": { + "thumbprint": "0AC113D5E1D94C401DDEB0EE2B1B96CC130", + "x509StoreName": "My" + } } } } @@ -348,6 +348,44 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { // Required parameters managementEndpoint: 'https://<>sfccom001.westeurope.cloudapp.azure.com:19080' name: '<>sfccom001' + nodeTypes: [ + { + applicationPorts: { + endPort: 30000 + startPort: 20000 + } + clientConnectionEndpointPort: 19000 + durabilityLevel: 'Silver' + ephemeralPorts: { + endPort: 65534 + startPort: 49152 + } + httpGatewayEndpointPort: 19080 + isPrimary: true + isStateless: false + multipleAvailabilityZones: false + name: 'Node01' + placementProperties: {} + reverseProxyEndpointPort: '' + vmInstanceCount: 5 + } + { + applicationPorts: { + endPort: 30000 + startPort: 20000 + } + clientConnectionEndpointPort: 19000 + durabilityLevel: 'Bronze' + ephemeralPorts: { + endPort: 64000 + httpGatewayEndpointPort: 19007 + isPrimary: true + name: 'Node02' + startPort: 49000 + vmInstanceCount: 5 + } + } + ] reliabilityLevel: 'Silver' // Non-required parameters addOnFeatures: [ @@ -426,44 +464,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { ] lock: 'CanNotDelete' maxUnusedVersionsToKeep: 2 - nodeTypes: [ - { - applicationPorts: { - endPort: 30000 - startPort: 20000 - } - clientConnectionEndpointPort: 19000 - durabilityLevel: 'Silver' - ephemeralPorts: { - endPort: 65534 - startPort: 49152 - } - httpGatewayEndpointPort: 19080 - isPrimary: true - isStateless: false - multipleAvailabilityZones: false - name: 'Node01' - placementProperties: {} - reverseProxyEndpointPort: '' - vmInstanceCount: 5 - } - { - applicationPorts: { - endPort: 30000 - startPort: 20000 - } - clientConnectionEndpointPort: 19000 - durabilityLevel: 'Bronze' - ephemeralPorts: { - endPort: 64000 - httpGatewayEndpointPort: 19007 - isPrimary: true - name: 'Node02' - startPort: 49000 - vmInstanceCount: 5 - } - } - ] notifications: [ { isEnabled: true @@ -533,6 +533,46 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "name": { "value": "<>sfccom001" }, + "nodeTypes": { + "value": [ + { + "applicationPorts": { + "endPort": 30000, + "startPort": 20000 + }, + "clientConnectionEndpointPort": 19000, + "durabilityLevel": "Silver", + "ephemeralPorts": { + "endPort": 65534, + "startPort": 49152 + }, + "httpGatewayEndpointPort": 19080, + "isPrimary": true, + "isStateless": false, + "multipleAvailabilityZones": false, + "name": "Node01", + "placementProperties": {}, + "reverseProxyEndpointPort": "", + "vmInstanceCount": 5 + }, + { + "applicationPorts": { + "endPort": 30000, + "startPort": 20000 + }, + "clientConnectionEndpointPort": 19000, + "durabilityLevel": "Bronze", + "ephemeralPorts": { + "endPort": 64000, + "httpGatewayEndpointPort": 19007, + "isPrimary": true, + "name": "Node02", + "startPort": 49000, + "vmInstanceCount": 5 + } + } + ] + }, "reliabilityLevel": { "value": "Silver" }, @@ -633,46 +673,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "maxUnusedVersionsToKeep": { "value": 2 }, - "nodeTypes": { - "value": [ - { - "applicationPorts": { - "endPort": 30000, - "startPort": 20000 - }, - "clientConnectionEndpointPort": 19000, - "durabilityLevel": "Silver", - "ephemeralPorts": { - "endPort": 65534, - "startPort": 49152 - }, - "httpGatewayEndpointPort": 19080, - "isPrimary": true, - "isStateless": false, - "multipleAvailabilityZones": false, - "name": "Node01", - "placementProperties": {}, - "reverseProxyEndpointPort": "", - "vmInstanceCount": 5 - }, - { - "applicationPorts": { - "endPort": 30000, - "startPort": 20000 - }, - "clientConnectionEndpointPort": 19000, - "durabilityLevel": "Bronze", - "ephemeralPorts": { - "endPort": 64000, - "httpGatewayEndpointPort": 19007, - "isPrimary": true, - "name": "Node02", - "startPort": 49000, - "vmInstanceCount": 5 - } - } - ] - }, "notifications": { "value": [ { @@ -749,8 +749,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { // Required parameters managementEndpoint: 'https://<>sfcmin001.westeurope.cloudapp.azure.com:19080' name: '<>sfcmin001' - reliabilityLevel: 'None' - // Non-required parameters nodeTypes: [ { applicationPorts: { @@ -768,6 +766,7 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { name: 'Node01' } ] + reliabilityLevel: 'None' } } ``` @@ -791,10 +790,6 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "name": { "value": "<>sfcmin001" }, - "reliabilityLevel": { - "value": "None" - }, - // Non-required parameters "nodeTypes": { "value": [ { @@ -813,6 +808,9 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { "name": "Node01" } ] + }, + "reliabilityLevel": { + "value": "None" } } } From a0af90ff3e41643c485968e173ac6503aa82e5cd Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Mon, 31 Oct 2022 09:20:55 +0100 Subject: [PATCH 13/19] Updated module --- .../clusters/.test/common/deploy.test.bicep | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep index 71916e1ebe..f82c16742d 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep @@ -32,20 +32,6 @@ module resourceGroupResources 'dependencies.bicep' = { } } -// Diagnostics -// =========== -module diagnosticDependencies '../../../../.shared/dependencyConstructs/diagnostic.dependencies.bicep' = { - scope: resourceGroup - name: '${uniqueString(deployment().name, location)}-diagnosticDependencies' - params: { - storageAccountName: 'dep<>diasa${serviceShort}01' - logAnalyticsWorkspaceName: 'dep-<>-law-${serviceShort}' - eventHubNamespaceEventHubName: 'dep-<>-evh-${serviceShort}' - eventHubNamespaceName: 'dep-<>-evhns-${serviceShort}' - location: location - } -} - // ============== // // Test Execution // // ============== // @@ -69,7 +55,7 @@ module testDeployment '../../deploy.bicep' = { ] maxUnusedVersionsToKeep: 2 azureActiveDirectory: { - clientApplication: '<>' + clientApplication: resourceGroupResources.outputs.managedIdentityPrincipalId clusterApplication: 'cf33fea8-b30f-424f-ab73-c48d99e0b222' tenantId: '<>' } From b1cd08a30b9b2b26142451ef8046820ff8e7ae9b Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Mon, 31 Oct 2022 09:29:06 +0100 Subject: [PATCH 14/19] Added storage account to dependencies --- .../clusters/.test/common/dependencies.bicep | 18 ++++++++++++++++++ .../clusters/.test/common/deploy.test.bicep | 9 +++++---- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep index a7f42aee7b..599effb4c0 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep @@ -4,10 +4,28 @@ param location string = resourceGroup().location @description('Required. The name of the Managed Identity to create.') param managedIdentityName string +@description('Required. The name of the storage account to create.') +param storageAccountName string + resource managedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2018-11-30' = { name: managedIdentityName location: location } +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-08-01' = { + name: storageAccountName + location: location + kind: 'StorageV2' + sku: { + name: 'Standard_LRS' + } + properties: { + allowBlobPublicAccess: false + } +} + @description('The principal ID of the created Managed Identity.') output managedIdentityPrincipalId string = managedIdentity.properties.principalId + +@description('The resource ID of the created Storage Account.') +output storageAccountResourceId string = storageAccount.id diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep index f82c16742d..cda9cfb9cc 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep @@ -29,6 +29,7 @@ module resourceGroupResources 'dependencies.bicep' = { name: '${uniqueString(deployment().name, location)}-paramNested' params: { managedIdentityName: 'dep-<>-msi-${serviceShort}' + storageAccountName: 'dep<>azsa${serviceShort}01' } } @@ -91,11 +92,11 @@ module testDeployment '../../deploy.bicep' = { } ] diagnosticsStorageAccountConfig: { - blobEndpoint: 'https://adp<>azsaweux001.blob.core.windows.net/' + blobEndpoint: 'https://${last(split(resourceGroupResources.outputs.storageAccountResourceId, ' /'))} .blob.core.windows.net/' protectedAccountKeyName: 'StorageAccountKey1' - queueEndpoint: 'https://adp<>azsaweux001.queue.core.windows.net/' - storageAccountName: 'adp<>azsaweux001' - tableEndpoint: 'https://adp<>azsaweux001.table.core.windows.net/' + queueEndpoint: 'https://${last(split(resourceGroupResources.outputs.storageAccountResourceId, ' /'))}.queue.core.windows.net/' + storageAccountName: '${last(split(resourceGroupResources.outputs.storageAccountResourceId, ' /'))}' + tableEndpoint: 'https://${last(split(resourceGroupResources.outputs.storageAccountResourceId, ' /'))}.table.core.windows.net/' } fabricSettings: [ { From 070a7823a6eedf2478b7a499164674ae5a3c5ef8 Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Mon, 31 Oct 2022 09:49:35 +0100 Subject: [PATCH 15/19] Updated dependencies and readme --- .../clusters/.test/common/dependencies.bicep | 4 ++-- .../clusters/.test/common/deploy.test.bicep | 8 ++++---- .../clusters/readme.md | 20 +++++++++---------- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep index 599effb4c0..31ddf58d79 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/dependencies.bicep @@ -27,5 +27,5 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-08-01' = { @description('The principal ID of the created Managed Identity.') output managedIdentityPrincipalId string = managedIdentity.properties.principalId -@description('The resource ID of the created Storage Account.') -output storageAccountResourceId string = storageAccount.id +@description('The name of the created Storage Account.') +output storageAccountResourceName string = last(split(storageAccount.id, '/')) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep index cda9cfb9cc..c35443be09 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep @@ -92,11 +92,11 @@ module testDeployment '../../deploy.bicep' = { } ] diagnosticsStorageAccountConfig: { - blobEndpoint: 'https://${last(split(resourceGroupResources.outputs.storageAccountResourceId, ' /'))} .blob.core.windows.net/' + blobEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.blob.core.windows.net/' protectedAccountKeyName: 'StorageAccountKey1' - queueEndpoint: 'https://${last(split(resourceGroupResources.outputs.storageAccountResourceId, ' /'))}.queue.core.windows.net/' - storageAccountName: '${last(split(resourceGroupResources.outputs.storageAccountResourceId, ' /'))}' - tableEndpoint: 'https://${last(split(resourceGroupResources.outputs.storageAccountResourceId, ' /'))}.table.core.windows.net/' + queueEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.core.windows.net/' + storageAccountName: resourceGroupResources.outputs.storageAccountResourceName + tableEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.table.core.windows.net/' } fabricSettings: [ { diff --git a/modules/Microsoft.ServiceFabric/clusters/readme.md b/modules/Microsoft.ServiceFabric/clusters/readme.md index c62f81640e..5941bf8417 100644 --- a/modules/Microsoft.ServiceFabric/clusters/readme.md +++ b/modules/Microsoft.ServiceFabric/clusters/readme.md @@ -400,7 +400,7 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { } ] azureActiveDirectory: { - clientApplication: '<>' + clientApplication: '' clusterApplication: 'cf33fea8-b30f-424f-ab73-c48d99e0b222' tenantId: '<>' } @@ -436,11 +436,11 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { } ] diagnosticsStorageAccountConfig: { - blobEndpoint: 'https://adp<>azsaweux001.blob.core.windows.net/' + blobEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.blob.core.windows.net/' protectedAccountKeyName: 'StorageAccountKey1' - queueEndpoint: 'https://adp<>azsaweux001.queue.core.windows.net/' - storageAccountName: 'adp<>azsaweux001' - tableEndpoint: 'https://adp<>azsaweux001.table.core.windows.net/' + queueEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.core.windows.net/' + storageAccountName: '' + tableEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.table.core.windows.net/' } fabricSettings: [ { @@ -594,7 +594,7 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { }, "azureActiveDirectory": { "value": { - "clientApplication": "<>", + "clientApplication": "", "clusterApplication": "cf33fea8-b30f-424f-ab73-c48d99e0b222", "tenantId": "<>" } @@ -638,11 +638,11 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { }, "diagnosticsStorageAccountConfig": { "value": { - "blobEndpoint": "https://adp<>azsaweux001.blob.core.windows.net/", + "blobEndpoint": "https://${resourceGroupResources.outputs.storageAccountResourceName}.blob.core.windows.net/", "protectedAccountKeyName": "StorageAccountKey1", - "queueEndpoint": "https://adp<>azsaweux001.queue.core.windows.net/", - "storageAccountName": "adp<>azsaweux001", - "tableEndpoint": "https://adp<>azsaweux001.table.core.windows.net/" + "queueEndpoint": "https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.core.windows.net/", + "storageAccountName": "", + "tableEndpoint": "https://${resourceGroupResources.outputs.storageAccountResourceName}.table.core.windows.net/" } }, "fabricSettings": { From 7b28deb90514dcb466584b57a1c458bff91ea15a Mon Sep 17 00:00:00 2001 From: Elena Batanero <46710322+elbatane@users.noreply.github.com> Date: Mon, 31 Oct 2022 11:51:29 +0100 Subject: [PATCH 16/19] Update modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep Co-authored-by: Alexander Sehr --- .../clusters/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep index c35443be09..b5e0c84b21 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep @@ -92,7 +92,7 @@ module testDeployment '../../deploy.bicep' = { } ] diagnosticsStorageAccountConfig: { - blobEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.blob.core.windows.net/' + blobEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.blob.${environment().suffixes.storage}/' protectedAccountKeyName: 'StorageAccountKey1' queueEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.core.windows.net/' storageAccountName: resourceGroupResources.outputs.storageAccountResourceName From d19a170b869f064cffc671a1c7bc87a861817a6e Mon Sep 17 00:00:00 2001 From: Elena Batanero <46710322+elbatane@users.noreply.github.com> Date: Mon, 31 Oct 2022 11:51:36 +0100 Subject: [PATCH 17/19] Update modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep Co-authored-by: Alexander Sehr --- .../clusters/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep index b5e0c84b21..6c4578ea28 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep @@ -94,7 +94,7 @@ module testDeployment '../../deploy.bicep' = { diagnosticsStorageAccountConfig: { blobEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.blob.${environment().suffixes.storage}/' protectedAccountKeyName: 'StorageAccountKey1' - queueEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.core.windows.net/' + queueEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.${environment().suffixes.storage}/' storageAccountName: resourceGroupResources.outputs.storageAccountResourceName tableEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.table.core.windows.net/' } From 53272f929652ddef791508fc620600dcb32e011b Mon Sep 17 00:00:00 2001 From: Elena Batanero <46710322+elbatane@users.noreply.github.com> Date: Mon, 31 Oct 2022 11:51:41 +0100 Subject: [PATCH 18/19] Update modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep Co-authored-by: Alexander Sehr --- .../clusters/.test/common/deploy.test.bicep | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep index 6c4578ea28..916608e10a 100644 --- a/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep +++ b/modules/Microsoft.ServiceFabric/clusters/.test/common/deploy.test.bicep @@ -96,7 +96,7 @@ module testDeployment '../../deploy.bicep' = { protectedAccountKeyName: 'StorageAccountKey1' queueEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.${environment().suffixes.storage}/' storageAccountName: resourceGroupResources.outputs.storageAccountResourceName - tableEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.table.core.windows.net/' + tableEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.table.${environment().suffixes.storage}/' } fabricSettings: [ { From b5a04d8de5ebd87da02dd2462894597667f87959 Mon Sep 17 00:00:00 2001 From: Elena Batanero Garcia Date: Mon, 31 Oct 2022 12:00:58 +0100 Subject: [PATCH 19/19] Updaed readme --- modules/Microsoft.ServiceFabric/clusters/readme.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/Microsoft.ServiceFabric/clusters/readme.md b/modules/Microsoft.ServiceFabric/clusters/readme.md index 5941bf8417..aa12cb360b 100644 --- a/modules/Microsoft.ServiceFabric/clusters/readme.md +++ b/modules/Microsoft.ServiceFabric/clusters/readme.md @@ -436,11 +436,11 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { } ] diagnosticsStorageAccountConfig: { - blobEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.blob.core.windows.net/' + blobEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.blob.${environment().suffixes.storage}/' protectedAccountKeyName: 'StorageAccountKey1' - queueEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.core.windows.net/' + queueEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.${environment().suffixes.storage}/' storageAccountName: '' - tableEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.table.core.windows.net/' + tableEndpoint: 'https://${resourceGroupResources.outputs.storageAccountResourceName}.table.${environment().suffixes.storage}/' } fabricSettings: [ { @@ -638,11 +638,11 @@ module clusters './Microsoft.ServiceFabric/clusters/deploy.bicep' = { }, "diagnosticsStorageAccountConfig": { "value": { - "blobEndpoint": "https://${resourceGroupResources.outputs.storageAccountResourceName}.blob.core.windows.net/", + "blobEndpoint": "https://${resourceGroupResources.outputs.storageAccountResourceName}.blob.${environment().suffixes.storage}/", "protectedAccountKeyName": "StorageAccountKey1", - "queueEndpoint": "https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.core.windows.net/", + "queueEndpoint": "https://${resourceGroupResources.outputs.storageAccountResourceName}.queue.${environment().suffixes.storage}/", "storageAccountName": "", - "tableEndpoint": "https://${resourceGroupResources.outputs.storageAccountResourceName}.table.core.windows.net/" + "tableEndpoint": "https://${resourceGroupResources.outputs.storageAccountResourceName}.table.${environment().suffixes.storage}/" } }, "fabricSettings": {