diff --git a/settings/remarks/microsoft.aadiam/remarks.json b/settings/remarks/microsoft.aadiam/remarks.json index bc501e82..0ca83ee8 100644 --- a/settings/remarks/microsoft.aadiam/remarks.json +++ b/settings/remarks/microsoft.aadiam/remarks.json @@ -6,5 +6,12 @@ "Path": "samples/diagnosticsettings/main.tf", "Description": "A basic example of deploying Azure Active Directory Diagnostic Setting for Azure Monitor." } + ], + "BicepSamples": [ + { + "ResourceType": "Microsoft.AADIAM/diagnosticSettings", + "Path": "samples/diagnosticsettings/main.bicep", + "Description": "A basic example of deploying Azure Active Directory Diagnostic Setting for Azure Monitor." + } ] } diff --git a/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep b/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep new file mode 100644 index 00000000..2bcbf99d --- /dev/null +++ b/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep @@ -0,0 +1,40 @@ +targetScope = 'tenant' + +param resourceName string = 'acctest0001' +param location string = 'westus' + +resource diagnosticSetting 'Microsoft.AADIAM/diagnosticSettings@2017-04-01' = { + name: '${resourceName}-DS-unique' + properties: { + logs: [ + { + category: 'RiskyUsers' + enabled: true + } + { + category: 'ServicePrincipalSignInLogs' + enabled: true + } + { + category: 'SignInLogs' + enabled: true + } + { + enabled: true + category: 'B2CRequestLogs' + } + { + category: 'UserRiskEvents' + enabled: true + } + { + category: 'NonInteractiveUserSignInLogs' + enabled: true + } + { + category: 'AuditLogs' + enabled: true + } + ] + } +} diff --git a/settings/remarks/microsoft.advisor/remarks.json b/settings/remarks/microsoft.advisor/remarks.json index c0325475..b9c1d588 100644 --- a/settings/remarks/microsoft.advisor/remarks.json +++ b/settings/remarks/microsoft.advisor/remarks.json @@ -6,5 +6,12 @@ "Path": "samples/recommendations/suppressions/main.tf", "Description": "A basic example of deploying Specifies a suppression for an Azure Advisor recommendation." } + ], + "BicepSamples": [ + { + "ResourceType": "Microsoft.Advisor/recommendations/suppressions", + "Path": "samples/recommendations/suppressions/main.bicep", + "Description": "A basic example of deploying Specifies a suppression for an Azure Advisor recommendation." + } ] } diff --git a/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep b/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep new file mode 100644 index 00000000..64544045 --- /dev/null +++ b/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep @@ -0,0 +1,11 @@ +param resourceName string = 'acctest0001' +param location string = 'westus' +param recommendationId string + +resource suppression 'Microsoft.Advisor/recommendations/suppressions@2023-01-01' = { + name: resourceName + properties: { + suppressionId: '' + ttl: '00:30:00' + } +} diff --git a/settings/remarks/microsoft.alertsmanagement/samples/actionrules/main.bicep b/settings/remarks/microsoft.alertsmanagement/samples/actionrules/main.bicep index c6fba9b9..2250350d 100644 --- a/settings/remarks/microsoft.alertsmanagement/samples/actionrules/main.bicep +++ b/settings/remarks/microsoft.alertsmanagement/samples/actionrules/main.bicep @@ -1,18 +1,17 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource actionRule 'Microsoft.AlertsManagement/actionRules@2021-08-08' = { name: resourceName location: 'global' properties: { + enabled: true + scopes: [] actions: [ { actionType: 'RemoveAllActionGroups' } ] description: '' - enabled: true - scopes: [ - resourceGroup().id - ] } } diff --git a/settings/remarks/microsoft.alertsmanagement/samples/prometheusrulegroups/main.bicep b/settings/remarks/microsoft.alertsmanagement/samples/prometheusrulegroups/main.bicep index 3ef991c6..2774d229 100644 --- a/settings/remarks/microsoft.alertsmanagement/samples/prometheusrulegroups/main.bicep +++ b/settings/remarks/microsoft.alertsmanagement/samples/prometheusrulegroups/main.bicep @@ -1,34 +1,34 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource account 'Microsoft.Monitor/accounts@2023-04-03' = { - name: resourceName - location: location - properties: { - publicNetworkAccess: 'Enabled' - } -} - resource prometheusRuleGroup 'Microsoft.AlertsManagement/prometheusRuleGroups@2023-03-01' = { name: resourceName location: location properties: { + scopes: [ + account.id + ] clusterName: '' description: '' enabled: false rules: [ { - enabled: false - expression: '''histogram_quantile(0.99, sum(rate(jobs_duration_seconds_bucket{service="billing-processing"}[5m])) by (job_type)) -''' labels: { team: 'prod' } record: 'job_type:billing_jobs_duration_seconds:99p5m' + enabled: false + expression: '''histogram_quantile(0.99, sum(rate(jobs_duration_seconds_bucket{service="billing-processing"}[5m])) by (job_type)) +''' } ] - scopes: [ - account.id - ] + } +} + +resource account 'Microsoft.Monitor/accounts@2023-04-03' = { + name: resourceName + location: location + properties: { + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep b/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep index 7c2efcf8..8f823c6d 100644 --- a/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep +++ b/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep @@ -1,12 +1,39 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource smartDetectorAlertRule 'microsoft.alertsManagement/smartDetectorAlertRules@2019-06-01' = { + name: resourceName + location: 'global' + properties: { + actionGroups: { + customEmailSubject: '' + customWebhookPayload: '' + groupIds: [ + actionGroup.id + ] + } + description: '' + detector: { + id: 'FailureAnomaliesDetector' + } + frequency: 'PT1M' + scope: [ + component.id + ] + severity: 'Sev0' + state: 'Enabled' + } +} + resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { name: resourceName location: 'global' properties: { + logicAppReceivers: [] + smsReceivers: [] + voiceReceivers: [] + webhookReceivers: [] armRoleReceivers: [] - automationRunbookReceivers: [] azureAppPushReceivers: [] azureFunctionReceivers: [] emailReceivers: [] @@ -14,10 +41,7 @@ resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { eventHubReceivers: [] groupShortName: 'acctestag' itsmReceivers: [] - logicAppReceivers: [] - smsReceivers: [] - voiceReceivers: [] - webhookReceivers: [] + automationRunbookReceivers: [] } } @@ -26,37 +50,13 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { + publicNetworkAccessForIngestion: 'Enabled' Application_Type: 'web' + publicNetworkAccessForQuery: 'Enabled' DisableIpMasking: false DisableLocalAuth: false ForceCustomerStorageForProfiler: false RetentionInDays: 90 SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - } -} - -resource smartDetectorAlertRule 'microsoft.alertsManagement/smartDetectorAlertRules@2019-06-01' = { - name: resourceName - location: 'global' - properties: { - actionGroups: { - customEmailSubject: '' - customWebhookPayload: '' - groupIds: [ - actionGroup.id - ] - } - description: '' - detector: { - id: 'FailureAnomaliesDetector' - } - frequency: 'PT1M' - scope: [ - component.id - ] - severity: 'Sev0' - state: 'Enabled' } } diff --git a/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep b/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep index 828a8406..1a5e246e 100644 --- a/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep +++ b/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep @@ -4,16 +4,16 @@ param location string = 'westeurope' resource server 'Microsoft.AnalysisServices/servers@2017-08-01' = { name: resourceName location: location + sku: { + name: 'B1' + } properties: { - asAdministrators: { - members: [] - } ipV4FirewallSettings: { enablePowerBIService: false firewallRules: [] } - } - sku: { - name: 'B1' + asAdministrators: { + members: [] + } } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep index 6e6d91b8..c88526e7 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep @@ -6,28 +6,32 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - Application_Type: 'web' - DisableIpMasking: false DisableLocalAuth: false - ForceCustomerStorageForProfiler: false RetentionInDays: 90 - SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' + DisableIpMasking: false + ForceCustomerStorageForProfiler: false + SamplingPercentage: 100 } } resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -35,15 +39,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' - } } resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { apiType: 'http' apiVersion: '' @@ -55,23 +55,23 @@ resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { } resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { + isBuffered: true + loggerType: 'applicationInsights' credentials: { instrumentationKey: component.properties.InstrumentationKey } description: '' - isBuffered: true - loggerType: 'applicationInsights' } } resource diagnostic 'Microsoft.ApiManagement/service/apis/diagnostics@2021-08-01' = { - parent: api name: 'applicationinsights' + parent: api properties: { - loggerId: logger.id operationNameFormat: 'Name' + loggerId: logger.id } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep index c15f73f6..628c0899 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep @@ -1,10 +1,18 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -14,34 +22,26 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { - apiRevisionDescription: '' - apiType: 'http' - apiVersion: '' - apiVersionDescription: '' - authenticationSettings: {} - description: '' - displayName: 'api1' path: 'api1' protocols: [ 'https' ] + authenticationSettings: {} + description: '' serviceUrl: '' subscriptionRequired: true type: 'http' + apiRevisionDescription: '' + apiType: 'http' + apiVersion: '' + apiVersionDescription: '' + displayName: 'api1' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep index 28df9ff6..6b824a82 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep @@ -1,41 +1,35 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-am' location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { - certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' + certificates: [] } } resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { - parent: service name: '${resourceName}-api;rev=1' + parent: service properties: { - apiRevisionDescription: '' - apiType: 'http' - apiVersionDescription: '' - authenticationSettings: {} description: 'What is my purpose? You parse butter.' - displayName: 'Butter Parser' - path: 'butter-parser' protocols: [ 'http' 'https' @@ -45,14 +39,20 @@ resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { header: 'X-Butter-Robot-API-Key' query: 'location' } + apiType: 'http' + authenticationSettings: {} + displayName: 'Butter Parser' + path: 'butter-parser' subscriptionRequired: true type: 'http' + apiRevisionDescription: '' + apiVersionDescription: '' } } resource operation 'Microsoft.ApiManagement/service/apis/operations@2022-08-01' = { - parent: api name: '${resourceName}-operation' + parent: api properties: { description: '' displayName: 'DELETE Resource' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/policies/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/policies/main.bicep index 181e1961..e5e62f93 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/policies/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/policies/main.bicep @@ -4,7 +4,16 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -13,42 +22,33 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { - apiRevisionDescription: '' - apiType: 'http' + type: 'http' apiVersion: '' - apiVersionDescription: '' authenticationSettings: {} description: '' displayName: 'api1' + serviceUrl: '' + apiRevisionDescription: '' + apiType: 'http' + apiVersionDescription: '' path: 'api1' protocols: [ 'https' ] - serviceUrl: '' subscriptionRequired: true - type: 'http' } } resource policy 'Microsoft.ApiManagement/service/apis/policies@2021-08-01' = { - parent: api name: 'policy' + parent: api properties: { format: 'xml' value: ''' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep index e62d1103..8ba31065 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep @@ -4,8 +4,11 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { - certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' @@ -18,37 +21,34 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' + certificates: [] } } resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { apiRevisionDescription: '' - apiType: 'http' apiVersion: '' - apiVersionDescription: '' authenticationSettings: {} + path: 'api1' + serviceUrl: '' + type: 'http' + apiType: 'http' + apiVersionDescription: '' description: '' displayName: 'api1' - path: 'api1' protocols: [ 'https' ] - serviceUrl: '' subscriptionRequired: true - type: 'http' } } resource schema 'Microsoft.ApiManagement/service/apis/schemas@2021-08-01' = { - parent: api name: resourceName + parent: api properties: { contentType: 'application/vnd.ms-azure-apim.xsd+xml' document: { diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/tagdescriptions/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/tagdescriptions/main.bicep index 4f4c4267..e2330250 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/tagdescriptions/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/tagdescriptions/main.bicep @@ -4,56 +4,56 @@ param location string = 'westus' resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-service' location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { - parent: service name: '${resourceName}-api;rev=1' + parent: service properties: { apiRevisionDescription: '' apiType: 'http' apiVersionDescription: '' authenticationSettings: {} displayName: 'api1' - path: 'api1' protocols: [ 'https' ] subscriptionRequired: true + path: 'api1' type: 'http' } } resource tag 'Microsoft.ApiManagement/service/tags@2022-08-01' = { - parent: service name: '${resourceName}-tag' + parent: service properties: { - displayName: 'acctest0001-tag' + displayName: '${resourceName}-tag' } } resource tagDescription 'Microsoft.ApiManagement/service/apis/tagDescriptions@2022-08-01' = { - parent: api name: '${resourceName}-tag' + parent: api properties: { description: 'tag description' externalDocsDescription: 'external tag description' @@ -62,6 +62,6 @@ resource tagDescription 'Microsoft.ApiManagement/service/apis/tagDescriptions@20 } resource tag1 'Microsoft.ApiManagement/service/apis/tags@2022-08-01' = { - parent: api name: '${resourceName}-tag' + parent: api } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep index 9263f2e8..fe282480 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep @@ -4,14 +4,18 @@ param location string = 'westus' resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-service' location: location + sku: { + name: 'Consumption' + capacity: 0 + } properties: { certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -19,34 +23,30 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' - } } resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { - parent: service name: '${resourceName}-api;rev=1' + parent: service properties: { - apiRevisionDescription: '' - apiType: 'http' - apiVersionDescription: '' - authenticationSettings: {} displayName: 'api1' - path: 'api1' protocols: [ 'https' ] + apiType: 'http' + apiVersionDescription: '' + path: 'api1' subscriptionRequired: true type: 'http' + apiRevisionDescription: '' + authenticationSettings: {} } } resource tag 'Microsoft.ApiManagement/service/tags@2022-08-01' = { - parent: service name: '${resourceName}-tag' + parent: service properties: { - displayName: 'acctest0001-tag' + displayName: '${resourceName}-tag' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep index 079e3fb3..3651e9c9 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep @@ -4,8 +4,11 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { - certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' @@ -18,16 +21,13 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' + certificates: [] } } resource apiVersionSet 'Microsoft.ApiManagement/service/apiVersionSets@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: 'TestDescription1' displayName: 'TestApiVersionSet1230630032559674766' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep index 244a30d9..b1b8ff90 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep @@ -9,48 +9,48 @@ param oauthClientSecret string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + name: 'Consumption' + capacity: 0 + } properties: { - certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' + certificates: [] } } resource authorizationServer 'Microsoft.ApiManagement/service/authorizationServers@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { + clientRegistrationEndpoint: 'https://azacceptance.hashicorptest.com/client/register' + defaultScope: '' + resourceOwnerPassword: '' + supportState: false + tokenBodyParameters: [] authorizationEndpoint: 'https://azacceptance.hashicorptest.com/client/authorize' authorizationMethods: [ 'GET' ] clientAuthenticationMethod: [] - clientId: null - clientRegistrationEndpoint: 'https://azacceptance.hashicorptest.com/client/register' - clientSecret: null - defaultScope: '' + clientSecret: '${oauthClientSecret}' description: '' displayName: 'Test Group' grantTypes: [ 'implicit' ] - resourceOwnerPassword: '' resourceOwnerUsername: '' - supportState: false - tokenBodyParameters: [] + clientId: '${oauthClientId}' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/backends/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/backends/main.bicep index aa963401..5319fc94 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/backends/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/backends/main.bicep @@ -4,7 +4,15 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -14,20 +22,12 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource backend 'Microsoft.ApiManagement/service/backends@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { protocol: 'http' url: 'https://acctest' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep index 63f1096f..f46fdb82 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep @@ -3,6 +3,7 @@ param location string = 'westeurope' resource redis 'Microsoft.Cache/redis@2023-04-01' = { name: resourceName + location: 'eastus' properties: { enableNonSslPort: true minimumTlsVersion: '1.2' @@ -17,7 +18,13 @@ resource redis 'Microsoft.Cache/redis@2023-04-01' = { resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + name: 'Consumption' + capacity: 0 + } properties: { + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -29,20 +36,14 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource cache 'Microsoft.ApiManagement/service/caches@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - connectionString: '${redis.name}.redis.cache.windows.net:6380,password=redis.listKeys().primaryKey,ssl=true,abortConnect=False' + connectionString: '${redis.name}.redis.cache.windows.net:6380,password=${redis.listKeys().primaryKey},ssl=true,abortConnect=False' useFromLocation: 'default' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep index 9fa37d0f..c5d0a2f3 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep @@ -4,30 +4,30 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource certificate 'Microsoft.ApiManagement/service/certificates@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { data: 'MIIKmQIBAzCCCl8GCSqGSIb3DQEHAaCCClAEggpMMIIKSDCCBP8GCSqGSIb3DQEHBqCCBPAwggTsAgEAMIIE5QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIp1c0ydxiVG0CAggAgIIEuA5qATScE+dBHsldt+cfd/PjV+FAei7+lyYXm2IN1TZ1mFEce3T6MlGaqXoHMlYlIEVtvxNp2qpbYyGbboCRYTmB1tHbDbwDAg0bO8J8ing2xOvkoKx+sFX7L0I+FcGz5ucJRoDus6K6GdMgWOi+vlEdliBpH7Lgk+8+SXpFf/JadnEY49Dr4XMUBs/fXe6BxB89b9H/5mUg1SQFuxnGQrdvEW7tNFJR7k9BUO/95X8b4mQZdqfXBzgayOKTcB7JShXA9gjyAbxsF2g5EXlmWNJoRVo8xPcybPgarDdfjM4L0eEzvB4mgn6JimCaHxt9Gb3PGhPJ0mFzVbJTPQgiFpjpREwDWVYk7LeKvjyLn70O9pQyCi8tjZGw5XfIHlt7P+EHEdXXYR7z7gbgNQmWFMjYEX2puAKjYyjYsZ3ZxlWWNsrWZA/lNE5BgIBAcNAT2NBGAGbe4floniM8RPpQJ/Tj53nFQxav2sY/toWRSA8z7/bMGmQZEh9Dun61YJc+yb0dzn0K98FlEw1+Uu4fR8l6/e4xvmpdH3tOVak0xFRJLdILlO9VwJ3Ins8CODFHV4J4DnuMyINonctjTl9qy66+pVf6ePX0Io5k+49hU3u19jZy/oN8xxTGDMGVQinZ19yNC5TJ7RJ4fb682Jk+P8dwc+1icbBydZo3a/n1JdglMjPJK4+f0iW/+KIBFD2oZlEt8/Hi+IzyXT2BJHuZJmPa61vxHurA/urGH06ybpcrSEkBC0Lcm07Ie5Ov/UQVcdwF2MM3f3Iv5hrdRogBmB5pe1sYwNGJanCy4dABwpu+qVrtBGZEdBRl4h6IUTTzFDJltVcAmi60blvB8pCufDnD+PdJobAD5FIcsMDl0hiB7AgDbtOWygE1i/b5GnoVsfOGt4iUclikKxCig4m500IgX/XgUBiY1RwkHIXZQ1mXyWBAnaFgPA7BOt70Qbj9wy9S60FvrElVG9NWXuTdGY+ECWkoEzjiGnCEL+T1Cv43b8SlL5GCCftIUHlM/ss8oBzcJmUJsUsv/ZHTcj3GKyHud5cIT4rli542dDkoZj0O6fsvE+yFM7kZaQrTzuPlstfnvi5OeJQ4+aJBeL+rEXvEspLn02i2Rg1afZAll6fk+epPJOxW2pkrVslDMj/0RfLr4dRi5uzBiJb3pILfCDJs9Nqzj2GMWOFudQn5OHbcbx6dtoB1RcdsZHSGTn+MrjoXey2nmIlg372aLR7tCH06Z66U9FagAr51DZAKq2ry0T6gR4sWtzHlS063xFH4JeCHAJouWqEwgxeBu1zSZneDlMaC1ifcB0fOML8658vi1B697wLP0Muc6UW4mqfuN7AMl1fJQ7vO5oTDgWbPd6bSrLk46zmN3vC3VzMqQVa/1BbKgGkTOaVIZJuK0OuN2hyaVLNvm8XQ2O5QWE6aY2l3fm7m4hbT2AXRd/ulquZRhbQa7jIyjTb6SwLZG9wpvRJ5pR/C1V/QitI4GrViMOgEX+LV2TzXZxmkBV45/dDJ9Vh+2LEUKvcbkWjxZEbgltyCOdDHbTA5ydcNCHi/t/L371N6mCcXJH4FC7za1LpNmXeRIZa4lUuW602YH0DCYTnZ95UqMNyXMIIFQQYJKoZIhvcNAQcBoIIFMgSCBS4wggUqMIIFJgYLKoZIhvcNAQwKAQKgggTuMIIE6jAcBgoqhkiG9w0BDAEDMA4ECMwUHG/3/JVkAgIIAASCBMivDxcmzXtuXLPeu468SGYRJk994sSYqjK6fKP4090KXsDgX+IkggKJWqZqyRb0Dq7EusKpMyrSJNtz9Cfl3+S/vsbX6mGz4TY1g4VNvkyJyUjqUjKIDL2SlULRa7ldEvpOciy0Ms/6PBQXOTyVr5Rd1dFUFSbkLAruIWTULK0OfQoFjuQXmDvunRBrqSbHtjID9m1OwdcTfzMGHjsXth3iSWSTTh5+Eg/6H+/9kGC9VEEURqFD3Gx2kWKjqSlZyf/LSOTBcQ6+qRQZT1B1ZnPAVBU9Xn9Z6Tq0EMNfNg9+pv1GlLBUg1Hqo8RAW1nNOBSBHXS0nq062j48luQOotthKOc1rkjQd91Q9qTLFlU12gllQw+ejHVVvEEPHtxJ7HVr/lvM/5mt2oObTJb01JcfVnYrnI3NnNSWRULx/tznhB2yoKqjtrnZAW3zNU9TQQVyLVjt2lIXhE4oXk0I+Cxmvbh+YJF6XLrATGc6yuL02ZInrC59ufkclcnjnTSGnXWr9gzIndZ6wSS0B+6bMpLxamvE4XDhAQCn6MEGGVcY9nMydxaWU3o7Is0J1nd/KZWgfXeOoZx10olSR22+PBKy8Gsge2mMbR2QvhUKNyXLTV3pOnxtjGf88PhseqDpwZ5++DOSFfi0spsDvfXJNO0F0f0JYrMNXbqlxO4uExj146thivXZVlR1n5Bo4eL0OoVIXn1w/MuU0suQvZm+kD8uVuajyBnJsnhsCWx2eTZ2vzHQTKB2EtYeDPioWSomTVVjIdg8A9pTzvvhe8MzFXvRMXFc9+ToN+uLjJqHRSmpZIGJvZQXCKrlCC9KRjP1HIhJhyfuYoEjTkF3IVeXS1tnA5CH5oilOG+guLKXNPWsrCXEpewz6i907ugx/VWTAmEMzYwMCDzCnW2l+mI8P56nWrwI0vDuk1GhIs6nn+Nhc6FPHD1996zyZ7hfmO7h25tto00IoVgI9QlhwtWLz10ZltLG581JvO7jEwT4u/nYxD7aO0Llb3ytNKihalFZMaY20a1dhVBsPwiWUpZcMmPoYySSiukyw350WiV/Z2NAsyeGRTWpdKcBi7gna0NN6fn0QLSdTcPKutASCplNExnI1IkkBFb3TmlF5HrrwmVht+vqxEHbRjDwEnKkvGcUbLWdjUjSWVNNbCbo8KbLAXcBPcjTHxIRw3gkLcS+yL0//uSENgo/LpHBZsO5d6as820lpYmHIjvyxhAMpMNlOPmUIW+cOgcf328wNaHaVWalIwfSGJdqGgC4msvP8vOcGWYgLkdrqJGWjhDs40x7LuFEBWgpgu6E2FfPOPTsqs5QxNKTgCw/eXjK92dZkdqO0Y7oLavU3OaJeWFJpAuZcC84Rwup2K0d4CXvZ0bOtpISSTr3VZeXRl8SkN2bQtgit9BJ2qGAy9blNObk1q8yOaVppercZMgG96DK23ZQ9uLRmliqytE1tXFKNKegwxGorKodoMwpRzClBz37KIYGJvFOYVya11v3gdcfeMcRTPdZG5dbI6US9DNk6fbShBJpc7PvYgMc8Vr+xEfzZXPnY2M8d+uJJomrU5ZQXcjy9jtyE4ToBz5ajh4Hq6Khlv6v5y2C+GrXb5+2KoSkcAYpTxlzAnjk9pYMZkwxJTAjBgkqhkiG9w0BCRUxFgQURdOwIJIHIprOPt5IqfZOf/7JJoQwMTAhMAkGBSsOAwIaBQAEFCaYzKHAOxuYPxNGezkbQ8Tp9cGsBAiTp8/jb7QK5AICCAAK' password: '' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep index 247cece4..dc053014 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep @@ -1,26 +1,19 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: resourceName - location: location - kind: 'web' - properties: { - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - } -} - resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -29,36 +22,42 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource diagnostic 'Microsoft.ApiManagement/service/diagnostics@2021-08-01' = { - parent: service name: 'applicationinsights' + parent: service properties: { - loggerId: logger.id operationNameFormat: 'Name' } } resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { + isBuffered: true + loggerType: 'applicationInsights' credentials: { instrumentationKey: component.properties.InstrumentationKey } description: '' - isBuffered: true - loggerType: 'applicationInsights' + } +} + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' + DisableIpMasking: false + RetentionInDays: 90 + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep index d400e9d2..5bb22b77 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep @@ -10,25 +10,29 @@ param certificatePassword string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false @@ -37,38 +41,34 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource certificate 'Microsoft.ApiManagement/service/certificates@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - data: null - password: null + data: '${certificateData}' + password: '${certificatePassword}' } } resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - description: '' locationData: { city: '' countryOrRegion: '' district: '' name: 'test' } + description: '' } } resource certificateAuthority 'Microsoft.ApiManagement/service/gateways/certificateAuthorities@2021-08-01' = { + name: 'azapi_resource.certificate.name' parent: gateway - name: 'certificate.name' properties: { isTrusted: false } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep index 30472942..b7a26773 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep @@ -4,26 +4,30 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -31,15 +35,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource certificate 'Microsoft.ApiManagement/service/certificates@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { data: 'MIIKmQIBAzCCCl8GCSqGSIb3DQEHAaCCClAEggpMMIIKSDCCBP8GCSqGSIb3DQEHBqCCBPAwggTsAgEAMIIE5QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIp1c0ydxiVG0CAggAgIIEuA5qATScE+dBHsldt+cfd/PjV+FAei7+lyYXm2IN1TZ1mFEce3T6MlGaqXoHMlYlIEVtvxNp2qpbYyGbboCRYTmB1tHbDbwDAg0bO8J8ing2xOvkoKx+sFX7L0I+FcGz5ucJRoDus6K6GdMgWOi+vlEdliBpH7Lgk+8+SXpFf/JadnEY49Dr4XMUBs/fXe6BxB89b9H/5mUg1SQFuxnGQrdvEW7tNFJR7k9BUO/95X8b4mQZdqfXBzgayOKTcB7JShXA9gjyAbxsF2g5EXlmWNJoRVo8xPcybPgarDdfjM4L0eEzvB4mgn6JimCaHxt9Gb3PGhPJ0mFzVbJTPQgiFpjpREwDWVYk7LeKvjyLn70O9pQyCi8tjZGw5XfIHlt7P+EHEdXXYR7z7gbgNQmWFMjYEX2puAKjYyjYsZ3ZxlWWNsrWZA/lNE5BgIBAcNAT2NBGAGbe4floniM8RPpQJ/Tj53nFQxav2sY/toWRSA8z7/bMGmQZEh9Dun61YJc+yb0dzn0K98FlEw1+Uu4fR8l6/e4xvmpdH3tOVak0xFRJLdILlO9VwJ3Ins8CODFHV4J4DnuMyINonctjTl9qy66+pVf6ePX0Io5k+49hU3u19jZy/oN8xxTGDMGVQinZ19yNC5TJ7RJ4fb682Jk+P8dwc+1icbBydZo3a/n1JdglMjPJK4+f0iW/+KIBFD2oZlEt8/Hi+IzyXT2BJHuZJmPa61vxHurA/urGH06ybpcrSEkBC0Lcm07Ie5Ov/UQVcdwF2MM3f3Iv5hrdRogBmB5pe1sYwNGJanCy4dABwpu+qVrtBGZEdBRl4h6IUTTzFDJltVcAmi60blvB8pCufDnD+PdJobAD5FIcsMDl0hiB7AgDbtOWygE1i/b5GnoVsfOGt4iUclikKxCig4m500IgX/XgUBiY1RwkHIXZQ1mXyWBAnaFgPA7BOt70Qbj9wy9S60FvrElVG9NWXuTdGY+ECWkoEzjiGnCEL+T1Cv43b8SlL5GCCftIUHlM/ss8oBzcJmUJsUsv/ZHTcj3GKyHud5cIT4rli542dDkoZj0O6fsvE+yFM7kZaQrTzuPlstfnvi5OeJQ4+aJBeL+rEXvEspLn02i2Rg1afZAll6fk+epPJOxW2pkrVslDMj/0RfLr4dRi5uzBiJb3pILfCDJs9Nqzj2GMWOFudQn5OHbcbx6dtoB1RcdsZHSGTn+MrjoXey2nmIlg372aLR7tCH06Z66U9FagAr51DZAKq2ry0T6gR4sWtzHlS063xFH4JeCHAJouWqEwgxeBu1zSZneDlMaC1ifcB0fOML8658vi1B697wLP0Muc6UW4mqfuN7AMl1fJQ7vO5oTDgWbPd6bSrLk46zmN3vC3VzMqQVa/1BbKgGkTOaVIZJuK0OuN2hyaVLNvm8XQ2O5QWE6aY2l3fm7m4hbT2AXRd/ulquZRhbQa7jIyjTb6SwLZG9wpvRJ5pR/C1V/QitI4GrViMOgEX+LV2TzXZxmkBV45/dDJ9Vh+2LEUKvcbkWjxZEbgltyCOdDHbTA5ydcNCHi/t/L371N6mCcXJH4FC7za1LpNmXeRIZa4lUuW602YH0DCYTnZ95UqMNyXMIIFQQYJKoZIhvcNAQcBoIIFMgSCBS4wggUqMIIFJgYLKoZIhvcNAQwKAQKgggTuMIIE6jAcBgoqhkiG9w0BDAEDMA4ECMwUHG/3/JVkAgIIAASCBMivDxcmzXtuXLPeu468SGYRJk994sSYqjK6fKP4090KXsDgX+IkggKJWqZqyRb0Dq7EusKpMyrSJNtz9Cfl3+S/vsbX6mGz4TY1g4VNvkyJyUjqUjKIDL2SlULRa7ldEvpOciy0Ms/6PBQXOTyVr5Rd1dFUFSbkLAruIWTULK0OfQoFjuQXmDvunRBrqSbHtjID9m1OwdcTfzMGHjsXth3iSWSTTh5+Eg/6H+/9kGC9VEEURqFD3Gx2kWKjqSlZyf/LSOTBcQ6+qRQZT1B1ZnPAVBU9Xn9Z6Tq0EMNfNg9+pv1GlLBUg1Hqo8RAW1nNOBSBHXS0nq062j48luQOotthKOc1rkjQd91Q9qTLFlU12gllQw+ejHVVvEEPHtxJ7HVr/lvM/5mt2oObTJb01JcfVnYrnI3NnNSWRULx/tznhB2yoKqjtrnZAW3zNU9TQQVyLVjt2lIXhE4oXk0I+Cxmvbh+YJF6XLrATGc6yuL02ZInrC59ufkclcnjnTSGnXWr9gzIndZ6wSS0B+6bMpLxamvE4XDhAQCn6MEGGVcY9nMydxaWU3o7Is0J1nd/KZWgfXeOoZx10olSR22+PBKy8Gsge2mMbR2QvhUKNyXLTV3pOnxtjGf88PhseqDpwZ5++DOSFfi0spsDvfXJNO0F0f0JYrMNXbqlxO4uExj146thivXZVlR1n5Bo4eL0OoVIXn1w/MuU0suQvZm+kD8uVuajyBnJsnhsCWx2eTZ2vzHQTKB2EtYeDPioWSomTVVjIdg8A9pTzvvhe8MzFXvRMXFc9+ToN+uLjJqHRSmpZIGJvZQXCKrlCC9KRjP1HIhJhyfuYoEjTkF3IVeXS1tnA5CH5oilOG+guLKXNPWsrCXEpewz6i907ugx/VWTAmEMzYwMCDzCnW2l+mI8P56nWrwI0vDuk1GhIs6nn+Nhc6FPHD1996zyZ7hfmO7h25tto00IoVgI9QlhwtWLz10ZltLG581JvO7jEwT4u/nYxD7aO0Llb3ytNKihalFZMaY20a1dhVBsPwiWUpZcMmPoYySSiukyw350WiV/Z2NAsyeGRTWpdKcBi7gna0NN6fn0QLSdTcPKutASCplNExnI1IkkBFb3TmlF5HrrwmVht+vqxEHbRjDwEnKkvGcUbLWdjUjSWVNNbCbo8KbLAXcBPcjTHxIRw3gkLcS+yL0//uSENgo/LpHBZsO5d6as820lpYmHIjvyxhAMpMNlOPmUIW+cOgcf328wNaHaVWalIwfSGJdqGgC4msvP8vOcGWYgLkdrqJGWjhDs40x7LuFEBWgpgu6E2FfPOPTsqs5QxNKTgCw/eXjK92dZkdqO0Y7oLavU3OaJeWFJpAuZcC84Rwup2K0d4CXvZ0bOtpISSTr3VZeXRl8SkN2bQtgit9BJ2qGAy9blNObk1q8yOaVppercZMgG96DK23ZQ9uLRmliqytE1tXFKNKegwxGorKodoMwpRzClBz37KIYGJvFOYVya11v3gdcfeMcRTPdZG5dbI6US9DNk6fbShBJpc7PvYgMc8Vr+xEfzZXPnY2M8d+uJJomrU5ZQXcjy9jtyE4ToBz5ajh4Hq6Khlv6v5y2C+GrXb5+2KoSkcAYpTxlzAnjk9pYMZkwxJTAjBgkqhkiG9w0BCRUxFgQURdOwIJIHIprOPt5IqfZOf/7JJoQwMTAhMAkGBSsOAwIaBQAEFCaYzKHAOxuYPxNGezkbQ8Tp9cGsBAiTp8/jb7QK5AICCAAK' password: '' @@ -47,8 +47,8 @@ resource certificate 'Microsoft.ApiManagement/service/certificates@2021-08-01' = } resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' locationData: { @@ -61,14 +61,14 @@ resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { } resource hostnameConfiguration 'Microsoft.ApiManagement/service/gateways/hostnameConfigurations@2021-08-01' = { - parent: gateway name: resourceName + parent: gateway properties: { - certificateId: certificate.id - hostname: 'host-name-230630032559671742' http2Enabled: true negotiateClientCertificate: false tls10Enabled: false tls11Enabled: false + certificateId: certificate.id + hostname: 'host-name-230630032559671742' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep index e8c528a7..2d71797a 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep @@ -4,49 +4,49 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' } } resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' locationData: { - city: '' countryOrRegion: '' district: '' name: 'test' + city: '' } } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep index dd41d7a0..cfae5b38 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep @@ -4,26 +4,30 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -31,15 +35,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource group 'Microsoft.ApiManagement/service/groups@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' displayName: 'Test Group' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep index 53ae60d6..6028868b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep @@ -9,26 +9,30 @@ param identityProviderClientSecret string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -36,18 +40,14 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource identityProvider 'Microsoft.ApiManagement/service/identityProviders@2021-08-01' = { - parent: service name: 'twitter' + parent: service properties: { - clientId: null - clientSecret: null + clientId: '${identityProviderClientId}' + clientSecret: '${identityProviderClientSecret}' type: 'twitter' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep index 5c044a15..ee345892 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep @@ -1,49 +1,33 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: resourceName - location: location - kind: 'web' - properties: { - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - } -} - resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { credentials: { instrumentationKey: component.properties.InstrumentationKey @@ -53,3 +37,19 @@ resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { loggerType: 'applicationInsights' } } + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + SamplingPercentage: 100 + Application_Type: 'web' + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + DisableIpMasking: false + DisableLocalAuth: false + } +} diff --git a/settings/remarks/microsoft.apimanagement/samples/service/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/main.bicep index 6d40bf73..f702d7cd 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/main.bicep @@ -4,35 +4,35 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + name: 'Developer' + capacity: 1 + } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep index 872f016c..45c3875f 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep @@ -4,30 +4,30 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + name: 'Consumption' + capacity: 0 + } properties: { + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource namedValue 'Microsoft.ApiManagement/service/namedValues@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { displayName: 'TestProperty230630032559683679' secret: false diff --git a/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep index 5ca9141b..80f16ce6 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep @@ -9,33 +9,33 @@ param openidClientSecret string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { - certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' + certificates: [] } } resource openidConnectProvider 'Microsoft.ApiManagement/service/openidConnectProviders@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - clientId: null - clientSecret: null + clientId: '${openidClientId}' + clientSecret: '${openidClientSecret}' description: '' displayName: 'Initial Name' metadataEndpoint: 'https://azacceptance.hashicorptest.com/example/foo' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep index b0ee6500..c3cfef2a 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep @@ -4,42 +4,42 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' } } resource policyFragment 'Microsoft.ApiManagement/service/policyFragments@2021-12-01-preview' = { - parent: service name: 'error-handler' + parent: service properties: { description: 'Fragment for Error Handling' format: 'xml' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep index 5b803d1a..f366333c 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep @@ -4,42 +4,42 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' } - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' } } resource portalsetting 'Microsoft.ApiManagement/service/portalsettings@2021-08-01' = { - parent: service name: 'signup' + parent: service properties: { enabled: false termsOfService: { diff --git a/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep index f85e8ff6..14925720 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep @@ -1,10 +1,18 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -14,25 +22,17 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { + subscriptionRequired: false + terms: '' description: '' displayName: 'Test Product' state: 'notPublished' - subscriptionRequired: false - terms: '' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep index 3fdf411f..775e19e4 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep @@ -4,14 +4,18 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -19,27 +23,23 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' - } } resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { + terms: '' description: '' displayName: 'Test Product' state: 'notPublished' subscriptionRequired: false - terms: '' } } resource policy2 'Microsoft.ApiManagement/service/products/policies@2021-08-01' = { - parent: product name: 'policy' + parent: product properties: { format: 'rawxml-link' value: 'https://gist.githubusercontent.com/riordanp/ca22f8113afae0eb38cc12d718fd048d/raw/d6ac89a2f35a6881a7729f8cb4883179dc88eea1/example.xml' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/products/tags/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/products/tags/main.bicep index b7bc916b..2916908c 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/tags/main.bicep @@ -1,33 +1,41 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' +} + +resource serviceTag 'Microsoft.ApiManagement/service/tags@2021-08-01' = { + name: resourceName + parent: service + properties: { + displayName: '${resourceName}' } } resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' displayName: 'Test Product' @@ -37,15 +45,7 @@ resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { } } -resource serviceTag 'Microsoft.ApiManagement/service/tags@2021-08-01' = { - parent: service - name: resourceName - properties: { - displayName: 'acctest0001' - } -} - resource tag 'Microsoft.ApiManagement/service/products/tags@2021-08-01' = { + name: 'azapi_resource.service_tag.name' parent: product - name: 'service_tag.name' } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep index beda098c..e14cd77b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep @@ -4,30 +4,30 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource schema 'Microsoft.ApiManagement/service/schemas@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' schemaType: 'xml' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep index bd723fb6..0a6817e8 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep @@ -1,29 +1,33 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -31,42 +35,37 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } -} - -resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - parent: service - name: resourceName - properties: { - description: '' - displayName: 'Test Product' - state: 'published' - subscriptionRequired: true - terms: '' - } } resource subscription 'Microsoft.ApiManagement/service/subscriptions@2021-08-01' = { - parent: service name: '0f393927-8f2d-499d-906f-c03943328d31' + parent: service properties: { - allowTracing: true displayName: 'Butter Parser API Enterprise Edition' - ownerId: user.id scope: product.id state: 'submitted' + allowTracing: true } } resource user 'Microsoft.ApiManagement/service/users@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { email: 'azure-acctest230630032559695401@example.com' firstName: 'Acceptance' lastName: 'Test' } } + +resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { + name: resourceName + parent: service + properties: { + displayName: 'Test Product' + state: 'published' + subscriptionRequired: true + terms: '' + description: '' + } +} diff --git a/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep index bcdae209..72d8fb4e 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep @@ -4,8 +4,11 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { - certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' @@ -18,17 +21,14 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' + certificates: [] } } resource tag 'Microsoft.ApiManagement/service/tags@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - displayName: 'acctest0001' + displayName: '${resourceName}' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep index cbb54ba1..e7fc0019 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep @@ -4,42 +4,42 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' } } resource user 'Microsoft.ApiManagement/service/users@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { email: 'azure-acctest230630032559695401@example.com' firstName: 'Acceptance' diff --git a/settings/remarks/microsoft.app/samples/containerapps/main.bicep b/settings/remarks/microsoft.app/samples/containerapps/main.bicep index 91f538b1..d37d69f7 100644 --- a/settings/remarks/microsoft.app/samples/containerapps/main.bicep +++ b/settings/remarks/microsoft.app/samples/containerapps/main.bicep @@ -1,6 +1,26 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { + name: resourceName + location: location + properties: { + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } + workspaceCapping: { + dailyQuotaGb: -1 + } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + } +} + resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { name: resourceName location: location @@ -8,7 +28,6 @@ resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { configuration: { activeRevisionsMode: 'Single' } - managedEnvironmentId: managedEnvironment.id template: { containers: [ { @@ -39,30 +58,9 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } } vnetConfiguration: {} } } - -resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { - name: resourceName - location: location - properties: { - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - retentionInDays: 30 - sku: { - name: 'PerGB2018' - } - workspaceCapping: { - dailyQuotaGb: -1 - } - } -} diff --git a/settings/remarks/microsoft.app/samples/jobs/main.bicep b/settings/remarks/microsoft.app/samples/jobs/main.bicep index 890a500a..47c804ce 100644 --- a/settings/remarks/microsoft.app/samples/jobs/main.bicep +++ b/settings/remarks/microsoft.app/samples/jobs/main.bicep @@ -14,7 +14,6 @@ resource job 'Microsoft.App/jobs@2025-01-01' = { replicaTimeout: 10 triggerType: 'Manual' } - environmentId: managedEnvironment.id template: { containers: [ { @@ -42,7 +41,6 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2025-01-01' = { appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } } diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep index eb160a33..d9e9ac86 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep @@ -11,7 +11,6 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } } @@ -23,12 +22,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 sku: { name: 'PerGB2018' @@ -36,15 +29,21 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { workspaceCapping: { dailyQuotaGb: -1 } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' } } resource certificate 'Microsoft.App/managedEnvironments/certificates@2022-03-01' = { - parent: managedEnvironment name: resourceName location: location + parent: managedEnvironment properties: { - password: null + password: '${certificatePassword}' value: 'MIIKEQIBAzCCCdcGCSqGSIb3DQEHAaCCCcgEggnEMIIJwDCCBHcGCSqGSIb3DQEHBqCCBGgwggRkAgEAMIIEXQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIC/GU56w4YWICAggAgIIEME9dVUOUs44yTqMunA5mEqo8YC4evKVXEA8ESnlfh8QVNEpyWzxwx83t6tg0Dfjk4INCGnDrAxqhQ/685mWQ9IM7J944BTznoN6uK9EqMtDVwavqwapvVR+yCCzqCMIQWUrrAiUzNPFQELCaMg1S13pjHOVd0iJSxvJ98Dga35baMyheYnLYksz1OObCyrn4yAHoyVnenqZd46He0ZmQS3pUrnTYe3U56fZDapRE6peRL5ItIpFrytaV7+KLisQdpQKDPkeew/zaf+p1hT57EHfUFgBYWFMgN4f1egqkKKDrh112Z+C6CUlps5N0AYGZ+ozLMNd1t/x87gCH5AuNeQEIBfDkmhLvZWZ5vLOiEKAoAQxFaMK+U+Vih6msysaQ7NhFA+h/NMmdt9RPm9pV7X+Qq7KNKHnhMZ7mNqxKvdidPOj5UGqhnN/OXrY8MykoedDakwwE9ZCY3ZQS9IN8kjwl2m9gJy18A2hZK+m3jEYGfn6tDayN6eAod1q/OnP7Tujp06pZFZ8HyXIbTPApuFYXSbAWhdBuCHGj0PzthLRzN8iv3T1d46oaEjjQddpM683RWH+daFtXLX7gMH4QjHxRND3IxEzHOiehLwOr2w6bgzIEeXksDPqitz/RGLgs4f10B6cvkCuGTXUCAQcel2IN4fM7dpD5uyg40q+xaFjmF/OLRdjS1vCezDvxVbRpazZOxMFMPQykBFcInP4vKURZ09MujElbBHSiglNjYGEC8k1Ehcqmz9GqU5o+9JHYFr2AgRqIIyz7jIjCZxsD0psdVjIPSYac6Qze5BK+qq/cH/ilIaNq3WGgwCtPA1pcicVYAYwB4czTHUfteO1FjlGYqbGu1b4GA4HzPLBUjTaFla4FgnO7je4PT7A3u3xaVAsCC1rZWKM4atYmkckboC4XE14mYlU625Hoap/xvKW6cbVAucBRkxMps/bV1Pik6N3YLeG2KUMQ77yNDGgv3qZ6XpgJ1Um7QZyW1XdQqtktZBror0bNUsG3Kkp/XPNxWhJLPI3baY84dqoRsXaDIh7k+iV+UuX/Tz70PqWThwANHJ2BmkwXUY1cyiHqJ4mBnu9t/oitjVVYr3a5UGKDzQY6Tcjrp22npiDrnEKpdwqUeShqb0mO4cCAksYy6jh7Eirk1Gdlk/tbMBMCN16Wbsh3kk/i9utQAc4R6+VFq5+/26noW/Q24a4onRGjZ5+rUXlGDUjzssJPxXM6906qMZIpdMB2nZMUp4P6UcPgB3t8FQa8SJs3gIFTxmf9Dce1qloHeXGX7UZ3IGZRZPqxXuBOzCbKf5/M2c3Pe6Vl3Jt/LTN22ghKR4VrVz7Ron71NU+CCvH4LbOyEnnzWe1ePO6RCdpRcN1bUJYa1htvWKb9WUMywfLiKjC6Cx+ezfFZ1DYvXsjq6MzKq22/XE4/fM0wggVBBgkqhkiG9w0BBwGgggUyBIIFLjCCBSowggUmBgsqhkiG9w0BDAoBAqCCBO4wggTqMBwGCiqGSIb3DQEMAQMwDgQIGRXiBvDEL+QCAggABIIEyLn7jmjZLfuFF366QMW9j8TolTxeyuMxsaPnEmw1sIc9Y6IlKzCqzGt3qAgSgdTPV6flNJBcoI4oQFhes7EDcpNfrAxzIRBQYS7i2JC/T68GNfkTIlb0sq8oU4JgoGMXDPjhgQ3yUNkn4xnxfpxy7N1mo41LfJVovG8JsBtg0boV2OovxKYTVFg4X1W4KD+BcJMkI+gjlmHcrnWkDFEycEddxznZINaf9LiZsoSh6gvSGXSRBrmFkG5nWXB/Q25r6cxHm4ZNIKYLFyCV8waq5R1fnvuiT62BI8vYyD1NO+Py2FGFO3vqV/7KrrD8x9eijSv2+ooe220Lqi2lR8HNlwrgh9my4Fak6SzQC5E2iAStzZrRtUr3Xfs4di8ixwgpC6HAt/egOCocKI6aJhouJJoihrow4axeKYdsjKgXairNElIu0/aTdKXptdfXuAos2ct42AHDP3TVngH6q+2B8HPyokQjegr+WE6Jfw9aHeLIBIPK3pFAUqH7hDHFt2OM4GZDaDMesNYhFaX+IJqdIbvr97eaLDFgrhVhB4kvRw7E2VW2K9aXDmDlIRP2XmXEcbC31cKzV19A4W7rEuTdJ9IJb06sCmU/jIGSdm9g+fKKXd15K9D+U+kyhCwqzEZt0JYsJIzypq15nL+QQX61renMUwfU13H0RYjjvqU3CGH3shUGcl0FvQoMPQy1a04ZvOsGiqLlR3lkiEbov7a/prJCkH1AAwezUHiSrn/Y7rVWGLHyd4k6Hd7wBvzRia3MmYDertXdEiinyMqPBiVRdd/NkSkjiBgLpHl3VleKJzmrlLfENnMt2iLSr3ZbhmVpJfn6wMhsqdIbkQT3CcSIoVo91U8JL6U38s4kArKtjgHgSUtST6Aw2o06EOWvVSp2BpsLNth/s21vK7Z1xnrZ06fO/msj+ElzsmLpPVGFpG3D8MW1ULZd2VqtK6cPFPyaYjUE3ZahGn50/DIVaSikvv6Yh4YjMBksiBfsLdndvfIit29i/eRTd3T28WPmvY87k6uG8xgYoDlwXmrBHdl57NktM8ND+Z9HUww4/issZkvvh7MdU2YbDOQsBs2kIYf6h2udRpztXBpecyI2WmFW8tsKXhv4vdx+xldEwtHQL4/UWgofkNl2LeABpn00kRjZ+rybD2p7cCmXKQbM+I6Yu564hC1lffAMBrMT5yUFgzCdmkRJT+8xp1C/zxWGx16dFImpTIPNmjGBU6UcfBg+fpFocybQ8s+yb2Xoq/s/NxpYDO5vqQT/rpPtKCQls8DLMssGgGAyvZ+e0qCnfK5BKUKtxA0tz/mXZrt+Ty6w6KjdZ6Ntmjt546tXTBeRrCJZlwJmPKehpeN5HopDQ7LyWqrKXLGlArCLmB1Xz1LUR1vL4KD7RdO/93LWN5EWQDRtoZCVFU/tCqRh+s4Ljw5jsiFBCczoF3z3dDSid3VL864bXB2neq/wHHhChSnODo6HhdaPfGYSFw7m4kFh7tn3MimFyTdJGqtPdLckFCqckZsliZyCqEAu05xgQJqjrnBEH8B/z3Aq3hHWiR0z1v8jPc8MUlBGeaTjl29c8DSx7gBh7c0Qs0yTxHd1TcELijPvy5dwzEenBYXDCbaxPW0Vm9AHsHVF2A2iuzElMCMGCSqGSIb3DQEJFTEWBBRwppPHAzTboDcfcZuQ6/YqIKiy2zAxMCEwCQYFKw4DAhoFAAQUNIuVDYFIRiHWnbIWwMphIFjOWckECND1GYVTSUGNAgIIAA==' } } diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep index 225e48b5..dedd0b74 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep @@ -1,21 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { - name: resourceName - location: location - properties: { - appLogsConfiguration: { - destination: 'log-analytics' - logAnalyticsConfiguration: { - customerId: workspace.properties.customerId - sharedKey: workspace.listKeys().primarySharedKey - } - } - vnetConfiguration: {} - } -} - resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location @@ -36,9 +21,23 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { } } +resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { + name: resourceName + location: location + properties: { + vnetConfiguration: {} + appLogsConfiguration: { + destination: 'log-analytics' + logAnalyticsConfiguration: { + sharedKey: workspace.listKeys().primarySharedKey + } + } + } +} + resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-03-01' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { componentType: 'state.azure.blobstorage' ignoreErrors: false diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep index 9e0a93f6..87123057 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep @@ -8,7 +8,6 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } } @@ -37,8 +36,8 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { } resource aspireDashboard 'Microsoft.App/managedEnvironments/dotNetComponents@2024-10-02-preview' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { componentType: 'AspireDashboard' configurations: [] diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep index 88753ea0..d080d24d 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep @@ -6,11 +6,10 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { location: location properties: { appLogsConfiguration: { - destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } + destination: 'log-analytics' } vnetConfiguration: {} } diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep index c819d4ca..2312f134 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep @@ -1,30 +1,14 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { - name: resourceName - location: location - properties: { - appLogsConfiguration: { - destination: 'log-analytics' - logAnalyticsConfiguration: { - customerId: workspace.properties.customerId - sharedKey: workspace.listKeys().primarySharedKey - } - } - vnetConfiguration: {} - } -} - resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -38,6 +22,9 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } isHnsEnabled: false + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowBlobPublicAccess: true isNfsV3Enabled: false isSftpEnabled: false minimumTlsVersion: 'TLS1_2' @@ -45,10 +32,8 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowCrossTenantReplication: true + allowSharedKeyAccess: true } tags: { environment: 'accTest' @@ -59,6 +44,9 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { + workspaceCapping: { + dailyQuotaGb: -1 + } features: { disableLocalAuth: false enableLogAccessUsingOnlyResourcePermissions: true @@ -69,20 +57,31 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { sku: { name: 'PerGB2018' } - workspaceCapping: { - dailyQuotaGb: -1 + } +} + +resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { + name: resourceName + location: location + properties: { + appLogsConfiguration: { + destination: 'log-analytics' + logAnalyticsConfiguration: { + sharedKey: workspace.listKeys().primarySharedKey + } } + vnetConfiguration: {} } } resource storage 'Microsoft.App/managedEnvironments/storages@2022-03-01' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { azureFile: { accessMode: 'ReadWrite' accountKey: storageAccount.listKeys().keys[0].value - accountName: storageAccount.properties.name + accountName: storageAccount.name shareName: 'testsharehkez7' } } diff --git a/settings/remarks/microsoft.appconfiguration/samples/configurationstores/main.bicep b/settings/remarks/microsoft.appconfiguration/samples/configurationstores/main.bicep index e443bc1f..38511033 100644 --- a/settings/remarks/microsoft.appconfiguration/samples/configurationstores/main.bicep +++ b/settings/remarks/microsoft.appconfiguration/samples/configurationstores/main.bicep @@ -4,11 +4,11 @@ param location string = 'westeurope' resource configurationStore 'Microsoft.AppConfiguration/configurationStores@2023-03-01' = { name: resourceName location: location - properties: { - disableLocalAuth: false - enablePurgeProtection: false - } sku: { name: 'standard' } + properties: { + enablePurgeProtection: false + disableLocalAuth: false + } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/apiportals/domains/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/apiportals/domains/main.bicep index f7d61a68..3c957a06 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apiportals/domains/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apiportals/domains/main.bicep @@ -4,32 +4,32 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource apiPortal 'Microsoft.AppPlatform/Spring/apiPortals@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring + sku: { + name: 'E0' + tier: 'Enterprise' + capacity: 1 + } properties: { gatewayIds: [] httpsOnly: false public: false } - sku: { - capacity: 1 - name: 'E0' - tier: 'Enterprise' - } } resource domain 'Microsoft.AppPlatform/Spring/apiPortals/domains@2023-05-01-preview' = { - parent: apiPortal name: '${resourceName}.azuremicroservices.io' + parent: apiPortal properties: { thumbprint: '' } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep index 8397c83d..863457af 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep @@ -4,25 +4,25 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource apiPortal 'Microsoft.AppPlatform/Spring/apiPortals@2023-05-01-preview' = { - parent: spring name: 'default' - properties: { - gatewayIds: [] - httpsOnly: false - public: false - } + parent: spring sku: { capacity: 1 name: 'E0' tier: 'Enterprise' } + properties: { + gatewayIds: [] + httpsOnly: false + public: false + } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep index cae0847c..b1011c14 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep @@ -4,22 +4,22 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource applicationAccelerator 'Microsoft.AppPlatform/Spring/applicationAccelerators@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring } resource customizedAccelerator 'Microsoft.AppPlatform/Spring/applicationAccelerators/customizedAccelerators@2023-05-01-preview' = { - parent: applicationAccelerator name: resourceName + parent: applicationAccelerator properties: { description: '' displayName: '' diff --git a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/main.bicep index 63c0908a..de11f7a9 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource applicationAccelerator 'Microsoft.AppPlatform/Spring/applicationAccelerators@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/applicationliveviews/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/applicationliveviews/main.bicep index bfd66a0c..97507179 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/applicationliveviews/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/applicationliveviews/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource applicationLiveView 'Microsoft.AppPlatform/Spring/applicationLiveViews@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep index f1b5e915..305a460f 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep @@ -4,47 +4,47 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'S0' } -} - -resource redis 'Microsoft.Cache/redis@2023-04-01' = { - name: resourceName - location: location properties: { - enableNonSslPort: true - minimumTlsVersion: '1.2' - sku: { - capacity: 2 - family: 'C' - name: 'Standard' - } + zoneRedundant: false } } resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { - parent: spring name: resourceName location: location + parent: spring properties: { - customPersistentDisks: [] enableEndToEndTLS: false public: false + customPersistentDisks: [] } } resource binding 'Microsoft.AppPlatform/Spring/apps/bindings@2023-05-01-preview' = { - parent: app name: resourceName + parent: app properties: { bindingParameters: { useSsl: 'true' } - key: 'redis.listKeys().primaryKey' + key: redis.listKeys().primaryKey resourceId: redis.id } } + +resource redis 'Microsoft.Cache/redis@2023-04-01' = { + name: resourceName + location: location + properties: { + sku: { + capacity: 2 + family: 'C' + name: 'Standard' + } + enableNonSslPort: true + minimumTlsVersion: '1.2' + } +} diff --git a/settings/remarks/microsoft.appplatform/samples/spring/apps/deployments/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/apps/deployments/main.bicep index 0d143257..ad6f5344 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apps/deployments/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apps/deployments/main.bicep @@ -4,18 +4,18 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { - parent: spring name: resourceName location: location + parent: spring properties: { customPersistentDisks: [] enableEndToEndTLS: false @@ -24,26 +24,26 @@ resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { } resource deployment 'Microsoft.AppPlatform/Spring/apps/deployments@2023-05-01-preview' = { - parent: app name: resourceName + parent: app + sku: { + capacity: 1 + name: 'E0' + tier: 'Enterprise' + } properties: { deploymentSettings: { environmentVariables: {} } source: { customContainer: { - args: [] command: [] containerImage: 'springio/gs-spring-boot-docker' languageFramework: '' server: 'docker.io' + args: [] } type: 'Container' } } - sku: { - capacity: 1 - name: 'E0' - tier: 'Enterprise' - } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/apps/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/apps/main.bicep index f0248f20..e7c50085 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apps/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apps/main.bicep @@ -4,21 +4,21 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { - parent: spring name: resourceName location: location + parent: spring properties: { - customPersistentDisks: [] enableEndToEndTLS: false public: false + customPersistentDisks: [] } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep index 21a9abab..abcadd49 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep @@ -4,17 +4,17 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource buildService 'Microsoft.AppPlatform/Spring/buildServices@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring properties: {} } @@ -39,8 +39,8 @@ resource builder 'Microsoft.AppPlatform/Spring/buildServices/builders@2023-05-01 } resource buildpackBinding 'Microsoft.AppPlatform/Spring/buildServices/builders/buildpackBindings@2023-05-01-preview' = { - parent: builder name: resourceName + parent: builder properties: { bindingType: 'ApplicationInsights' } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/main.bicep index 649a93ba..968bf270 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/main.bicep @@ -1,23 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { - name: resourceName - location: location - properties: { - zoneRedundant: false - } - sku: { - name: 'E0' - } -} - -resource buildService 'Microsoft.AppPlatform/Spring/buildServices@2023-05-01-preview' = { - parent: spring - name: 'default' - properties: {} -} - resource builder 'Microsoft.AppPlatform/Spring/buildServices/builders@2023-05-01-preview' = { name: resourceName properties: { @@ -37,3 +20,20 @@ resource builder 'Microsoft.AppPlatform/Spring/buildServices/builders@2023-05-01 } } } + +resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { + name: resourceName + location: location + sku: { + name: 'E0' + } + properties: { + zoneRedundant: false + } +} + +resource buildService 'Microsoft.AppPlatform/Spring/buildServices@2023-05-01-preview' = { + name: 'default' + parent: spring + properties: {} +} diff --git a/settings/remarks/microsoft.appplatform/samples/spring/configservers/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/configservers/main.bicep index d683b9a9..f0a27f4b 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/configservers/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/configservers/main.bicep @@ -4,17 +4,17 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'S0' } + properties: { + zoneRedundant: false + } } resource configServer 'Microsoft.AppPlatform/Spring/configServers@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring properties: { configServer: {} } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/configurationservices/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/configurationservices/main.bicep index 9650fb4d..13158829 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/configurationservices/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/configurationservices/main.bicep @@ -1,20 +1,20 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource configurationService 'Microsoft.AppPlatform/Spring/configurationServices@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring properties: { settings: { gitProperty: {} diff --git a/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep index 95f0bda9..80b5d0bd 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep @@ -1,21 +1,22 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } -resource devtoolportal 'Microsoft.AppPlatform/Spring/DevToolPortals@2023-05-01-preview' = { - parent: spring +resource devToolPortal 'Microsoft.AppPlatform/Spring/DevToolPortals@2023-05-01-preview' = { name: 'default' + parent: spring properties: { + public: false features: { applicationAccelerator: { state: 'Disabled' @@ -24,6 +25,5 @@ resource devtoolportal 'Microsoft.AppPlatform/Spring/DevToolPortals@2023-05-01-p state: 'Disabled' } } - public: false } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/gateways/domains/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/gateways/domains/main.bicep index e0e7e5ac..d3b511ce 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/gateways/domains/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/gateways/domains/main.bicep @@ -4,31 +4,31 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource gateway 'Microsoft.AppPlatform/Spring/gateways@2023-05-01-preview' = { - parent: spring name: 'default' - properties: { - httpsOnly: false - public: false - } + parent: spring sku: { capacity: 1 name: 'E0' tier: 'Enterprise' } + properties: { + httpsOnly: false + public: false + } } resource domain 'Microsoft.AppPlatform/Spring/gateways/domains@2023-05-01-preview' = { - parent: gateway name: '${resourceName}.azuremicroservices.io' + parent: gateway properties: { thumbprint: '' } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep index 4d3c60fa..f11837f6 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep @@ -4,24 +4,24 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource gateway 'Microsoft.AppPlatform/Spring/gateways@2023-05-01-preview' = { - parent: spring name: 'default' - properties: { - httpsOnly: false - public: false - } + parent: spring sku: { capacity: 1 name: 'E0' tier: 'Enterprise' } + properties: { + httpsOnly: false + public: false + } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep index dd36bcdb..5bf03fd5 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep @@ -4,18 +4,18 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { - parent: spring name: resourceName location: location + parent: spring properties: { customPersistentDisks: [] enableEndToEndTLS: false @@ -24,22 +24,22 @@ resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { } resource gateway 'Microsoft.AppPlatform/Spring/gateways@2023-05-01-preview' = { - parent: spring name: 'default' - properties: { - httpsOnly: false - public: false - } + parent: spring sku: { capacity: 1 name: 'E0' tier: 'Enterprise' } + properties: { + httpsOnly: false + public: false + } } resource routeConfig 'Microsoft.AppPlatform/Spring/gateways/routeConfigs@2023-05-01-preview' = { - parent: gateway name: resourceName + parent: gateway properties: { appResourceId: app.id protocol: 'HTTP' diff --git a/settings/remarks/microsoft.appplatform/samples/spring/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/main.bicep index 0a56e401..bc5107b6 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/main.bicep @@ -4,10 +4,10 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'S0' } + properties: { + zoneRedundant: false + } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/monitoringsettings/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/monitoringsettings/main.bicep index 78031b28..c56f9199 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/monitoringsettings/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/monitoringsettings/main.bicep @@ -4,17 +4,17 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'S0' } + properties: { + zoneRedundant: false + } } resource monitoringSetting 'Microsoft.AppPlatform/Spring/monitoringSettings@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring properties: { traceEnabled: false } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep index caebb15d..55dbcca3 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep @@ -4,24 +4,31 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'S0' } + properties: { + zoneRedundant: false + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_GRS' + } kind: 'StorageV2' properties: { + supportsHttpsTrafficOnly: true accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false + allowSharedKeyAccess: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -33,24 +40,17 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_GRS' } } resource storage 'Microsoft.AppPlatform/Spring/storages@2023-05-01-preview' = { - parent: spring name: resourceName + parent: spring properties: { accountKey: storageAccount.listKeys().keys[0].value accountName: storageAccount.name diff --git a/settings/remarks/microsoft.authorization/samples/locks/main.bicep b/settings/remarks/microsoft.authorization/samples/locks/main.bicep index 01847652..e8a708da 100644 --- a/settings/remarks/microsoft.authorization/samples/locks/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/locks/main.bicep @@ -1,18 +1,13 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' - -resource lock 'Microsoft.Authorization/locks@2020-05-01' = { - scope: publicIPAddress - name: resourceName - properties: { - level: 'CanNotDelete' - notes: '' - } -} +param resourceName string = 'acctest0001' resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { name: resourceName location: location + sku: { + name: 'Basic' + tier: 'Regional' + } properties: { ddosSettings: { protectionMode: 'VirtualNetworkInherited' @@ -21,8 +16,13 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { publicIPAddressVersion: 'IPv4' publicIPAllocationMethod: 'Static' } - sku: { - name: 'Basic' - tier: 'Regional' +} + +resource lock 'Microsoft.Authorization/locks@2020-05-01' = { + name: resourceName + scope: publicIPAddress + properties: { + level: 'CanNotDelete' + notes: '' } } diff --git a/settings/remarks/microsoft.authorization/samples/policyassignments/main.bicep b/settings/remarks/microsoft.authorization/samples/policyassignments/main.bicep index 13204f20..1fbf1e03 100644 --- a/settings/remarks/microsoft.authorization/samples/policyassignments/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policyassignments/main.bicep @@ -1,9 +1,11 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' = { name: resourceName + scope: subscription() properties: { displayName: '' enforcementMode: 'Default' @@ -16,7 +18,6 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' ] } } - policyDefinitionId: policyDefinition.id scope: subscription().id } } @@ -24,6 +25,18 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { name: resourceName properties: { + policyRule: { + if: { + not: { + field: 'location' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + } + } + then: { + effect: 'audit' + } + } + policyType: 'Custom' description: '' displayName: 'my-policy-definition' mode: 'All' @@ -37,17 +50,5 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' type: 'Array' } } - policyRule: { - if: { - not: { - field: 'location' - in: '[parameters(\'allowedLocations\')]' - } - } - then: { - effect: 'audit' - } - } - policyType: 'Custom' } } diff --git a/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep index e4cd4a97..59418177 100644 --- a/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep @@ -1,5 +1,6 @@ targetScope = 'subscription' +param location string = 'eastus' param resourceName string = 'acctest0001' resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { @@ -10,19 +11,19 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' mode: 'All' parameters: { allowedLocations: { + type: 'Array' metadata: { description: 'The list of allowed locations for resources.' displayName: 'Allowed locations' strongType: 'location' } - type: 'Array' } } policyRule: { if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } then: { diff --git a/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep b/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep index 0b94be00..fd565362 100644 --- a/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep @@ -1,13 +1,15 @@ targetScope = 'subscription' +param location string = 'eastus' param resourceName string = 'acctest0001' resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' = { name: resourceName + location: 'westeurope' + scope: subscription() properties: { displayName: '' enforcementMode: 'Default' - policyDefinitionId: policyDefinition.id scope: subscription().id } } @@ -15,24 +17,11 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { name: resourceName properties: { - description: '' - displayName: 'my-policy-definition' - mode: 'All' - parameters: { - allowedLocations: { - metadata: { - description: 'The list of allowed locations for resources.' - displayName: 'Allowed locations' - strongType: 'location' - } - type: 'Array' - } - } policyRule: { if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } then: { @@ -40,11 +29,25 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' } } policyType: 'Custom' + description: '' + displayName: 'my-policy-definition' + mode: 'All' + parameters: { + allowedLocations: { + type: 'Array' + metadata: { + strongType: 'location' + description: 'The list of allowed locations for resources.' + displayName: 'Allowed locations' + } + } + } } } resource policyExemption 'Microsoft.Authorization/policyExemptions@2020-07-01-preview' = { name: resourceName + scope: subscription() properties: { exemptionCategory: 'Mitigated' policyAssignmentId: policyAssignment.id diff --git a/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep index 9dd7d3ef..ced28763 100644 --- a/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep @@ -1,5 +1,6 @@ targetScope = 'subscription' +param location string = 'westus' param resourceName string = 'acctest0001' resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { @@ -22,7 +23,7 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } then: { @@ -36,14 +37,15 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' resource policySetDefinition 'Microsoft.Authorization/policySetDefinitions@2025-01-01' = { name: 'acctestpolset-${resourceName}' properties: { + policyType: 'Custom' description: '' - displayName: 'acctestpolset-acctest0001' + displayName: 'acctestpolset-${resourceName}' parameters: { allowedLocations: { metadata: { + strongType: 'location' description: 'The list of allowed locations for resources.' displayName: 'Allowed locations' - strongType: 'location' } type: 'Array' } @@ -53,13 +55,12 @@ resource policySetDefinition 'Microsoft.Authorization/policySetDefinitions@2025- groupNames: [] parameters: { listOfAllowedLocations: { - value: '[parameters(\'allowedLocations\')]' + value: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } policyDefinitionId: policyDefinition.id policyDefinitionReferenceId: '' } ] - policyType: 'Custom' } } diff --git a/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep index 5f726a3e..1c5be7d6 100644 --- a/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep @@ -1,10 +1,12 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-preview' = { name: '6faae21a-0cd6-4536-8c23-a278823d12ed' properties: { + type: 'CustomRole' assignableScopes: [ subscription().id ] @@ -19,7 +21,6 @@ resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-prev notDataActions: [] } ] - roleName: 'acctest0001' - type: 'CustomRole' + roleName: resourceName } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/certificates/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/certificates/main.bicep index e4863be0..5d4a62b3 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/certificates/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/certificates/main.bicep @@ -16,8 +16,8 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource certificate 'Microsoft.Automation/automationAccounts/certificates@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { base64Value: 'MIIJXQIBAzCCCSMGCSqGSIb3DQEHAaCCCRQEggkQMIIJDDCCA0cGCSqGSIb3DQEHBqCCAzgwggM0AgEAMIIDLQYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIgZpS0MR7AtwCAggAgIIDABD/o+pR2WXdr9RKUXVH3+L5/iNcSEAf5IFtBs2DftFE4wF+y32TUsp67M0LY4YfGLs3UEyv6qL2Mf1/nHRL87CaKWza9Dzz1H+TWIffA2fj/AsqLr+6QDJ4Ur9cvmvqdL2xL0hfmWt3RwCn7F0JLBfwLeColacsLkEqwqStGkFvjQ8r2CJ+E0xZ8GRzOdT8TOz0cGNzDl3dkSeRGYqDQ5/5NlGE6n3MJTqhullbff61hM6NBEZyB9xhNNs6zkT5j6Askx40YFpEStdFJ1TQSRMLDoCEpb6lqYY+HQ07ezoxYKvK/XMq43eN15sZz320ktkEkUF5ICyAry+ud1Cd6ReSV6ai4JvOaZGNwLVuFxinAq8TXqpBlqLOQSJCA6dItWo1O4snfPKTqblj8LxRYecLR8Pl9R55iVf2rh6p70b89UviTWrdlnUxhz3Ilb2CDC1dFIZCy8/qVA7pT0NwfNrhCIqv+qUrIRdhMAJkifa61EIQPUKJaWJutpnBHg82T1FKKpuIqgQvHnsctrQegW1KdF1WJKa/p8knRbKKeID4TQxM/c5+GdP+wAfsNjEedoZ4Z9Ud69ZMGYHrv21CgdafSzfhSecuz89kDzG8XNVXjIjhRA3aRkxMXK+xPD2ikmy0kZjBchpTbzy7zfC8SHfKypUkYTSqbQKakgqSQY9Ydd0XxGS+GovQ4TgCDr1qHCP8KYhtYbuW8PPDUblhLOxJzP3AzDbmMuZfFrRzUrq24F8FgOVvFiGrvLVgOXzMOX+mah+cli5fw3XqnBeu72yYhhXi/jxCHZ4C8I2T0okcCu016f4a0T9+dx///F7HsEjIkGI/Vrpiqiwclu1BXdiUwGpWBDvMHjTa0nD/2mqMZzSD6KclmeuQEzGLcgbVUzcg2VYGMfw8PHlDJNCJVZKf6TaK39+M+tW1BRB4/vSjBeZ2rSHDHzIykUGWmowPnb8mb50CaRa3k1iqhGmzcIaGbsDupPc+lTXB+VuaDQT+WAquINnhKQqIsgopDvmh1zCCBb0GCSqGSIb3DQEHAaCCBa4EggWqMIIFpjCCBaIGCyqGSIb3DQEMCgECoIIE7jCCBOowHAYKKoZIhvcNAQwBAzAOBAicxAYjkBRUlAICCAAEggTI6TAZVzV4qOBs34TeAIembvZyAxzknzIMB1jdKWQJgRXbeICY9v4ch68ilhKJGkzexOwqaEcOuB7rG8GKw4f+DIimLTSpHdKXpqVlUbhapQxnKvOvrcX3jJrfBmXu7cqaEXwol5b6Sx4zKbryAyNqACHxD2XOeUFG0man/aoVrJVfyLgv4i+K/I3hNwtaX4NY4Yegmlm05MH+pInHmt2lNKLKJhwgMiImarmoixFymSvt/4bqBfZMzXf4iWzacK+MjHVLZL6B7AeY026AGEOmlH/yEQCpee/LXzkpG3iAABQlVPuioYTv7svTiEi9IQa3qg2xjLQKAC8rsaUabNZ4rRJgmU2BNrzhgkNpKCjtLqpXMUB+hGi8njlLVciIxjElG3xpu829sNCm/hnXUyTiGvamNbQ0LfsFBttXX0OtnYeWoaBQMUsPsnc7HqsPVo2TD29PMs6Pgh2k6H6L7HSUWv5TN7kRFujDGCG79AKjSHTlF6htrioo3ZZRxUMOAWB4KBrLxLrR3Fs1B5etvvUd+nG2GY4sKZf2ezwblfjCqNYX2CmbH8xT+2L0WRBfp+QsOEZP8VnBpO1uSLhqogIr4fs10sWq9CZ8fnE4NRGgb1Di++8OSeXxSiIJox4zsME8HjePUKTajO2l/q22D29CCMh6aPW2cWQSDBbHE80UMrb2ewa/lKohviqm1Z/BaHRyqAf4J5szrroQe0KrFGk/7ju3s4xZ3qagg+vhgQin8csHrolq1mW2RiTSzNgPyTP54axZqAXO75LxcYoexsxZi1anvubc8L49kuD6Sra8SU9Op0GYSLQwtVug0IqYaQbZFiN8CW5cxG6T1F6CBSM91xBBld3Cq8xwTltOBG1u1jXgMHWTeXCBzBPADC8zmJ8Xth4ZBRdOj8krUQI07feTz+xFhVRs4FHgimJBzv9HtqvDaZFUajQyBLRucTqC5pj4bVcZCKPAwTr4dpgb0C4OvYJD92YDI5h1lUgdC1oRERf9gv0j+gfOJwnDNPq8WwmdvHbYdoATPqIqLcfFig5bElX1BRQGnP6CmfUzU/yiN48saHoYw0Xsg/C6pBvI9daxz/8qpsAjacJw/SkUveqLxkSvrRyiDm6mnTb0L/tl/wk0KwOT5SkR7viD7GvG5ChSr9nhfIjcOXEuorNEe8bEgrwrQqinCz9Q3UGZI0ZdsvI+2eK9YRgyp4p2Z4skXlPZP2p9MbTJDLdIAwFsvtwCBfM/SQc93YkkIvT6JQvAs9krhnWbMg5jpgQR7gRZvUyLkscxq1Q0hFmWQ9eeyACgOmC8iC6tjANLaAM9gu6i8PnTWIgy5DKzxyCi8ql0JgCtT+oMVz9bA8HY9sxB5v+qSssQB2j110URUTw77XFHfmas8vR7fajhuOTgBN5ohyidHSC3LlKv6l5r1NbI+66nYDabJn/DEk2VpkJ2+0HhmiW6mTqGSTf2P1prHzGXKnQpxodr5s5Z/X94Nwc3jyhZcDkOOEDpw0DvrwBjjhaTRnMvA7x1Re8aBQC9+5cXnG45x6AGMI1kB/wwE9PLZM7EiyTh2mj2cqZQ84H9uG2MhSBMMKC8fDxB/rezV+2HF4gBHOYbLw6YBZKXVvL1sb07yMOhirBcs1eOMYGgMCMGCSqGSIb3DQEJFTEWBBSuuXuBpo6JiIUJcpFqi4ts2POYEzB5BgkrBgEEAYI3EQExbB5qAE0AaQBjAHIAbwBzAG8AZgB0ACAARQBuAGgAYQBuAGMAZQBkACAAUgBTAEEAIABhAG4AZAAgAEEARQBTACAAQwByAHkAcAB0AG8AZwByAGEAcABoAGkAYwAgAFAAcgBvAHYAaQBkAGUAcjAxMCEwCQYFKw4DAhoFAAQUbe4FrGhxVExQjYdlCaXBHX2nbG4ECAHH8i4dQCJDAgIIAA==' description: '' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep index bb8b1030..dd7b0c94 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep @@ -5,27 +5,27 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { - encryption: { - keySource: 'Microsoft.Automation' - } publicNetworkAccess: true sku: { name: 'Basic' } + encryption: { + keySource: 'Microsoft.Automation' + } } } resource configuration 'Microsoft.Automation/automationAccounts/configurations@2022-08-08' = { - parent: automationAccount name: resourceName location: location + parent: automationAccount properties: { - description: 'test' - logVerbose: false source: { type: 'embeddedContent' value: 'configuration acctest {}' } + description: 'test' + logVerbose: false } tags: { ENV: 'prod' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep index d8df2325..ac22283e 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep @@ -18,19 +18,19 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource connection 'Microsoft.Automation/automationAccounts/connections@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { connectionType: { name: 'AzureServicePrincipal' } description: '' fieldDefinitionValues: { - ApplicationId: null CertificateThumbprint: '''AEB97B81A68E8988850972916A8B8B6CD8F39813 ''' SubscriptionId: subscription().subscriptionId - TenantId: deployer().tenantId + TenantId: tenant().tenantId + ApplicationId: servicePrincipalApplicationId } } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep index 192e8d59..dc30d716 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep @@ -5,19 +5,19 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { + sku: { + name: 'Basic' + } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true - sku: { - name: 'Basic' - } } } resource connectionType 'Microsoft.Automation/automationAccounts/connectionTypes@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { fieldDefinitions: { my_def: { diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep index 92ad0950..b7e13255 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep @@ -19,11 +19,11 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { description: '' - password: null + password: '${automationCredentialPassword}' userName: 'test_user' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep index 7782f89a..bb4e8884 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep @@ -1,23 +1,62 @@ +@secure() +@description('The administrator password for the virtual machine') +param vmAdminPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The password for the automation account hybrid runbook worker') param automationWorkerPassword string -@secure() -@description('The administrator password for the virtual machine') -param vmAdminPassword string resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = { name: resourceName location: location properties: { - encryption: { - keySource: 'Microsoft.Automation' - } publicNetworkAccess: true sku: { name: 'Basic' } + encryption: { + keySource: 'Microsoft.Automation' + } + } +} + +resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { + name: resourceName + parent: automationAccount + properties: { + description: '' + password: '${automationWorkerPassword}' + userName: 'test_user' + } +} + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: 'internal' + parent: virtualNetwork + properties: { + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' } } @@ -34,20 +73,30 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] } } +resource hybridRunbookWorkerGroup 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups@2021-06-22' = { + name: resourceName + parent: automationAccount +} + +resource hybridRunbookWorker 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups/hybridRunbookWorkers@2021-06-22' = { + name: 'c7714056-5ba8-4bbe-920e-2993171164eb' + parent: hybridRunbookWorkerGroup + properties: { + vmResourceId: virtualMachine.id + } +} + resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - additionalCapabilities: {} applicationProfile: { galleryApplications: [] } @@ -57,7 +106,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { storageUri: '' } } - extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_D2s_v3' } @@ -72,10 +120,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null + adminPassword: vmAdminPassword adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { disablePasswordAuthentication: false patchSettings: { @@ -89,14 +137,13 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } secrets: [] } - priority: 'Regular' storageProfile: { dataDisks: [] imageReference: { + version: 'latest' offer: 'UbuntuServer' publisher: 'Canonical' sku: '16.04-LTS' - version: 'latest' } osDisk: { caching: 'ReadWrite' @@ -108,60 +155,8 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { writeAcceleratorEnabled: false } } - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - -resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { - parent: automationAccount - name: resourceName - properties: { - description: '' - password: null - userName: 'test_user' - } -} - -resource hybridRunbookWorkerGroup 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups@2021-06-22' = { - parent: automationAccount - name: resourceName - credential: { - name: credential.name - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork - name: 'internal' - properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - } -} - -resource hybridRunbookWorker 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups/hybridRunbookWorkers@2021-06-22' = { - parent: hybridRunbookWorkerGroup - name: 'c7714056-5ba8-4bbe-920e-2993171164eb' - properties: { - vmResourceId: virtualMachine.id + additionalCapabilities: {} + extensionsTimeBudget: 'PT1H30M' + priority: 'Regular' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep index 07bf40b6..ae163f2a 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep @@ -1,8 +1,8 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The password for the automation account credential') param credentialPassword string +param resourceName string = 'acctest0001' resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = { name: resourceName @@ -19,19 +19,16 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { description: '' - password: null + password: '${credentialPassword}' userName: 'test_user' } } resource hybridRunbookWorkerGroup 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups@2021-06-22' = { - parent: automationAccount name: resourceName - credential: { - name: credential.name - } + parent: automationAccount } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep index d664d2d8..fe6099c5 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep @@ -5,19 +5,19 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { - encryption: { - keySource: 'Microsoft.Automation' - } publicNetworkAccess: true sku: { name: 'Basic' } + encryption: { + keySource: 'Microsoft.Automation' + } } } resource module 'Microsoft.Automation/automationAccounts/modules@2020-01-13-preview' = { - parent: automationAccount name: 'xActiveDirectory' + parent: automationAccount properties: { contentLink: { uri: 'https://devopsgallerystorage.blob.core.windows.net/packages/xactivedirectory.2.19.0.nupkg' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/powershell72modules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/powershell72modules/main.bicep index 64a0d1b0..630c7bbb 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/powershell72modules/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/powershell72modules/main.bicep @@ -16,8 +16,8 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource powerShell72Module 'Microsoft.Automation/automationAccounts/powerShell72Modules@2020-01-13-preview' = { - parent: automationAccount name: 'xActiveDirectory' + parent: automationAccount properties: { contentLink: { uri: 'https://devopsgallerystorage.blob.core.windows.net/packages/xactivedirectory.2.19.0.nupkg' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/python3packages/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/python3packages/main.bicep index 656fe259..61334e3f 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/python3packages/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/python3packages/main.bicep @@ -17,8 +17,8 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2023-11-01' } resource python3Package 'Microsoft.Automation/automationAccounts/python3Packages@2023-11-01' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { contentLink: { uri: 'https://files.pythonhosted.org/packages/py3/r/requests/requests-2.31.0-py3-none-any.whl' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep index 645c6422..84b33a58 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep @@ -5,20 +5,20 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { - encryption: { - keySource: 'Microsoft.Automation' - } publicNetworkAccess: true sku: { name: 'Basic' } + encryption: { + keySource: 'Microsoft.Automation' + } } } resource runbook 'Microsoft.Automation/automationAccounts/runbooks@2019-06-01' = { - parent: automationAccount name: 'Get-AzureVMTutorial' location: location + parent: automationAccount properties: { description: 'This is a test runbook for terraform acceptance test' draft: {} @@ -30,6 +30,6 @@ resource runbook 'Microsoft.Automation/automationAccounts/runbooks@2019-06-01' = } resource draft 'Microsoft.Automation/automationAccounts/runbooks/draft@2018-06-30' = { - parent: runbook name: 'content' + parent: runbook } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep index 3e84d9ce..53971680 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep @@ -5,20 +5,20 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { - encryption: { - keySource: 'Microsoft.Automation' - } publicNetworkAccess: true sku: { name: 'Basic' } + encryption: { + keySource: 'Microsoft.Automation' + } } } resource runbook 'Microsoft.Automation/automationAccounts/runbooks@2019-06-01' = { - parent: automationAccount name: 'Get-AzureVMTutorial' location: location + parent: automationAccount properties: { description: 'This is a test runbook for terraform acceptance test' draft: {} diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep index bf571ec0..feca9534 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep @@ -5,19 +5,19 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { + sku: { + name: 'Basic' + } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true - sku: { - name: 'Basic' - } } } resource schedule 'Microsoft.Automation/automationAccounts/schedules@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { description: '' frequency: 'OneTime' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep index 020e8583..465e422a 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep @@ -16,27 +16,20 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource softwareUpdateConfiguration 'Microsoft.Automation/automationAccounts/softwareUpdateConfigurations@2019-06-01' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { scheduleInfo: { - description: '' + nextRunOffsetMinutes: 0 + timeZone: 'Etc/UTC' expiryTimeOffsetMinutes: 0 frequency: 'OneTime' + startTimeOffsetMinutes: 0 + description: '' interval: 0 isEnabled: true - nextRunOffsetMinutes: 0 - startTimeOffsetMinutes: 0 - timeZone: 'Etc/UTC' } updateConfiguration: { - duration: 'PT2H' - linux: { - excludedPackageNameMasks: [] - includedPackageClassifications: 'Security' - includedPackageNameMasks: [] - rebootSetting: 'IfRequired' - } operatingSystem: 'Linux' targets: { azureQueries: [ @@ -50,6 +43,13 @@ resource softwareUpdateConfiguration 'Microsoft.Automation/automationAccounts/so } ] } + duration: 'PT2H' + linux: { + excludedPackageNameMasks: [] + includedPackageClassifications: 'Security' + includedPackageNameMasks: [] + rebootSetting: 'IfRequired' + } } } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep index 5a18a7a3..ee976165 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep @@ -19,18 +19,18 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2023-11-01' } resource sourceControl 'Microsoft.Automation/automationAccounts/sourceControls@2023-11-01' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { - autoSync: false branch: 'master' folderPath: '/' publishRunbook: false repoUrl: 'https://github.com/Azure-Samples/acr-build-helloworld-node.git' securityToken: { - accessToken: null + accessToken: '${pat}' tokenType: 'PersonalAccessToken' } sourceType: 'GitHub' + autoSync: false } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep index b64904b1..1a42425c 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep @@ -16,11 +16,11 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource variable 'Microsoft.Automation/automationAccounts/variables@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { description: '' isEncrypted: false - value: '"Hello, Terraform Basic Test."' + value: 'Hello, Terraform Basic Test.' } } diff --git a/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep b/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep index afde51c0..878f8c7b 100644 --- a/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep +++ b/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep @@ -4,6 +4,9 @@ param location string = 'centralus' resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { name: resourceName location: location + sku: { + name: 'av36' + } properties: { internet: 'Disabled' managementCluster: { @@ -11,12 +14,9 @@ resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { } networkBlock: '192.168.48.0/22' } - sku: { - name: 'av36' - } } resource authorization 'Microsoft.AVS/privateClouds/authorizations@2022-05-01' = { - parent: privateCloud name: resourceName + parent: privateCloud } diff --git a/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep b/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep index 96933b18..a55bba1f 100644 --- a/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep +++ b/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep @@ -4,6 +4,9 @@ param location string = 'centralus' resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { name: resourceName location: location + sku: { + name: 'av36' + } properties: { internet: 'Disabled' managementCluster: { @@ -11,7 +14,4 @@ resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { } networkBlock: '192.168.48.0/22' } - sku: { - name: 'av36' - } } diff --git a/settings/remarks/microsoft.azureactivedirectory/samples/b2cdirectories/main.bicep b/settings/remarks/microsoft.azureactivedirectory/samples/b2cdirectories/main.bicep index 5a6c877c..9745b7cf 100644 --- a/settings/remarks/microsoft.azureactivedirectory/samples/b2cdirectories/main.bicep +++ b/settings/remarks/microsoft.azureactivedirectory/samples/b2cdirectories/main.bicep @@ -10,15 +10,14 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { resource b2cDirectory 'Microsoft.AzureActiveDirectory/b2cDirectories@2021-04-01-preview' = { name: '${resourceName}.onmicrosoft.com' - location: 'United States' + sku: { + name: 'PremiumP1' + tier: 'A0' + } properties: { createTenantProperties: { countryCode: 'US' - displayName: 'acctest0003' + displayName: '${resourceName}' } } - sku: { - name: 'PremiumP1' - tier: 'A0' - } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep index 1ab86d68..edf32285 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep @@ -5,27 +5,37 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' autoStorage: { authenticationMode: 'StorageKeys' - storageAccountId: storageAccount.id } encryption: { keySource: 'Microsoft.Batch' } poolAllocationMode: 'BatchService' - publicNetworkAccess: 'Enabled' } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + isNfsV3Enabled: false + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } accessTier: 'Hot' + allowSharedKeyAccess: true + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true allowBlobPublicAccess: true allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -39,26 +49,15 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } resource application 'Microsoft.Batch/batchAccounts/applications@2022-10-01' = { - parent: batchAccount name: resourceName + parent: batchAccount properties: { - allowUpdates: true defaultVersion: '' displayName: '' + allowUpdates: true } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep index 52dc66f5..a017849a 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep @@ -1,10 +1,10 @@ +@description('The thumbprint of the certificate') +param certificateThumbprint string param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The base64-encoded certificate data') param certificateData string -@description('The thumbprint of the certificate') -param certificateThumbprint string resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { name: resourceName @@ -19,12 +19,12 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { } resource certificate 'Microsoft.Batch/batchAccounts/certificates@2022-10-01' = { - parent: batchAccount name: 'SHA1-${certificateThumbprint}' + parent: batchAccount properties: { - data: null + data: '${certificateData}' format: 'Cer' - thumbprint: null + thumbprint: '${certificateThumbprint}' thumbprintAlgorithm: 'sha1' } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep index f4661451..46ec22ce 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep @@ -14,8 +14,8 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { } resource pool 'Microsoft.Batch/batchAccounts/pools@2022-10-01' = { - parent: batchAccount name: resourceName + parent: batchAccount properties: { certificates: null deploymentConfiguration: { @@ -34,18 +34,18 @@ resource pool 'Microsoft.Batch/batchAccounts/pools@2022-10-01' = { } } } + taskSlotsPerNode: 1 displayName: '' interNodeCommunication: 'Enabled' metadata: [] scaleSettings: { fixedScale: { - nodeDeallocationOption: '' resizeTimeout: 'PT15M' targetDedicatedNodes: 1 targetLowPriorityNodes: 0 + nodeDeallocationOption: '' } } - taskSlotsPerNode: 1 vmSize: 'STANDARD_A1' } } diff --git a/settings/remarks/microsoft.billing/remarks.json b/settings/remarks/microsoft.billing/remarks.json index 58191af5..3f70f053 100644 --- a/settings/remarks/microsoft.billing/remarks.json +++ b/settings/remarks/microsoft.billing/remarks.json @@ -6,5 +6,12 @@ "Path": "samples/billingaccounts/billingprofiles/main.tf", "Description": "A basic example of deploying Billing Accounts Billing Profiles." } + ], + "BicepSamples": [ + { + "ResourceType": "Microsoft.Billing/billingAccounts/billingProfiles", + "Path": "samples/billingaccounts/billingprofiles/main.bicep", + "Description": "A basic example of deploying Billing Accounts Billing Profiles." + } ] } diff --git a/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep b/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep new file mode 100644 index 00000000..db96f363 --- /dev/null +++ b/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep @@ -0,0 +1,39 @@ +targetScope = 'tenant' + +param resourceName string = 'acctest0001' +@description('Specify Billing Account Id for Billing Profile') +param billingAccountId string +@description('Specify Payment Method Id (For example: Credit Card and etc)') +param paymentMethodId string +@description('Specify Payment SCA Id for Payment Method Validation') +param paymentScaId string + +resource billingProfile 'Microsoft.Billing/billingAccounts/billingProfiles@2024-04-01' = { + name: resourceName + properties: { + enabledAzurePlans: [ + { + skuId: '0001' + } + ] + shipTo: { + postalCode: '12345-1234' + region: 'WA' + addressLine1: 'TestWay' + city: 'Redmond' + companyName: 'TestCompany' + country: 'US' + isValidAddress: true + } + billTo: { + companyName: 'TestCompany' + country: 'US' + isValidAddress: true + postalCode: '12345-1234' + region: 'WA' + addressLine1: 'TestWay' + city: 'Redmond' + } + displayName: '${resourceName}' + } +} diff --git a/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep b/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep index 2b1fa1b6..9f03eece 100644 --- a/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep +++ b/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep @@ -4,29 +4,29 @@ param location string = 'westus' resource botService 'Microsoft.BotService/botServices@2021-05-01-preview' = { name: resourceName location: location + sku: { + name: 'F0' + } kind: 'bot' properties: { - cmekKeyVaultUrl: '' - description: '' - developerAppInsightKey: '' - developerAppInsightsApiKey: '' - developerAppInsightsApplicationId: '' - displayName: 'acctest0001' endpoint: '' iconUrl: 'https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png' isCmekEnabled: false - isStreamingSupported: false msaAppId: '12345678-1234-1234-1234-123456789012' - } - sku: { - name: 'F0' + developerAppInsightKey: '' + developerAppInsightsApiKey: '' + isStreamingSupported: false + cmekKeyVaultUrl: '' + description: '' + developerAppInsightsApplicationId: '' + displayName: '${resourceName}' } } resource channel 'Microsoft.BotService/botServices/channels@2021-05-01-preview' = { - parent: botService name: 'AlexaChannel' location: location + parent: botService kind: 'bot' properties: { channelName: 'AlexaChannel' diff --git a/settings/remarks/microsoft.botservice/samples/botservices/main.bicep b/settings/remarks/microsoft.botservice/samples/botservices/main.bicep index f369a978..127d9095 100644 --- a/settings/remarks/microsoft.botservice/samples/botservices/main.bicep +++ b/settings/remarks/microsoft.botservice/samples/botservices/main.bicep @@ -1,21 +1,24 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' + +param clientId string resource botService 'Microsoft.BotService/botServices@2021-05-01-preview' = { name: resourceName location: 'global' + sku: { + name: 'F0' + } kind: 'sdk' properties: { + displayName: resourceName + endpoint: '' + luisKey: '' + msaAppId: clientId + luisAppIds: [] developerAppInsightKey: '' developerAppInsightsApiKey: '' developerAppInsightsApplicationId: '' - displayName: 'acctest0001' - endpoint: '' - luisAppIds: [] - luisKey: '' - msaAppId: deployer().objectId - } - sku: { - name: 'F0' } tags: { environment: 'production' diff --git a/settings/remarks/microsoft.cache/remarks.json b/settings/remarks/microsoft.cache/remarks.json index fd40d222..cd140979 100644 --- a/settings/remarks/microsoft.cache/remarks.json +++ b/settings/remarks/microsoft.cache/remarks.json @@ -75,6 +75,16 @@ "ResourceType": "Microsoft.Cache/redisEnterprise/databases", "Path": "samples/redisenterprise/databases/main.bicep", "Description": "A basic example of deploying Redis Enterprise Database." + }, + { + "ResourceType": "Microsoft.Cache/redis/linkedServers", + "Path": "samples/redis/linkedservers/main.bicep", + "Description": "A basic example of deploying Redis Linked Server." + }, + { + "ResourceType": "Microsoft.Cache/redis/linkedServers", + "Path": "samples/redis/linkedservers/main-rg-module.bicep", + "Description": "A basic example of deploying Redis Linked Server." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep b/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep index 81125cb5..a8dc96a1 100644 --- a/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep @@ -5,9 +5,6 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { name: resourceName location: location properties: { - disableAccessKeyAuthentication: false - enableNonSslPort: true - minimumTlsVersion: '1.2' publicNetworkAccess: 'Enabled' redisConfiguration: { 'maxmemory-policy': 'volatile-lru' @@ -19,12 +16,15 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { family: 'C' name: 'Basic' } + disableAccessKeyAuthentication: false + enableNonSslPort: true + minimumTlsVersion: '1.2' } } resource accessPolicy 'Microsoft.Cache/redis/accessPolicies@2024-11-01' = { - parent: redis name: '${resourceName}-accessPolicy' + parent: redis properties: { permissions: '+@read +@connection +cluster|info allkeys' } diff --git a/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep b/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep index 512d5360..8e450a10 100644 --- a/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep @@ -16,11 +16,11 @@ resource redis 'Microsoft.Cache/redis@2023-04-01' = { } resource accessPolicyAssignment 'Microsoft.Cache/redis/accessPolicyAssignments@2024-03-01' = { - parent: redis name: resourceName + parent: redis properties: { + objectIdAlias: 'ServicePrincipal' accessPolicyName: 'Data Contributor' objectId: deployer().objectId - objectIdAlias: 'ServicePrincipal' } } diff --git a/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep b/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep index 7785eb12..f9a30e3f 100644 --- a/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep @@ -5,6 +5,11 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { name: resourceName location: location properties: { + sku: { + capacity: 1 + family: 'P' + name: 'Premium' + } disableAccessKeyAuthentication: false enableNonSslPort: false minimumTlsVersion: '1.2' @@ -16,19 +21,14 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { 'preferred-data-persistence-auth-method': '' } redisVersion: '6.0' - sku: { - capacity: 1 - family: 'P' - name: 'Premium' - } } } resource firewallRule 'Microsoft.Cache/redis/firewallRules@2024-11-01' = { - parent: redis name: '${resourceName}_fwrule' + parent: redis properties: { - endIP: '2.3.4.5' startIP: '1.2.3.4' + endIP: '2.3.4.5' } } diff --git a/settings/remarks/microsoft.cache/samples/redis/linkedservers/main-rg-module.bicep b/settings/remarks/microsoft.cache/samples/redis/linkedservers/main-rg-module.bicep new file mode 100644 index 00000000..e9417a74 --- /dev/null +++ b/settings/remarks/microsoft.cache/samples/redis/linkedservers/main-rg-module.bicep @@ -0,0 +1,58 @@ +param resourceName string = 'acctest0001' +param location string = 'westus' + +resource redisPrimary 'Microsoft.Cache/redis@2024-11-01' = { + name: '${resourceName}-primary' + location: location + properties: { + disableAccessKeyAuthentication: false + enableNonSslPort: false + minimumTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' + redisConfiguration: { + 'preferred-data-persistence-auth-method': '' + 'maxmemory-delta': '642' + 'maxmemory-policy': 'allkeys-lru' + 'maxmemory-reserved': '642' + } + redisVersion: '6' + sku: { + capacity: 1 + family: 'P' + name: 'Premium' + } + } +} + +resource redisSecondary 'Microsoft.Cache/redis@2024-11-01' = { + name: '${resourceName}-secondary' + location: location + properties: { + redisConfiguration: { + 'maxmemory-delta': '642' + 'maxmemory-policy': 'allkeys-lru' + 'maxmemory-reserved': '642' + 'preferred-data-persistence-auth-method': '' + } + redisVersion: '6' + sku: { + capacity: 1 + family: 'P' + name: 'Premium' + } + disableAccessKeyAuthentication: false + enableNonSslPort: false + minimumTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' + } +} + +resource linkedServer 'Microsoft.Cache/redis/linkedServers@2024-11-01' = { + name: '${resourceName}-secondary' + parent: redisPrimary + properties: { + linkedRedisCacheId: redisSecondary.id + linkedRedisCacheLocation: location + serverRole: 'Secondary' + } +} diff --git a/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep b/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep new file mode 100644 index 00000000..ad12030e --- /dev/null +++ b/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep @@ -0,0 +1,23 @@ +targetScope = 'subscription' + +param resourceName string = 'acctest0001' +param location string = 'westus' + +resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: resourceName + location: location +} + +resource resourcegroupSecondary 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: '${resourceName}-secondary' + location: location +} + +module module1 'main-rg-module.bicep' = { + name: 'deploy-rg-resources' + scope: resourceGroup + params: { + resourceName: resourceName + location: location + } +} diff --git a/settings/remarks/microsoft.cache/samples/redis/main.bicep b/settings/remarks/microsoft.cache/samples/redis/main.bicep index b4171f1a..a674cb7f 100644 --- a/settings/remarks/microsoft.cache/samples/redis/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' +param resourceName string = 'acctest0001' resource redis 'Microsoft.Cache/redis@2023-04-01' = { name: resourceName @@ -8,9 +8,9 @@ resource redis 'Microsoft.Cache/redis@2023-04-01' = { enableNonSslPort: true minimumTlsVersion: '1.2' sku: { - capacity: 2 family: 'C' name: 'Standard' + capacity: 2 } } } diff --git a/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep b/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep index 332151c3..6345b2cf 100644 --- a/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep @@ -4,24 +4,24 @@ param location string = 'westus' resource redisEnterprise 'Microsoft.Cache/redisEnterprise@2025-04-01' = { name: resourceName location: location + sku: { + name: 'Balanced_B0' + } properties: { encryption: {} highAvailability: 'Enabled' minimumTlsVersion: '1.2' } - sku: { - name: 'Balanced_B0' - } } resource defaultDatabase 'Microsoft.Cache/redisEnterprise/databases@2025-04-01' = { - parent: redisEnterprise name: 'default' + parent: redisEnterprise properties: { + port: 10000 clientProtocol: 'Encrypted' clusteringPolicy: 'OSSCluster' evictionPolicy: 'VolatileLRU' modules: [] - port: 10000 } } diff --git a/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep b/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep index 1e337bec..1aa9e04a 100644 --- a/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep @@ -4,12 +4,12 @@ param location string = 'eastus' resource redisEnterprise 'Microsoft.Cache/redisEnterprise@2025-04-01' = { name: resourceName location: location + sku: { + name: 'Balanced_B0' + } properties: { encryption: {} highAvailability: 'Enabled' minimumTlsVersion: '1.2' } - sku: { - name: 'Balanced_B0' - } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/main.bicep index 2e318bc4..10f5512c 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/main.bicep @@ -1,20 +1,21 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Standard_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource afdEndpoint 'Microsoft.Cdn/profiles/afdEndpoints@2021-06-01' = { - parent: profile name: resourceName location: 'global' + parent: profile properties: { enabledState: 'Enabled' } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep index 76b591ce..0125edac 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep @@ -1,59 +1,59 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Standard_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource afdEndpoint 'Microsoft.Cdn/profiles/afdEndpoints@2021-06-01' = { - parent: profile name: resourceName location: 'global' + parent: profile properties: { enabledState: 'Enabled' } } resource originGroup 'Microsoft.Cdn/profiles/originGroups@2021-06-01' = { - parent: profile name: resourceName + parent: profile properties: { + trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 loadBalancingSettings: { - additionalLatencyInMilliseconds: 0 sampleSize: 16 successfulSamplesRequired: 3 + additionalLatencyInMilliseconds: 0 } sessionAffinityState: 'Enabled' - trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 } } resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2021-06-01' = { - parent: originGroup name: resourceName + parent: originGroup properties: { enabledState: 'Enabled' enforceCertificateNameCheck: false - hostName: 'contoso.com' httpPort: 80 httpsPort: 443 + weight: 1 + hostName: 'contoso.com' originHostHeader: 'www.contoso.com' priority: 1 - weight: 1 } } resource route 'Microsoft.Cdn/profiles/afdEndpoints/routes@2021-06-01' = { - parent: afdEndpoint name: resourceName + parent: afdEndpoint properties: { - enabledState: 'Enabled' forwardingProtocol: 'MatchRequest' httpsRedirect: 'Enabled' linkToDefaultDomain: 'Enabled' @@ -67,5 +67,6 @@ resource route 'Microsoft.Cdn/profiles/afdEndpoints/routes@2021-06-01' = { 'Https' 'Http' ] + enabledState: 'Enabled' } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep index 96d9bbca..6c295351 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep @@ -1,32 +1,33 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' -resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { - name: '${resourceName}.com' - location: 'global' -} - resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Premium_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource customDomain 'Microsoft.Cdn/profiles/customDomains@2021-06-01' = { - parent: profile name: resourceName + parent: profile properties: { - azureDnsZone: { - id: dnsZone.id - } - hostName: 'fabrikam.acctest0001.com' tlsSettings: { certificateType: 'ManagedCertificate' minimumTlsVersion: 'TLS12' } + azureDnsZone: { + id: dnsZone.id + } + hostName: 'fabrikam.${resourceName}.com' } } + +resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { + name: '${resourceName}.com' + location: 'global' +} diff --git a/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep index 572ff490..11025868 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep @@ -10,12 +10,10 @@ resource profile 'Microsoft.Cdn/profiles@2020-09-01' = { } resource endpoint 'Microsoft.Cdn/profiles/endpoints@2020-09-01' = { - parent: profile name: resourceName location: location + parent: profile properties: { - isHttpAllowed: true - isHttpsAllowed: true origins: [ { name: 'acceptanceTestCdnOrigin1' @@ -27,5 +25,7 @@ resource endpoint 'Microsoft.Cdn/profiles/endpoints@2020-09-01' = { } ] queryStringCachingBehavior: 'IgnoreQueryString' + isHttpAllowed: true + isHttpsAllowed: true } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/main.bicep index dbd2929d..7b279da8 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/main.bicep @@ -1,12 +1,13 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Premium_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep index 4294b4ed..d369a864 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep @@ -1,24 +1,25 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Standard_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource originGroup 'Microsoft.Cdn/profiles/originGroups@2021-06-01' = { - parent: profile name: resourceName + parent: profile properties: { loadBalancingSettings: { - additionalLatencyInMilliseconds: 0 sampleSize: 16 successfulSamplesRequired: 3 + additionalLatencyInMilliseconds: 0 } sessionAffinityState: 'Enabled' trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 diff --git a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/origins/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/origins/main.bicep index a76d00b7..2af31e8c 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/origins/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/origins/main.bicep @@ -1,41 +1,42 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Standard_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource originGroup 'Microsoft.Cdn/profiles/originGroups@2021-06-01' = { - parent: profile name: resourceName + parent: profile properties: { + trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 loadBalancingSettings: { additionalLatencyInMilliseconds: 0 sampleSize: 16 successfulSamplesRequired: 3 } sessionAffinityState: 'Enabled' - trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 } } resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2021-06-01' = { - parent: originGroup name: resourceName + parent: originGroup properties: { - enabledState: 'Enabled' - enforceCertificateNameCheck: false - hostName: 'contoso.com' - httpPort: 80 httpsPort: 443 originHostHeader: 'www.contoso.com' priority: 1 + enforceCertificateNameCheck: false + hostName: 'contoso.com' weight: 1 + enabledState: 'Enabled' + httpPort: 80 } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/rulesets/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/rulesets/main.bicep index 2ee48591..ca746d21 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/rulesets/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/rulesets/main.bicep @@ -1,17 +1,18 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Standard_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource ruleSet 'Microsoft.Cdn/profiles/ruleSets@2021-06-01' = { - parent: profile name: resourceName + parent: profile } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep index 7908e707..2101bca7 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep @@ -1,64 +1,38 @@ param resourceName string = 'acctest0001' +param location string = 'westus' param cdnLocation string = 'global' resource profile 'Microsoft.Cdn/profiles@2024-09-01' = { name: '${resourceName}-profile' - properties: { - originResponseTimeoutSeconds: 120 - } + location: cdnLocation sku: { name: 'Standard_AzureFrontDoor' } -} - -resource originGroup 'Microsoft.Cdn/profiles/originGroups@2024-09-01' = { - parent: profile - name: '${resourceName}-origingroup' properties: { - loadBalancingSettings: { - additionalLatencyInMilliseconds: 0 - sampleSize: 16 - successfulSamplesRequired: 3 - } - sessionAffinityState: 'Enabled' - trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 + originResponseTimeoutSeconds: 120 } } resource ruleSet 'Microsoft.Cdn/profiles/ruleSets@2024-09-01' = { + name: 'ruleSet${substring(resourceName, (length(resourceName) - 4), 3)}' parent: profile - name: 'ruleSet${substring(resourceName, length(resourceName) - 4, 4)}' -} - -resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2024-09-01' = { - parent: originGroup - name: '${resourceName}-origin' - properties: { - enabledState: 'Enabled' - enforceCertificateNameCheck: false - hostName: 'contoso.com' - httpPort: 80 - httpsPort: 443 - originHostHeader: 'www.contoso.com' - priority: 1 - weight: 1 - } } resource rule 'Microsoft.Cdn/profiles/ruleSets/rules@2024-09-01' = { + name: 'rule${substring(resourceName, (length(resourceName) - 4), 3)}' parent: ruleSet - name: 'rule${substring(resourceName, length(resourceName) - 4, 4)}' properties: { actions: [ { name: 'RouteConfigurationOverride' parameters: { + typeName: 'DeliveryRuleRouteConfigurationOverrideActionParameters' cacheConfiguration: { - cacheBehavior: 'OverrideIfOriginMissing' - cacheDuration: '23:59:59' isCompressionEnabled: 'Disabled' queryParameters: 'clientIp={client_ip}' queryStringCachingBehavior: 'IgnoreSpecifiedQueryStrings' + cacheBehavior: 'OverrideIfOriginMissing' + cacheDuration: '23:59:59' } originGroupOverride: { forwardingProtocol: 'HttpsOnly' @@ -66,7 +40,6 @@ resource rule 'Microsoft.Cdn/profiles/ruleSets/rules@2024-09-01' = { id: originGroup.id } } - typeName: 'DeliveryRuleRouteConfigurationOverrideActionParameters' } } ] @@ -75,3 +48,32 @@ resource rule 'Microsoft.Cdn/profiles/ruleSets/rules@2024-09-01' = { order: 1 } } + +resource originGroup 'Microsoft.Cdn/profiles/originGroups@2024-09-01' = { + name: '${resourceName}-origingroup' + parent: profile + properties: { + loadBalancingSettings: { + additionalLatencyInMilliseconds: 0 + sampleSize: 16 + successfulSamplesRequired: 3 + } + sessionAffinityState: 'Enabled' + trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 + } +} + +resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2024-09-01' = { + name: '${resourceName}-origin' + parent: originGroup + properties: { + enforceCertificateNameCheck: false + hostName: 'contoso.com' + httpPort: 80 + originHostHeader: 'www.contoso.com' + priority: 1 + weight: 1 + enabledState: 'Enabled' + httpsPort: 443 + } +} diff --git a/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep index 59c3d517..02904ace 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep @@ -1,8 +1,12 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' -resource frontdoorwebapplicationfirewallpolicy 'Microsoft.Network/FrontDoorWebApplicationFirewallPolicies@2020-11-01' = { +resource frontDoorWebApplicationFirewallPolicy 'Microsoft.Network/FrontDoorWebApplicationFirewallPolicies@2020-11-01' = { name: resourceName location: 'global' + sku: { + name: 'Premium_AzureFrontDoor' + } properties: { customRules: { rules: [ @@ -20,10 +24,10 @@ resource frontdoorwebapplicationfirewallpolicy 'Microsoft.Network/FrontDoorWebAp operator: 'IPMatch' } ] - name: 'Rule1' priority: 1 - rateLimitDurationInMinutes: 1 rateLimitThreshold: 10 + name: 'Rule1' + rateLimitDurationInMinutes: 1 ruleType: 'MatchRule' } ] @@ -62,9 +66,6 @@ resource frontdoorwebapplicationfirewallpolicy 'Microsoft.Network/FrontDoorWebAp redirectUrl: 'https://www.fabrikam.com' } } - sku: { - name: 'Premium_AzureFrontDoor' - } } resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { @@ -75,22 +76,22 @@ resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Premium_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource customDomain 'Microsoft.Cdn/profiles/customDomains@2021-06-01' = { - parent: profile name: resourceName + parent: profile properties: { azureDnsZone: { id: dnsZone.id } - hostName: 'fabrikam.acctest0001.com' + hostName: 'fabrikam.${resourceName}.com' tlsSettings: { certificateType: 'ManagedCertificate' minimumTlsVersion: 'TLS12' @@ -99,8 +100,8 @@ resource customDomain 'Microsoft.Cdn/profiles/customDomains@2021-06-01' = { } resource securityPolicy 'Microsoft.Cdn/profiles/securityPolicies@2021-06-01' = { - parent: profile name: resourceName + parent: profile properties: { parameters: { associations: [ @@ -117,7 +118,7 @@ resource securityPolicy 'Microsoft.Cdn/profiles/securityPolicies@2021-06-01' = { ] type: 'WebApplicationFirewall' wafPolicy: { - id: frontdoorwebapplicationfirewallpolicy.id + id: frontDoorWebApplicationFirewallPolicy.id } } } diff --git a/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep b/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep index 9d9cd839..26827e98 100644 --- a/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep +++ b/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep @@ -1,13 +1,14 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource certificateOrder 'Microsoft.CertificateRegistration/certificateOrders@2021-02-01' = { name: resourceName location: 'global' properties: { + validityInYears: 1 autoRenew: true distinguishedName: 'CN=example.com' keySize: 2048 productType: 'StandardDomainValidatedSsl' - validityInYears: 1 } } diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep index a8ce9a6c..4eb963bf 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep @@ -4,29 +4,29 @@ param location string = 'eastus' resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { name: resourceName location: location - identity: { - type: 'None' - userAssignedIdentities: null + sku: { + name: 'S0' } kind: 'OpenAI' properties: { - disableLocalAuth: false dynamicThrottlingEnabled: false publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false + disableLocalAuth: false } - sku: { - name: 'S0' + identity: { + type: 'None' + userAssignedIdentities: null } } resource deployment 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = { - parent: account name: 'testdep' + parent: account properties: { model: { - format: 'OpenAI' name: 'text-embedding-ada-002' + format: 'OpenAI' } } } diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep index f5ae4140..bad0624d 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep @@ -4,19 +4,19 @@ param location string = 'westus2' resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { name: resourceName location: location + sku: { + tier: 'Standard' + name: 'S0' + } kind: 'SpeechServices' properties: { + dynamicThrottlingEnabled: false + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: false allowedFqdnList: [] apiProperties: {} customSubDomainName: 'acctest-cogacc-230630032807723157' disableLocalAuth: false - dynamicThrottlingEnabled: false - publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: false - } - sku: { - name: 'S0' - tier: 'Standard' } } diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep index 9c0ebd8c..0669007f 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep @@ -4,26 +4,26 @@ param location string = 'westus2' resource account 'Microsoft.CognitiveServices/accounts@2025-06-01' = { name: resourceName location: location + sku: { + name: 'S0' + } kind: 'AIServices' properties: { + restrictOutboundNetworkAccess: false allowProjectManagement: true - customSubDomainName: 'cog-acctest0001' + customSubDomainName: 'cog-${resourceName}' disableLocalAuth: false dynamicThrottlingEnabled: false publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: false - } - sku: { - name: 'S0' } } resource project 'Microsoft.CognitiveServices/accounts/projects@2025-06-01' = { - parent: account name: resourceName location: location + parent: account properties: { + displayName: 'project-${resourceName}' description: 'test project' - displayName: 'project-acctest0001' } } diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep index de03fb57..965a3010 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep @@ -4,24 +4,24 @@ param location string = 'westus' resource account 'Microsoft.CognitiveServices/accounts@2024-10-01' = { name: '${resourceName}-ca' location: location + sku: { + name: 'S0' + } kind: 'OpenAI' properties: { - allowedFqdnList: [] - apiProperties: {} customSubDomainName: '' disableLocalAuth: false dynamicThrottlingEnabled: false publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false - } - sku: { - name: 'S0' + allowedFqdnList: [] + apiProperties: {} } } resource raiBlocklist 'Microsoft.CognitiveServices/accounts/raiBlocklists@2024-10-01' = { - parent: account name: '${resourceName}-crb' + parent: account properties: { description: 'Acceptance test data new azurerm resource' } diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/raipolicies/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/raipolicies/main.bicep index 8aba460d..b1210231 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/raipolicies/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/raipolicies/main.bicep @@ -4,6 +4,9 @@ param location string = 'eastus' resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { name: resourceName location: location + sku: { + name: 'S0' + } kind: 'OpenAI' properties: { disableLocalAuth: false @@ -11,23 +14,20 @@ resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false } - sku: { - name: 'S0' - } } resource raiPolicy 'Microsoft.CognitiveServices/accounts/raiPolicies@2024-10-01' = { - parent: account name: 'NoModerationPolicy' + parent: account properties: { basePolicyName: 'Microsoft.Default' contentFilters: [ { - blocking: true enabled: true name: 'Hate' severityThreshold: 'High' source: 'Prompt' + blocking: true } ] } diff --git a/settings/remarks/microsoft.communication/samples/communicationservices/main.bicep b/settings/remarks/microsoft.communication/samples/communicationservices/main.bicep index df28431d..b9027222 100644 --- a/settings/remarks/microsoft.communication/samples/communicationservices/main.bicep +++ b/settings/remarks/microsoft.communication/samples/communicationservices/main.bicep @@ -1,3 +1,4 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource communicationService 'Microsoft.Communication/communicationServices@2023-03-31' = { diff --git a/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep b/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep index f41783c0..d39ebcd7 100644 --- a/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep +++ b/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep @@ -1,3 +1,4 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource emailService 'Microsoft.Communication/emailServices@2023-04-01-preview' = { @@ -9,9 +10,9 @@ resource emailService 'Microsoft.Communication/emailServices@2023-04-01-preview' } resource domain 'Microsoft.Communication/emailServices/domains@2023-04-01-preview' = { - parent: emailService name: 'example.com' location: 'global' + parent: emailService properties: { domainManagement: 'CustomerManaged' userEngagementTracking: 'Disabled' diff --git a/settings/remarks/microsoft.communication/samples/emailservices/domains/senderusernames/main.bicep b/settings/remarks/microsoft.communication/samples/emailservices/domains/senderusernames/main.bicep index f31ba812..8d662207 100644 --- a/settings/remarks/microsoft.communication/samples/emailservices/domains/senderusernames/main.bicep +++ b/settings/remarks/microsoft.communication/samples/emailservices/domains/senderusernames/main.bicep @@ -1,4 +1,5 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource emailService 'Microsoft.Communication/emailServices@2023-04-01-preview' = { name: resourceName @@ -9,9 +10,9 @@ resource emailService 'Microsoft.Communication/emailServices@2023-04-01-preview' } resource domain 'Microsoft.Communication/emailServices/domains@2023-04-01-preview' = { - parent: emailService name: 'example.com' location: 'global' + parent: emailService properties: { domainManagement: 'CustomerManaged' userEngagementTracking: 'Disabled' @@ -19,8 +20,8 @@ resource domain 'Microsoft.Communication/emailServices/domains@2023-04-01-previe } resource senderUsername 'Microsoft.Communication/emailServices/domains/senderUsernames@2023-04-01-preview' = { - parent: domain name: 'TestSenderUserName' + parent: domain properties: { displayName: 'TestDisplayName' username: 'TestSenderUserName' diff --git a/settings/remarks/microsoft.communication/samples/emailservices/main.bicep b/settings/remarks/microsoft.communication/samples/emailservices/main.bicep index f1ddb214..f283e665 100644 --- a/settings/remarks/microsoft.communication/samples/emailservices/main.bicep +++ b/settings/remarks/microsoft.communication/samples/emailservices/main.bicep @@ -1,4 +1,5 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource emailService 'Microsoft.Communication/emailServices@2023-03-31' = { name: resourceName diff --git a/settings/remarks/microsoft.compute/samples/availabilitysets/main.bicep b/settings/remarks/microsoft.compute/samples/availabilitysets/main.bicep index 52496255..079d8079 100644 --- a/settings/remarks/microsoft.compute/samples/availabilitysets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/availabilitysets/main.bicep @@ -4,11 +4,11 @@ param location string = 'westeurope' resource availabilitySet 'Microsoft.Compute/availabilitySets@2021-11-01' = { name: resourceName location: location + sku: { + name: 'Aligned' + } properties: { platformFaultDomainCount: 3 platformUpdateDomainCount: 5 } - sku: { - name: 'Aligned' - } } diff --git a/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep b/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep index db2d3eeb..466c9af0 100644 --- a/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep +++ b/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep @@ -7,9 +7,9 @@ resource capacityReservationGroup 'Microsoft.Compute/capacityReservationGroups@2 } resource capacityReservation 'Microsoft.Compute/capacityReservationGroups/capacityReservations@2022-03-01' = { - parent: capacityReservationGroup name: '${resourceName}-ccr' location: location + parent: capacityReservationGroup sku: { capacity: 2 name: 'Standard_F2' diff --git a/settings/remarks/microsoft.compute/samples/diskaccesses/main.bicep b/settings/remarks/microsoft.compute/samples/diskaccesses/main.bicep index d194267d..07c011ad 100644 --- a/settings/remarks/microsoft.compute/samples/diskaccesses/main.bicep +++ b/settings/remarks/microsoft.compute/samples/diskaccesses/main.bicep @@ -1,11 +1,11 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource diskAccess 'Microsoft.Compute/diskAccesses@2022-03-02' = { name: resourceName location: location tags: { - 'cost-center': 'ops' environment: 'acctest' + 'cost-center': 'ops' } } diff --git a/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep b/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep index bcc6162e..4e474a99 100644 --- a/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep @@ -1,38 +1,23 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource diskEncryptionSet 'Microsoft.Compute/diskEncryptionSets@2022-03-02' = { - name: resourceName - location: location - properties: { - activeKey: { - keyUrl: key.properties.keyUriWithVersion - sourceVault: { - id: vault.id - } - } - encryptionType: 'EncryptionAtRestWithCustomerKey' - rotationToLatestKeyVersionEnabled: false - } -} - resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName location: location properties: { - accessPolicies: [] - enableSoftDelete: true sku: { family: 'A' name: 'standard' } - tenantId: deployer().tenantId + accessPolicies: [] + enableSoftDelete: true + tenantId: tenant().tenantId } } resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { - parent: vault name: resourceName + parent: vault properties: { keyOps: [ 'encrypt' @@ -46,3 +31,15 @@ resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { kty: 'RSA' } } + +resource diskEncryptionSet 'Microsoft.Compute/diskEncryptionSets@2022-03-02' = { + name: resourceName + location: location + properties: { + activeKey: { + sourceVault: {} + } + encryptionType: 'EncryptionAtRestWithCustomerKey' + rotationToLatestKeyVersionEnabled: false + } +} diff --git a/settings/remarks/microsoft.compute/samples/disks/main.bicep b/settings/remarks/microsoft.compute/samples/disks/main.bicep index 9da32a6f..214f2c92 100644 --- a/settings/remarks/microsoft.compute/samples/disks/main.bicep +++ b/settings/remarks/microsoft.compute/samples/disks/main.bicep @@ -4,19 +4,19 @@ param location string = 'westeurope' resource disk 'Microsoft.Compute/disks@2022-03-02' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } properties: { - creationData: { - createOption: 'Empty' - } - diskSizeGB: 10 encryption: { type: 'EncryptionAtRestWithPlatformKey' } networkAccessPolicy: 'AllowAll' osType: '' publicNetworkAccess: 'Enabled' - } - sku: { - name: 'Standard_LRS' + creationData: { + createOption: 'Empty' + } + diskSizeGB: 10 } } diff --git a/settings/remarks/microsoft.compute/samples/galleries/applications/main.bicep b/settings/remarks/microsoft.compute/samples/galleries/applications/main.bicep index 1f8ab269..d2e4de89 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/applications/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/applications/main.bicep @@ -10,9 +10,9 @@ resource gallery 'Microsoft.Compute/galleries@2022-03-03' = { } resource application 'Microsoft.Compute/galleries/applications@2022-03-03' = { - parent: gallery name: resourceName location: location + parent: gallery properties: { supportedOSType: 'Linux' } diff --git a/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep b/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep index cbc629ca..eac3ae8f 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep @@ -1,23 +1,28 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource gallery 'Microsoft.Compute/galleries@2022-03-03' = { - name: '${resourceName}sig' - location: location - properties: { - description: '' - } -} - resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: '${resourceName}acc' location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + minimumTlsVersion: 'TLS1_2' + networkAcls: { + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + } + allowSharedKeyAccess: true + isSftpEnabled: false + allowCrossTenantReplication: false + isHnsEnabled: false accessTier: 'Hot' allowBlobPublicAccess: true - allowCrossTenantReplication: false - allowSharedKeyAccess: true defaultToOAuthAuthentication: false dnsEndpointType: 'Standard' encryption: { @@ -31,60 +36,57 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - isHnsEnabled: false isLocalUserEnabled: true isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - bypass: 'AzureServices' - defaultAction: 'Allow' - ipRules: [] - resourceAccessRules: [] - virtualNetworkRules: [] - } publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } -} - -resource application 'Microsoft.Compute/galleries/applications@2022-03-03' = { - parent: gallery - name: '${resourceName}-app' - location: location - properties: { - supportedOSType: 'Linux' - } } -// The blob service is a singleton named 'default' under the storage account -resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2023-05-01' existing = { - parent: storageAccount +resource storageaccountBlobservices 'Microsoft.Storage/storageAccounts/blobServices@2023-05-01' = { name: 'default' + parent: storageAccount } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2023-05-01' = { - parent: blobService name: 'mycontainer' + parent: storageaccountBlobservices properties: { publicAccess: 'Blob' } } +resource gallery 'Microsoft.Compute/galleries@2022-03-03' = { + name: '${resourceName}sig' + location: location + properties: { + description: '' + } +} + +resource application 'Microsoft.Compute/galleries/applications@2022-03-03' = { + name: '${resourceName}-app' + location: location + parent: gallery + properties: { + supportedOSType: 'Linux' + } +} + resource version 'Microsoft.Compute/galleries/applications/versions@2022-03-03' = { - parent: application name: '0.0.1' location: location + parent: application + dependsOn: [ + container + ] properties: { publishingProfile: { enableHealthCheck: false excludeFromLatest: false manageActions: { - install: '[install command]' - remove: '[remove command]' + install: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + remove: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} update: '' } source: { @@ -93,7 +95,7 @@ resource version 'Microsoft.Compute/galleries/applications/versions@2022-03-03' } targetRegions: [ { - name: 'westus' + name: location regionalReplicaCount: 1 storageAccountType: 'Standard_LRS' } @@ -103,7 +105,4 @@ resource version 'Microsoft.Compute/galleries/applications/versions@2022-03-03' allowDeletionOfReplicatedLocations: true } } - dependsOn: [ - container - ] } diff --git a/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep b/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep index 58285d6e..6ed2e71d 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource gallery 'Microsoft.Compute/galleries@2022-03-03' = { name: resourceName @@ -10,12 +10,11 @@ resource gallery 'Microsoft.Compute/galleries@2022-03-03' = { } resource image 'Microsoft.Compute/galleries/images@2022-03-03' = { - parent: gallery name: resourceName location: location + parent: gallery properties: { architecture: 'x64' - description: '' disallowed: { diskTypes: [] } @@ -26,6 +25,8 @@ resource image 'Microsoft.Compute/galleries/images@2022-03-03' = { publisher: 'AccTesPublisher230630032848825313' sku: 'AccTesSku230630032848825313' } + releaseNoteUri: '' + description: '' osState: 'Generalized' osType: 'Linux' privacyStatementUri: '' @@ -33,6 +34,5 @@ resource image 'Microsoft.Compute/galleries/images@2022-03-03' = { memory: {} vCPUs: {} } - releaseNoteUri: '' } } diff --git a/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep b/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep index 7d01a4fb..95e327a4 100644 --- a/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep +++ b/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep @@ -10,15 +10,15 @@ resource hostGroup 'Microsoft.Compute/hostGroups@2021-11-01' = { } resource host 'Microsoft.Compute/hostGroups/hosts@2021-11-01' = { - parent: hostGroup name: resourceName location: location + parent: hostGroup + sku: { + name: 'DSv3-Type1' + } properties: { - autoReplaceOnFailure: true licenseType: 'None' platformFaultDomain: 1 - } - sku: { - name: 'DSv3-Type1' + autoReplaceOnFailure: true } } diff --git a/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep b/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep index 1963c586..c1d29a3b 100644 --- a/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep +++ b/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep @@ -1,12 +1,41 @@ param resourceName string = 'acctest0001' param location string = 'eastus' +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + privateEndpointVNetPolicies: 'Disabled' + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { + name: resourceName + parent: virtualNetwork + properties: { + privateEndpointNetworkPolicies: 'Disabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.0.0/24' + defaultOutboundAccess: true + delegations: [] + } +} + resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { name: resourceName location: location properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false ipConfigurations: [ { name: 'internal' @@ -14,12 +43,12 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { primary: false privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] + enableAcceleratedNetworking: false + enableIPForwarding: false } } @@ -27,9 +56,7 @@ resource restorePointCollection 'Microsoft.Compute/restorePointCollections@2024- name: resourceName location: location properties: { - source: { - id: virtualMachine.id - } + source: {} } } @@ -37,17 +64,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: resourceName location: location properties: { - additionalCapabilities: {} - applicationProfile: { - galleryApplications: [] - } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_F2' } @@ -61,10 +77,32 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } ] } + priority: 'Regular' + storageProfile: { + osDisk: { + writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' + managedDisk: { + storageAccountType: 'Standard_LRS' + } + osType: 'Linux' + } + dataDisks: [] + imageReference: { + version: 'latest' + offer: '0001-com-ubuntu-server-jammy' + publisher: 'Canonical' + sku: '22_04-lts' + } + } + applicationProfile: { + galleryApplications: [] + } osProfile: { adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { disablePasswordAuthentication: true patchSettings: { @@ -83,55 +121,13 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } secrets: [] } - priority: 'Regular' - storageProfile: { - dataDisks: [] - imageReference: { - offer: '0001-com-ubuntu-server-jammy' - publisher: 'Canonical' - sku: '22_04-lts' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - managedDisk: { - storageAccountType: 'Standard_LRS' - } - osType: 'Linux' - writeAcceleratorEnabled: false + additionalCapabilities: {} + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' } } - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - privateEndpointVNetPolicies: 'Disabled' - subnets: [] - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork - name: resourceName - properties: { - addressPrefix: '10.0.0.0/24' - defaultOutboundAccess: true - delegations: [] - privateEndpointNetworkPolicies: 'Disabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] + extensionsTimeBudget: 'PT1H30M' } } diff --git a/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep b/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep index 79442794..09c1c4a6 100644 --- a/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep +++ b/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep @@ -1,35 +1,11 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { - name: '${resourceName}-nic' - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'internal' - properties: { - primary: false - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] - } -} - resource restorePointCollection 'Microsoft.Compute/restorePointCollections@2024-03-01' = { name: '${resourceName}-rpc' location: location properties: { - source: { - id: virtualMachine.id - } + source: {} } } @@ -37,7 +13,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: '${resourceName}-vm' location: location properties: { - additionalCapabilities: {} applicationProfile: { galleryApplications: [] } @@ -47,10 +22,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { storageUri: '' } } - extensionsTimeBudget: 'PT1H30M' - hardwareProfile: { - vmSize: 'Standard_F2' - } networkProfile: { networkInterfaces: [ { @@ -61,10 +32,12 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } ] } + additionalCapabilities: {} + extensionsTimeBudget: 'PT1H30M' + hardwareProfile: { + vmSize: 'Standard_F2' + } osProfile: { - adminUsername: 'adminuser' - allowExtensionOperations: true - computerName: 'acctest0001-vm' linuxConfiguration: { disablePasswordAuthentication: true patchSettings: { @@ -82,6 +55,9 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } } secrets: [] + adminUsername: 'adminuser' + allowExtensionOperations: true + computerName: '${resourceName}-vm' } priority: 'Regular' storageProfile: { @@ -123,21 +99,41 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } resource restorePoint 'Microsoft.Compute/restorePointCollections/restorePoints@2024-03-01' = { - parent: restorePointCollection name: '${resourceName}-rp' + parent: restorePointCollection properties: {} } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: '${resourceName}-subnet' + parent: virtualNetwork properties: { - addressPrefix: '10.0.0.0/24' - defaultOutboundAccess: true - delegations: [] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.0.0/24' + defaultOutboundAccess: true + delegations: [] + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: '${resourceName}-nic' + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + properties: { + privateIPAllocationMethod: 'Dynamic' + subnet: {} + primary: false + privateIPAddressVersion: 'IPv4' + } + name: 'internal' + } + ] } } diff --git a/settings/remarks/microsoft.compute/samples/snapshots/main.bicep b/settings/remarks/microsoft.compute/samples/snapshots/main.bicep index a79e0b2c..17fa20d3 100644 --- a/settings/remarks/microsoft.compute/samples/snapshots/main.bicep +++ b/settings/remarks/microsoft.compute/samples/snapshots/main.bicep @@ -1,38 +1,38 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource disk 'Microsoft.Compute/disks@2023-04-02' = { - name: '${resourceName}disk' +resource snapshot 'Microsoft.Compute/snapshots@2022-03-02' = { + name: '${resourceName}snapshot' location: location properties: { creationData: { - createOption: 'Empty' - performancePlus: false - } - diskSizeGB: 10 - encryption: { - type: 'EncryptionAtRestWithPlatformKey' + sourceUri: disk.id + createOption: 'Copy' } + diskSizeGB: 20 + incremental: false networkAccessPolicy: 'AllowAll' - optimizedForFrequentAttach: false publicNetworkAccess: 'Enabled' } - sku: { - name: 'Standard_LRS' - } } -resource snapshot 'Microsoft.Compute/snapshots@2022-03-02' = { - name: '${resourceName}snapshot' +resource disk 'Microsoft.Compute/disks@2023-04-02' = { + name: '${resourceName}disk' location: location + sku: { + name: 'Standard_LRS' + } properties: { - creationData: { - createOption: 'Copy' - sourceUri: disk.id + diskSizeGB: 10 + encryption: { + type: 'EncryptionAtRestWithPlatformKey' } - diskSizeGB: 20 - incremental: false networkAccessPolicy: 'AllowAll' + optimizedForFrequentAttach: false publicNetworkAccess: 'Enabled' + creationData: { + performancePlus: false + createOption: 'Empty' + } } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep index f176ad72..42220e37 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep @@ -1,10 +1,10 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator username for the virtual machine') param adminUsername string @secure() @description('The administrator password for the virtual machine') param adminPassword string +param resourceName string = 'acctest0001' var attachedDataDiskName = 'myattacheddatadisk1' var osDiskName = 'myosdisk1' @@ -13,7 +13,12 @@ var dataDiskName = 'mydatadisk1' resource attachedDisk 'Microsoft.Compute/disks@2022-03-02' = { name: attachedDataDiskName location: location + sku: { + name: 'Standard_LRS' + } properties: { + osType: 'Linux' + publicNetworkAccess: 'Enabled' creationData: { createOption: 'Empty' } @@ -22,11 +27,6 @@ resource attachedDisk 'Microsoft.Compute/disks@2022-03-02' = { type: 'EncryptionAtRestWithPlatformKey' } networkAccessPolicy: 'AllowAll' - osType: 'Linux' - publicNetworkAccess: 'Enabled' - } - sku: { - name: 'Standard_LRS' } } @@ -43,9 +43,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -79,10 +77,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } storageProfile: { imageReference: { + version: 'latest' offer: 'UbuntuServer' publisher: 'Canonical' sku: '16.04-LTS' - version: 'latest' } osDisk: { caching: 'ReadWrite' @@ -92,7 +90,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } dataDisks: [ { - caching: 'ReadWrite' createOption: 'Empty' name: dataDiskName diskSizeGB: 1 @@ -100,6 +97,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { managedDisk: { storageAccountType: 'Standard_LRS' } + caching: 'ReadWrite' } { caching: 'ReadWrite' @@ -132,8 +130,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' delegations: [] diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep index f066b25c..0eef5057 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep @@ -1,3 +1,4 @@ +param attachedResourceName string = 'acctest0002' param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator username for the virtual machine') @@ -5,7 +6,6 @@ param adminUsername string @secure() @description('The administrator password for the virtual machine') param adminPassword string -param attachedResourceName string = 'acctest0002' var osDiskName = 'myosdisk1' var attachedOsDiskName = 'myosdisk2' @@ -14,53 +14,32 @@ resource managedDisk 'Microsoft.Compute/disks@2023-10-02' existing = { name: osDiskName } -resource attachedManagedDisk 'Microsoft.Compute/disks@2023-10-02' = { - name: attachedOsDiskName +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName location: location properties: { - creationData: { - createOption: 'Copy' - sourceResourceId: snapshot.id - } - diskSizeGB: 30 - encryption: { - type: 'EncryptionAtRestWithPlatformKey' + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] } - hyperVGeneration: 'V1' - networkAccessPolicy: 'AllowAll' - osType: 'Linux' - publicNetworkAccess: 'Enabled' - supportedCapabilities: { - architecture: 'x64' + dhcpOptions: { + dnsServers: [] } + subnets: [] } - sku: { - name: 'Standard_LRS' - } - zones: [ - '1' - ] } -resource attachedNetworkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { - name: attachedResourceName - location: location +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: resourceName + parent: virtualNetwork properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'testconfiguration2' - properties: { - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] } } @@ -83,7 +62,6 @@ resource attachedVirtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = } storageProfile: { osDisk: { - caching: 'ReadWrite' createOption: 'Attach' name: attachedOsDiskName osType: 'Linux' @@ -91,16 +69,60 @@ resource attachedVirtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = managedDisk: { id: attachedManagedDisk.id } + caching: 'ReadWrite' } } } } +resource attachedManagedDisk 'Microsoft.Compute/disks@2023-10-02' = { + name: attachedOsDiskName + location: location + sku: { + name: 'Standard_LRS' + } + properties: { + creationData: { + createOption: 'Copy' + } + diskSizeGB: 30 + encryption: { + type: 'EncryptionAtRestWithPlatformKey' + } + networkAccessPolicy: 'AllowAll' + publicNetworkAccess: 'Enabled' + osType: 'Linux' + hyperVGeneration: 'V1' + supportedCapabilities: { + architecture: 'x64' + } + } +} + +resource attachedNetworkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: attachedResourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration2' + properties: { + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + primary: true + } + } + ] + } +} + resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName location: location properties: { - enableAcceleratedNetworking: false enableIPForwarding: false ipConfigurations: [ { @@ -109,18 +131,20 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] + enableAcceleratedNetworking: false } } resource snapshot 'Microsoft.Compute/snapshots@2023-10-02' = { name: resourceName location: location + sku: { + name: 'Standard_ZRS' + } properties: { creationData: { createOption: 'Copy' @@ -130,18 +154,15 @@ resource snapshot 'Microsoft.Compute/snapshots@2023-10-02' = { encryption: { type: 'EncryptionAtRestWithPlatformKey' } - hyperVGeneration: 'V1' incremental: true networkAccessPolicy: 'AllowAll' osType: 'Linux' + hyperVGeneration: 'V1' publicNetworkAccess: 'Enabled' supportedCapabilities: { architecture: 'x64' } } - sku: { - name: 'Standard_ZRS' - } } resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { @@ -170,47 +191,18 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } } storageProfile: { - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '16.04-LTS' - version: 'latest' - } osDisk: { - caching: 'ReadWrite' createOption: 'FromImage' name: osDiskName writeAcceleratorEnabled: false + caching: 'ReadWrite' + } + imageReference: { + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' + offer: 'UbuntuServer' } } } } - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork - name: resourceName - properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - } -} diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep index 93a31595..fe7c62d6 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep @@ -1,32 +1,10 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator username for the virtual machine') param adminUsername string @secure() @description('The administrator password for the virtual machine') param adminPassword string - -resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { - name: resourceName - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'testconfiguration1' - properties: { - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] - } -} +param resourceName string = 'acctest0001' resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName @@ -46,8 +24,8 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null - adminUsername: null + adminPassword: adminPassword + adminUsername: adminUsername computerName: 'hostname230630032848831819' linuxConfiguration: { disablePasswordAuthentication: false @@ -55,16 +33,16 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } storageProfile: { imageReference: { + version: 'latest' offer: 'UbuntuServer' publisher: 'Canonical' sku: '16.04-LTS' - version: 'latest' } osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' name: 'myosdisk1' writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' } } } @@ -87,14 +65,34 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration1' + properties: { + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + } + } + ] } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep index 1092716f..c38ddd4d 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep @@ -17,9 +17,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -44,7 +42,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null + adminPassword: vmAdminPassword adminUsername: 'testadmin' computerName: 'hostname230630032848831819' linuxConfiguration: { @@ -53,10 +51,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } storageProfile: { imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' sku: '16.04-LTS' version: 'latest' + offer: 'UbuntuServer' + publisher: 'Canonical' } osDisk: { caching: 'ReadWrite' @@ -85,11 +83,10 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource extension 'Microsoft.Compute/virtualMachines/extensions@2023-03-01' = { - parent: virtualMachine name: resourceName location: location + parent: virtualMachine properties: { - autoUpgradeMinorVersion: false enableAutomaticUpgrade: false publisher: 'Microsoft.Azure.Extensions' settings: { @@ -98,6 +95,7 @@ resource extension 'Microsoft.Compute/virtualMachines/extensions@2023-03-01' = { suppressFailures: false type: 'CustomScript' typeHandlerVersion: '2.0' + autoUpgradeMinorVersion: false } tags: { environment: 'Production' @@ -105,14 +103,14 @@ resource extension 'Microsoft.Compute/virtualMachines/extensions@2023-03-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] - serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep index 7a26f542..8915b2f9 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep @@ -4,28 +4,6 @@ param location string = 'eastus' @description('The administrator password for the virtual machine') param adminPassword string -resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { - name: '${resourceName}-nic' - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'internal' - properties: { - primary: false - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] - } -} - resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { name: '${resourceName}-uai' location: location @@ -35,20 +13,32 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: '${resourceName}-vm' location: location properties: { - additionalCapabilities: {} - applicationProfile: { - galleryApplications: [] + hardwareProfile: { + vmSize: 'Standard_B2s' } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' + priority: 'Regular' + storageProfile: { + dataDisks: [] + imageReference: { + offer: '0001-com-ubuntu-server-jammy' + publisher: 'Canonical' + sku: '22_04-lts' + version: 'latest' + } + osDisk: { + osType: 'Linux' + writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' + managedDisk: { + storageAccountType: 'Premium_LRS' + } } } - extensionsTimeBudget: 'PT1H30M' - hardwareProfile: { - vmSize: 'Standard_B2s' + applicationProfile: { + galleryApplications: [] } + extensionsTimeBudget: 'PT1H30M' networkProfile: { networkInterfaces: [ { @@ -60,10 +50,11 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { ] } osProfile: { - adminPassword: null + secrets: [] + adminPassword: adminPassword adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001-vm' + computerName: '${resourceName}-vm' linuxConfiguration: { disablePasswordAuthentication: false patchSettings: { @@ -75,25 +66,12 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { publicKeys: [] } } - secrets: [] } - priority: 'Regular' - storageProfile: { - dataDisks: [] - imageReference: { - offer: '0001-com-ubuntu-server-jammy' - publisher: 'Canonical' - sku: '22_04-lts' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - managedDisk: { - storageAccountType: 'Premium_LRS' - } - osType: 'Linux' - writeAcceleratorEnabled: false + additionalCapabilities: {} + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' } } } @@ -117,28 +95,28 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } resource runCommand 'Microsoft.Compute/virtualMachines/runCommands@2023-03-01' = { - parent: virtualMachine name: '${resourceName}-runcommand' location: location + parent: virtualMachine properties: { - asyncExecution: false - errorBlobUri: '' - outputBlobUri: '' parameters: [] protectedParameters: [] - runAsPassword: '' runAsUser: '' source: { script: 'echo \'hello world\'' } timeoutInSeconds: 1200 treatFailureAsDeploymentFailure: true + asyncExecution: false + errorBlobUri: '' + outputBlobUri: '' + runAsPassword: '' } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' defaultOutboundAccess: true @@ -149,3 +127,23 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { serviceEndpoints: [] } } + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: '${resourceName}-nic' + location: location + properties: { + ipConfigurations: [ + { + name: 'internal' + properties: { + primary: false + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + } + } + ] + enableAcceleratedNetworking: false + enableIPForwarding: false + } +} diff --git a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep index 7fd25e57..280d0b7b 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep @@ -4,21 +4,13 @@ param location string = 'westeurope' resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023-03-01' = { name: resourceName location: location + sku: { + tier: 'Standard' + capacity: 1 + name: 'Standard_F2' + } properties: { - additionalCapabilities: {} - doNotRunExtensionsOnOverprovisionedVMs: false - orchestrationMode: 'Uniform' - overprovision: true - scaleInPolicy: { - forceDeletion: false - rules: [ - 'Default' - ] - } singlePlacementGroup: true - upgradePolicy: { - mode: 'Manual' - } virtualMachineProfile: { diagnosticsProfile: { bootDiagnostics: { @@ -34,35 +26,34 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- { name: 'example' properties: { - dnsSettings: { - dnsServers: [] - } - enableAcceleratedNetworking: false enableIPForwarding: false ipConfigurations: [ { name: 'internal' properties: { + privateIPAddressVersion: 'IPv4' + subnet: {} applicationGatewayBackendAddressPools: [] applicationSecurityGroups: [] loadBalancerBackendAddressPools: [] loadBalancerInboundNatPools: [] primary: true - privateIPAddressVersion: 'IPv4' - subnet: { - id: subnet.id - } } } ] primary: true + dnsSettings: { + dnsServers: [] + } + enableAcceleratedNetworking: false } } ] } osProfile: { + secrets: [] adminUsername: 'adminuser' - computerNamePrefix: 'acctest0001' + computerNamePrefix: resourceName linuxConfiguration: { disablePasswordAuthentication: true provisionVMAgent: true @@ -75,7 +66,6 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- ] } } - secrets: [] } priority: 'Regular' storageProfile: { @@ -87,21 +77,29 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- version: 'latest' } osDisk: { + writeAcceleratorEnabled: false caching: 'ReadWrite' createOption: 'FromImage' managedDisk: { storageAccountType: 'Standard_LRS' } osType: 'Linux' - writeAcceleratorEnabled: false } } } - } - sku: { - capacity: 1 - name: 'Standard_F2' - tier: 'Standard' + additionalCapabilities: {} + doNotRunExtensionsOnOverprovisionedVMs: false + orchestrationMode: 'Uniform' + overprovision: true + scaleInPolicy: { + rules: [ + 'Default' + ] + forceDeletion: false + } + upgradePolicy: { + mode: 'Manual' + } } } @@ -109,44 +107,44 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + dhcpOptions: { + dnsServers: [] + } + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' ] } - dhcpOptions: { - dnsServers: [] - } - subnets: [] } } resource extension 'Microsoft.Compute/virtualMachineScaleSets/extensions@2023-03-01' = { - parent: virtualMachineScaleSet name: resourceName + parent: virtualMachineScaleSet properties: { autoUpgradeMinorVersion: true enableAutomaticUpgrade: false - provisionAfterExtensions: [] publisher: 'Microsoft.Azure.Extensions' settings: { commandToExecute: 'echo $HOSTNAME' } suppressFailures: false - type: 'CustomScript' typeHandlerVersion: '2.0' + provisionAfterExtensions: [] + type: 'CustomScript' } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep index 149cea35..a1384cba 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep @@ -4,11 +4,12 @@ param location string = 'westeurope' resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023-03-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_F2' + tier: 'Standard' + } properties: { - additionalCapabilities: {} - doNotRunExtensionsOnOverprovisionedVMs: false - orchestrationMode: 'Uniform' - overprovision: true scaleInPolicy: { forceDeletion: false rules: [ @@ -16,10 +17,50 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- ] } singlePlacementGroup: true + additionalCapabilities: {} + doNotRunExtensionsOnOverprovisionedVMs: false + orchestrationMode: 'Uniform' + overprovision: true upgradePolicy: { mode: 'Manual' } virtualMachineProfile: { + osProfile: { + adminUsername: 'adminuser' + computerNamePrefix: resourceName + linuxConfiguration: { + ssh: { + publicKeys: [ + { + keyData: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+wWK73dCr+jgQOAxNsHAnNNNMEMWOHYEccp6wJm2gotpr9katuF/ZAdou5AaW1C61slRkHRkpRRX9FA9CYBiitZgvCCz+3nWNN7l/Up54Zps/pHWGZLHNJZRYyAB6j5yVLMVHIHriY49d/GZTZVNB8GoJv9Gakwc/fuEZYYl4YDFiGMBP///TzlI4jhiJzjKnEvqPFki5p2ZRJqcbCiF4pJrxUQR/RXqVFQdbRLZgYfJ8xGB878RENq3yQ39d8dVOkq4edbkzwcUmwwwkYVPIoDGsYLaRHnG+To7FvMeyO7xDVQkMKzopTQV8AuKpyvpqu0a9pWOMaiCyDytO7GGN you@me.com' + path: '/home/adminuser/.ssh/authorized_keys' + } + ] + } + disablePasswordAuthentication: true + provisionVMAgent: true + } + secrets: [] + } + priority: 'Regular' + storageProfile: { + dataDisks: [] + imageReference: { + version: 'latest' + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + } + osDisk: { + writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' + managedDisk: { + storageAccountType: 'Standard_LRS' + } + osType: 'Linux' + } + } diagnosticsProfile: { bootDiagnostics: { enabled: false @@ -43,15 +84,13 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- { name: 'internal' properties: { - applicationGatewayBackendAddressPools: [] - applicationSecurityGroups: [] loadBalancerBackendAddressPools: [] loadBalancerInboundNatPools: [] primary: true privateIPAddressVersion: 'IPv4' - subnet: { - id: subnet.id - } + subnet: {} + applicationGatewayBackendAddressPools: [] + applicationSecurityGroups: [] } } ] @@ -60,49 +99,8 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } ] } - osProfile: { - adminUsername: 'adminuser' - computerNamePrefix: 'acctest0001' - linuxConfiguration: { - disablePasswordAuthentication: true - provisionVMAgent: true - ssh: { - publicKeys: [ - { - keyData: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+wWK73dCr+jgQOAxNsHAnNNNMEMWOHYEccp6wJm2gotpr9katuF/ZAdou5AaW1C61slRkHRkpRRX9FA9CYBiitZgvCCz+3nWNN7l/Up54Zps/pHWGZLHNJZRYyAB6j5yVLMVHIHriY49d/GZTZVNB8GoJv9Gakwc/fuEZYYl4YDFiGMBP///TzlI4jhiJzjKnEvqPFki5p2ZRJqcbCiF4pJrxUQR/RXqVFQdbRLZgYfJ8xGB878RENq3yQ39d8dVOkq4edbkzwcUmwwwkYVPIoDGsYLaRHnG+To7FvMeyO7xDVQkMKzopTQV8AuKpyvpqu0a9pWOMaiCyDytO7GGN you@me.com' - path: '/home/adminuser/.ssh/authorized_keys' - } - ] - } - } - secrets: [] - } - priority: 'Regular' - storageProfile: { - dataDisks: [] - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '16.04-LTS' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - managedDisk: { - storageAccountType: 'Standard_LRS' - } - osType: 'Linux' - writeAcceleratorEnabled: false - } - } } } - sku: { - capacity: 1 - name: 'Standard_F2' - tier: 'Standard' - } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -122,8 +120,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' delegations: [] diff --git a/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep b/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep index 248c723d..f60b984d 100644 --- a/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep +++ b/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep @@ -8,19 +8,19 @@ resource ledger 'Microsoft.ConfidentialLedger/ledgers@2022-05-13' = { name: resourceName location: location properties: { - aadBasedSecurityPrincipals: [ + certBasedSecurityPrincipals: [ { + cert: ledgerCertificate ledgerRoleName: 'Administrator' - principalId: deployer().objectId - tenantId: deployer().tenantId } ] - certBasedSecurityPrincipals: [ + ledgerType: 'Private' + aadBasedSecurityPrincipals: [ { - cert: null ledgerRoleName: 'Administrator' + principalId: deployer().objectId + tenantId: tenant().tenantId } ] - ledgerType: 'Private' } } diff --git a/settings/remarks/microsoft.consumption/samples/budgets/main.bicep b/settings/remarks/microsoft.consumption/samples/budgets/main.bicep index d8ab99ee..78b6b1ba 100644 --- a/settings/remarks/microsoft.consumption/samples/budgets/main.bicep +++ b/settings/remarks/microsoft.consumption/samples/budgets/main.bicep @@ -1,21 +1,36 @@ +targetScope = 'subscription' + param resourceName string = 'acctest0001' +param location string = 'westus' + +resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: resourceName + location: location +} resource budget 'Microsoft.Consumption/budgets@2019-10-01' = { name: resourceName properties: { + timeGrain: 'Monthly' + timePeriod: { + startDate: '2025-08-01T00:00:00Z' + } amount: 1000 category: 'Cost' filter: { tags: { - name: 'foo' - operator: 'In' values: [ 'bar' ] + name: 'foo' + operator: 'In' } } notifications: { 'Actual_EqualTo_90.000000_Percent': { + operator: 'EqualTo' + threshold: 90 + thresholdType: 'Actual' contactEmails: [ 'foo@example.com' 'bar@example.com' @@ -23,14 +38,7 @@ resource budget 'Microsoft.Consumption/budgets@2019-10-01' = { contactGroups: [] contactRoles: [] enabled: true - operator: 'EqualTo' - threshold: 90 - thresholdType: 'Actual' } } - timeGrain: 'Monthly' - timePeriod: { - startDate: '2025-08-01T00:00:00Z' - } } } diff --git a/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep b/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep index cd16892d..28ea0219 100644 --- a/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep +++ b/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep @@ -20,8 +20,8 @@ resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' ] resources: { requests: { - cpu: any('0.5') memoryInGB: any('0.5') + cpu: any('0.5') } } } @@ -45,5 +45,4 @@ resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' tags: { environment: 'Testing' } - zones: [] } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep index d5cfa193..127c321c 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep @@ -4,14 +4,18 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Premium' + tier: 'Premium' + } properties: { + dataEndpointEnabled: false + networkRuleBypassOptions: 'AzureServices' adminUserEnabled: false anonymousPullEnabled: false - dataEndpointEnabled: false encryption: { status: 'disabled' } - networkRuleBypassOptions: 'AzureServices' policies: { exportPolicy: { status: 'enabled' @@ -29,16 +33,12 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Premium' - tier: 'Premium' - } } resource agentPool 'Microsoft.ContainerRegistry/registries/agentPools@2019-06-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { count: 1 os: 'Linux' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep index a4ecf510..5fe9115b 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep @@ -4,32 +4,32 @@ param location string = 'westus' resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = { name: '${resourceName}registry' location: location + sku: { + name: 'Basic' + } properties: { + zoneRedundancy: 'Disabled' adminUserEnabled: false anonymousPullEnabled: false dataEndpointEnabled: false networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } quarantinePolicy: { status: 'disabled' } retentionPolicy: {} trustPolicy: {} + exportPolicy: { + status: 'enabled' + } } publicNetworkAccess: 'Enabled' - zoneRedundancy: 'Disabled' - } - sku: { - name: 'Basic' } } resource cacheRule 'Microsoft.ContainerRegistry/registries/cacheRules@2023-07-01' = { - parent: registry name: '${resourceName}-cache-rule' + parent: registry properties: { sourceRepository: 'mcr.microsoft.com/hello-world' targetRepository: 'target' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep index e709e2a0..f28404ad 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep @@ -1,10 +1,15 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = { name: '${resourceName}registry' location: location + sku: { + name: 'Premium' + } properties: { + publicNetworkAccess: 'Enabled' + zoneRedundancy: 'Disabled' adminUserEnabled: false anonymousPullEnabled: false dataEndpointEnabled: true @@ -19,17 +24,12 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = retentionPolicy: {} trustPolicy: {} } - publicNetworkAccess: 'Enabled' - zoneRedundancy: 'Disabled' - } - sku: { - name: 'Premium' } } resource connectedRegistry 'Microsoft.ContainerRegistry/registries/connectedRegistries@2023-11-01-preview' = { - parent: registry name: '${resourceName}connectedregistry' + parent: registry properties: { clientTokenIds: null logging: { @@ -39,18 +39,17 @@ resource connectedRegistry 'Microsoft.ContainerRegistry/registries/connectedRegi mode: 'ReadWrite' parent: { syncProperties: { + syncWindow: '' messageTtl: 'P1D' schedule: '* * * * *' - syncWindow: '' - tokenId: token.id } } } } resource scopeMap 'Microsoft.ContainerRegistry/registries/scopeMaps@2023-11-01-preview' = { - parent: registry name: '${resourceName}scopemap' + parent: registry properties: { actions: [ 'repositories/hello-world/content/delete' @@ -58,18 +57,18 @@ resource scopeMap 'Microsoft.ContainerRegistry/registries/scopeMaps@2023-11-01-p 'repositories/hello-world/content/write' 'repositories/hello-world/metadata/read' 'repositories/hello-world/metadata/write' - 'gateway/acctest0001connectedregistry/config/read' - 'gateway/acctest0001connectedregistry/config/write' - 'gateway/acctest0001connectedregistry/message/read' - 'gateway/acctest0001connectedregistry/message/write' + 'gateway/${resourceName}connectedregistry/config/read' + 'gateway/${resourceName}connectedregistry/config/write' + 'gateway/${resourceName}connectedregistry/message/read' + 'gateway/${resourceName}connectedregistry/message/write' ] description: '' } } resource token 'Microsoft.ContainerRegistry/registries/tokens@2023-11-01-preview' = { - parent: registry name: '${resourceName}token' + parent: registry properties: { scopeMapId: scopeMap.id status: 'enabled' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep index 83e8da41..292d1af2 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep @@ -7,36 +7,15 @@ param credentialUsername string = 'testuser' @description('The password for the container registry credential') param credentialPassword string -resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = { - name: resourceName - location: location - properties: { - adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false - networkRuleBypassOptions: 'AzureServices' - policies: { - exportPolicy: { - status: 'enabled' - } - quarantinePolicy: { - status: 'disabled' - } - retentionPolicy: {} - trustPolicy: {} - } - publicNetworkAccess: 'Enabled' - zoneRedundancy: 'Disabled' - } - sku: { - name: 'Basic' - } -} - resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: '${resourceName}vault' location: location properties: { + enableRbacAuthorization: false + enableSoftDelete: true + enabledForTemplateDeployment: false + publicNetworkAccess: 'Enabled' + tenantId: tenant().tenantId accessPolicies: [ { objectId: deployer().objectId @@ -51,34 +30,55 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { ] storage: [] } - tenantId: deployer().tenantId + tenantId: tenant().tenantId } ] - createMode: 'default' - enableRbacAuthorization: false - enableSoftDelete: true enabledForDeployment: false enabledForDiskEncryption: false - enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' sku: { family: 'A' name: 'standard' } softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId + createMode: 'default' + } +} + +resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = { + name: resourceName + location: location + sku: { + name: 'Basic' + } + properties: { + networkRuleBypassOptions: 'AzureServices' + policies: { + exportPolicy: { + status: 'enabled' + } + quarantinePolicy: { + status: 'disabled' + } + retentionPolicy: {} + trustPolicy: {} + } + publicNetworkAccess: 'Enabled' + zoneRedundancy: 'Disabled' + adminUserEnabled: false + anonymousPullEnabled: false + dataEndpointEnabled: false } } resource credentialSet 'Microsoft.ContainerRegistry/registries/credentialSets@2023-07-01' = { - parent: registry name: '${resourceName}-acr-credential-set' + parent: registry properties: { authCredentials: [ { + usernameSecretIdentifier: 'https://${resourceName}vault.vault.azure.net/secrets/username' name: 'Credential1' - passwordSecretIdentifier: 'https://acctest0001vault.vault.azure.net/secrets/password' - usernameSecretIdentifier: 'https://acctest0001vault.vault.azure.net/secrets/username' + passwordSecretIdentifier: 'https://${resourceName}vault.vault.azure.net/secrets/password' } ] loginServer: 'docker.io' @@ -86,17 +86,17 @@ resource credentialSet 'Microsoft.ContainerRegistry/registries/credentialSets@20 } resource passwordSecret 'Microsoft.KeyVault/vaults/secrets@2023-02-01' = { - parent: vault name: 'password' + parent: vault properties: { - value: null + value: '${credentialPassword}' } } resource usernameSecret 'Microsoft.KeyVault/vaults/secrets@2023-02-01' = { - parent: vault name: 'username' + parent: vault properties: { - value: 'testuser' + value: '${credentialUsername}' } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep index b9e3386c..c3479db2 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep @@ -4,33 +4,33 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Standard' + tier: 'Standard' + } properties: { - adminUserEnabled: false - anonymousPullEnabled: false dataEndpointEnabled: false encryption: { status: 'disabled' } networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } - quarantinePolicy: { - status: 'disabled' - } retentionPolicy: { status: 'disabled' } trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } + quarantinePolicy: { + status: 'disabled' + } } publicNetworkAccess: 'Enabled' + adminUserEnabled: false + anonymousPullEnabled: false zoneRedundancy: 'Disabled' } - sku: { - name: 'Standard' - tier: 'Standard' - } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep index b40cc76a..bf93f7c3 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep @@ -4,14 +4,11 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + tier: 'Premium' + name: 'Premium' + } properties: { - adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false - encryption: { - status: 'disabled' - } - networkRuleBypassOptions: 'AzureServices' policies: { exportPolicy: { status: 'enabled' @@ -26,18 +23,21 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = status: 'disabled' } } - publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Premium' - tier: 'Premium' + adminUserEnabled: false + anonymousPullEnabled: false + dataEndpointEnabled: false + publicNetworkAccess: 'Enabled' + encryption: { + status: 'disabled' + } + networkRuleBypassOptions: 'AzureServices' } } resource scopeMap 'Microsoft.ContainerRegistry/registries/scopeMaps@2021-08-01-preview' = { - parent: registry name: resourceName + parent: registry properties: { actions: [ 'repositories/testrepo/content/read' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep index 0789863e..95f527e8 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep @@ -4,14 +4,19 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Standard' + tier: 'Standard' + } properties: { - adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false encryption: { status: 'disabled' } networkRuleBypassOptions: 'AzureServices' + publicNetworkAccess: 'Enabled' + adminUserEnabled: false + anonymousPullEnabled: false + dataEndpointEnabled: false policies: { exportPolicy: { status: 'enabled' @@ -26,19 +31,14 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = status: 'disabled' } } - publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Standard' - tier: 'Standard' - } } resource taskRun 'Microsoft.ContainerRegistry/registries/taskRuns@2019-06-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { runRequest: { dockerFilePath: 'Dockerfile' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep index c31bbd8c..d288908c 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep @@ -4,14 +4,18 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Basic' + tier: 'Basic' + } properties: { adminUserEnabled: false anonymousPullEnabled: false - dataEndpointEnabled: false encryption: { status: 'disabled' } networkRuleBypassOptions: 'AzureServices' + dataEndpointEnabled: false policies: { exportPolicy: { status: 'enabled' @@ -29,20 +33,16 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Basic' - tier: 'Basic' - } } resource task 'Microsoft.ContainerRegistry/registries/tasks@2019-06-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { - isSystemTask: true - status: 'Enabled' step: null timeout: 3600 + isSystemTask: true + status: 'Enabled' } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep index b4380ac1..b4b03f75 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep @@ -4,14 +4,15 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Premium' + tier: 'Premium' + } properties: { + networkRuleBypassOptions: 'AzureServices' + publicNetworkAccess: 'Enabled' adminUserEnabled: true - anonymousPullEnabled: false dataEndpointEnabled: false - encryption: { - status: 'disabled' - } - networkRuleBypassOptions: 'AzureServices' policies: { exportPolicy: { status: 'enabled' @@ -26,18 +27,17 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = status: 'disabled' } } - publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Premium' - tier: 'Premium' + anonymousPullEnabled: false + encryption: { + status: 'disabled' + } } } resource token 'Microsoft.ContainerRegistry/registries/tokens@2021-08-01-preview' = { - parent: registry name: resourceName + parent: registry properties: { scopeMapId: resourceId('Microsoft.ContainerRegistry/registries/scopeMaps', registry.name, '_repositories_pull') status: 'enabled' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep index 23f95fe2..d819c4bd 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep @@ -4,18 +4,13 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Standard' + tier: 'Standard' + } properties: { - adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false - encryption: { - status: 'disabled' - } networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } quarantinePolicy: { status: 'disabled' } @@ -25,27 +20,32 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } } publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Standard' - tier: 'Standard' + anonymousPullEnabled: false + adminUserEnabled: false + dataEndpointEnabled: false + encryption: { + status: 'disabled' + } } } resource webHook 'Microsoft.ContainerRegistry/registries/webHooks@2021-08-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { + scope: '' + serviceUri: 'https://mywebhookreceiver.example/mytag' + status: 'enabled' actions: [ 'push' ] customHeaders: {} - scope: '' - serviceUri: 'https://mywebhookreceiver.example/mytag' - status: 'enabled' } } diff --git a/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep b/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep index 627308ea..42284263 100644 --- a/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep @@ -1,42 +1,52 @@ -param resourceName string = 'acctest0001' param location string = 'westus' - -resource fleet 'Microsoft.ContainerService/fleets@2024-04-01' = { - name: resourceName - location: location - properties: {} -} +param resourceName string = 'acctest0001' resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' = { name: resourceName location: location + sku: { + name: 'Base' + tier: 'Free' + } properties: { + metricsProfile: { + costAnalysis: { + enabled: false + } + } + nodeResourceGroup: '' addonProfiles: {} agentPoolProfiles: [ { + mode: 'System' + osDiskType: 'Managed' + tags: {} count: 1 enableAutoScaling: false - enableEncryptionAtHost: false - enableFIPS: false - enableNodePublicIP: false enableUltraSSD: false - kubeletDiskType: '' - mode: 'System' - name: 'default' - nodeLabels: {} - osDiskType: 'Managed' - osType: 'Linux' scaleDownMode: 'Delete' - tags: {} + vmSize: 'Standard_B2s' + enableNodePublicIP: false type: 'VirtualMachineScaleSets' upgradeSettings: { drainTimeoutInMinutes: 0 maxSurge: '10%' nodeSoakDurationInMinutes: 0 } - vmSize: 'Standard_B2s' + enableEncryptionAtHost: false + name: 'default' + nodeLabels: {} + osType: 'Linux' + enableFIPS: false + kubeletDiskType: '' } ] + enableRBAC: true + securityProfile: {} + servicePrincipalProfile: { + clientId: 'msi' + } + supportPlan: 'KubernetesOfficial' apiServerAccessProfile: { disableRunCommand: false enablePrivateCluster: false @@ -52,32 +62,22 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' } } disableLocalAccounts: false - dnsPrefix: 'acctest0001' - enableRBAC: true + dnsPrefix: '${resourceName}' kubernetesVersion: '' - metricsProfile: { - costAnalysis: { - enabled: false - } - } - nodeResourceGroup: '' - securityProfile: {} - servicePrincipalProfile: { - clientId: 'msi' - } - supportPlan: 'KubernetesOfficial' - } - sku: { - name: 'Base' - tier: 'Free' } } +resource fleet 'Microsoft.ContainerService/fleets@2024-04-01' = { + name: resourceName + location: location + properties: {} +} + resource member 'Microsoft.ContainerService/fleets/members@2024-04-01' = { - parent: fleet name: resourceName + parent: fleet properties: { - clusterResourceId: managedCluster.id group: 'default' + clusterResourceId: managedCluster.id } } diff --git a/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep b/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep index c752f464..1b17cd79 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep @@ -13,13 +13,13 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p vmSize: 'Standard_DS2_v2' } ] - dnsPrefix: 'acctest0001' + dnsPrefix: '${resourceName}' } } resource agentPool 'Microsoft.ContainerService/managedClusters/agentPools@2023-04-02-preview' = { - parent: managedCluster name: 'internal' + parent: managedCluster properties: { count: 1 mode: 'User' diff --git a/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep b/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep index 786bb9f1..63d7517e 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep @@ -5,6 +5,7 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p name: resourceName location: location properties: { + dnsPrefix: '${resourceName}' agentPoolProfiles: [ { count: 1 @@ -13,6 +14,5 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p vmSize: 'Standard_DS2_v2' } ] - dnsPrefix: 'acctest0001' } } diff --git a/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep b/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep index 25a49290..9c8ff611 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep @@ -1,99 +1,33 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: 'ai-${resourceName}' - location: location - kind: 'web' - properties: { - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - } -} - -resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' = { - name: 'aks-${resourceName}' - location: location - properties: { - addonProfiles: {} - agentPoolProfiles: [ - { - count: 1 - enableAutoScaling: false - enableEncryptionAtHost: false - enableFIPS: false - enableNodePublicIP: false - enableUltraSSD: false - kubeletDiskType: '' - mode: 'System' - name: 'default' - nodeLabels: {} - osDiskType: 'Managed' - osType: 'Linux' - scaleDownMode: 'Delete' - tags: {} - type: 'VirtualMachineScaleSets' - upgradeSettings: { - drainTimeoutInMinutes: 0 - maxSurge: '10%' - nodeSoakDurationInMinutes: 0 - } - vmSize: 'Standard_B2s' - } - ] - apiServerAccessProfile: { - disableRunCommand: false - enablePrivateCluster: false - enablePrivateClusterPublicFQDN: false - } - autoUpgradeProfile: { - nodeOSUpgradeChannel: 'NodeImage' - upgradeChannel: 'none' - } - azureMonitorProfile: { - metrics: { - enabled: false - } - } - disableLocalAccounts: false - dnsPrefix: 'aks-acctest0001' - enableRBAC: true - kubernetesVersion: '' - metricsProfile: { - costAnalysis: { - enabled: false - } - } - nodeResourceGroup: '' - securityProfile: {} - servicePrincipalProfile: { - clientId: 'msi' - } - supportPlan: 'KubernetesOfficial' - } - sku: { - name: 'Base' - tier: 'Free' - } -} - resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: 'st${resourceName}' location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: false + minimumTlsVersion: 'TLS1_2' allowSharedKeyAccess: true + isHnsEnabled: false defaultToOAuthAuthentication: false dnsEndpointType: 'Standard' + isNfsV3Enabled: false + isSftpEnabled: false + networkAcls: { + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + allowBlobPublicAccess: true + allowCrossTenantReplication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -105,23 +39,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - isHnsEnabled: false isLocalUserEnabled: true - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - bypass: 'AzureServices' - defaultAction: 'Allow' - ipRules: [] - resourceAccessRules: [] - virtualNetworkRules: [] - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } @@ -130,24 +48,28 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { location: location properties: { accessPolicies: [] - createMode: 'default' - enableRbacAuthorization: false enabledForDeployment: false enabledForDiskEncryption: false - enabledForTemplateDeployment: false publicNetworkAccess: 'Enabled' sku: { - family: 'A' name: 'standard' + family: 'A' } softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId + createMode: 'default' + enableRbacAuthorization: false + enabledForTemplateDeployment: false + tenantId: tenant().tenantId } } resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-04-01' = { name: 'mlw-${resourceName}' location: location + sku: { + name: 'Basic' + tier: 'Basic' + } kind: 'Default' properties: { applicationInsights: component.id @@ -156,15 +78,77 @@ resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-04-01' = { storageAccount: storageAccount.id v1LegacyMode: false } +} + +resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' = { + name: 'aks-${resourceName}' + location: location sku: { - name: 'Basic' - tier: 'Basic' + tier: 'Free' + name: 'Base' + } + properties: { + apiServerAccessProfile: { + disableRunCommand: false + enablePrivateCluster: false + enablePrivateClusterPublicFQDN: false + } + azureMonitorProfile: { + metrics: { + enabled: false + } + } + disableLocalAccounts: false + dnsPrefix: 'aks-${resourceName}' + enableRBAC: true + metricsProfile: { + costAnalysis: { + enabled: false + } + } + nodeResourceGroup: '' + servicePrincipalProfile: { + clientId: 'msi' + } + addonProfiles: {} + agentPoolProfiles: [ + { + enableAutoScaling: false + name: 'default' + nodeLabels: {} + enableEncryptionAtHost: false + osDiskType: 'Managed' + tags: {} + type: 'VirtualMachineScaleSets' + upgradeSettings: { + drainTimeoutInMinutes: 0 + maxSurge: '10%' + nodeSoakDurationInMinutes: 0 + } + scaleDownMode: 'Delete' + count: 1 + enableNodePublicIP: false + enableUltraSSD: false + kubeletDiskType: '' + osType: 'Linux' + enableFIPS: false + mode: 'System' + vmSize: 'Standard_B2s' + } + ] + autoUpgradeProfile: { + nodeOSUpgradeChannel: 'NodeImage' + upgradeChannel: 'none' + } + kubernetesVersion: '' + securityProfile: {} + supportPlan: 'KubernetesOfficial' } } resource trustedAccessRoleBinding 'Microsoft.ContainerService/managedClusters/trustedAccessRoleBindings@2025-02-01' = { - parent: managedCluster name: 'tarb-${resourceName}' + parent: managedCluster properties: { roles: [ 'Microsoft.MachineLearningServices/workspaces/mlworkload' @@ -172,3 +156,19 @@ resource trustedAccessRoleBinding 'Microsoft.ContainerService/managedClusters/tr sourceResourceId: workspace.id } } + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: 'ai-${resourceName}' + location: location + kind: 'web' + properties: { + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' + } +} diff --git a/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep b/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep index 1eb2dc82..790a130d 100644 --- a/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep +++ b/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep @@ -1,11 +1,25 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' resource scheduledAction 'Microsoft.CostManagement/scheduledActions@2022-10-01' = { name: resourceName + scope: subscription() kind: 'Email' properties: { + notificationEmail: 'test@test.com' + schedule: { + frequency: 'Daily' + hourOfDay: 0 + startDate: '2023-07-01T00:00:00Z' + weeksOfMonth: null + dayOfMonth: 0 + daysOfWeek: null + endDate: '2023-07-02T00:00:00Z' + } + status: 'Enabled' + viewId: resourceId('Microsoft.CostManagement/views', 'ms:CostByService') displayName: 'CostByServiceViewerz3k' fileDestination: { fileFormats: [] @@ -18,17 +32,5 @@ resource scheduledAction 'Microsoft.CostManagement/scheduledActions@2022-10-01' 'hashicorp@test.com' ] } - notificationEmail: 'test@test.com' - schedule: { - dayOfMonth: 0 - daysOfWeek: null - endDate: '2023-07-02T00:00:00Z' - frequency: 'Daily' - hourOfDay: 0 - startDate: '2023-07-01T00:00:00Z' - weeksOfMonth: null - } - status: 'Enabled' - viewId: resourceId('Microsoft.CostManagement/views', 'ms:CostByService') } } diff --git a/settings/remarks/microsoft.costmanagement/samples/views/main.bicep b/settings/remarks/microsoft.costmanagement/samples/views/main.bicep index be056d90..5294f43a 100644 --- a/settings/remarks/microsoft.costmanagement/samples/views/main.bicep +++ b/settings/remarks/microsoft.costmanagement/samples/views/main.bicep @@ -1,6 +1,5 @@ -targetScope = 'subscription' - param resourceName string = 'acctest0001' +param location string = 'eastus' resource view 'Microsoft.CostManagement/views@2022-10-01' = { name: resourceName @@ -30,17 +29,6 @@ resource view 'Microsoft.CostManagement/views@2022-10-01' = { ] query: { dataSet: { - aggregation: { - totalCost: { - function: 'Sum' - name: 'Cost' - } - totalCostUSD: { - function: 'Sum' - name: 'CostUSD' - } - } - granularity: 'Monthly' grouping: [ { name: 'ResourceGroupName' @@ -53,6 +41,17 @@ resource view 'Microsoft.CostManagement/views@2022-10-01' = { name: 'BillingMonth' } ] + aggregation: { + totalCost: { + function: 'Sum' + name: 'Cost' + } + totalCostUSD: { + function: 'Sum' + name: 'CostUSD' + } + } + granularity: 'Monthly' } timeframe: 'MonthToDate' type: 'Usage' diff --git a/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep b/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep index 042f70ca..a1ea4cbe 100644 --- a/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep +++ b/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep @@ -4,6 +4,9 @@ param location string = 'westeurope' resource grafana 'Microsoft.Dashboard/grafana@2022-08-01' = { name: resourceName location: location + sku: { + name: 'Standard' + } properties: { apiKey: 'Disabled' autoGeneratedDomainNameLabelScope: 'TenantReuse' @@ -11,7 +14,4 @@ resource grafana 'Microsoft.Dashboard/grafana@2022-08-01' = { publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Standard' - } } diff --git a/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep b/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep index 71e55b93..e1e986b2 100644 --- a/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep @@ -12,6 +12,9 @@ resource account 'Microsoft.Monitor/accounts@2023-04-03' = { resource grafana 'Microsoft.Dashboard/grafana@2023-09-01' = { name: '${resourceName}-graf' location: location + sku: { + name: 'Standard' + } properties: { apiKey: 'Disabled' autoGeneratedDomainNameLabelScope: 'TenantReuse' @@ -20,22 +23,19 @@ resource grafana 'Microsoft.Dashboard/grafana@2023-09-01' = { publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Standard' - } } resource managedPrivateEndpoint 'Microsoft.Dashboard/grafana/managedPrivateEndpoints@2023-09-01' = { - parent: grafana name: '${resourceName}-mpe' location: location + parent: grafana properties: { - groupIds: [ - 'prometheusMetrics' - ] privateLinkResourceId: account.id - privateLinkResourceRegion: 'eastus' + privateLinkResourceRegion: location privateLinkServiceUrl: '' requestMessage: '' + groupIds: [ + 'prometheusMetrics' + ] } } diff --git a/settings/remarks/microsoft.databricks/samples/workspaces/main.bicep b/settings/remarks/microsoft.databricks/samples/workspaces/main.bicep index 73fa901d..6892df12 100644 --- a/settings/remarks/microsoft.databricks/samples/workspaces/main.bicep +++ b/settings/remarks/microsoft.databricks/samples/workspaces/main.bicep @@ -4,8 +4,11 @@ param location string = 'eastus2' resource workspace 'Microsoft.Databricks/workspaces@2023-02-01' = { name: resourceName location: location + sku: { + name: 'premium' + } properties: { - managedResourceGroupId: resourceId('Microsoft.Resources/resourceGroups', 'databricks-rg-${resourceName}') + managedResourceGroupId: resourceGroup().id parameters: { prepareEncryption: { value: true @@ -16,7 +19,4 @@ resource workspace 'Microsoft.Databricks/workspaces@2023-02-01' = { } publicNetworkAccess: 'Enabled' } - sku: { - name: 'premium' - } } diff --git a/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep b/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep index a75f36b6..bd3413f3 100644 --- a/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep +++ b/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep @@ -20,27 +20,19 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { resource workspace 'Microsoft.Databricks/workspaces@2023-02-01' = { name: resourceName location: location - properties: { - managedResourceGroupId: resourceId('Microsoft.Resources/resourceGroups', 'databricks-rg-${resourceName}') - publicNetworkAccess: 'Enabled' - } sku: { name: 'standard' } + properties: { + publicNetworkAccess: 'Enabled' + managedResourceGroupId: resourceGroup().id + } } resource virtualNetworkPeering 'Microsoft.Databricks/workspaces/virtualNetworkPeerings@2023-02-01' = { - parent: workspace name: resourceName + parent: workspace properties: { - allowForwardedTraffic: false - allowGatewayTransit: false - allowVirtualNetworkAccess: true - databricksAddressSpace: { - addressPrefixes: [ - '10.139.0.0/16' - ] - } remoteAddressSpace: { addressPrefixes: [ '10.0.1.0/24' @@ -50,5 +42,13 @@ resource virtualNetworkPeering 'Microsoft.Databricks/workspaces/virtualNetworkPe id: virtualNetwork.id } useRemoteGateways: false + allowForwardedTraffic: false + allowGatewayTransit: false + allowVirtualNetworkAccess: true + databricksAddressSpace: { + addressPrefixes: [ + '10.139.0.0/16' + ] + } } } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep index 74ba3e81..6d3e1d0e 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep @@ -12,17 +12,18 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' } resource credential 'Microsoft.DataFactory/factories/credentials@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { + type: 'ManagedIdentity' annotations: [ 'test' ] description: 'this is a test' - type: 'ManagedIdentity' typeProperties: { resourceId: userAssignedIdentity.id } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep index f8f1274a..57deb90e 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep @@ -13,42 +13,42 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { - queue: { + table: { keyType: 'Service' } - table: { + queue: { keyType: 'Service' } } } - isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } + accessTier: 'Hot' + allowBlobPublicAccess: true + defaultToOAuthAuthentication: false + isHnsEnabled: false + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowCrossTenantReplication: true + allowSharedKeyAccess: true } } resource dataflow 'Microsoft.DataFactory/factories/dataflows@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'Flowlet' @@ -69,9 +69,8 @@ source1 sink( { description: '' linkedService: { - parameters: {} - referenceName: linkedservice.name type: 'LinkedServiceReference' + parameters: {} } name: 'sink1' } @@ -81,7 +80,6 @@ source1 sink( description: '' linkedService: { parameters: {} - referenceName: linkedservice.name type: 'LinkedServiceReference' } name: 'source1' @@ -92,8 +90,8 @@ source1 sink( } resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'AzureBlobStorage' diff --git a/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep index 8f874454..87c8eabf 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep @@ -13,13 +13,19 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + isNfsV3Enabled: false + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -31,28 +37,21 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + defaultToOAuthAuthentication: false + isHnsEnabled: false } } resource dataset 'Microsoft.DataFactory/factories/datasets@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' linkedServiceName: { - referenceName: linkedservice.name type: 'LinkedServiceReference' } type: 'Json' @@ -69,8 +68,8 @@ resource dataset 'Microsoft.DataFactory/factories/datasets@2018-06-01' = { } resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'AzureBlobStorage' diff --git a/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep index 0b9e810d..1147b531 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep @@ -11,8 +11,8 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } resource integrationRuntime 'Microsoft.DataFactory/factories/integrationRuntimes@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'SelfHosted' diff --git a/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep index 6eb10574..145e99ed 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep @@ -10,16 +10,32 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } } +resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { + name: resourceName + parent: factory + properties: { + type: 'AzureBlobStorage' + typeProperties: { + serviceEndpoint: storageAccount.properties.primaryEndpoints.blob + } + description: '' + } +} + resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -31,29 +47,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' - } -} - -resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { - parent: factory - name: resourceName - properties: { - description: '' - type: 'AzureBlobStorage' - typeProperties: { - serviceEndpoint: storageAccount.properties.primaryEndpoints.blob - } + accessTier: 'Hot' + allowBlobPublicAccess: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false + isHnsEnabled: false } } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep index bf26c35b..1d550e51 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep @@ -5,14 +5,14 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { name: resourceName location: location properties: { + repoConfiguration: null globalParameters: {} publicNetworkAccess: 'Enabled' - repoConfiguration: null } } resource managedVirtualNetwork 'Microsoft.DataFactory/factories/managedVirtualNetworks@2018-06-01' = { - parent: factory name: 'default' + parent: factory properties: {} } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep index aecaf32e..77de140a 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep @@ -14,10 +14,14 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'BlobStorage' properties: { + minimumTlsVersion: 'TLS1_2' + supportsHttpsTrafficOnly: true accessTier: 'Hot' - allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true defaultToOAuthAuthentication: false @@ -32,30 +36,26 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowBlobPublicAccess: true + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false } } resource managedVirtualNetwork 'Microsoft.DataFactory/factories/managedVirtualNetworks@2018-06-01' = { - parent: factory name: 'default' + parent: factory properties: {} } resource managedPrivateEndpoint 'Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints@2018-06-01' = { - parent: managedVirtualNetwork name: resourceName + parent: managedVirtualNetwork properties: { groupId: 'blob' privateLinkResourceId: storageAccount.id diff --git a/settings/remarks/microsoft.datafactory/samples/factories/pipelines/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/pipelines/main.bicep index a17dd9d8..8d6c2e91 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/pipelines/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/pipelines/main.bicep @@ -11,8 +11,8 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } resource pipeline 'Microsoft.DataFactory/factories/pipelines@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { annotations: [] description: '' diff --git a/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep index 4921a197..218320a7 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep @@ -11,8 +11,8 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } resource pipeline 'Microsoft.DataFactory/factories/pipelines@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { annotations: [] description: '' @@ -27,9 +27,15 @@ resource pipeline 'Microsoft.DataFactory/factories/pipelines@2018-06-01' = { } resource trigger 'Microsoft.DataFactory/factories/triggers@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { + typeProperties: { + frequency: 'Minute' + interval: 15 + maxConcurrency: 50 + startTime: '2022-09-21T00:00:00Z' + } description: '' pipeline: { parameters: {} @@ -39,11 +45,5 @@ resource trigger 'Microsoft.DataFactory/factories/triggers@2018-06-01' = { } } type: 'TumblingWindowTrigger' - typeProperties: { - frequency: 'Minute' - interval: 15 - maxConcurrency: 50 - startTime: '2022-09-21T00:00:00Z' - } } } diff --git a/settings/remarks/microsoft.datamigration/samples/services/main.bicep b/settings/remarks/microsoft.datamigration/samples/services/main.bicep index 655e65d7..6ff14b29 100644 --- a/settings/remarks/microsoft.datamigration/samples/services/main.bicep +++ b/settings/remarks/microsoft.datamigration/samples/services/main.bicep @@ -1,16 +1,14 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.DataMigration/services@2018-04-19' = { name: resourceName location: location - kind: 'Cloud' - properties: { - virtualSubnetId: subnet.id - } sku: { name: 'Standard_1vCores' } + kind: 'Cloud' + properties: {} } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -30,8 +28,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.1.0/24' delegations: [] diff --git a/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep b/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep index 097ee330..9e30b03f 100644 --- a/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep +++ b/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep @@ -1,16 +1,14 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.DataMigration/services@2018-04-19' = { name: resourceName location: location - kind: 'Cloud' - properties: { - virtualSubnetId: subnet.id - } sku: { name: 'Standard_1vCores' } + kind: 'Cloud' + properties: {} } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -30,9 +28,9 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource project 'Microsoft.DataMigration/services/projects@2018-04-19' = { - parent: service name: resourceName location: location + parent: service properties: { sourcePlatform: 'SQL' targetPlatform: 'SQLDB' @@ -40,14 +38,14 @@ resource project 'Microsoft.DataMigration/services/projects@2018-04-19' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.0.1.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.1.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' } } diff --git a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep index 85769b4f..32c15701 100644 --- a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep @@ -4,84 +4,75 @@ param location string = 'westeurope' @description('The administrator login password for the PostgreSQL server') param administratorLoginPassword string -resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { - name: resourceName - location: location - properties: { - storageSettings: [ - { - datastoreType: 'VaultStore' - type: 'LocallyRedundant' - } - ] - } -} - resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'B_Gen5_2' + tier: 'Basic' + } properties: { - administratorLogin: 'psqladmin' - administratorLoginPassword: null createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 5120 + backupRetentionDays: 7 } version: '9.5' + administratorLogin: 'psqladmin' + administratorLoginPassword: '${administratorLoginPassword}' + infrastructureEncryption: 'Disabled' + minimalTlsVersion: 'TLS1_2' + sslEnforcement: 'Enabled' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'B_Gen5_2' - tier: 'Basic' +} + +resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { + name: resourceName + location: location + properties: { + storageSettings: [ + { + type: 'LocallyRedundant' + datastoreType: 'VaultStore' + } + ] } } resource backupInstance 'Microsoft.DataProtection/backupVaults/backupInstances@2022-04-01' = { - parent: backupVault name: resourceName + parent: backupVault properties: { - dataSourceInfo: { - datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' - objectType: 'Datasource' - resourceID: database.id - resourceLocation: 'database.location' - resourceName: database.name - resourceType: 'Microsoft.DBforPostgreSQL/servers/databases' - resourceUri: '' - } dataSourceSetInfo: { + resourceUri: '' datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' objectType: 'DatasourceSet' resourceID: server.id - resourceLocation: 'server.location' + resourceLocation: server.location resourceName: server.name resourceType: 'Microsoft.DBForPostgreSQL/servers' - resourceUri: '' } datasourceAuthCredentials: null - friendlyName: 'acctest0001' + friendlyName: resourceName objectType: 'BackupInstance' - policyInfo: { - policyId: backupPolicy.id + policyInfo: {} + dataSourceInfo: { + objectType: 'Datasource' + resourceType: 'Microsoft.DBforPostgreSQL/servers/databases' + resourceUri: '' + datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' } } } resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022-04-01' = { - parent: backupVault name: resourceName + parent: backupVault properties: { - datasourceTypes: [ - 'Microsoft.DBforPostgreSQL/servers/databases' - ] - objectType: 'BackupPolicy' policyRules: [ { backupParameters: { @@ -103,12 +94,12 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 } taggingCriteria: [ { - isDefault: true tagInfo: { id: 'Default_' tagName: 'Default' } taggingPriority: 99 + isDefault: true } ] } @@ -122,8 +113,8 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 objectType: 'AbsoluteDeleteOption' } sourceDataStore: { - dataStoreType: 'VaultStore' objectType: 'DataStoreInfoBase' + dataStoreType: 'VaultStore' } targetDataStoreCopySettings: [] } @@ -132,12 +123,16 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 objectType: 'AzureRetentionRule' } ] + datasourceTypes: [ + 'Microsoft.DBforPostgreSQL/servers/databases' + ] + objectType: 'BackupPolicy' } } resource database 'Microsoft.DBforPostgreSQL/servers/databases@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { charset: 'UTF8' collation: 'English_United States.1252' diff --git a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep index 0e11a48b..ffe77a45 100644 --- a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep @@ -15,8 +15,8 @@ resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { } resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022-04-01' = { - parent: backupVault name: resourceName + parent: backupVault properties: { datasourceTypes: [ 'Microsoft.DBforPostgreSQL/servers/databases' @@ -24,14 +24,6 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 objectType: 'BackupPolicy' policyRules: [ { - backupParameters: { - backupType: 'Full' - objectType: 'AzureBackupParams' - } - dataStore: { - dataStoreType: 'VaultStore' - objectType: 'DataStoreInfoBase' - } name: 'BackupIntervals' objectType: 'AzureBackupRule' trigger: { @@ -43,23 +35,31 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 } taggingCriteria: [ { - isDefault: true tagInfo: { - id: 'Default_' tagName: 'Default' + id: 'Default_' } taggingPriority: 99 + isDefault: true } ] } + backupParameters: { + backupType: 'Full' + objectType: 'AzureBackupParams' + } + dataStore: { + objectType: 'DataStoreInfoBase' + dataStoreType: 'VaultStore' + } } { isDefault: true lifecycles: [ { deleteAfter: { - duration: 'P4M' objectType: 'AbsoluteDeleteOption' + duration: 'P4M' } sourceDataStore: { dataStoreType: 'VaultStore' diff --git a/settings/remarks/microsoft.datashare/samples/accounts/shares/main.bicep b/settings/remarks/microsoft.datashare/samples/accounts/shares/main.bicep index 60c29ba6..dc18f972 100644 --- a/settings/remarks/microsoft.datashare/samples/accounts/shares/main.bicep +++ b/settings/remarks/microsoft.datashare/samples/accounts/shares/main.bicep @@ -10,8 +10,8 @@ resource account 'Microsoft.DataShare/accounts@2019-11-01' = { } resource share 'Microsoft.DataShare/accounts/shares@2019-11-01' = { - parent: account name: resourceName + parent: account properties: { description: '' shareKind: 'CopyBased' diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep index cd3d6b2e..5116c198 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep @@ -9,31 +9,31 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + family: 'Gen5' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } + administratorLogin: '${administratorLogin}' + createMode: 'Default' + sslEnforcement: 'Enabled' version: '10.2' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: 'TLS1_2' } } resource configuration 'Microsoft.DBforMariaDB/servers/configurations@2018-06-01' = { - parent: server name: 'character_set_server' + parent: server properties: { value: 'LATIN1' } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep index deeb5349..a91bcacc 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep @@ -9,31 +9,31 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + tier: 'Basic' + capacity: 2 + family: 'Gen5' + name: 'B_Gen5_2' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: 'TLS1_2' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } version: '10.2' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'B_Gen5_2' - tier: 'Basic' + createMode: 'Default' } } resource database 'Microsoft.DBforMariaDB/servers/databases@2018-06-01' = { - parent: server name: resourceName + parent: server properties: { charset: 'utf8' collation: 'utf8_general_ci' diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep index a521dad4..26b50fa7 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep @@ -9,33 +9,33 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } version: '10.2' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + minimalTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' } } resource firewallRule 'Microsoft.DBforMariaDB/servers/firewallRules@2018-06-01' = { - parent: server name: resourceName + parent: server properties: { - endIpAddress: '255.255.255.255' startIpAddress: '0.0.0.0' + endIpAddress: '255.255.255.255' } } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep index 2f777e9f..b321f3ab 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep @@ -9,24 +9,24 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { + storageMB: 51200 backupRetentionDays: 7 storageAutogrow: 'Enabled' - storageMB: 51200 } version: '10.2' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + minimalTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + administratorLogin: '${administratorLogin}' } } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep index a29902eb..c476ec0d 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep @@ -9,25 +9,25 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } + administratorLogin: '${administratorLogin}' + sslEnforcement: 'Enabled' version: '10.2' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + minimalTlsVersion: 'TLS1_2' } } @@ -35,25 +35,22 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + dhcpOptions: { + dnsServers: [] + } + subnets: [] addressSpace: { addressPrefixes: [ '10.7.29.0/29' ] } - dhcpOptions: { - dnsServers: [] - } - subnets: [] } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.7.29.0/29' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [ @@ -61,12 +58,15 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { service: 'Microsoft.Sql' } ] + addressPrefix: '10.7.29.0/29' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' } } resource virtualNetworkRule 'Microsoft.DBforMariaDB/servers/virtualNetworkRules@2018-06-01' = { - parent: server name: resourceName + parent: server properties: { ignoreMissingVnetServiceEndpoint: false virtualNetworkSubnetId: subnet.id diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep index e74f865d..126cba40 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep @@ -1,18 +1,22 @@ -param resourceName string = 'acctest0001' param location string = 'westus' @secure() @description('The administrator login password for the MySQL flexible server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { name: '${resourceName}-mysql' location: location + sku: { + tier: 'Burstable' + name: 'Standard_B1ms' + } properties: { administratorLogin: 'tfadmin' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' backup: { - backupRetentionDays: 7 geoRedundantBackup: 'Disabled' + backupRetentionDays: 7 } dataEncryption: { type: 'SystemManaged' @@ -22,10 +26,6 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { } version: '8.0.21' } - sku: { - name: 'Standard_B1ms' - tier: 'Burstable' - } } resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { @@ -39,13 +39,13 @@ resource userassignedidentity1 'Microsoft.ManagedIdentity/userAssignedIdentities } resource administrator 'Microsoft.DBforMySQL/flexibleServers/administrators@2023-12-30' = { - parent: flexibleServer name: 'ActiveDirectory' + parent: flexibleServer properties: { + sid: deployer().objectId + tenantId: tenant().tenantId administratorType: 'ActiveDirectory' identityResourceId: userAssignedIdentity.id login: 'sqladmin' - sid: deployer().objectId - tenantId: deployer().tenantId } } diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep index f6ea8f5b..aa4e48a9 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep @@ -7,9 +7,17 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { name: '${resourceName}-mysql' location: location + sku: { + name: 'Standard_B1ms' + tier: 'Burstable' + } properties: { + highAvailability: { + mode: 'Disabled' + } + version: '8.0.21' administratorLogin: 'tfadmin' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' @@ -17,20 +25,12 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { dataEncryption: { type: 'SystemManaged' } - highAvailability: { - mode: 'Disabled' - } - version: '8.0.21' - } - sku: { - name: 'Standard_B1ms' - tier: 'Burstable' } } resource configuration 'Microsoft.DBforMySQL/flexibleServers/configurations@2023-12-30' = { - parent: flexibleServer name: 'character_set_server' + parent: flexibleServer properties: { value: 'utf8mb4' } diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep index 463da0ff..bf312e7d 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep @@ -9,32 +9,32 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { name: resourceName location: location + sku: { + tier: 'Burstable' + name: 'Standard_B1s' + } properties: { - administratorLogin: null - administratorLoginPassword: null + network: {} + version: '' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + dataEncryption: { + type: 'SystemManaged' + } backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' } createMode: '' - dataEncryption: { - type: 'SystemManaged' - } highAvailability: { mode: 'Disabled' } - network: {} - version: '' - } - sku: { - name: 'Standard_B1s' - tier: 'Burstable' } } resource database 'Microsoft.DBforMySQL/flexibleServers/databases@2021-05-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { charset: 'utf8' collation: 'utf8_unicode_ci' diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep index 01af1e66..6e82710c 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep @@ -1,38 +1,38 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator password for the MySQL flexible server') param mysqlAdministratorPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { name: resourceName location: location + sku: { + name: 'Standard_B1s' + tier: 'Burstable' + } properties: { administratorLogin: 'adminTerraform' - administratorLoginPassword: null + administratorLoginPassword: '${mysqlAdministratorPassword}' backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' } createMode: '' - dataEncryption: { - type: 'SystemManaged' - } highAvailability: { mode: 'Disabled' } network: {} + dataEncryption: { + type: 'SystemManaged' + } version: '5.7' } - sku: { - name: 'Standard_B1s' - tier: 'Burstable' - } } resource firewallRule 'Microsoft.DBforMySQL/flexibleServers/firewallRules@2021-05-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { endIpAddress: '255.255.255.255' startIpAddress: '0.0.0.0' diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep index 93c05978..721d5ce5 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep @@ -9,9 +9,17 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { name: resourceName location: location + sku: { + name: 'Standard_B1s' + tier: 'Burstable' + } properties: { - administratorLogin: null - administratorLoginPassword: null + highAvailability: { + mode: 'Disabled' + } + network: {} + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' @@ -20,13 +28,5 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { dataEncryption: { type: 'SystemManaged' } - highAvailability: { - mode: 'Disabled' - } - network: {} - } - sku: { - name: 'Standard_B1s' - tier: 'Burstable' } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep index d06f8361..2cbf148c 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep @@ -6,16 +6,23 @@ param administratorLogin string @description('The administrator login password for the MySQL server') param administratorLoginPassword string +param clientId string + resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + family: 'Gen5' + } properties: { - administratorLogin: null - administratorLoginPassword: null createMode: 'Default' + publicNetworkAccess: 'Enabled' + administratorLoginPassword: '${administratorLoginPassword}' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 @@ -23,22 +30,17 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { storageMB: 51200 } version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' } } resource administrator 'Microsoft.DBforMySQL/servers/administrators@2017-12-01' = { - parent: server name: 'activeDirectory' + parent: server properties: { administratorType: 'ActiveDirectory' login: 'sqladmin' - sid: deployer().objectId - tenantId: deployer().tenantId + sid: clientId + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep index 28c38190..d20b66d9 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep @@ -1,21 +1,27 @@ +@secure() +@description('The administrator login password for the MySQL server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the MySQL server') param administratorLogin string -@secure() -@description('The administrator login password for the MySQL server') -param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' createMode: 'Default' infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: 'TLS1_2' sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 @@ -24,17 +30,11 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { } version: '5.7' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } resource configuration 'Microsoft.DBforMySQL/servers/configurations@2017-12-01' = { - parent: server name: 'character_set_server' + parent: server properties: { value: 'latin1' } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep index 4464b7d9..95992e8c 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep @@ -9,31 +9,31 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' + administratorLogin: '${administratorLogin}' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_1' - publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { storageAutogrow: 'Enabled' storageMB: 51200 } + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + publicNetworkAccess: 'Enabled' version: '5.7' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } resource database 'Microsoft.DBforMySQL/servers/databases@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { charset: 'utf8' collation: 'utf8_unicode_ci' diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep index 6e518061..2cd7423e 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep @@ -1,40 +1,40 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @description('The administrator login for the MySQL server') param administratorLogin string @secure() @description('The administrator login password for the MySQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' + publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' } } resource firewallRule 'Microsoft.DBforMySQL/servers/firewallRules@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { endIpAddress: '255.255.255.255' startIpAddress: '0.0.0.0' diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep index b2d69497..fbbdb4b3 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep @@ -9,12 +9,16 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_1' + administratorLogin: '${administratorLogin}' + createMode: 'Default' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { @@ -22,11 +26,7 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { storageMB: 51200 } version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLoginPassword: '${administratorLoginPassword}' + infrastructureEncryption: 'Disabled' } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep index 8e5a7693..1c2002fc 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep @@ -1,36 +1,10 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @description('The administrator login name for the MySQL server') param administratorLogin string @secure() @description('The administrator login password for the MySQL server') param administratorLoginPassword string - -resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { - name: resourceName - location: location - properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' - storageProfile: { - backupRetentionDays: 7 - storageAutogrow: 'Enabled' - storageMB: 51200 - } - version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } -} +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName @@ -49,8 +23,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.7.29.0/29' delegations: [] @@ -65,11 +39,37 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { } } +resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { + name: resourceName + location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } + properties: { + administratorLogin: '${administratorLogin}' + createMode: 'Default' + minimalTlsVersion: 'TLS1_2' + version: '5.7' + administratorLoginPassword: '${administratorLoginPassword}' + infrastructureEncryption: 'Disabled' + publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' + storageProfile: { + storageAutogrow: 'Enabled' + storageMB: 51200 + backupRetentionDays: 7 + } + } +} + resource virtualNetworkRule 'Microsoft.DBforMySQL/servers/virtualNetworkRules@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { - ignoreMissingVnetServiceEndpoint: false virtualNetworkSubnetId: subnet.id + ignoreMissingVnetServiceEndpoint: false } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep index a53943c6..bb884ccf 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep @@ -9,15 +9,20 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = { name: resourceName location: location + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword authConfig: { activeDirectoryAuth: 'Enabled' passwordAuth: 'Enabled' - tenantId: deployer().tenantId + tenantId: tenant().tenantId } availabilityZone: '2' + version: '12' backup: { geoRedundantBackup: 'Disabled' } @@ -28,19 +33,14 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = storage: { storageSizeGB: 32 } - version: '12' - } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' } } resource administrator 'Microsoft.DBforPostgreSQL/flexibleServers/administrators@2022-12-01' = { + name: deployer().objectId parent: flexibleServer - name: 'data.azurerm_client_config.current.object_id' properties: { principalType: 'ServicePrincipal' - tenantId: deployer().tenantId + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep index 29b9710c..34300ab8 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep @@ -1,20 +1,21 @@ -param resourceName string = 'acctest0001' -param location string = 'eastus' @secure() @description('The administrator password for the PostgreSQL flexible server') param postgresqlAdministratorPassword string +param resourceName string = 'acctest0001' +param location string = 'eastus' resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-preview' = { name: resourceName location: location - identity: { - type: 'None' - userAssignedIdentities: null + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' } properties: { - administratorLogin: 'adminTerraform' - administratorLoginPassword: null + administratorLoginPassword: '${postgresqlAdministratorPassword}' availabilityZone: '2' + version: '12' + administratorLogin: 'adminTerraform' backup: { geoRedundantBackup: 'Disabled' } @@ -25,31 +26,30 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-pr storage: { storageSizeGB: 32 } - version: '12' } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' + identity: { + userAssignedIdentities: null + type: 'None' } } -resource pgbouncerDefaultPoolSize 'Microsoft.DBforPostgreSQL/flexibleServers/configurations@2022-12-01' = { +resource pgbouncerEnabled 'Microsoft.DBforPostgreSQL/flexibleServers/configurations@2022-12-01' = { + name: 'pgbouncer.enabled' parent: flexibleServer - name: 'pgbouncer.default_pool_size' properties: { source: 'user-override' - value: '40' + value: 'true' } - dependsOn: [ - pgbouncerEnabled - ] } -resource pgbouncerEnabled 'Microsoft.DBforPostgreSQL/flexibleServers/configurations@2022-12-01' = { +resource pgbouncerDefaultPoolSize 'Microsoft.DBforPostgreSQL/flexibleServers/configurations@2022-12-01' = { + name: 'pgbouncer.default_pool_size' parent: flexibleServer - name: 'pgbouncer.enabled' + dependsOn: [ + pgbouncerEnabled + ] properties: { + value: '40' source: 'user-override' - value: 'true' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep index 36781900..9cf5f3c4 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep @@ -7,31 +7,31 @@ param postgresqlAdministratorPassword string resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = { name: resourceName location: location + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: 'adminTerraform' - administratorLoginPassword: null - availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' } + network: {} + version: '12' + administratorLoginPassword: '${postgresqlAdministratorPassword}' highAvailability: { mode: 'Disabled' } - network: {} storage: { storageSizeGB: 32 } - version: '12' - } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' + administratorLogin: 'adminTerraform' + availabilityZone: '2' } } resource database 'Microsoft.DBforPostgreSQL/flexibleServers/databases@2022-12-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { charset: 'UTF8' collation: 'en_US.UTF8' diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep index 0f1d9126..eba0bcb4 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep @@ -1,37 +1,37 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator password for the PostgreSQL flexible server') param postgresqlAdministratorPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = { name: resourceName location: location + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: 'adminTerraform' - administratorLoginPassword: null + administratorLoginPassword: '${postgresqlAdministratorPassword}' availabilityZone: '2' - backup: { - geoRedundantBackup: 'Disabled' - } highAvailability: { mode: 'Disabled' } + version: '12' + administratorLogin: 'adminTerraform' + backup: { + geoRedundantBackup: 'Disabled' + } network: {} storage: { storageSizeGB: 32 } - version: '12' - } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' } } resource firewallRule 'Microsoft.DBforPostgreSQL/flexibleServers/firewallRules@2022-12-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { endIpAddress: '122.122.0.0' startIpAddress: '122.122.0.0' diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep index bd677693..37112ae4 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep @@ -9,13 +9,12 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-preview' = { name: resourceName location: location - identity: { - type: 'None' - userAssignedIdentities: null + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' @@ -28,9 +27,10 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-pr storageSizeGB: 32 } version: '12' + administratorLogin: '${administratorLogin}' } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' + identity: { + type: 'None' + userAssignedIdentities: null } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep index f32b3bc8..aa04d932 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep @@ -1,25 +1,29 @@ -param resourceName string = 'acctest0001' param location string = 'westus' @secure() @description('The administrator login password for the PostgreSQL flexible server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { name: '${resourceName}-primary' location: location + sku: { + name: 'Standard_D2ads_v5' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: 'psqladmin' - administratorLoginPassword: null - availabilityZone: '1' - backup: { - geoRedundantBackup: 'Disabled' - } + administratorLoginPassword: '${administratorLoginPassword}' highAvailability: { mode: 'Disabled' } network: { publicNetworkAccess: 'Disabled' } + administratorLogin: 'psqladmin' + availabilityZone: '1' + backup: { + geoRedundantBackup: 'Disabled' + } storage: { autoGrow: 'Disabled' storageSizeGB: 32 @@ -27,10 +31,6 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = } version: '16' } - sku: { - name: 'Standard_D2ads_v5' - tier: 'GeneralPurpose' - } } resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { @@ -38,9 +38,6 @@ resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' location: location properties: { availabilityZone: '1' - backup: { - geoRedundantBackup: 'Disabled' - } createMode: 'Replica' highAvailability: { mode: 'Disabled' @@ -48,19 +45,22 @@ resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' network: { publicNetworkAccess: 'Disabled' } - sourceServerResourceId: flexibleServer.id storage: { - autoGrow: 'Disabled' storageSizeGB: 32 tier: 'P30' + autoGrow: 'Disabled' } version: '16' + backup: { + geoRedundantBackup: 'Disabled' + } + sourceServerResourceId: flexibleServer.id } } resource virtualEndpoint 'Microsoft.DBforPostgreSQL/flexibleServers/virtualEndpoints@2024-08-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { endpointType: 'ReadWrite' members: [ diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep index b4888c67..0283e193 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep @@ -1,14 +1,13 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator login password for the PostgreSQL server group') param administratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource serverGroupsv2 'Microsoft.DBforPostgreSQL/serverGroupsv2@2022-11-08' = { name: resourceName location: location properties: { - administratorLoginPassword: null coordinatorEnablePublicIpAccess: true coordinatorServerEdition: 'GeneralPurpose' coordinatorStorageQuotaInMb: 131072 @@ -17,5 +16,6 @@ resource serverGroupsv2 'Microsoft.DBforPostgreSQL/serverGroupsv2@2022-11-08' = nodeCount: 0 nodeEnablePublicIpAccess: false nodeServerEdition: 'MemoryOptimized' + administratorLoginPassword: '${administratorLoginPassword}' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep index 042fc32c..2529e019 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep @@ -8,39 +8,41 @@ param administratorLoginPassword string @description('The administrator login name for the PostgreSQL server admin') param adminLogin string +param clientId string + resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' createMode: 'Default' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } version: '9.6' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + infrastructureEncryption: 'Disabled' } } resource administrator 'Microsoft.DBforPostgreSQL/servers/administrators@2017-12-01' = { - parent: server name: 'activeDirectory' + parent: server properties: { administratorType: 'ActiveDirectory' - login: null - sid: deployer().objectId - tenantId: deployer().tenantId + login: adminLogin + sid: clientId + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep index e3a3be58..3f7edd11 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep @@ -1,40 +1,40 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the PostgreSQL server') param administratorLogin string @secure() @description('The administrator login password for the PostgreSQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' + administratorLoginPassword: '${administratorLoginPassword}' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } + administratorLogin: '${administratorLogin}' + createMode: 'Default' + sslEnforcement: 'Enabled' version: '9.6' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } resource configuration 'Microsoft.DBforPostgreSQL/servers/configurations@2017-12-01' = { - parent: server name: 'backslash_quote' + parent: server properties: { value: 'on' } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep index 3b7730c5..f7c08349 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep @@ -1,40 +1,40 @@ +@secure() +@description('The administrator login password for the PostgreSQL server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the PostgreSQL server') param administratorLogin string -@secure() -@description('The administrator login password for the PostgreSQL server') -param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + minimalTlsVersion: 'TLS1_2' + sslEnforcement: 'Enabled' version: '9.6' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } resource database 'Microsoft.DBforPostgreSQL/servers/databases@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { charset: 'UTF8' collation: 'English_United States.1252' diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep index 5d2022d7..d413fc39 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep @@ -1,40 +1,40 @@ +@secure() +@description('The administrator login password for the PostgreSQL server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the PostgreSQL server') param administratorLogin string -@secure() -@description('The administrator login password for the PostgreSQL server') -param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' createMode: 'Default' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } version: '9.6' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + infrastructureEncryption: 'Disabled' + sslEnforcement: 'Enabled' } } resource firewallRule 'Microsoft.DBforPostgreSQL/servers/firewallRules@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { endIpAddress: '255.255.255.255' startIpAddress: '0.0.0.0' diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep index 39559318..64a4cc89 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep @@ -1,33 +1,33 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the PostgreSQL server') param administratorLogin string @secure() @description('The administrator login password for the PostgreSQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + publicNetworkAccess: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } version: '9.5' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' + infrastructureEncryption: 'Disabled' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep index 471521bb..cc149b88 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep @@ -6,54 +6,26 @@ param administratorLogin string @description('The administrator login password for the PostgreSQL server') param administratorLoginPassword string -resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { - name: resourceName - location: location - properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' - storageProfile: { - backupRetentionDays: 7 - storageAutogrow: 'Enabled' - storageMB: 51200 - } - version: '9.5' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + dhcpOptions: { + dnsServers: [] + } + subnets: [] addressSpace: { addressPrefixes: [ '10.7.29.0/29' ] } - dhcpOptions: { - dnsServers: [] - } - subnets: [] } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.7.29.0/29' - delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] @@ -62,12 +34,40 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { service: 'Microsoft.Sql' } ] + addressPrefix: '10.7.29.0/29' + delegations: [] + } +} + +resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { + name: resourceName + location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } + properties: { + publicNetworkAccess: 'Enabled' + createMode: 'Default' + minimalTlsVersion: 'TLS1_2' + sslEnforcement: 'Enabled' + storageProfile: { + storageAutogrow: 'Enabled' + storageMB: 51200 + backupRetentionDays: 7 + } + version: '9.5' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + infrastructureEncryption: 'Disabled' } } resource virtualNetworkRule 'Microsoft.DBforPostgreSQL/servers/virtualNetworkRules@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { ignoreMissingVnetServiceEndpoint: false virtualNetworkSubnetId: subnet.id diff --git a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep index 190e9064..f6a2fd67 100644 --- a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep +++ b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep @@ -6,31 +6,30 @@ resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@202 location: location properties: { applicationGroupType: 'RemoteApp' - hostPoolArmPath: hostPool.id } } -resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' = { +resource application 'Microsoft.DesktopVirtualization/applicationGroups/applications@2023-09-05' = { name: resourceName location: location + parent: applicationGroup properties: { - hostPoolType: 'Pooled' - loadBalancerType: 'BreadthFirst' - maxSessionLimit: 999999 - preferredAppGroupType: 'Desktop' - publicNetworkAccess: 'Enabled' - startVMOnConnect: false - validationEnvironment: false + commandLineSetting: 'DoNotAllow' + filePath: 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' + showInPortal: false } } -resource application 'Microsoft.DesktopVirtualization/applicationGroups/applications@2023-09-05' = { - parent: applicationGroup +resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' = { name: resourceName location: location properties: { - commandLineSetting: 'DoNotAllow' - filePath: 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' - showInPortal: false + startVMOnConnect: false + validationEnvironment: false + hostPoolType: 'Pooled' + loadBalancerType: 'BreadthFirst' + maxSessionLimit: 999999 + preferredAppGroupType: 'Desktop' + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep index 75e4a4c3..a402031e 100644 --- a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep +++ b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep @@ -8,7 +8,6 @@ resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@202 applicationGroupType: 'Desktop' description: '' friendlyName: '' - hostPoolArmPath: hostPool.id } } @@ -16,17 +15,17 @@ resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-03' = { name: '${resourceName}-hp' location: location properties: { - customRdpProperty: '' - description: '' friendlyName: '' hostPoolType: 'Pooled' loadBalancerType: 'BreadthFirst' maxSessionLimit: 999999 personalDesktopAssignmentType: '' preferredAppGroupType: 'Desktop' - publicNetworkAccess: 'Enabled' startVMOnConnect: false validationEnvironment: false + customRdpProperty: '' + description: '' + publicNetworkAccess: 'Enabled' vmTemplate: '' } } diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep index 7cb03984..b6b30cb3 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep @@ -1,24 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { - name: resourceName - location: location - identity: { - type: 'SystemAssigned' - userAssignedIdentities: null - } -} - -resource networkConnection 'Microsoft.DevCenter/networkConnections@2023-04-01' = { - name: resourceName - location: 'westeurope' - properties: { - domainJoinType: 'AzureADJoin' - subnetId: subnet.id - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location @@ -31,18 +13,34 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } } +resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { + name: resourceName + location: location + identity: { + type: 'SystemAssigned' + userAssignedIdentities: null + } +} + resource attachNetwork 'Microsoft.DevCenter/devcenters/attachednetworks@2023-04-01' = { - parent: devCenter name: resourceName + parent: devCenter properties: { networkConnectionId: networkConnection.id } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' } } + +resource networkConnection 'Microsoft.DevCenter/networkConnections@2023-04-01' = { + name: resourceName + properties: { + domainJoinType: 'AzureADJoin' + } +} diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep index a6a3809a..5d6fd22b 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep @@ -8,8 +8,8 @@ resource devCenter 'Microsoft.DevCenter/devCenters@2025-02-01' = { } resource catalog 'Microsoft.DevCenter/devCenters/catalogs@2025-02-01' = { - parent: devCenter name: '${substring(resourceName, 0, 17)}-catalog' + parent: devCenter properties: { adoGit: { branch: 'main' diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep index 2368eef0..f8ef3cd2 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { name: resourceName @@ -11,9 +11,9 @@ resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { } resource devBoxDefinition 'Microsoft.DevCenter/devcenters/devboxdefinitions@2024-10-01-preview' = { - parent: devCenter name: resourceName location: location + parent: devCenter properties: { hibernateSupport: 'Enabled' imageReference: { diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/environmenttypes/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/environmenttypes/main.bicep index 48152382..7321f16b 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/environmenttypes/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/environmenttypes/main.bicep @@ -8,6 +8,6 @@ resource devCenter 'Microsoft.DevCenter/devCenters@2025-02-01' = { } resource environmentType 'Microsoft.DevCenter/devCenters/environmentTypes@2025-02-01' = { - parent: devCenter name: resourceName + parent: devCenter } diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep index c091a718..145349a9 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep @@ -1,12 +1,12 @@ param resourceName string = 'acctest0001' param location string = 'eastus' -resource devCenter 'Microsoft.DevCenter/devCenters@2025-02-01' = { - name: resourceName +resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: '${resourceName}-uai' location: location } -resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { - name: '${resourceName}-uai' +resource devCenter 'Microsoft.DevCenter/devCenters@2025-02-01' = { + name: resourceName location: location } diff --git a/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep b/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep index b1655e53..6fd54a6c 100644 --- a/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep @@ -6,7 +6,6 @@ resource networkConnection 'Microsoft.DevCenter/networkConnections@2023-04-01' = location: location properties: { domainJoinType: 'AzureADJoin' - subnetId: subnet.id } } @@ -23,8 +22,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' } diff --git a/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep b/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep index 85ced5c5..7296c867 100644 --- a/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep @@ -11,22 +11,22 @@ resource project 'Microsoft.DevCenter/projects@2025-02-01' = { name: '${resourceName}-proj' location: location properties: { - description: '' devCenterId: devCenter.id maxDevBoxesPerUser: 0 + description: '' } } resource environmentType 'Microsoft.DevCenter/devCenters/environmentTypes@2025-02-01' = { - parent: devCenter name: '${resourceName}-envtype' + parent: devCenter } resource environmenttype1 'Microsoft.DevCenter/projects/environmentTypes@2025-02-01' = { + name: 'azapi_resource.environmentType.name' parent: project - name: 'environmentType.name' properties: { - deploymentTargetId: '/subscriptions/subscription().subscriptionId' + deploymentTargetId: '/subscriptions/${subscription().subscriptionId}' status: 'Enabled' } } diff --git a/settings/remarks/microsoft.devcenter/samples/projects/main.bicep b/settings/remarks/microsoft.devcenter/samples/projects/main.bicep index 53ecbc92..b9f60cb0 100644 --- a/settings/remarks/microsoft.devcenter/samples/projects/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/projects/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource devCenter 'Microsoft.DevCenter/devCenters@2025-02-01' = { name: resourceName diff --git a/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep b/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep index eaac0850..3246a71a 100644 --- a/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep +++ b/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep @@ -1,13 +1,18 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The Base64 encoded certificate content for the IoT Hub') param certificateContent string +param resourceName string = 'acctest0001' -resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { +resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'B1' + } properties: { + storageEndpoints: {} cloudToDevice: {} enableFileUploadNotifications: false messagingEndpoints: {} @@ -21,19 +26,14 @@ resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { source: 'DeviceMessages' } } - storageEndpoints: {} - } - sku: { - capacity: 1 - name: 'B1' } } resource certificate 'Microsoft.Devices/IotHubs/certificates@2022-04-30-preview' = { - parent: iothub name: resourceName + parent: iotHub properties: { - certificate: null + certificate: '${certificateContent}' isVerified: false } } diff --git a/settings/remarks/microsoft.devices/samples/iothubs/main.bicep b/settings/remarks/microsoft.devices/samples/iothubs/main.bicep index 036e8dd0..462703d5 100644 --- a/settings/remarks/microsoft.devices/samples/iothubs/main.bicep +++ b/settings/remarks/microsoft.devices/samples/iothubs/main.bicep @@ -1,9 +1,13 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { +resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'S1' + } properties: { cloudToDevice: {} enableFileUploadNotifications: false @@ -20,8 +24,4 @@ resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { } storageEndpoints: {} } - sku: { - capacity: 1 - name: 'S1' - } } diff --git a/settings/remarks/microsoft.devices/samples/provisioningservices/certificates/main.bicep b/settings/remarks/microsoft.devices/samples/provisioningservices/certificates/main.bicep index 0132ce72..9dfdd9a4 100644 --- a/settings/remarks/microsoft.devices/samples/provisioningservices/certificates/main.bicep +++ b/settings/remarks/microsoft.devices/samples/provisioningservices/certificates/main.bicep @@ -4,21 +4,21 @@ param location string = 'westeurope' resource provisioningService 'Microsoft.Devices/provisioningServices@2022-02-05' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'S1' + } properties: { allocationPolicy: 'Hashed' enableDataResidency: false iotHubs: [] publicNetworkAccess: 'Enabled' } - sku: { - capacity: 1 - name: 'S1' - } } resource certificate 'Microsoft.Devices/provisioningServices/certificates@2022-02-05' = { - parent: provisioningService name: resourceName + parent: provisioningService properties: { certificate: 'LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlEYnpDQ0FsZWdBd0lCQWdJSkFJempSRDM2c0liYk1BMEdDU3FHU0liM0RRRUJDd1VBTUUweEN6QUpCZ05WDQpCQVlUQWxWVE1STXdFUVlEVlFRSURBcFRiMjFsTFZOMFlYUmxNUkl3RUFZRFZRUUtEQWwwWlhKeVlXWnZjbTB4DQpGVEFUQmdOVkJBTU1ESFJsY25KaFptOXliUzVwYnpBZ0Z3MHhOekEwTWpFeU1EQTFNamRhR0E4eU1URTNNRE15DQpPREl3TURVeU4xb3dUVEVMTUFrR0ExVUVCaE1DVlZNeEV6QVJCZ05WQkFnTUNsTnZiV1V0VTNSaGRHVXhFakFRDQpCZ05WQkFvTUNYUmxjbkpoWm05eWJURVZNQk1HQTFVRUF3d01kR1Z5Y21GbWIzSnRMbWx2TUlJQklqQU5CZ2txDQpoa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQTNMOUw1c3pUNCtGTHlrVEZOeXlQankvazNCUVRZQWZSDQpRelAyZGhuc3VVS20zY2RQQzBOeVord0VYSVVHaG9ETzJZRzZFWUNoT2w4ZnNEcURPamxvU1VHS3FZdysrbmxwDQpISXVVZ0p4OEl4eEcyWGtBTENqRlU3RW1GK3c3a243NmQwZXpwRUlZeG5MUCtLRzJEVm9ybm9FdDFhTGh2MU1MDQptcGdFWlpQaERiTVNMaFNZV2VUVlJNYXlYTHdxdGZnbkR1bVFTQis4ZC8xSnVKcXJTSTRwRDEySm96VlRoemI2DQpoc2pmYjZSTVg0ZXBQbXJHbjBQYlRQRUVBNmF3bXN4QkNYQjBzMTNuTlF0L08waExNMmFnd3ZBeW96aWxRVitzDQo2MTZDa2drNkRKb1VrcVpoRHk3dlBZTUlSU3I5OGZCd3M2emtyVjZ0VExqbUQ4eEF2b2JlUFFJREFRQUJvMUF3DQpUakFkQmdOVkhRNEVGZ1FVWElxTzQyMXpNTW1iY1JSWDl3Y3RaRkNRdVBJd0h3WURWUjBqQkJnd0ZvQVVYSXFPDQo0MjF6TU1tYmNSUlg5d2N0WkZDUXVQSXdEQVlEVlIwVEJBVXdBd0VCL3pBTkJna3Foa2lHOXcwQkFRc0ZBQU9DDQpBUUVBcjgyTmVUM0JZSk9LTGxVTDZPbTVMalVGNjZld2NKakc5bHRkdnlRd1ZuZU1jcTd0NVVBUHhnQ2h6cU5SDQpWazRkYThQemtYcGpCSnlXZXpIdXBkSk5YM1hxZVVrMmtTeHFRNi9nbWhxdmZJM3k3ZGpyd29PNmp2TUVZMjZXDQpxdGtUTk9SV0RQM1RISkpWaW1DM3pWK0tNVTVVQlZyRXpoT1ZoSFNVNzA5bEJQNzVvMEJCbjN4R3NQcVNxOWs4DQpJb3RJRmZ5QWM2YStYUDMrWk1wdmg3d3FBVW1sN3ZXYTV3bGNYRXhDeDM5aDFiYWxmRFNMR05DNHN3V1BDcDlBDQpNblFSMHArdk1heTloTlAxRWgrOVFZVWFpMTRkNUtTM2NGVitLeEUxY0pSNUhEL2lMbHRubk9FYnBNc0IwZVZPDQpaV2tGdkU3WTVsVzBvVlNBZmluNVR3VEpNUT09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t' } diff --git a/settings/remarks/microsoft.devices/samples/provisioningservices/main.bicep b/settings/remarks/microsoft.devices/samples/provisioningservices/main.bicep index e38ef376..2db45788 100644 --- a/settings/remarks/microsoft.devices/samples/provisioningservices/main.bicep +++ b/settings/remarks/microsoft.devices/samples/provisioningservices/main.bicep @@ -4,14 +4,14 @@ param location string = 'westeurope' resource provisioningService 'Microsoft.Devices/provisioningServices@2022-02-05' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'S1' + } properties: { allocationPolicy: 'Hashed' enableDataResidency: false iotHubs: [] publicNetworkAccess: 'Enabled' } - sku: { - capacity: 1 - name: 'S1' - } } diff --git a/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep b/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep index 348c8fb1..21270127 100644 --- a/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep +++ b/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep @@ -1,30 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' - -resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { - name: resourceName - location: location - properties: { - cloudToDevice: {} - enableFileUploadNotifications: false - messagingEndpoints: {} - routing: { - fallbackRoute: { - condition: 'true' - endpointNames: [ - 'events' - ] - isEnabled: true - source: 'DeviceMessages' - } - } - storageEndpoints: {} - } - sku: { - capacity: 1 - name: 'S1' - } -} +param resourceName string = 'acctest0001' resource account 'Microsoft.DeviceUpdate/accounts@2022-10-01' = { name: resourceName @@ -36,16 +11,41 @@ resource account 'Microsoft.DeviceUpdate/accounts@2022-10-01' = { } resource instance 'Microsoft.DeviceUpdate/accounts/instances@2022-10-01' = { - parent: account name: resourceName location: location + parent: account properties: { accountName: account.name enableDiagnostics: false iotHubs: [ { - resourceId: iothub.id + resourceId: iotHub.id } ] } } + +resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { + name: resourceName + location: location + sku: { + capacity: 1 + name: 'S1' + } + properties: { + storageEndpoints: {} + cloudToDevice: {} + enableFileUploadNotifications: false + messagingEndpoints: {} + routing: { + fallbackRoute: { + condition: 'true' + endpointNames: [ + 'events' + ] + isEnabled: true + source: 'DeviceMessages' + } + } + } +} diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/policysets/policies/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/policysets/policies/main.bicep index 94a1f5c2..d2b25310 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/policysets/policies/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/policysets/policies/main.bicep @@ -6,15 +6,8 @@ resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { location: location } -// The policy set is a singleton named 'default' under the lab -resource policySet 'Microsoft.DevTestLab/labs/policySets@2018-09-15' existing = { - parent: lab - name: 'default' -} - resource policy 'Microsoft.DevTestLab/labs/policySets/policies@2018-09-15' = { - parent: policySet - name: 'LabVmCount' + name: 'policySets/default/LabVmCount' properties: { description: '' evaluatorType: 'MaxValuePolicy' diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep index c4733acb..dbaa851d 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep @@ -10,10 +10,11 @@ resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { } resource schedule 'Microsoft.DevTestLab/labs/schedules@2018-09-15' = { - parent: lab name: 'LabVmsShutdown' location: location + parent: lab properties: { + timeZoneId: 'India Standard Time' dailyRecurrence: { time: '0100' } @@ -24,7 +25,6 @@ resource schedule 'Microsoft.DevTestLab/labs/schedules@2018-09-15' = { } status: 'Disabled' taskType: 'LabVmsShutdownTask' - timeZoneId: 'India Standard Time' } tags: { environment: 'Production' diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep index ce588176..d32d7be7 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep @@ -13,11 +13,10 @@ resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { } resource virtualMachine 'Microsoft.DevTestLab/labs/virtualMachines@2018-09-15' = { - parent: lab name: resourceName location: location + parent: lab properties: { - allowClaim: true disallowPublicIpAddress: false galleryImageReference: { offer: 'WindowsServer' @@ -26,28 +25,33 @@ resource virtualMachine 'Microsoft.DevTestLab/labs/virtualMachines@2018-09-15' = sku: '2012-Datacenter' version: 'latest' } - isAuthenticationWithSshKey: false - labSubnetName: '\'${resourceName}Subnet\'' - labVirtualNetworkId: virtualNetwork.id networkInterface: {} - notes: '' osType: 'Windows' - password: null + password: vmPassword size: 'Standard_F2' + allowClaim: true + isAuthenticationWithSshKey: false + labSubnetName: '${resourceName}Subnet' + notes: '' storageType: 'Standard' userName: 'acct5stU5er' } } resource virtualNetwork 'Microsoft.DevTestLab/labs/virtualNetworks@2018-09-15' = { - parent: lab name: resourceName + parent: lab properties: { description: '' subnetOverrides: [ { - labSubnetName: '\'${resourceName}Subnet\'' - resourceId: resourceId('Microsoft.Network/virtualNetworks/subnets', resourceName, '${resourceName}Subnet') + labSubnetName: '${resourceName}Subnet' + resourceId: resourceId( + 'Microsoft.Network/virtualNetworks/subnets', + resourceGroup().name, + resourceName, + '${resourceName}Subnet' + ) useInVmCreationPermission: 'Allow' usePublicIpAddressPermission: 'Allow' } diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep index 68435e1e..25065ec0 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep @@ -10,16 +10,21 @@ resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { } resource virtualNetwork 'Microsoft.DevTestLab/labs/virtualNetworks@2018-09-15' = { - parent: lab name: resourceName + parent: lab properties: { description: '' subnetOverrides: [ { - labSubnetName: '\'${resourceName}Subnet\'' - resourceId: resourceId('Microsoft.Network/virtualNetworks/subnets', resourceName, '${resourceName}Subnet') useInVmCreationPermission: 'Allow' usePublicIpAddressPermission: 'Allow' + labSubnetName: '${resourceName}Subnet' + resourceId: resourceId( + 'Microsoft.Network/virtualNetworks/subnets', + resourceGroup().name, + resourceName, + '${resourceName}Subnet' + ) } ] } diff --git a/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep b/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep index 6aa87538..669e94ee 100644 --- a/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep @@ -17,9 +17,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -30,6 +28,9 @@ resource schedule 'Microsoft.DevTestLab/schedules@2018-09-15' = { name: resourceName location: location properties: { + status: 'Enabled' + taskType: 'ComputeVmShutdownTask' + timeZoneId: 'Pacific Standard Time' dailyRecurrence: { time: '0100' } @@ -39,10 +40,6 @@ resource schedule 'Microsoft.DevTestLab/schedules@2018-09-15' = { timeInMinutes: 30 webhookUrl: '' } - status: 'Enabled' - targetResourceId: virtualMachine.id - taskType: 'ComputeVmShutdownTask' - timeZoneId: 'Pacific Standard Time' } tags: { environment: 'Production' @@ -54,6 +51,27 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { location: location properties: { additionalCapabilities: {} + extensionsTimeBudget: 'PT1H30M' + priority: 'Regular' + storageProfile: { + imageReference: { + sku: '18.04-LTS' + version: 'latest' + offer: 'UbuntuServer' + publisher: 'Canonical' + } + osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' + managedDisk: { + storageAccountType: 'Standard_LRS' + } + name: 'myosdisk-230630033106863551' + osType: 'Linux' + writeAcceleratorEnabled: false + } + dataDisks: [] + } applicationProfile: { galleryApplications: [] } @@ -63,7 +81,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { storageUri: '' } } - extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_B2s' } @@ -78,12 +95,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null adminUsername: 'testadmin' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { - disablePasswordAuthentication: false patchSettings: { assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' @@ -92,28 +107,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ssh: { publicKeys: [] } + disablePasswordAuthentication: false } secrets: [] - } - priority: 'Regular' - storageProfile: { - dataDisks: [] - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '18.04-LTS' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - managedDisk: { - storageAccountType: 'Standard_LRS' - } - name: 'myosdisk-230630033106863551' - osType: 'Linux' - writeAcceleratorEnabled: false - } + adminPassword: adminPassword } } } @@ -122,6 +119,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -130,19 +128,18 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { dhcpOptions: { dnsServers: [] } - subnets: [] } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] - serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep b/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep index 7ed9bdf0..a6f23f9b 100644 --- a/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep +++ b/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep @@ -6,36 +6,36 @@ resource digitalTwinsInstance 'Microsoft.DigitalTwins/digitalTwinsInstances@2020 location: location } -resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { +resource endpoint 'Microsoft.DigitalTwins/digitalTwinsInstances/endpoints@2020-12-01' = { name: resourceName - location: location + parent: digitalTwinsInstance properties: { - disableLocalAuth: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false + authenticationType: 'KeyBased' + deadLetterSecret: '' + endpointType: 'ServiceBus' + primaryConnectionString: authorizationRule.listKeys().primaryConnectionString + secondaryConnectionString: authorizationRule.listKeys().secondaryConnectionString } +} + +resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { + name: resourceName + location: location sku: { capacity: 0 name: 'Standard' tier: 'Standard' } -} - -resource endpoint 'Microsoft.DigitalTwins/digitalTwinsInstances/endpoints@2020-12-01' = { - parent: digitalTwinsInstance - name: resourceName properties: { - authenticationType: 'KeyBased' - deadLetterSecret: '' - endpointType: 'ServiceBus' - primaryConnectionString: 'authorizationRule.listKeys().primaryConnectionString' - secondaryConnectionString: 'authorizationRule.listKeys().secondaryConnectionString' + disableLocalAuth: false + publicNetworkAccess: 'Enabled' + zoneRedundant: false } } resource topic 'Microsoft.ServiceBus/namespaces/topics@2021-06-01-preview' = { - parent: namespace name: resourceName + parent: namespace properties: { enableBatchedOperations: false enableExpress: false @@ -48,8 +48,8 @@ resource topic 'Microsoft.ServiceBus/namespaces/topics@2021-06-01-preview' = { } resource authorizationRule 'Microsoft.ServiceBus/namespaces/topics/authorizationRules@2021-06-01-preview' = { - parent: topic name: resourceName + parent: topic properties: { rights: [ 'Send' diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep index 6c9cc2f6..9622bacb 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep @@ -6,25 +6,16 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + virtualNetworkRules: [] capabilities: [ { name: 'EnableCassandra' } ] - consistencyPolicy: { - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } + enableFreeTier: false databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] isVirtualNetworkFilterEnabled: false locations: [ { @@ -33,20 +24,29 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] + publicNetworkAccess: 'Enabled' + disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false + enableAutomaticFailover: false + enableMultipleWriteLocations: false + ipRules: [] + consistencyPolicy: { + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } networkAclBypass: 'None' networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] } } resource cassandraKeyspace 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep index 01f22229..e18d0dca 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep @@ -1,9 +1,9 @@ param resourceName string = 'acctest0001' param location string = 'eastus' -var keyspaceName = '${toLower(resourceName)}ks' -var tableName = '${toLower(resourceName)}tbl' -var accountName = toLower(replace(resourceName, '-', '')) +var keyspaceName = 'resourcenameks' +var tableName = 'resourcenametbl' +var accountName = 'resourcename' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: accountName @@ -11,6 +11,17 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { kind: 'GlobalDocumentDB' properties: { backupPolicy: null + enableAutomaticFailover: false + enableBurstCapacity: false + locations: [ + { + failoverPriority: 0 + isZoneRedundant: false + locationName: '${location}' + } + ] + minimalTlsVersion: 'Tls12' + virtualNetworkRules: [] capabilities: [ { name: 'EnableCassandra' @@ -22,51 +33,40 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { maxStalenessPrefix: 100 } databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: true - enableAutomaticFailover: false - enableBurstCapacity: false enableFreeTier: false - enableMultipleWriteLocations: false enablePartitionMerge: false - ipRules: [] + networkAclBypassResourceIds: [] + enableAnalyticalStorage: true isVirtualNetworkFilterEnabled: false - locations: [ - { - failoverPriority: 0 - isZoneRedundant: false - locationName: 'eastus' - } - ] - minimalTlsVersion: 'Tls12' networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' + enableMultipleWriteLocations: false + ipRules: [] } } resource cassandraKeyspace 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces@2021-10-15' = { - parent: databaseAccount name: keyspaceName + parent: databaseAccount properties: { options: {} resource: { - id: keyspaceName + id: '${keyspaceName}' } } } resource table 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces/tables@2021-10-15' = { - parent: cassandraKeyspace name: tableName + parent: cassandraKeyspace properties: { options: {} resource: { analyticalStorageTtl: 1 - id: tableName + id: '${tableName}' schema: { clusterKeys: [] columns: [ diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep index 497566c8..3d5eb3f7 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep @@ -16,15 +16,16 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' + disableLocalAuth: false + networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false enableFreeTier: false + networkAclBypass: 'None' + virtualNetworkRules: [] enableMultipleWriteLocations: false - ipRules: [] isVirtualNetworkFilterEnabled: false locations: [ { @@ -33,33 +34,32 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + databaseAccountOfferType: 'Standard' + enableAutomaticFailover: false + ipRules: [] } } resource gremlinDatabase 'Microsoft.DocumentDB/databaseAccounts/gremlinDatabases@2023-04-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } resource graph 'Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs@2023-04-15' = { - parent: gremlinDatabase name: resourceName + parent: gremlinDatabase properties: { options: { throughput: 400 } resource: { - id: 'acctest0001' + id: '${resourceName}' partitionKey: { kind: 'Hash' paths: [ diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep index a620ab10..2a807513 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep @@ -6,26 +6,28 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [ - { - name: 'EnableGremlin' - } - ] + defaultIdentity: 'FirstPartyIdentity' + isVirtualNetworkFilterEnabled: false consistencyPolicy: { + maxStalenessPrefix: 100 defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 } + disableLocalAuth: false + enableAutomaticFailover: false + ipRules: [] + publicNetworkAccess: 'Enabled' databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false enableFreeTier: false enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false + networkAclBypass: 'None' + capabilities: [ + { + name: 'EnableGremlin' + } + ] locations: [ { failoverPriority: 0 @@ -33,20 +35,18 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' virtualNetworkRules: [] } } resource gremlinDatabase 'Microsoft.DocumentDB/databaseAccounts/gremlinDatabases@2023-04-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep index 325a0359..eb48928d 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep @@ -6,32 +6,32 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] - consistencyPolicy: { - defaultConsistencyLevel: 'BoundedStaleness' - maxIntervalInSeconds: 10 - maxStalenessPrefix: 200 - } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { - failoverPriority: 0 isZoneRedundant: false locationName: 'West Europe' + failoverPriority: 0 } ] networkAclBypass: 'None' + databaseAccountOfferType: 'Standard' + enableAnalyticalStorage: false + defaultIdentity: 'FirstPartyIdentity' + isVirtualNetworkFilterEnabled: false networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' virtualNetworkRules: [] + capabilities: [] + enableFreeTier: false + enableMultipleWriteLocations: false + ipRules: [] + publicNetworkAccess: 'Enabled' + consistencyPolicy: { + defaultConsistencyLevel: 'BoundedStaleness' + maxIntervalInSeconds: 10 + maxStalenessPrefix: 200 + } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep index 55714880..cf602e09 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep @@ -11,42 +11,42 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: 'EnableMongo' } ] - consistencyPolicy: { - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } - databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false enableAutomaticFailover: false - enableFreeTier: false enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { + locationName: 'West Europe' failoverPriority: 0 isZoneRedundant: false - locationName: 'West Europe' } ] networkAclBypass: 'None' - networkAclBypassResourceIds: [] + consistencyPolicy: { + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + defaultConsistencyLevel: 'Strong' + } + databaseAccountOfferType: 'Standard' + enableFreeTier: false + isVirtualNetworkFilterEnabled: false publicNetworkAccess: 'Enabled' virtualNetworkRules: [] + disableLocalAuth: false + networkAclBypassResourceIds: [] + enableAnalyticalStorage: false } } resource mongodbDatabase 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep index c6bc4736..4ea8ceb7 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep @@ -1,76 +1,76 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' +param resourceName string = 'acctest0001' -var accountName = toLower(replace(resourceName, '-', '')) -var dbName = '${toLower(resourceName)}db' -var roleName = '${toLower(resourceName)}role' +var dbName = 'resourcenamedb' +var roleName = 'resourcenamerole' +var accountName = 'resourcename' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: accountName location: location kind: 'MongoDB' properties: { - backupPolicy: null - capabilities: [ - { - name: 'EnableMongoRoleBasedAccessControl' - } - { - name: 'EnableMongo' - } - ] - consistencyPolicy: { - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false enableAnalyticalStorage: false enableAutomaticFailover: false enableBurstCapacity: false - enableFreeTier: false - enableMultipleWriteLocations: false - enablePartitionMerge: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 isZoneRedundant: false - locationName: 'eastus' + locationName: '${location}' } ] + virtualNetworkRules: [] + backupPolicy: null + disableKeyBasedMetadataWriteAccess: false + ipRules: [] + networkAclBypassResourceIds: [] + enablePartitionMerge: false + consistencyPolicy: { + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + enableFreeTier: false + isVirtualNetworkFilterEnabled: false minimalTlsVersion: 'Tls12' + defaultIdentity: 'FirstPartyIdentity' + enableMultipleWriteLocations: false networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + capabilities: [ + { + name: 'EnableMongoRoleBasedAccessControl' + } + { + name: 'EnableMongo' + } + ] } } resource mongodbDatabase 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2021-10-15' = { - parent: databaseAccount name: dbName + parent: databaseAccount properties: { options: {} resource: { - id: dbName + id: '${dbName}' } } } resource mongodbRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions@2022-11-15' = { - parent: databaseAccount name: '${dbName}.${roleName}' - properties: { - databaseName: dbName - roleName: roleName - type: 1 - } + parent: databaseAccount dependsOn: [ mongodbDatabase ] + properties: { + databaseName: '${dbName}' + roleName: '${roleName}' + type: 1 + } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep index 471dae66..db297983 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep @@ -9,7 +9,28 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { location: location kind: 'MongoDB' properties: { + enableAutomaticFailover: false + minimalTlsVersion: 'Tls12' + networkAclBypass: 'None' + publicNetworkAccess: 'Enabled' + databaseAccountOfferType: 'Standard' + enableMultipleWriteLocations: false + locations: [ + { + failoverPriority: 0 + isZoneRedundant: false + locationName: '${location}' + } + ] + enableAnalyticalStorage: false + enableBurstCapacity: false + enablePartitionMerge: false + ipRules: [] + isVirtualNetworkFilterEnabled: false + networkAclBypassResourceIds: [] + virtualNetworkRules: [] backupPolicy: null + enableFreeTier: false capabilities: [ { name: 'EnableMongoRoleBasedAccessControl' @@ -19,54 +40,33 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { } ] consistencyPolicy: { + maxStalenessPrefix: 100 defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableBurstCapacity: false - enableFreeTier: false - enableMultipleWriteLocations: false - enablePartitionMerge: false - ipRules: [] - isVirtualNetworkFilterEnabled: false - locations: [ - { - failoverPriority: 0 - isZoneRedundant: false - locationName: 'westus' - } - ] - minimalTlsVersion: 'Tls12' - networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] } } resource mongodbDatabas 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2021-10-15' = { - parent: databaseAccount name: '${resourceName}-mongodb' + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001-mongodb' + id: '${resourceName}-mongodb' } } } resource mongodbUserDefinition 'Microsoft.DocumentDB/databaseAccounts/mongodbUserDefinitions@2022-11-15' = { - parent: databaseAccount name: '${mongodbDatabas.name}.myUserName' + parent: databaseAccount properties: { databaseName: mongodbDatabas.name mechanisms: 'SCRAM-SHA-256' - password: null + password: mongodbUserPassword userName: 'myUserName' } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep index fe8b85c7..95d3b42d 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep @@ -1,44 +1,44 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: resourceName location: location kind: 'GlobalDocumentDB' properties: { + disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false + isVirtualNetworkFilterEnabled: false + networkAclBypassResourceIds: [] capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } + publicNetworkAccess: 'Enabled' databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false + virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' + enableAutomaticFailover: false + enableFreeTier: false locations: [ { + locationName: 'West Europe' failoverPriority: 0 isZoneRedundant: false - locationName: 'West Europe' } ] networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] } } resource service 'Microsoft.DocumentDB/databaseAccounts/services@2022-05-15' = { - parent: databaseAccount name: 'SqlDedicatedGateway' + parent: databaseAccount properties: { instanceCount: 1 instanceSize: 'Cosmos.D4s' diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep index 145232df..d1b0b5ea 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep @@ -6,52 +6,52 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 10 maxStalenessPrefix: 200 } databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { - failoverPriority: 0 isZoneRedundant: false locationName: 'West Europe' + failoverPriority: 0 } ] + capabilities: [] + disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false + enableFreeTier: false + isVirtualNetworkFilterEnabled: false networkAclBypass: 'None' + enableAutomaticFailover: false + enableMultipleWriteLocations: false + ipRules: [] + virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' + enableAnalyticalStorage: false networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] } } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { + resource: { + id: '${resourceName}' + } options: { throughput: 400 } - resource: { - id: 'acctest0001' - } } } resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = { - parent: sqlDatabase name: resourceName + parent: sqlDatabase properties: { options: {} resource: { diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/storedprocedures/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/storedprocedures/main.bicep index e412697c..f6256b05 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/storedprocedures/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/storedprocedures/main.bicep @@ -6,22 +6,11 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] - consistencyPolicy: { - defaultConsistencyLevel: 'Session' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false + ipRules: [] + networkAclBypass: 'None' disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -29,31 +18,42 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' + isVirtualNetworkFilterEnabled: false + capabilities: [] + consistencyPolicy: { + defaultConsistencyLevel: 'Session' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + defaultIdentity: 'FirstPartyIdentity' + disableKeyBasedMetadataWriteAccess: false + enableAutomaticFailover: false + enableFreeTier: false networkAclBypassResourceIds: [] + databaseAccountOfferType: 'Standard' publicNetworkAccess: 'Enabled' virtualNetworkRules: [] } } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = { - parent: sqlDatabase name: resourceName + parent: sqlDatabase properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' partitionKey: { kind: 'Hash' paths: [ @@ -65,8 +65,8 @@ resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/container } resource storedProcedure 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/storedProcedures@2021-10-15' = { - parent: container name: resourceName + parent: container properties: { options: {} resource: { @@ -76,7 +76,7 @@ resource storedProcedure 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/con response.setBody(''Hello, World''); } ''' - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/triggers/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/triggers/main.bicep index e580ac3c..bf72d8bb 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/triggers/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/triggers/main.bicep @@ -1,59 +1,59 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: resourceName location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'Session' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' + isVirtualNetworkFilterEnabled: false + ipRules: [] + publicNetworkAccess: 'Enabled' disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false enableAutomaticFailover: false enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { - failoverPriority: 0 isZoneRedundant: false locationName: 'West Europe' + failoverPriority: 0 } ] networkAclBypass: 'None' networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' virtualNetworkRules: [] + capabilities: [] + databaseAccountOfferType: 'Standard' + defaultIdentity: 'FirstPartyIdentity' + disableLocalAuth: false + enableAnalyticalStorage: false + enableMultipleWriteLocations: false } } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = { - parent: sqlDatabase name: resourceName + parent: sqlDatabase properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' partitionKey: { kind: 'Hash' paths: [ @@ -65,13 +65,13 @@ resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/container } resource trigger 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/triggers@2021-10-15' = { - parent: container name: resourceName + parent: container properties: { options: {} resource: { body: 'function trigger(){}' - id: 'acctest0001' + id: '${resourceName}' triggerOperation: 'All' triggerType: 'Pre' } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep index 4ee0c4fb..bbd9145a 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep @@ -6,22 +6,10 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] - consistencyPolicy: { - defaultConsistencyLevel: 'Session' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] isVirtualNetworkFilterEnabled: false + defaultIdentity: 'FirstPartyIdentity' locations: [ { failoverPriority: 0 @@ -30,30 +18,42 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } ] networkAclBypass: 'None' - networkAclBypassResourceIds: [] + capabilities: [] + disableKeyBasedMetadataWriteAccess: false + enableAutomaticFailover: false + enableFreeTier: false publicNetworkAccess: 'Enabled' virtualNetworkRules: [] + consistencyPolicy: { + defaultConsistencyLevel: 'Session' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + enableAnalyticalStorage: false + enableMultipleWriteLocations: false + ipRules: [] + networkAclBypassResourceIds: [] } } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { - options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } + options: {} } } resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = { - parent: sqlDatabase name: resourceName + parent: sqlDatabase properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' partitionKey: { kind: 'Hash' paths: [ @@ -65,8 +65,8 @@ resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/container } resource userDefinedFunction 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/userDefinedFunctions@2021-10-15' = { - parent: container name: resourceName + parent: container properties: { options: {} resource: { @@ -76,7 +76,7 @@ resource userDefinedFunction 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases response.setBody(''Hello, World''); } ''' - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep index a5d2f53d..76b0f888 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep @@ -6,22 +6,22 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + isVirtualNetworkFilterEnabled: false + networkAclBypass: 'None' + disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false + enableAnalyticalStorage: false + ipRules: [] + networkAclBypassResourceIds: [] + virtualNetworkRules: [] capabilities: [] consistencyPolicy: { - defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 10 maxStalenessPrefix: 200 + defaultConsistencyLevel: 'BoundedStaleness' } - databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -29,22 +29,22 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] + databaseAccountOfferType: 'Standard' publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + enableFreeTier: false + enableMultipleWriteLocations: false } } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: { throughput: 400 } resource: { - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep index f2ac0313..94accaf9 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep @@ -2,30 +2,8 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions@2021-10-15' existing = { - parent: databaseAccount name: '00000000-0000-0000-0000-000000000001' -} - -resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { - name: resourceName - location: location - properties: { - enableAutoStop: true - enableDiskEncryption: false - enableDoubleEncryption: false - enablePurge: false - enableStreamingIngest: false - engineType: 'V2' - publicIPType: 'IPv4' - publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' - trustedExternalTenants: [] - } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' - } + parent: databaseAccount } resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { @@ -33,22 +11,21 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + enableFreeTier: false + databaseAccountOfferType: 'Standard' + disableKeyBasedMetadataWriteAccess: false + enableMultipleWriteLocations: false + isVirtualNetworkFilterEnabled: false + networkAclBypassResourceIds: [] + virtualNetworkRules: [] capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'Session' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -57,26 +34,49 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } ] networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + enableAutomaticFailover: false + ipRules: [] + enableAnalyticalStorage: false } } -resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { - parent: cluster - name: resourceName - location: location - kind: 'ReadWrite' - properties: {} -} - resource sqlRoleAssignment 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2021-10-15' = { - parent: databaseAccount name: 'ff419bf7-f8ca-ef51-00d2-3576700c341b' + parent: databaseAccount properties: { - principalId: cluster.properties.identity.principalId roleDefinitionId: sqlRoleDefinition.id scope: databaseAccount.id + principalId: cluster.identity.principalId + } +} + +resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { + name: resourceName + location: location + sku: { + tier: 'Basic' + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' } + properties: { + enablePurge: false + restrictOutboundNetworkAccess: 'Disabled' + enableDiskEncryption: false + enableDoubleEncryption: false + enableStreamingIngest: false + engineType: 'V2' + publicIPType: 'IPv4' + publicNetworkAccess: 'Enabled' + trustedExternalTenants: [] + enableAutoStop: true + } +} + +resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { + name: resourceName + location: location + parent: cluster + kind: 'ReadWrite' + properties: {} } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep index d27400e8..2e260e27 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep @@ -6,22 +6,12 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -29,16 +19,26 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] + databaseAccountOfferType: 'Standard' + enableFreeTier: false + enableMultipleWriteLocations: false + ipRules: [] + isVirtualNetworkFilterEnabled: false networkAclBypass: 'None' networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' + capabilities: [] + disableLocalAuth: false + enableAnalyticalStorage: false virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' + enableAutomaticFailover: false } } resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions@2021-10-15' = { - parent: databaseAccount name: 'c3ce1661-d0b9-3476-0a7c-2654ce2f3055' + parent: databaseAccount properties: { assignableScopes: [ databaseAccount.id @@ -50,7 +50,7 @@ resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinit ] } ] - roleName: 'acctest0001' + roleName: resourceName type: 'CustomRole' } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep index 210b7112..36610180 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep @@ -6,25 +6,23 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [ - { - name: 'EnableTable' - } - ] consistencyPolicy: { defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false + publicNetworkAccess: 'Enabled' + virtualNetworkRules: [] + databaseAccountOfferType: 'Standard' enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false enableMultipleWriteLocations: false ipRules: [] + networkAclBypass: 'None' + networkAclBypassResourceIds: [] + disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false + enableAutomaticFailover: false isVirtualNetworkFilterEnabled: false locations: [ { @@ -33,20 +31,22 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + capabilities: [ + { + name: 'EnableTable' + } + ] + enableFreeTier: false } } resource table 'Microsoft.DocumentDB/databaseAccounts/tables@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep b/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep index 69e3ef43..c6581ca2 100644 --- a/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep @@ -5,21 +5,12 @@ resource mongoCluster 'Microsoft.DocumentDB/mongoClusters@2025-09-01' = { name: resourceName location: location properties: { - authConfig: { - allowedModes: [ - 'MicrosoftEntraID' - ] - } compute: { tier: 'M40' } highAvailability: { targetMode: 'Disabled' } - previewFeatures: [ - 'ShardRebalancer' - ] - publicNetworkAccess: 'Enabled' serverVersion: '5.0' sharding: { shardCount: 1 @@ -27,12 +18,21 @@ resource mongoCluster 'Microsoft.DocumentDB/mongoClusters@2025-09-01' = { storage: { sizeGb: 32 } + authConfig: { + allowedModes: [ + 'MicrosoftEntraID' + ] + } + previewFeatures: [ + 'ShardRebalancer' + ] + publicNetworkAccess: 'Enabled' } } resource firewallRule 'Microsoft.DocumentDB/mongoClusters/firewallRules@2025-09-01' = { - parent: mongoCluster name: resourceName + parent: mongoCluster properties: { endIpAddress: '0.0.0.0' startIpAddress: '0.0.0.0' diff --git a/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep b/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep index b5f1dd2e..f8153c73 100644 --- a/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep @@ -22,8 +22,8 @@ resource mongoClusterSSDv2 'Microsoft.DocumentDB/mongoClusters@2025-09-01' = { shardCount: 1 } storage: { - sizeGb: 64 type: 'PremiumSSDv2' + sizeGb: 64 } } } @@ -34,8 +34,8 @@ resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@ } resource mongouserEntraserviceprincipal 'Microsoft.DocumentDB/mongoClusters/users@2025-09-01' = { + name: 'azapi_resource.userAssignedIdentity.output.properties.principalId' parent: mongoClusterSSDv2 - name: 'userAssignedIdentity.properties.principalId' properties: { identityProvider: { properties: { @@ -45,8 +45,8 @@ resource mongouserEntraserviceprincipal 'Microsoft.DocumentDB/mongoClusters/user } roles: [ { - db: 'admin' role: 'root' + db: 'admin' } ] } diff --git a/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep index 9e0b659a..bf006e9a 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep @@ -1,15 +1,15 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource elasticSan 'Microsoft.ElasticSan/elasticSans@2023-01-01' = { name: resourceName location: location properties: { - baseSizeTiB: 1 extendedCapacitySizeTiB: 0 sku: { name: 'Premium_LRS' tier: 'Premium' } + baseSizeTiB: 1 } } diff --git a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep index c9205983..53573992 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep @@ -15,8 +15,8 @@ resource elasticSan 'Microsoft.ElasticSan/elasticSans@2023-01-01' = { } resource volumeGroup 'Microsoft.ElasticSan/elasticSans/volumeGroups@2023-01-01' = { - parent: elasticSan name: '${resourceName}-vg' + parent: elasticSan properties: { encryption: 'EncryptionAtRestWithPlatformKey' networkAcls: { diff --git a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep index ab0d9770..fcf2c59d 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep @@ -5,30 +5,30 @@ resource elasticSan 'Microsoft.ElasticSan/elasticSans@2023-01-01' = { name: '${resourceName}-es' location: location properties: { - baseSizeTiB: 1 extendedCapacitySizeTiB: 0 sku: { name: 'Premium_LRS' tier: 'Premium' } + baseSizeTiB: 1 } } resource volumeGroup 'Microsoft.ElasticSan/elasticSans/volumeGroups@2023-01-01' = { - parent: elasticSan name: '${resourceName}-vg' + parent: elasticSan properties: { + protocolType: 'Iscsi' encryption: 'EncryptionAtRestWithPlatformKey' networkAcls: { virtualNetworkRules: [] } - protocolType: 'Iscsi' } } resource volume 'Microsoft.ElasticSan/elasticSans/volumeGroups/volumes@2023-01-01' = { - parent: volumeGroup name: '${resourceName}-v' + parent: volumeGroup properties: { sizeGiB: 1 } diff --git a/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep b/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep index a9c9a9ec..4725dd49 100644 --- a/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep @@ -5,11 +5,11 @@ resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { name: resourceName location: location properties: { + inputSchemaMapping: null + publicNetworkAccess: 'Enabled' autoCreateTopicWithFirstSubscription: true autoDeleteTopicWithLastSubscription: true disableLocalAuth: false inputSchema: 'EventGridSchema' - inputSchemaMapping: null - publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep index 200dc074..d2a95d58 100644 --- a/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep @@ -15,6 +15,6 @@ resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { } resource topic 'Microsoft.EventGrid/domains/topics@2021-12-01' = { - parent: domain name: resourceName + parent: domain } diff --git a/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep b/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep index cb0ed3cd..7a6ae55b 100644 --- a/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep @@ -1,17 +1,52 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: { + allowBlobPublicAccess: true + allowCrossTenantReplication: true + encryption: { + keySource: 'Microsoft.Storage' + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + } + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + } +} + resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = { - scope: storageAccount name: resourceName + scope: storageAccount properties: { deadLetterDestination: null destination: { - endpointType: 'EventHub' properties: { deliveryAttributeMappings: null - resourceId: eventhub.id } + endpointType: 'EventHub' } eventDeliverySchema: 'EventGridSchema' filter: { @@ -31,58 +66,22 @@ resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location - properties: { - disableLocalAuth: false - isAutoInflateEnabled: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false - } sku: { capacity: 1 name: 'Standard' tier: 'Standard' } -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - encryption: { - keySource: 'Microsoft.Storage' - services: { - queue: { - keyType: 'Service' - } - table: { - keyType: 'Service' - } - } - } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } + disableLocalAuth: false + isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + zoneRedundant: false } } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { messageRetentionInDays: 1 partitionCount: 1 diff --git a/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep b/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep index cac8743f..e59655c9 100644 --- a/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep @@ -4,11 +4,11 @@ param location string = 'westus' resource namespace 'Microsoft.EventGrid/namespaces@2023-12-15-preview' = { name: '${resourceName}-ns' location: location - properties: { - publicNetworkAccess: 'Enabled' - } sku: { capacity: 1 name: 'Standard' } + properties: { + publicNetworkAccess: 'Enabled' + } } diff --git a/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep b/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep index 41576cfc..de155e9b 100644 --- a/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep @@ -1,23 +1,35 @@ param resourceName string = 'acctest0001' param location string = 'westus' -var storageAccountName = '${resourceName}sa01' -var queueName = '${resourceName}queue' -var eventSubscription1Name = '${resourceName}-es1' -var eventSubscription2Name = '${resourceName}-es2' -var systemTopicName = '${resourceName}-st' +var queueServiceId = '${storageAccount.id}/queueServices/default' +var storageAccountName = 'resourceNamesa01' +var queueName = 'resourceNamequeue' +var eventSubscription1Name = 'resourceName-es1' +var eventSubscription2Name = 'resourceName-es2' +var systemTopicName = 'resourceName-st' + +resource systemTopic 'Microsoft.EventGrid/systemTopics@2022-06-15' = { + name: systemTopicName + location: 'global' + properties: { + source: resourceGroup().id + topicType: 'Microsoft.Resources.ResourceGroups' + } +} resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: storageAccountName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true allowCrossTenantReplication: false + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + allowBlobPublicAccess: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - dnsEndpointType: 'Standard' encryption: { keySource: 'Microsoft.Storage' services: { @@ -29,11 +41,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - isHnsEnabled: false isLocalUserEnabled: true - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { bypass: 'AzureServices' defaultAction: 'Allow' @@ -41,26 +49,29 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { resourceAccessRules: [] virtualNetworkRules: [] } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + defaultToOAuthAuthentication: false + dnsEndpointType: 'Standard' + isHnsEnabled: false + isSftpEnabled: false + publicNetworkAccess: 'Enabled' + accessTier: 'Hot' } } -resource systemTopic 'Microsoft.EventGrid/systemTopics@2022-06-15' = { - name: systemTopicName - location: 'global' - properties: { - source: resourceGroup().id - topicType: 'Microsoft.Resources.ResourceGroups' - } +resource queue 'Microsoft.Storage/storageAccounts/queueServices/queues@2023-05-01' = { + name: queueName + dependsOn: [ + storageAccount + ] } resource eventSubscription 'Microsoft.EventGrid/systemTopics/eventSubscriptions@2022-06-15' = { - parent: systemTopic name: eventSubscription1Name + parent: systemTopic + dependsOn: [ + queue + ] properties: { deadLetterDestination: null destination: { @@ -76,28 +87,30 @@ resource eventSubscription 'Microsoft.EventGrid/systemTopics/eventSubscriptions@ { key: 'subject' operatorType: 'StringBeginsWith' - values: ['foo'] + values: [ + 'foo' + ] } ] } labels: [] } - dependsOn: [ - queue - ] } resource eventsubscription1 'Microsoft.EventGrid/systemTopics/eventSubscriptions@2022-06-15' = { - parent: systemTopic name: eventSubscription2Name + parent: systemTopic + dependsOn: [ + queue + ] properties: { deadLetterDestination: null destination: { - endpointType: 'StorageQueue' properties: { queueName: queueName resourceId: storageAccount.id } + endpointType: 'StorageQueue' } eventDeliverySchema: 'EventGridSchema' filter: { @@ -105,28 +118,12 @@ resource eventsubscription1 'Microsoft.EventGrid/systemTopics/eventSubscriptions { key: 'subject' operatorType: 'StringEndsWith' - values: ['bar'] + values: [ + 'bar' + ] } ] } labels: [] } - dependsOn: [ - queue - ] -} - -// The queue service is a singleton named 'default' under the storage account -resource queueService 'Microsoft.Storage/storageAccounts/queueServices@2023-05-01' existing = { - parent: storageAccount - name: 'default' -} - -resource queue 'Microsoft.Storage/storageAccounts/queueServices/queues@2023-05-01' = { - parent: queueService - name: queueName - - dependsOn: [ - storageAccount - ] } diff --git a/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep index 02267b1a..db3c1e98 100644 --- a/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep @@ -1,4 +1,5 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource systemTopic 'Microsoft.EventGrid/systemTopics@2021-12-01' = { name: resourceName diff --git a/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep index 7d52cb0d..7036e6b5 100644 --- a/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep @@ -5,9 +5,9 @@ resource topic 'Microsoft.EventGrid/topics@2021-12-01' = { name: resourceName location: location properties: { - disableLocalAuth: false - inputSchema: 'EventGridSchema' inputSchemaMapping: null publicNetworkAccess: 'Enabled' + disableLocalAuth: false + inputSchema: 'EventGridSchema' } } diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/authorizationrules/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/authorizationrules/main.bicep index b2e9ba33..23d2c1d0 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/authorizationrules/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/authorizationrules/main.bicep @@ -4,22 +4,22 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + tier: 'Basic' + capacity: 1 + name: 'Basic' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Basic' - tier: 'Basic' - } } resource authorizationRule 'Microsoft.EventHub/namespaces/authorizationRules@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { rights: [ 'Listen' diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep index e6831c27..1a83569a 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep @@ -4,37 +4,38 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location - properties: { - disableLocalAuth: false - isAutoInflateEnabled: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false - } sku: { capacity: 1 name: 'Standard' tier: 'Standard' } -} - -resource namespace2 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { - name: resourceName properties: { - disableLocalAuth: false - isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false + disableLocalAuth: false + isAutoInflateEnabled: false } +} + +resource namespace2 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { + name: resourceName + location: 'westus2' sku: { capacity: 1 name: 'Standard' tier: 'Standard' } + properties: { + publicNetworkAccess: 'Enabled' + zoneRedundant: false + disableLocalAuth: false + isAutoInflateEnabled: false + } } resource disasterRecoveryConfig 'Microsoft.EventHub/namespaces/disasterRecoveryConfigs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { partnerNamespace: namespace2.id } diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep index 8101f1a7..8e795956 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep @@ -1,25 +1,25 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location - properties: { - disableLocalAuth: false - isAutoInflateEnabled: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false - } sku: { capacity: 1 name: 'Basic' tier: 'Basic' } + properties: { + zoneRedundant: false + disableLocalAuth: false + isAutoInflateEnabled: false + publicNetworkAccess: 'Enabled' + } } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { messageRetentionInDays: 1 partitionCount: 2 @@ -28,8 +28,8 @@ resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { } resource authorizationRule 'Microsoft.EventHub/namespaces/eventhubs/authorizationRules@2021-11-01' = { - parent: eventhub name: resourceName + parent: eventhub properties: { rights: [ 'Send' diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep index 044a8065..be576c42 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep @@ -4,22 +4,22 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location - properties: { - disableLocalAuth: false - isAutoInflateEnabled: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false - } sku: { capacity: 1 name: 'Standard' tier: 'Standard' } + properties: { + isAutoInflateEnabled: false + publicNetworkAccess: 'Enabled' + zoneRedundant: false + disableLocalAuth: false + } } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { messageRetentionInDays: 1 partitionCount: 2 @@ -28,8 +28,8 @@ resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { } resource consumerGroup 'Microsoft.EventHub/namespaces/eventhubs/consumerGroups@2021-11-01' = { - parent: eventhub name: resourceName + parent: eventhub properties: { userMetadata: '' } diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep index 423bc654..1f75b415 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep @@ -1,25 +1,25 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + tier: 'Standard' + capacity: 1 + name: 'Standard' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Standard' - tier: 'Standard' - } } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { messageRetentionInDays: 1 partitionCount: 2 diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep index e41aea1f..eb6da542 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location - properties: { - disableLocalAuth: false - isAutoInflateEnabled: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false - } sku: { capacity: 1 name: 'Standard' tier: 'Standard' } + properties: { + isAutoInflateEnabled: false + publicNetworkAccess: 'Enabled' + zoneRedundant: false + disableLocalAuth: false + } } diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep index b61787f7..77283c9e 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep @@ -4,22 +4,22 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard' + tier: 'Standard' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Standard' - tier: 'Standard' - } } resource schemaGroup 'Microsoft.EventHub/namespaces/schemaGroups@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { schemaCompatibility: 'Forward' schemaType: 'Avro' diff --git a/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep b/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep index 212e175b..356e312e 100644 --- a/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep +++ b/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep @@ -4,27 +4,6 @@ param location string = 'westeurope' @description('The administrator password for the virtual machine') param adminPassword string -resource guestConfigurationAssignment 'Microsoft.GuestConfiguration/guestConfigurationAssignments@2020-06-25' = { - scope: virtualMachine - name: 'WhitelistedApplication' - location: location - properties: { - guestConfiguration: { - assignmentType: '' - configurationParameter: [ - { - name: '[InstalledApplication]bwhitelistedapp;Name' - value: 'NotePad,sql' - } - ] - contentHash: '' - contentUri: '' - name: 'WhitelistedApplication' - version: '1.*' - } - } -} - resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName location: location @@ -38,9 +17,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -51,17 +28,12 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - additionalCapabilities: {} - applicationProfile: { - galleryApplications: [] - } diagnosticsProfile: { bootDiagnostics: { - enabled: false storageUri: '' + enabled: false } } - extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_F2' } @@ -76,23 +48,23 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null - adminUsername: 'adminuser' - allowExtensionOperations: true computerName: 'acctestvmdro23' secrets: [] windowsConfiguration: { enableAutomaticUpdates: true patchSettings: { - assessmentMode: 'ImageDefault' enableHotpatching: false patchMode: 'AutomaticByOS' + assessmentMode: 'ImageDefault' } provisionVMAgent: true winRM: { listeners: [] } } + adminPassword: adminPassword + adminUsername: 'adminuser' + allowExtensionOperations: true } priority: 'Regular' storageProfile: { @@ -104,15 +76,20 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { version: 'latest' } osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' managedDisk: { storageAccountType: 'Standard_LRS' } osType: 'Windows' writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' } } + additionalCapabilities: {} + applicationProfile: { + galleryApplications: [] + } + extensionsTimeBudget: 'PT1H30M' } } @@ -133,14 +110,35 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] - serviceEndpoints: [] + } +} + +resource guestConfigurationAssignment 'Microsoft.GuestConfiguration/guestConfigurationAssignments@2020-06-25' = { + name: 'WhitelistedApplication' + location: location + scope: virtualMachine + properties: { + guestConfiguration: { + contentHash: '' + contentUri: '' + name: 'WhitelistedApplication' + version: '1.*' + assignmentType: '' + configurationParameter: [ + { + name: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + value: 'NotePad,sql' + } + ] + } } } diff --git a/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep b/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep index ce8260ec..887625ef 100644 --- a/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep @@ -1,3 +1,6 @@ +@secure() +@description('The REST API credential password for the HDInsight cluster gateway') +param restCredentialPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The username for the HDInsight cluster virtual machines') @@ -5,19 +8,31 @@ param vmUsername string @secure() @description('The password for the HDInsight cluster virtual machines') param vmPassword string -@secure() -@description('The REST API credential password for the HDInsight cluster gateway') -param restCredentialPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount +} + +resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { + name: resourceName + parent: blobService + properties: { + metadata: { + key: 'value' + } + } } resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { name: resourceName location: location properties: { + encryptionInTransitProperties: { + isEncryptionInTransitEnabled: false + } + osType: 'Linux' + tier: 'standard' clusterDefinition: { componentVersion: { Spark: '2.4' @@ -31,23 +46,34 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { } kind: 'Spark' } + minSupportedTlsVersion: '1.2' + storageProfile: { + storageaccounts: [ + { + isDefault: true + key: storageAccount.listKeys().keys[0].value + name: '.blob.core.windows.net' + } + ] + } clusterVersion: '4.0.3000.1' computeProfile: { roles: [ { - hardwareProfile: { - vmSize: 'standard_a4_v2' - } - name: 'headnode' osProfile: { linuxOperatingSystemProfile: { - password: vmPassword username: vmUsername + password: vmPassword } } targetInstanceCount: 2 + hardwareProfile: { + vmSize: 'standard_a4_v2' + } + name: 'headnode' } { + targetInstanceCount: 3 hardwareProfile: { vmSize: 'standard_a4_v2' } @@ -58,9 +84,9 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { username: vmUsername } } - targetInstanceCount: 3 } { + targetInstanceCount: 3 hardwareProfile: { vmSize: 'standard_a2_v2' } @@ -71,40 +97,23 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { username: vmUsername } } - targetInstanceCount: 3 } ] } - encryptionInTransitProperties: { - isEncryptionInTransitEnabled: false - } - minSupportedTlsVersion: '1.2' - osType: 'Linux' - storageProfile: { - storageaccounts: [ - { - container: container.name - isDefault: true - key: storageAccount.listKeys().keys[0].value - name: '${storageAccount.name}.blob.core.windows.net' - resourceId: storageAccount.id - } - ] - } - tier: 'standard' } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' - allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -116,27 +125,16 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false isNfsV3Enabled: false isSftpEnabled: false minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + allowBlobPublicAccess: true + defaultToOAuthAuthentication: false + isHnsEnabled: false networkAcls: { defaultAction: 'Allow' } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } -} - -resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService - name: resourceName - properties: { - metadata: { - key: 'value' - } - } } diff --git a/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep index 47827fb8..6cdc8773 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep @@ -6,6 +6,10 @@ resource service 'Microsoft.HealthcareApis/services@2022-12-01' = { location: location kind: 'fhir' properties: { + cosmosDbConfiguration: { + offerThroughput: 1000 + } + publicNetworkAccess: 'Enabled' accessPolicies: [ { objectId: deployer().objectId @@ -13,9 +17,5 @@ resource service 'Microsoft.HealthcareApis/services@2022-12-01' = { ] authenticationConfiguration: {} corsConfiguration: {} - cosmosDbConfiguration: { - offerThroughput: 1000 - } - publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.healthcareapis/samples/workspaces/dicomservices/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/workspaces/dicomservices/main.bicep index 1be52aff..e7634a40 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/dicomservices/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/dicomservices/main.bicep @@ -7,9 +7,9 @@ resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { } resource dicomService 'Microsoft.HealthcareApis/workspaces/dicomServices@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace properties: { publicNetworkAccess: 'Enabled' } diff --git a/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep index 3fb569c6..affcbe04 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep @@ -7,16 +7,16 @@ resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { } resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace kind: 'fhir-R4' properties: { acrConfiguration: {} authenticationConfiguration: { - audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' - authority: 'https://login.microsoftonline.com/deployer().tenantId' + authority: 'https://login.microsoftonline.com/${tenant().tenantId}' smartProxyEnabled: false + audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' } corsConfiguration: { allowCredentials: false @@ -28,9 +28,9 @@ resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-0 } resource fhirService2 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace kind: 'fhir-R4' properties: { acrConfiguration: {} diff --git a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep index f2bcb8fc..08347146 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep @@ -4,86 +4,85 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard' + tier: 'Standard' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Standard' - tier: 'Standard' - } -} - -resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { - name: resourceName - location: location } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { + status: 'Active' messageRetentionInDays: 1 partitionCount: 2 - status: 'Active' } } +resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { + name: resourceName + location: location +} + resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace kind: 'fhir-R4' properties: { acrConfiguration: {} authenticationConfiguration: { audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' - authority: 'https://login.microsoftonline.com/deployer().tenantId' + authority: 'https://login.microsoftonline.com/${tenant().tenantId}' smartProxyEnabled: false } corsConfiguration: { - allowCredentials: false headers: [] methods: [] origins: [] + allowCredentials: false } } } resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace properties: { + ingestionEndpointConfiguration: { + eventHubName: eventhub.name + fullyQualifiedEventHubNamespace: '${namespace.name}.servicebus.windows.net' + } deviceMapping: { content: { template: [] templateType: 'CollectionContent' } } - ingestionEndpointConfiguration: { - consumerGroup: consumerGroup.id - eventHubName: eventhub.name - fullyQualifiedEventHubNamespace: '${namespace.name}.servicebus.windows.net' - } } } resource consumerGroup 'Microsoft.EventHub/namespaces/eventhubs/consumerGroups@2021-11-01' = { - parent: eventhub name: resourceName + parent: eventhub properties: { userMetadata: '' } } resource fhirDestination 'Microsoft.HealthcareApis/workspaces/iotConnectors/fhirDestinations@2022-12-01' = { - parent: iotConnector name: resourceName location: location + parent: iotConnector properties: { fhirMapping: { content: { diff --git a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep index eefb1927..565d0667 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep @@ -4,38 +4,38 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + tier: 'Standard' + capacity: 1 + name: 'Standard' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Standard' - tier: 'Standard' - } -} - -resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { - name: resourceName - location: location } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { + status: 'Active' messageRetentionInDays: 1 partitionCount: 2 - status: 'Active' } } +resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { + name: resourceName + location: location +} + resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace properties: { deviceMapping: { content: { @@ -44,7 +44,6 @@ resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12 } } ingestionEndpointConfiguration: { - consumerGroup: consumerGroup.id eventHubName: eventhub.name fullyQualifiedEventHubNamespace: '${namespace.name}.servicebus.windows.net' } @@ -52,8 +51,8 @@ resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12 } resource consumerGroup 'Microsoft.EventHub/namespaces/eventhubs/consumerGroups@2021-11-01' = { - parent: eventhub name: resourceName + parent: eventhub properties: { userMetadata: '' } diff --git a/settings/remarks/microsoft.impact/remarks.json b/settings/remarks/microsoft.impact/remarks.json index 74e3d285..ad4b99ea 100644 --- a/settings/remarks/microsoft.impact/remarks.json +++ b/settings/remarks/microsoft.impact/remarks.json @@ -17,6 +17,11 @@ "ResourceType": "Microsoft.Impact/connectors", "Path": "samples/connectors/main.bicep", "Description": "A basic example of deploying Impact Connectors." + }, + { + "ResourceType": "Microsoft.Impact/workloadImpacts", + "Path": "samples/workloadimpacts/main.bicep", + "Description": "A basic example of deploying Impact Workload Impacts." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.impact/samples/connectors/main.bicep b/settings/remarks/microsoft.impact/samples/connectors/main.bicep index 39b2c82d..e70a791f 100644 --- a/settings/remarks/microsoft.impact/samples/connectors/main.bicep +++ b/settings/remarks/microsoft.impact/samples/connectors/main.bicep @@ -1,6 +1,7 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource connector 'Microsoft.Impact/connectors@2024-05-01-preview' = { name: resourceName diff --git a/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep b/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep new file mode 100644 index 00000000..dc52430c --- /dev/null +++ b/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep @@ -0,0 +1,158 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' +@secure() +@description('The administrator password for the virtual machine') +param adminPassword string + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: resourceName + parent: virtualNetwork + properties: { + serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + properties: { + subnet: {} + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + } + name: 'testconfiguration1' + } + ] + } +} + +resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { + name: resourceName + location: location + properties: { + osProfile: { + adminUsername: 'testadmin' + computerName: 'hostname230630032848831819' + linuxConfiguration: { + disablePasswordAuthentication: false + } + adminPassword: adminPassword + } + storageProfile: { + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' + } + osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' + name: 'myosdisk1' + writeAcceleratorEnabled: false + } + } + hardwareProfile: { + vmSize: 'Standard_F2' + } + networkProfile: { + networkInterfaces: [ + { + id: networkInterface.id + properties: { + primary: false + } + } + ] + } + } +} + +resource workloadImpact 'Microsoft.Impact/workloadImpacts@2023-12-01-preview' = { + name: resourceName + properties: { + impactCategory: 'Resource.Availability' + performance: [ + { + actual: 2 + expected: 2 + expectedValueRange: { + min: 1 + max: 5 + } + metricName: 'example' + unit: 'ByteSeconds' + } + ] + startDateTime: '2024-12-03T01:15:00Z' + workload: { + context: 'context' + toolset: 'Ansible' + } + additionalProperties: { + Location: 'DataCenter1' + LogUrl: 'http://example.com/log' + ModelNumber: 'Model123' + NodeId: 'node-123' + PhysicalHostName: 'host123' + SerialNumber: 'SN123456' + CollectTelemetry: true + Manufacturer: 'ManufacturerName' + VmUniqueId: 'vm-unique-id' + } + armCorrelationIds: [ + 'id1' + 'id2' + ] + clientIncidentDetails: { + clientIncidentId: 'id' + clientIncidentSource: 'AzureDevops' + } + connectivity: { + port: 1443 + protocol: 'TCP' + source: { + azureResourceId: virtualMachine.id + } + target: { + azureResourceId: virtualMachine.id + } + } + errorDetails: { + errorCode: 'code' + errorMessage: 'errorMessage' + } + impactDescription: 'impact description' + impactGroupId: 'impact groupid' + impactedResourceId: virtualMachine.id + confidenceLevel: 'High' + endDateTime: '2024-12-04T01:15:00Z' + } +} diff --git a/settings/remarks/microsoft.insights/remarks.json b/settings/remarks/microsoft.insights/remarks.json index 46cad46d..c8cd87ae 100644 --- a/settings/remarks/microsoft.insights/remarks.json +++ b/settings/remarks/microsoft.insights/remarks.json @@ -191,6 +191,21 @@ "ResourceType": "Microsoft.Insights/workbooks", "Path": "samples/workbooks/main.bicep", "Description": "A basic example of deploying Azure Workbook." + }, + { + "ResourceType": "Microsoft.Insights/components/ProactiveDetectionConfigs", + "Path": "samples/components/proactivedetectionconfigs/main.bicep", + "Description": "A basic example of deploying Application Insights Smart Detection Rule." + }, + { + "ResourceType": "Microsoft.Insights/logProfiles", + "Path": "samples/logprofiles/main.bicep", + "Description": "A basic example of deploying Insights Log Profiles." + }, + { + "ResourceType": "Microsoft.Insights/logProfiles", + "Path": "samples/logprofiles/main-rg-module.bicep", + "Description": "A basic example of deploying Insights Log Profiles." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep b/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep index a50473f2..0a46c86d 100644 --- a/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep +++ b/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep @@ -1,21 +1,22 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { name: resourceName location: 'global' properties: { - armRoleReceivers: [] - automationRunbookReceivers: [] - azureAppPushReceivers: [] - azureFunctionReceivers: [] emailReceivers: [] + itsmReceivers: [] + logicAppReceivers: [] + voiceReceivers: [] + automationRunbookReceivers: [] enabled: true eventHubReceivers: [] groupShortName: 'acctestag' - itsmReceivers: [] - logicAppReceivers: [] smsReceivers: [] - voiceReceivers: [] webhookReceivers: [] + armRoleReceivers: [] + azureAppPushReceivers: [] + azureFunctionReceivers: [] } } diff --git a/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep b/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep index fe95dfcf..6c7d60c5 100644 --- a/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep +++ b/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep @@ -5,19 +5,19 @@ resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { name: resourceName location: 'global' properties: { + itsmReceivers: [] + smsReceivers: [] + webhookReceivers: [] armRoleReceivers: [] - automationRunbookReceivers: [] azureAppPushReceivers: [] azureFunctionReceivers: [] emailReceivers: [] enabled: true - eventHubReceivers: [] groupShortName: 'acctestag1' - itsmReceivers: [] logicAppReceivers: [] - smsReceivers: [] voiceReceivers: [] - webhookReceivers: [] + automationRunbookReceivers: [] + eventHubReceivers: [] } } @@ -26,17 +26,17 @@ resource actionGroup2 'Microsoft.Insights/actionGroups@2023-01-01' = { location: 'global' properties: { armRoleReceivers: [] - automationRunbookReceivers: [] azureAppPushReceivers: [] azureFunctionReceivers: [] emailReceivers: [] enabled: true eventHubReceivers: [] + smsReceivers: [] + voiceReceivers: [] + automationRunbookReceivers: [] groupShortName: 'acctestag2' itsmReceivers: [] logicAppReceivers: [] - smsReceivers: [] - voiceReceivers: [] webhookReceivers: [] } } @@ -45,6 +45,8 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { name: resourceName location: 'global' properties: { + enabled: true + scopes: [] actions: { actionGroups: [ { @@ -93,8 +95,8 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { { anyOf: [ { - equals: 'PlatformInitiated' field: 'properties.cause' + equals: 'PlatformInitiated' } { equals: 'UserInitiated' @@ -105,24 +107,19 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { ] } description: 'This is just a test acceptance.' - enabled: true - scopes: [ - resourceGroup().id - storageAccount.id - ] } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' - allowBlobPublicAccess: true allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -141,10 +138,10 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { networkAcls: { defaultAction: 'Allow' } + allowBlobPublicAccess: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } } diff --git a/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep b/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep index a1ef6631..349f606e 100644 --- a/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep +++ b/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep @@ -14,56 +14,55 @@ resource autoScaleSetting 'Microsoft.Insights/autoScaleSettings@2022-10-01' = { notifications: [] profiles: [ { - capacity: { - default: '1' - maximum: '10' - minimum: '1' - } - name: 'metricRules' rules: [ { metricTrigger: { + timeGrain: 'PT1M' + timeWindow: 'PT5M' + threshold: 75 + timeAggregation: 'Last' dimensions: [] dividePerInstance: true metricName: 'Percentage CPU' metricNamespace: '' - metricResourceUri: virtualMachineScaleSet.id operator: 'GreaterThan' statistic: 'Average' - threshold: 75 - timeAggregation: 'Last' - timeGrain: 'PT1M' - timeWindow: 'PT5M' } scaleAction: { - cooldown: 'PT1M' direction: 'Increase' type: 'ChangeCount' value: '1' + cooldown: 'PT1M' } } ] + capacity: { + default: '1' + maximum: '10' + minimum: '1' + } + name: 'metricRules' } ] - targetResourceUri: virtualMachineScaleSet.id } } resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023-03-01' = { name: resourceName location: location + sku: { + capacity: 2 + name: 'Standard_F2' + tier: 'Standard' + } properties: { additionalCapabilities: {} - doNotRunExtensionsOnOverprovisionedVMs: false - orchestrationMode: 'Uniform' - overprovision: true scaleInPolicy: { forceDeletion: false rules: [ 'Default' ] } - singlePlacementGroup: true upgradePolicy: { mode: 'Manual' } @@ -80,8 +79,8 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- networkProfile: { networkInterfaceConfigurations: [ { - name: 'TestNetworkProfile-230630033559396108' properties: { + primary: true dnsSettings: { dnsServers: [] } @@ -91,26 +90,24 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- { name: 'TestIPConfiguration' properties: { + privateIPAddressVersion: 'IPv4' + subnet: {} applicationGatewayBackendAddressPools: [] applicationSecurityGroups: [] loadBalancerBackendAddressPools: [] loadBalancerInboundNatPools: [] primary: true - privateIPAddressVersion: 'IPv4' - subnet: { - id: subnet.id - } } } ] - primary: true } + name: 'TestNetworkProfile-230630033559396108' } ] } osProfile: { - adminPassword: null - adminUsername: null + adminPassword: adminPassword + adminUsername: adminUsername computerNamePrefix: 'testvm-230630033559396108' linuxConfiguration: { disablePasswordAuthentication: false @@ -128,29 +125,28 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } priority: 'Regular' storageProfile: { - dataDisks: [] - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '16.04-LTS' - version: 'latest' - } osDisk: { + osType: 'Linux' + writeAcceleratorEnabled: false caching: 'ReadWrite' createOption: 'FromImage' managedDisk: { storageAccountType: 'StandardSSD_LRS' } - osType: 'Linux' - writeAcceleratorEnabled: false + } + dataDisks: [] + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' } } } - } - sku: { - capacity: 2 - name: 'Standard_F2' - tier: 'Standard' + doNotRunExtensionsOnOverprovisionedVMs: false + orchestrationMode: 'Uniform' + overprovision: true + singlePlacementGroup: true } } @@ -158,6 +154,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -166,13 +163,12 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { dhcpOptions: { dnsServers: [] } - subnets: [] } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' delegations: [] diff --git a/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep b/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep index c22f4fd2..a5d7a01b 100644 --- a/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep +++ b/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep @@ -6,22 +6,18 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false RetentionInDays: 90 - SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' + DisableLocalAuth: false + SamplingPercentage: 100 + DisableIpMasking: false + ForceCustomerStorageForProfiler: false } } resource analyticsItem 'microsoft.insights/components/analyticsItems@2015-05-01' = { - parent: component name: 'item' - Content: 'requests #test' - Name: 'testquery' - Scope: 'shared' - Type: 'query' + parent: component } diff --git a/settings/remarks/microsoft.insights/samples/components/main.bicep b/settings/remarks/microsoft.insights/samples/components/main.bicep index e36d6913..be5c10c2 100644 --- a/settings/remarks/microsoft.insights/samples/components/main.bicep +++ b/settings/remarks/microsoft.insights/samples/components/main.bicep @@ -7,12 +7,12 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { kind: 'web' properties: { Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false ForceCustomerStorageForProfiler: false RetentionInDays: 90 SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' + DisableIpMasking: false + DisableLocalAuth: false + publicNetworkAccessForIngestion: 'Enabled' } } diff --git a/settings/remarks/microsoft.insights/samples/components/proactivedetectionconfigs/main.bicep b/settings/remarks/microsoft.insights/samples/components/proactivedetectionconfigs/main.bicep new file mode 100644 index 00000000..92e100bc --- /dev/null +++ b/settings/remarks/microsoft.insights/samples/components/proactivedetectionconfigs/main.bicep @@ -0,0 +1,23 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + RetentionInDays: 90 + Application_Type: 'web' + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + DisableIpMasking: false + } +} + +resource proactiveDetectionConfig 'Microsoft.Insights/components/ProactiveDetectionConfigs@2015-05-01' = { + name: 'slowpageloadtime' + parent: component +} diff --git a/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep b/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep index 72d5147a..2d268ee5 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep @@ -4,6 +4,35 @@ param location string = 'westeurope' @description('The administrator password for the virtual machine') param adminPassword string +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: 'network-230630033559397415' + location: location + properties: { + subnets: [] + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: 'subnet-230630033559397415' + parent: virtualNetwork + properties: { + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + } +} + resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { name: resourceName location: location @@ -27,45 +56,10 @@ resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' } } -resource dataCollectionRuleAssociation 'Microsoft.Insights/dataCollectionRuleAssociations@2022-06-01' = { - scope: virtualMachine - name: resourceName - properties: { - dataCollectionRuleId: dataCollectionRule.id - description: '' - } -} - -resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { - name: 'nic-230630033559397415' - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'internal' - properties: { - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] - } -} - resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: 'machine-230630033559397415' location: location properties: { - additionalCapabilities: {} - applicationProfile: { - galleryApplications: [] - } diagnosticsProfile: { bootDiagnostics: { enabled: false @@ -76,34 +70,38 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { hardwareProfile: { vmSize: 'Standard_B1ls' } - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: true - } - } - ] - } osProfile: { - adminPassword: null + adminPassword: adminPassword adminUsername: 'adminuser' allowExtensionOperations: true computerName: 'machine-230630033559397415' linuxConfiguration: { + provisionVMAgent: true + ssh: { + publicKeys: [] + } disablePasswordAuthentication: false patchSettings: { assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' } - provisionVMAgent: true - ssh: { - publicKeys: [] - } } secrets: [] } + additionalCapabilities: {} + applicationProfile: { + galleryApplications: [] + } + networkProfile: { + networkInterfaces: [ + { + id: networkInterface.id + properties: { + primary: true + } + } + ] + } priority: 'Regular' storageProfile: { dataDisks: [] @@ -114,43 +112,43 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { version: 'latest' } osDisk: { + osType: 'Linux' + writeAcceleratorEnabled: false caching: 'ReadWrite' createOption: 'FromImage' managedDisk: { storageAccountType: 'Standard_LRS' } - osType: 'Linux' - writeAcceleratorEnabled: false } } } } -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: 'network-230630033559397415' - location: location +resource dataCollectionRuleAssociation 'Microsoft.Insights/dataCollectionRuleAssociations@2022-06-01' = { + name: resourceName + scope: virtualMachine properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] + description: '' + dataCollectionRuleId: dataCollectionRule.id } } -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork - name: 'subnet-230630033559397415' +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: 'nic-230630033559397415' + location: location properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + properties: { + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + } + name: 'internal' + } + ] } } diff --git a/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep b/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep index 30fee3fa..27788640 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep @@ -7,12 +7,12 @@ resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' properties: { dataFlows: [ { - destinations: [ - 'test-destination-metrics' - ] streams: [ 'Microsoft-InsightsMetrics' ] + destinations: [ + 'test-destination-metrics' + ] } ] description: '' diff --git a/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep b/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep index 0b673c3a..c55f9338 100644 --- a/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep +++ b/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep @@ -1,49 +1,20 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource diagnosticSetting 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = { - scope: vault - name: resourceName - properties: { - eventHubAuthorizationRuleId: authorizationRule.id - eventHubName: namespace.name - logs: [ - { - categoryGroup: 'Audit' - enabled: true - retentionPolicy: { - days: 0 - enabled: false - } - } - ] - metrics: [ - { - category: 'AllMetrics' - enabled: true - retentionPolicy: { - days: 0 - enabled: false - } - } - ] - } -} - resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Basic' + tier: 'Basic' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Basic' - tier: 'Basic' - } } resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { @@ -52,23 +23,23 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { properties: { accessPolicies: [] createMode: 'default' - enableRbacAuthorization: false enableSoftDelete: true enabledForDeployment: false enabledForDiskEncryption: false - enabledForTemplateDeployment: false publicNetworkAccess: 'Enabled' sku: { - family: 'A' name: 'standard' + family: 'A' } - tenantId: deployer().tenantId + tenantId: tenant().tenantId + enableRbacAuthorization: false + enabledForTemplateDeployment: false } } resource authorizationRule 'Microsoft.EventHub/namespaces/authorizationRules@2021-11-01' = { - parent: namespace name: 'example' + parent: namespace properties: { rights: [ 'Listen' @@ -77,3 +48,30 @@ resource authorizationRule 'Microsoft.EventHub/namespaces/authorizationRules@202 ] } } + +resource diagnosticSetting 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = { + name: resourceName + scope: vault + properties: { + logs: [ + { + categoryGroup: 'Audit' + enabled: true + retentionPolicy: { + days: 0 + enabled: false + } + } + ] + metrics: [ + { + category: 'AllMetrics' + enabled: true + retentionPolicy: { + days: 0 + enabled: false + } + } + ] + } +} diff --git a/settings/remarks/microsoft.insights/samples/logprofiles/main-rg-module.bicep b/settings/remarks/microsoft.insights/samples/logprofiles/main-rg-module.bicep new file mode 100644 index 00000000..b80e5c9d --- /dev/null +++ b/settings/remarks/microsoft.insights/samples/logprofiles/main-rg-module.bicep @@ -0,0 +1,38 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_GRS' + } + kind: 'StorageV2' + properties: { + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false + isNfsV3Enabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + accessTier: 'Hot' + encryption: { + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + keySource: 'Microsoft.Storage' + } + isHnsEnabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' + supportsHttpsTrafficOnly: true + } +} diff --git a/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep b/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep new file mode 100644 index 00000000..d7f97dff --- /dev/null +++ b/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep @@ -0,0 +1,35 @@ +targetScope = 'subscription' + +param resourceName string = 'acctest0001' +param location string = 'westeurope' + +resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: resourceName + location: location +} + +resource logProfile 'Microsoft.Insights/logProfiles@2016-03-01' = { + name: resourceName + properties: { + categories: [ + 'Action' + ] + locations: [ + 'westeurope' + 'westeurope' + ] + retentionPolicy: { + enabled: true + days: 7 + } + } +} + +module module1 'main-rg-module.bicep' = { + name: 'deploy-rg-resources' + scope: resourceGroup + params: { + resourceName: resourceName + location: location + } +} diff --git a/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep b/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep index f09c6e22..42dd4ade 100644 --- a/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep +++ b/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep @@ -5,52 +5,61 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = { name: resourceName location: 'global' properties: { - actions: [] - autoMitigate: true + scopes: [] criteria: { allOf: [ { - criterionType: 'StaticThresholdCriterion' dimensions: [] metricName: 'UsedCapacity' metricNamespace: 'Microsoft.Storage/storageAccounts' name: 'Metric1' operator: 'GreaterThan' skipMetricValidation: false - threshold: any('55.5') timeAggregation: 'Average' + criterionType: 'StaticThresholdCriterion' + threshold: any('55.5') } ] 'odata.type': 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria' } - description: '' - enabled: true evaluationFrequency: 'PT1M' - scopes: [ - storageAccount.id - ] severity: 3 targetResourceRegion: '' targetResourceType: '' windowSize: 'PT1H' + actions: [] + autoMitigate: true + description: '' + enabled: true } tags: { - CUSTOMER: 'CUSTOMERx' Example: 'Example123' terraform: 'Coolllll' test: '123' + CUSTOMER: 'CUSTOMERx' } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + allowSharedKeyAccess: true + isHnsEnabled: false + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -63,17 +72,6 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } diff --git a/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep b/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep index 59efc1be..cb40125f 100644 --- a/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep +++ b/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep @@ -1,6 +1,8 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-preview' = { name: resourceName + location: 'Global' properties: {} } diff --git a/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep b/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep index 05a33bb3..bb5221a5 100644 --- a/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep +++ b/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep @@ -7,24 +7,25 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { kind: 'web' properties: { Application_Type: 'web' + ForceCustomerStorageForProfiler: false + SamplingPercentage: 100 + publicNetworkAccessForQuery: 'Enabled' DisableIpMasking: false DisableLocalAuth: false - ForceCustomerStorageForProfiler: false RetentionInDays: 90 - SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' } } resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-preview' = { name: resourceName + location: 'Global' properties: {} } resource scopedResource 'Microsoft.Insights/privateLinkScopes/scopedResources@2019-10-17-preview' = { - parent: privateLinkScope name: resourceName + parent: privateLinkScope properties: { linkedResourceId: component.id } diff --git a/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep b/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep index fae18770..01d86e7c 100644 --- a/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep +++ b/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource component 'Microsoft.Insights/components@2020-02-02' = { name: resourceName @@ -8,11 +8,11 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { properties: { Application_Type: 'web' DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false RetentionInDays: 90 SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false publicNetworkAccessForQuery: 'Enabled' } } @@ -22,7 +22,6 @@ resource scheduledQueryRule 'Microsoft.Insights/scheduledQueryRules@2021-08-01' location: location kind: 'LogAlert' properties: { - autoMitigate: false checkWorkspaceAlertsStorageConfigured: false criteria: { allOf: [ @@ -37,14 +36,15 @@ resource scheduledQueryRule 'Microsoft.Insights/scheduledQueryRules@2021-08-01' } ] } - enabled: true evaluationFrequency: 'PT5M' scopes: [ component.id ] severity: 3 - skipQueryValidation: false targetResourceTypes: null windowSize: 'PT5M' + autoMitigate: false + enabled: true + skipQueryValidation: false } } diff --git a/settings/remarks/microsoft.insights/samples/webtests/main.bicep b/settings/remarks/microsoft.insights/samples/webtests/main.bicep index 072fc674..979871b7 100644 --- a/settings/remarks/microsoft.insights/samples/webtests/main.bicep +++ b/settings/remarks/microsoft.insights/samples/webtests/main.bicep @@ -6,13 +6,13 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - Application_Type: 'web' DisableIpMasking: false DisableLocalAuth: false ForceCustomerStorageForProfiler: false RetentionInDays: 90 SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' + Application_Type: 'web' publicNetworkAccessForQuery: 'Enabled' } } @@ -22,22 +22,18 @@ resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { location: location kind: 'standard' properties: { - Description: '' + RetryEnabled: false + SyntheticMonitorId: resourceName Enabled: false Frequency: 300 Kind: 'standard' - Locations: [ - { - Id: 'us-tx-sn1-azr' - } - ] - Name: 'acctest0001' + Name: resourceName Request: { FollowRedirects: false Headers: [ { - key: 'x-header' value: 'testheader' + key: 'x-header' } { key: 'x-header-2' @@ -48,15 +44,19 @@ resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { ParseDependentRequests: false RequestUrl: 'http://microsoft.com' } - RetryEnabled: false - SyntheticMonitorId: 'acctest0001' Timeout: 30 ValidationRules: { ExpectedHttpStatusCode: 200 SSLCheck: false } + Description: '' + Locations: [ + { + Id: 'us-tx-sn1-azr' + } + ] } tags: { - 'hidden-link:azapi_resource.component.id': 'Resource' + 'hidden-link:${component.id}': 'Resource' } } diff --git a/settings/remarks/microsoft.insights/samples/workbooks/main.bicep b/settings/remarks/microsoft.insights/samples/workbooks/main.bicep index 50f54680..9cb7e9e0 100644 --- a/settings/remarks/microsoft.insights/samples/workbooks/main.bicep +++ b/settings/remarks/microsoft.insights/samples/workbooks/main.bicep @@ -1,3 +1,4 @@ +param resourceName string = 'acctest0001' param location string = 'westeurope' resource workbook 'Microsoft.Insights/workbooks@2022-04-01' = { @@ -7,7 +8,7 @@ resource workbook 'Microsoft.Insights/workbooks@2022-04-01' = { properties: { category: 'workbook' displayName: 'acctest-amw-230630032616547405' - serializedData: '{"fallbackResourceIds":["Azure Monitor"],"isLocked":false,"items":[{"content":{"json":"Test2022"},"name":"text - 0","type":1}],"version":"Notebook/1.0"}' + serializedData: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} sourceId: 'azure monitor' } } diff --git a/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep b/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep index 5538419d..c3de877f 100644 --- a/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep +++ b/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep @@ -7,11 +7,11 @@ resource workbookTemplate 'Microsoft.Insights/workbookTemplates@2020-11-20' = { properties: { galleries: [ { + type: 'workbook' category: 'workbook' name: 'test' order: 0 resourceType: 'Azure Monitor' - type: 'workbook' } ] priority: 0 diff --git a/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep b/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep index 464310e5..7fe41657 100644 --- a/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep +++ b/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep @@ -4,13 +4,13 @@ param location string = 'westeurope' resource iotApp 'Microsoft.IoTCentral/iotApps@2021-11-01-preview' = { name: resourceName location: location + sku: { + name: 'ST1' + } properties: { - displayName: 'acctest0001' + displayName: '${resourceName}' publicNetworkAccess: 'Enabled' subdomain: 'subdomain-2306300333537' template: 'iotc-pnp-preview@1.0.0' } - sku: { - name: 'ST1' - } } diff --git a/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep b/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep index bed18d28..805fe61c 100644 --- a/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep @@ -1,21 +1,22 @@ +param resourceName string = 'acctest0001' param location string = 'westeurope' resource managedHSM 'Microsoft.KeyVault/managedHSMs@2021-10-01' = { name: 'kvHsm230630033342437496' location: location + sku: { + family: 'B' + name: 'Standard_B1' + } properties: { + publicNetworkAccess: 'Enabled' + softDeleteRetentionInDays: 90 + tenantId: tenant().tenantId createMode: 'default' enablePurgeProtection: false enableSoftDelete: true initialAdminObjectIds: [ deployer().objectId ] - publicNetworkAccess: 'Enabled' - softDeleteRetentionInDays: 90 - tenantId: deployer().tenantId - } - sku: { - family: 'B' - name: 'Standard_B1' } } diff --git a/settings/remarks/microsoft.keyvault/samples/vaults/accesspolicies/main.bicep b/settings/remarks/microsoft.keyvault/samples/vaults/accesspolicies/main.bicep index 439d976c..59203d63 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/accesspolicies/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/accesspolicies/main.bicep @@ -5,19 +5,19 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName location: location properties: { - accessPolicies: [] enableSoftDelete: true + tenantId: tenant().tenantId sku: { family: 'A' name: 'standard' } - tenantId: deployer().tenantId + accessPolicies: [] } } resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = { - parent: vault name: 'add' + parent: vault properties: { accessPolicies: [ { @@ -34,7 +34,7 @@ resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = ] storage: [] } - tenantId: deployer().tenantId + tenantId: tenant().tenantId } ] } diff --git a/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep b/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep index 01dbf532..e85badfd 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep @@ -5,28 +5,26 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName location: location properties: { - accessPolicies: [] - enablePurgeProtection: true - enableSoftDelete: true sku: { - family: 'A' name: 'standard' + family: 'A' } - tenantId: deployer().tenantId + accessPolicies: [] + enableSoftDelete: true + enablePurgeProtection: true + tenantId: tenant().tenantId } } resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = { - parent: vault name: 'add' + parent: vault properties: { accessPolicies: [ { + tenantId: tenant().tenantId objectId: deployer().objectId permissions: { - certificates: [ - 'ManageContacts' - ] keys: [ 'Get' 'Create' @@ -46,16 +44,21 @@ resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = 'Get' ] storage: [] + certificates: [ + 'ManageContacts' + ] } - tenantId: deployer().tenantId } ] } } resource putKey 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { - parent: vault name: resourceName + parent: vault + dependsOn: [ + putAccesspolicy + ] properties: { keyOps: [ 'encrypt' @@ -68,7 +71,4 @@ resource putKey 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { keySize: 2048 kty: 'RSA' } - dependsOn: [ - putAccesspolicy - ] } diff --git a/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep b/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep index dbd1ed80..a5234c93 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep @@ -5,36 +5,36 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' + sku: { + family: 'A' + name: 'standard' + } + softDeleteRetentionInDays: 7 + tenantId: tenant().tenantId accessPolicies: [ { objectId: deployer().objectId permissions: { + secrets: [ + 'Set' + ] + storage: [] certificates: [ 'ManageContacts' ] keys: [ 'Create' ] - secrets: [ - 'Set' - ] - storage: [] } - tenantId: deployer().tenantId + tenantId: tenant().tenantId } ] - createMode: 'default' enableRbacAuthorization: false - enableSoftDelete: true enabledForDeployment: false enabledForDiskEncryption: false enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' - sku: { - family: 'A' - name: 'standard' - } - softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId + createMode: 'default' + enableSoftDelete: true } } diff --git a/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep b/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep index a761e6f5..afc77277 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep @@ -5,19 +5,19 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName location: location properties: { - accessPolicies: [] - enableSoftDelete: true sku: { family: 'A' name: 'standard' } - tenantId: deployer().tenantId + accessPolicies: [] + enableSoftDelete: true + tenantId: tenant().tenantId } } resource putSecret 'Microsoft.KeyVault/vaults/secrets@2023-02-01' = { - parent: vault name: resourceName + parent: vault properties: { value: 'szechuan' } diff --git a/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep b/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep index f3c96a80..db4aa7a1 100644 --- a/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep +++ b/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep @@ -1,15 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = { - scope: managedCluster - name: resourceName - properties: { - autoUpgradeMinorVersion: true - extensionType: 'microsoft.flux' - } -} - resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-preview' = { name: resourceName location: location @@ -22,6 +13,15 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p vmSize: 'Standard_DS2_v2' } ] - dnsPrefix: 'acctest0001' + dnsPrefix: '${resourceName}' + } +} + +resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = { + name: resourceName + scope: managedCluster + properties: { + autoUpgradeMinorVersion: true + extensionType: 'microsoft.flux' } } diff --git a/settings/remarks/microsoft.kubernetesconfiguration/samples/fluxconfigurations/main.bicep b/settings/remarks/microsoft.kubernetesconfiguration/samples/fluxconfigurations/main.bicep index 342721d7..d5dcda9b 100644 --- a/settings/remarks/microsoft.kubernetesconfiguration/samples/fluxconfigurations/main.bicep +++ b/settings/remarks/microsoft.kubernetesconfiguration/samples/fluxconfigurations/main.bicep @@ -1,9 +1,25 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-preview' = { + name: resourceName + location: location + properties: { + agentPoolProfiles: [ + { + count: 1 + mode: 'System' + name: 'default' + vmSize: 'Standard_DS2_v2' + } + ] + dnsPrefix: '${resourceName}' + } +} + resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = { - scope: managedCluster name: resourceName + scope: managedCluster properties: { autoUpgradeMinorVersion: true extensionType: 'microsoft.flux' @@ -11,16 +27,20 @@ resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = { } resource fluxConfiguration 'Microsoft.KubernetesConfiguration/fluxConfigurations@2022-03-01' = { - scope: managedCluster name: resourceName + scope: managedCluster + dependsOn: [ + extension + ] properties: { + suspend: false gitRepository: { - repositoryRef: { - branch: 'branch' - } syncIntervalInSeconds: 120 timeoutInSeconds: 120 url: 'https://github.com/Azure/arc-k8s-demo' + repositoryRef: { + branch: 'branch' + } } kustomizations: { applications: { @@ -35,36 +55,16 @@ resource fluxConfiguration 'Microsoft.KubernetesConfiguration/fluxConfigurations timeoutInSeconds: 600 } shared: { - force: false path: 'cluster-config/shared' prune: false retryIntervalInSeconds: 60 syncIntervalInSeconds: 60 timeoutInSeconds: 600 + force: false } } namespace: 'flux-system' scope: 'cluster' sourceKind: 'GitRepository' - suspend: false - } - dependsOn: [ - extension - ] -} - -resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-preview' = { - name: resourceName - location: location - properties: { - agentPoolProfiles: [ - { - count: 1 - mode: 'System' - name: 'default' - vmSize: 'Standard_DS2_v2' - } - ] - dnsPrefix: 'acctest0001' } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep index e7f447c8..c9967356 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep @@ -4,29 +4,29 @@ param location string = 'westeurope' resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { enableAutoStop: true enableDiskEncryption: false enableDoubleEncryption: false + engineType: 'V2' + publicNetworkAccess: 'Enabled' + trustedExternalTenants: [] enablePurge: false enableStreamingIngest: false - engineType: 'V2' publicIPType: 'IPv4' - publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' - trustedExternalTenants: [] - } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' } } resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { - parent: cluster name: resourceName location: location + parent: cluster kind: 'ReadWrite' properties: {} } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep index fd2d641b..b2add1b7 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep @@ -1,43 +1,45 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +param clientId string + resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { + restrictOutboundNetworkAccess: 'Disabled' + trustedExternalTenants: [] enableAutoStop: true enableDiskEncryption: false + engineType: 'V2' enableDoubleEncryption: false enablePurge: false enableStreamingIngest: false - engineType: 'V2' publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' - trustedExternalTenants: [] - } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' } } resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { - parent: cluster name: resourceName location: location + parent: cluster kind: 'ReadWrite' properties: {} } resource principalAssignment 'Microsoft.Kusto/clusters/databases/principalAssignments@2023-05-02' = { - parent: database name: resourceName + parent: database properties: { - principalId: deployer().objectId + principalId: clientId principalType: 'App' role: 'Viewer' - tenantId: deployer().tenantId + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep index de6d36b8..65d3d151 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep @@ -4,38 +4,37 @@ param location string = 'westeurope' resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { - enableAutoStop: true enableDiskEncryption: false enableDoubleEncryption: false enablePurge: false enableStreamingIngest: false engineType: 'V2' - publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] - } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' + enableAutoStop: true + publicIPType: 'IPv4' + restrictOutboundNetworkAccess: 'Disabled' } } resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { - parent: cluster name: resourceName location: location + parent: cluster kind: 'ReadWrite' properties: {} } resource script 'Microsoft.Kusto/clusters/databases/scripts@2023-05-02' = { - parent: database name: 'create-table-script' + parent: database properties: { - continueOnErrors: false forceUpdateTag: '9e2e7874-aa37-7041-81b7-06397f03a37d' scriptContent: '''.create table TestTable(Id:string, Name:string, _ts:long, _timestamp:datetime) .create table TestTable ingestion json mapping "TestMapping" @@ -47,5 +46,6 @@ resource script 'Microsoft.Kusto/clusters/databases/scripts@2023-05-02' = { '']'' .alter table TestTable policy ingestionbatching "{''MaximumBatchingTimeSpan'': ''0:0:10'', ''MaximumNumberOfItems'': 10000}" ''' + continueOnErrors: false } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/main.bicep index 1a464e0e..a2f57e43 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/main.bicep @@ -4,21 +4,21 @@ param location string = 'westeurope' resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { enableAutoStop: true enableDiskEncryption: false - enableDoubleEncryption: false enablePurge: false enableStreamingIngest: false - engineType: 'V2' publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] - } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' + enableDoubleEncryption: false + engineType: 'V2' + restrictOutboundNetworkAccess: 'Disabled' } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep index d595fe4c..2eb79c40 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep @@ -4,37 +4,47 @@ param location string = 'westeurope' resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { - enableAutoStop: true - enableDiskEncryption: false - enableDoubleEncryption: false enablePurge: false - enableStreamingIngest: false engineType: 'V2' publicIPType: 'IPv4' - publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] + enableAutoStop: true + enableDiskEncryption: false + enableDoubleEncryption: false + enableStreamingIngest: false + publicNetworkAccess: 'Enabled' } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' +} + +resource managedPrivateEndpoint 'Microsoft.Kusto/clusters/managedPrivateEndpoints@2023-05-02' = { + name: resourceName + parent: cluster + properties: { + groupId: 'blob' + privateLinkResourceId: storageAccount.id } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + isNfsV3Enabled: false + supportsHttpsTrafficOnly: true accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { - keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -43,27 +53,17 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } - isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' - } -} - -resource managedPrivateEndpoint 'Microsoft.Kusto/clusters/managedPrivateEndpoints@2023-05-02' = { - parent: cluster - name: resourceName - properties: { - groupId: 'blob' - privateLinkResourceId: storageAccount.id + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + isHnsEnabled: false } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep index bfe0741d..5a84a59e 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep @@ -1,35 +1,37 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +param clientId string + resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { + publicNetworkAccess: 'Enabled' + trustedExternalTenants: [] + enableDoubleEncryption: false + restrictOutboundNetworkAccess: 'Disabled' enableAutoStop: true enableDiskEncryption: false - enableDoubleEncryption: false enablePurge: false enableStreamingIngest: false engineType: 'V2' publicIPType: 'IPv4' - publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' - trustedExternalTenants: [] - } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' } } resource principalAssignment 'Microsoft.Kusto/clusters/principalAssignments@2023-05-02' = { - parent: cluster name: resourceName + parent: cluster properties: { - principalId: deployer().objectId + principalId: clientId principalType: 'App' role: 'AllDatabasesViewer' - tenantId: deployer().tenantId + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.labservices/samples/labplans/main.bicep b/settings/remarks/microsoft.labservices/samples/labplans/main.bicep index 8b9e5b62..8d5d8966 100644 --- a/settings/remarks/microsoft.labservices/samples/labplans/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labplans/main.bicep @@ -6,7 +6,7 @@ resource labPlan 'Microsoft.LabServices/labPlans@2022-08-01' = { location: location properties: { allowedRegions: [ - 'westeurope' + '${location}' ] } } diff --git a/settings/remarks/microsoft.labservices/samples/labs/main.bicep b/settings/remarks/microsoft.labservices/samples/labs/main.bicep index 16a69b18..a5635d60 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/main.bicep @@ -8,42 +8,42 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { name: resourceName location: location properties: { - autoShutdownProfile: { - shutdownOnDisconnect: 'Disabled' - shutdownOnIdle: 'None' - shutdownWhenNotConnected: 'Disabled' - } - connectionProfile: { - clientRdpAccess: 'None' - clientSshAccess: 'None' - webRdpAccess: 'None' - webSshAccess: 'None' - } - securityProfile: { - openAccess: 'Disabled' - } title: 'Test Title' virtualMachineProfile: { + usageQuota: 'PT0S' + useSharedPassword: 'Disabled' additionalCapabilities: { installGpuDrivers: 'Disabled' } adminUser: { - password: null + password: '${adminPassword}' username: 'testadmin' } createOption: 'Image' imageReference: { - offer: '0001-com-ubuntu-server-focal' - publisher: 'canonical' sku: '20_04-lts' version: 'latest' + offer: '0001-com-ubuntu-server-focal' + publisher: 'canonical' } sku: { capacity: 1 name: 'Classic_Fsv2_2_4GB_128_S_SSD' } - usageQuota: 'PT0S' - useSharedPassword: 'Disabled' + } + autoShutdownProfile: { + shutdownOnDisconnect: 'Disabled' + shutdownOnIdle: 'None' + shutdownWhenNotConnected: 'Disabled' + } + connectionProfile: { + clientRdpAccess: 'None' + clientSshAccess: 'None' + webRdpAccess: 'None' + webSshAccess: 'None' + } + securityProfile: { + openAccess: 'Disabled' } } } diff --git a/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep b/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep index 2794d8e2..9666c05b 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep @@ -8,17 +8,6 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { name: resourceName location: location properties: { - autoShutdownProfile: { - shutdownOnDisconnect: 'Disabled' - shutdownOnIdle: 'None' - shutdownWhenNotConnected: 'Disabled' - } - connectionProfile: { - clientRdpAccess: 'None' - clientSshAccess: 'None' - webRdpAccess: 'None' - webSshAccess: 'None' - } securityProfile: { openAccess: 'Disabled' } @@ -28,7 +17,7 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { installGpuDrivers: 'Disabled' } adminUser: { - password: null + password: '${adminPassword}' username: 'testadmin' } createOption: 'Image' @@ -45,12 +34,23 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { usageQuota: 'PT0S' useSharedPassword: 'Disabled' } + autoShutdownProfile: { + shutdownOnDisconnect: 'Disabled' + shutdownOnIdle: 'None' + shutdownWhenNotConnected: 'Disabled' + } + connectionProfile: { + webSshAccess: 'None' + clientRdpAccess: 'None' + clientSshAccess: 'None' + webRdpAccess: 'None' + } } } resource schedule 'Microsoft.LabServices/labs/schedules@2022-08-01' = { - parent: lab name: resourceName + parent: lab properties: { stopAt: '2023-06-30T04:33:55Z' timeZoneId: 'America/Los_Angeles' diff --git a/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep b/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep index 9453127f..bc41bbbb 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep @@ -8,30 +8,17 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { name: resourceName location: location properties: { - autoShutdownProfile: { - shutdownOnDisconnect: 'Disabled' - shutdownOnIdle: 'None' - shutdownWhenNotConnected: 'Disabled' - } connectionProfile: { + webSshAccess: 'None' clientRdpAccess: 'None' clientSshAccess: 'None' webRdpAccess: 'None' - webSshAccess: 'None' } securityProfile: { openAccess: 'Disabled' } title: 'Test Title' virtualMachineProfile: { - additionalCapabilities: { - installGpuDrivers: 'Disabled' - } - adminUser: { - password: null - username: 'testadmin' - } - createOption: 'Image' imageReference: { offer: '0001-com-ubuntu-server-focal' publisher: 'canonical' @@ -44,15 +31,28 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { } usageQuota: 'PT0S' useSharedPassword: 'Disabled' + additionalCapabilities: { + installGpuDrivers: 'Disabled' + } + adminUser: { + username: 'testadmin' + password: '${adminPassword}' + } + createOption: 'Image' + } + autoShutdownProfile: { + shutdownOnDisconnect: 'Disabled' + shutdownOnIdle: 'None' + shutdownWhenNotConnected: 'Disabled' } } } resource user 'Microsoft.LabServices/labs/users@2022-08-01' = { - parent: lab name: resourceName + parent: lab properties: { - additionalUsageQuota: 'PT0S' email: 'terraform-acctest@hashicorp.com' + additionalUsageQuota: 'PT0S' } } diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep index 21d7e4b9..a1d52ff2 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep @@ -4,46 +4,40 @@ param location string = 'westeurope' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard' } + properties: {} } resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { agreementType: 'AS2' content: { aS2: { receiveAgreement: { protocolSettings: { - acknowledgementConnectionSettings: { - ignoreCertificateNameMismatch: false - keepHttpConnectionAlive: false - supportHttpStatusCodeContinue: false - unfoldHttpHeaders: false - } envelopeSettings: { + suspendMessageOnFileNameGenerationError: true + transmitFileNameInMimeHeader: false autogenerateFileName: false fileNameTemplate: '%FILE().ReceivedFileName%' messageContentType: 'text/plain' - suspendMessageOnFileNameGenerationError: true - transmitFileNameInMimeHeader: false } errorSettings: { resendIfMDNNotReceived: false suspendDuplicateMessage: false } mdnSettings: { - dispositionNotificationTo: 'http://localhost' - micHashingAlgorithm: 'SHA1' needMDN: false sendInboundMDNToMessageBox: true sendMDNAsynchronously: false signMDN: false signOutboundMDNIfOptional: false + dispositionNotificationTo: 'http://localhost' + micHashingAlgorithm: 'SHA1' } messageConnectionSettings: { ignoreCertificateNameMismatch: false @@ -61,21 +55,27 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = overrideGroupSigningCertificate: false } validationSettings: { - checkCertificateRevocationListOnReceive: false - checkCertificateRevocationListOnSend: false checkDuplicateMessage: false compressMessage: false encryptMessage: false encryptionAlgorithm: 'DES3' - interchangeDuplicatesValidityDays: 5 overrideMessageProperties: false + checkCertificateRevocationListOnReceive: false + interchangeDuplicatesValidityDays: 5 signMessage: false signingAlgorithm: 'Default' + checkCertificateRevocationListOnSend: false + } + acknowledgementConnectionSettings: { + supportHttpStatusCodeContinue: false + unfoldHttpHeaders: false + ignoreCertificateNameMismatch: false + keepHttpConnectionAlive: false } } receiverBusinessIdentity: { - qualifier: 'AS2Identity' value: 'FabrikamNY' + qualifier: 'AS2Identity' } senderBusinessIdentity: { qualifier: 'AS2Identity' @@ -84,6 +84,18 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = } sendAgreement: { protocolSettings: { + validationSettings: { + overrideMessageProperties: false + signingAlgorithm: 'Default' + checkDuplicateMessage: false + compressMessage: false + encryptionAlgorithm: 'DES3' + interchangeDuplicatesValidityDays: 5 + signMessage: false + checkCertificateRevocationListOnReceive: false + checkCertificateRevocationListOnSend: false + encryptMessage: false + } acknowledgementConnectionSettings: { ignoreCertificateNameMismatch: false keepHttpConnectionAlive: false @@ -91,24 +103,24 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = unfoldHttpHeaders: false } envelopeSettings: { + transmitFileNameInMimeHeader: false autogenerateFileName: false fileNameTemplate: '%FILE().ReceivedFileName%' messageContentType: 'text/plain' suspendMessageOnFileNameGenerationError: true - transmitFileNameInMimeHeader: false } errorSettings: { resendIfMDNNotReceived: false suspendDuplicateMessage: false } mdnSettings: { - dispositionNotificationTo: 'http://localhost' - micHashingAlgorithm: 'SHA1' - needMDN: false sendInboundMDNToMessageBox: true sendMDNAsynchronously: false signMDN: false signOutboundMDNIfOptional: false + dispositionNotificationTo: 'http://localhost' + micHashingAlgorithm: 'SHA1' + needMDN: false } messageConnectionSettings: { ignoreCertificateNameMismatch: false @@ -117,25 +129,13 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = unfoldHttpHeaders: true } securitySettings: { - enableNRRForInboundDecodedMessages: false - enableNRRForInboundEncodedMessages: false - enableNRRForInboundMDN: false enableNRRForOutboundDecodedMessages: false enableNRRForOutboundEncodedMessages: false enableNRRForOutboundMDN: false overrideGroupSigningCertificate: false - } - validationSettings: { - checkCertificateRevocationListOnReceive: false - checkCertificateRevocationListOnSend: false - checkDuplicateMessage: false - compressMessage: false - encryptMessage: false - encryptionAlgorithm: 'DES3' - interchangeDuplicatesValidityDays: 5 - overrideMessageProperties: false - signMessage: false - signingAlgorithm: 'Default' + enableNRRForInboundDecodedMessages: false + enableNRRForInboundEncodedMessages: false + enableNRRForInboundMDN: false } } receiverBusinessIdentity: { @@ -153,18 +153,16 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = qualifier: 'AS2Identity' value: 'FabrikamDC' } - guestPartner: partner2.name hostIdentity: { qualifier: 'AS2Identity' value: 'FabrikamNY' } - hostPartner: partner.name } } resource partner 'Microsoft.Logic/integrationAccounts/partners@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { content: { b2b: { @@ -181,8 +179,8 @@ resource partner 'Microsoft.Logic/integrationAccounts/partners@2019-05-01' = { } resource partner2 'Microsoft.Logic/integrationAccounts/partners@2019-05-01' = { - parent: integrationAccount name: '${resourceName}another' + parent: integrationAccount properties: { content: { b2b: { diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep index f52d2ca9..e468a575 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep @@ -4,23 +4,26 @@ param location string = 'westus' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: '${resourceName}-ia' location: location - properties: {} sku: { name: 'Standard' } + properties: {} } resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: replace(substring(toLower('${resourceName}sa'), 0, 24), '-', '') location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' + dnsEndpointType: 'Standard' + publicNetworkAccess: 'Enabled' allowBlobPublicAccess: true - allowCrossTenantReplication: false allowSharedKeyAccess: true defaultToOAuthAuthentication: false - dnsEndpointType: 'Standard' encryption: { keySource: 'Microsoft.Storage' services: { @@ -34,9 +37,8 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } isHnsEnabled: false isLocalUserEnabled: true - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' + supportsHttpsTrafficOnly: true + allowCrossTenantReplication: false networkAcls: { bypass: 'AzureServices' defaultAction: 'Allow' @@ -44,24 +46,22 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { resourceAccessRules: [] virtualNetworkRules: [] } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + isNfsV3Enabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' } } resource assembly 'Microsoft.Logic/integrationAccounts/assemblies@2019-05-01' = { - parent: integrationAccount name: '${resourceName}-assembly' + parent: integrationAccount properties: { - assemblyName: 'TestAssembly2' - assemblyVersion: '2.2.2.2' - content: 'dGVzdA==' contentType: 'application/octet-stream' metadata: { foo: 'bar2' } + assemblyName: 'TestAssembly2' + assemblyVersion: '2.2.2.2' + content: 'dGVzdA==' } } diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep index ffb5d1cd..032a54e7 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard' } + properties: {} } resource batchConfiguration 'Microsoft.Logic/integrationAccounts/batchConfigurations@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { batchGroupName: 'TestBatchGroup' releaseCriteria: { diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep index 8f755960..a3120411 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep @@ -4,8 +4,8 @@ param location string = 'westeurope' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName location: location - properties: {} sku: { name: 'Basic' } + properties: {} } diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep index 5cf9e450..6c6af484 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName location: location - properties: {} sku: { name: 'Basic' } + properties: {} } resource map 'Microsoft.Logic/integrationAccounts/maps@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { content: '''' + runtimeVersion: 'Java_8' + type: 'Jar' + } + } +} + +resource linker 'Microsoft.ServiceLinker/linkers@2022-05-01' = { + name: resourceName + scope: deployment + properties: { + clientType: 'none' + targetService: { + resourceProperties: null + type: 'AzureResource' + } + authInfo: { + authType: 'systemAssignedIdentity' + } } } @@ -17,22 +68,14 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 10 maxStalenessPrefix: 200 } - databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -40,74 +83,30 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' + disableKeyBasedMetadataWriteAccess: false + capabilities: [] + enableMultipleWriteLocations: false + isVirtualNetworkFilterEnabled: false virtualNetworkRules: [] - } -} - -resource linker 'Microsoft.ServiceLinker/linkers@2022-05-01' = { - scope: deployment - name: resourceName - properties: { - authInfo: { - authType: 'systemAssignedIdentity' - } - clientType: 'none' - targetService: { - id: sqlDatabase.id - resourceProperties: null - type: 'AzureResource' - } - } -} - -resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { - parent: spring - name: resourceName - location: location - properties: { - customPersistentDisks: [] - enableEndToEndTLS: false - public: false + databaseAccountOfferType: 'Standard' + enableAnalyticalStorage: false + enableAutomaticFailover: false + enableFreeTier: false + networkAclBypass: 'None' + publicNetworkAccess: 'Enabled' } } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: { throughput: 400 } resource: { - id: 'acctest0001' + id: '${resourceName}' } } } - -resource deployment 'Microsoft.AppPlatform/Spring/apps/deployments@2023-05-01-preview' = { - parent: app - name: 'deploy-q4uff' - properties: { - deploymentSettings: { - environmentVariables: {} - resourceRequests: { - cpu: '1' - memory: '1Gi' - } - } - source: { - jvmOptions: '' - relativePath: '' - runtimeVersion: 'Java_8' - type: 'Jar' - } - } - sku: { - capacity: 1 - name: 'S0' - tier: 'Standard' - } -} diff --git a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep index 1b9932b2..a0929393 100644 --- a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep +++ b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep @@ -1,15 +1,12 @@ -param resourceName string = 'acctest0001' param location string = 'westus' - -resource trafficController 'Microsoft.ServiceNetworking/trafficControllers@2023-11-01' = { - name: '${resourceName}-tc' - location: location -} +param resourceName string = 'acctest0001' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: '${resourceName}-vnet' location: location properties: { + privateEndpointVNetPolicies: 'Disabled' + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -18,27 +15,30 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { dhcpOptions: { dnsServers: [] } - privateEndpointVNetPolicies: 'Disabled' - subnets: [] } } +resource trafficController 'Microsoft.ServiceNetworking/trafficControllers@2023-11-01' = { + name: '${resourceName}-tc' + location: location +} + resource association 'Microsoft.ServiceNetworking/trafficControllers/associations@2023-11-01' = { - parent: trafficController name: '${resourceName}-assoc' location: location + parent: trafficController properties: { associationType: 'subnets' - subnet: { - id: subnet.id - } + subnet: {} } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: '${resourceName}-subnet' + parent: virtualNetwork properties: { + serviceEndpointPolicies: [] + serviceEndpoints: [] addressPrefix: '10.0.1.0/24' defaultOutboundAccess: true delegations: [ @@ -51,7 +51,5 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { ] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep index 1d959084..af33f2f6 100644 --- a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep +++ b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep @@ -7,8 +7,8 @@ resource trafficController 'Microsoft.ServiceNetworking/trafficControllers@2023- } resource frontend 'Microsoft.ServiceNetworking/trafficControllers/frontends@2023-11-01' = { - parent: trafficController name: '${resourceName}-frontend' location: location + parent: trafficController properties: {} } diff --git a/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep b/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep index cf280b4f..bdde427f 100644 --- a/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep @@ -4,29 +4,13 @@ param location string = 'westeurope' resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_S1' + } properties: { - cors: {} disableAadAuth: false disableLocalAuth: false - features: [ - { - flag: 'ServiceMode' - value: 'Default' - } - { - flag: 'EnableConnectivityLogs' - value: 'False' - } - { - flag: 'EnableMessagingLogs' - value: 'False' - } - { - flag: 'EnableLiveTrace' - value: 'False' - } - ] - publicNetworkAccess: 'Enabled' resourceLogConfiguration: { categories: [ { @@ -49,12 +33,28 @@ resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { tls: { clientCertEnabled: false } + cors: {} + features: [ + { + flag: 'ServiceMode' + value: 'Default' + } + { + flag: 'EnableConnectivityLogs' + value: 'False' + } + { + flag: 'EnableMessagingLogs' + value: 'False' + } + { + flag: 'EnableLiveTrace' + value: 'False' + } + ] + publicNetworkAccess: 'Enabled' upstream: { templates: [] } } - sku: { - capacity: 1 - name: 'Standard_S1' - } } diff --git a/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep b/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep index 8e2ebab2..7f85da90 100644 --- a/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep @@ -4,10 +4,18 @@ param location string = 'westeurope' resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_S1' + } properties: { + upstream: { + templates: [] + } cors: {} - disableAadAuth: false disableLocalAuth: false + publicNetworkAccess: 'Enabled' + disableAadAuth: false features: [ { flag: 'ServiceMode' @@ -26,7 +34,6 @@ resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { value: 'False' } ] - publicNetworkAccess: 'Enabled' resourceLogConfiguration: { categories: [ { @@ -49,13 +56,16 @@ resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { tls: { clientCertEnabled: false } - upstream: { - templates: [] - } } - sku: { - capacity: 1 - name: 'Standard_S1' +} + +resource sharedPrivateLinkResource 'Microsoft.SignalRService/signalR/sharedPrivateLinkResources@2023-02-01' = { + name: resourceName + parent: signalR + properties: { + groupId: 'vault' + privateLinkResourceId: vault.id + requestMessage: 'please approve' } } @@ -78,31 +88,21 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { ] storage: [] } - tenantId: deployer().tenantId + tenantId: tenant().tenantId } ] createMode: 'default' - enableRbacAuthorization: false enableSoftDelete: true enabledForDeployment: false - enabledForDiskEncryption: false enabledForTemplateDeployment: false publicNetworkAccess: 'Enabled' + enableRbacAuthorization: false + enabledForDiskEncryption: false sku: { family: 'A' name: 'standard' } softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId - } -} - -resource sharedPrivateLinkResource 'Microsoft.SignalRService/signalR/sharedPrivateLinkResources@2023-02-01' = { - parent: signalR - name: resourceName - properties: { - groupId: 'vault' - privateLinkResourceId: vault.id - requestMessage: 'please approve' + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep b/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep index fe288f3f..377ec535 100644 --- a/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep @@ -4,6 +4,10 @@ param location string = 'westeurope' resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_S1' + } properties: { disableAadAuth: false disableLocalAuth: false @@ -12,15 +16,11 @@ resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { clientCertEnabled: false } } - sku: { - capacity: 1 - name: 'Standard_S1' - } } resource hub 'Microsoft.SignalRService/webPubSub/hubs@2023-02-01' = { - parent: webPubSub name: resourceName + parent: webPubSub properties: { anonymousConnectPolicy: 'Deny' eventListeners: [] diff --git a/settings/remarks/microsoft.signalrservice/samples/webpubsub/main.bicep b/settings/remarks/microsoft.signalrservice/samples/webpubsub/main.bicep index 9e647d23..1ba41a43 100644 --- a/settings/remarks/microsoft.signalrservice/samples/webpubsub/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/webpubsub/main.bicep @@ -4,16 +4,16 @@ param location string = 'westeurope' resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { name: resourceName location: location + sku: { + name: 'Standard_S1' + capacity: 1 + } properties: { - disableAadAuth: false disableLocalAuth: false publicNetworkAccess: 'Enabled' tls: { clientCertEnabled: false } - } - sku: { - capacity: 1 - name: 'Standard_S1' + disableAadAuth: false } } diff --git a/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep b/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep index 054ee992..2ddbcb72 100644 --- a/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep @@ -5,6 +5,16 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { + enableRbacAuthorization: false + enabledForDeployment: false + enabledForTemplateDeployment: false + publicNetworkAccess: 'Enabled' + sku: { + family: 'A' + name: 'standard' + } + softDeleteRetentionInDays: 7 + tenantId: tenant().tenantId accessPolicies: [ { objectId: deployer().objectId @@ -20,28 +30,22 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { ] storage: [] } - tenantId: deployer().tenantId + tenantId: tenant().tenantId } ] createMode: 'default' - enableRbacAuthorization: false enableSoftDelete: true - enabledForDeployment: false enabledForDiskEncryption: false - enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' - sku: { - family: 'A' - name: 'standard' - } - softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId } } resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_S1' + } properties: { disableAadAuth: false disableLocalAuth: false @@ -50,15 +54,11 @@ resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { clientCertEnabled: false } } - sku: { - capacity: 1 - name: 'Standard_S1' - } } resource sharedPrivateLinkResource 'Microsoft.SignalRService/webPubSub/sharedPrivateLinkResources@2023-02-01' = { - parent: webPubSub name: resourceName + parent: webPubSub properties: { groupId: 'vault' privateLinkResourceId: vault.id diff --git a/settings/remarks/microsoft.solutions/samples/applications/main.bicep b/settings/remarks/microsoft.solutions/samples/applications/main.bicep index 70a405e6..ff7d60dd 100644 --- a/settings/remarks/microsoft.solutions/samples/applications/main.bicep +++ b/settings/remarks/microsoft.solutions/samples/applications/main.bicep @@ -6,31 +6,21 @@ resource application 'Microsoft.Solutions/applications@2021-07-01' = { location: location kind: 'ServiceCatalog' properties: { - applicationDefinitionId: applicationDefinition.id - managedResourceGroupId: '/subscriptions/subscription().subscriptionId/resourceGroups/acctest0001-infragroup' + managedResourceGroupId: '/subscriptions/${subscription().subscriptionId}/resourceGroups/${resourceName}-infragroup' parameters: { - arrayParameter: { - value: [ - 'value_1' - 'value_2' - ] - } - boolParameter: { - value: true - } intParameter: { value: 100 } objectParameter: { value: { - nested_array: [ - 'value_1' - 'value_2' - ] nested_bool: true nested_object: { key_0: 0 } + nested_array: [ + 'value_1' + 'value_2' + ] } } secureStringParameter: { @@ -39,6 +29,15 @@ resource application 'Microsoft.Solutions/applications@2021-07-01' = { stringParameter: { value: 'value_1' } + arrayParameter: { + value: [ + 'value_1' + 'value_2' + ] + } + boolParameter: { + value: true + } } } } @@ -47,83 +46,17 @@ resource applicationDefinition 'Microsoft.Solutions/applicationDefinitions@2021- name: '${resourceName}-appdef' location: location properties: { + displayName: 'TestManagedAppDefinition' + isEnabled: true + lockLevel: 'ReadOnly' + mainTemplate: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} authorizations: [ { principalId: deployer().objectId roleDefinitionId: 'b24988ac-6180-42a0-ab88-20f7382dd24c' } ] - createUiDefinition: ''' { - "$schema": "https://schema.management.azure.com/schemas/0.1.2-preview/CreateUIDefinition.MultiVm.json#", - "handler": "Microsoft.Azure.CreateUIDef", - "version": "0.1.2-preview", - "parameters": { - "basics": [], - "steps": [], - "outputs": {} - } - } -''' + createUiDefinition: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} description: 'Test Managed App Definition' - displayName: 'TestManagedAppDefinition' - isEnabled: true - lockLevel: 'ReadOnly' - mainTemplate: ''' { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - - "boolParameter": { - "type": "bool" - }, - "intParameter": { - "type": "int" - }, - "stringParameter": { - "type": "string" - }, - "secureStringParameter": { - "type": "secureString" - }, - "objectParameter": { - "type": "object" - }, - "arrayParameter": { - "type": "array" - } - - }, - "variables": {}, - "resources": [], - "outputs": { - "boolOutput": { - "type": "bool", - "value": true - }, - "intOutput": { - "type": "int", - "value": 100 - }, - "stringOutput": { - "type": "string", - "value": "stringOutputValue" - }, - "objectOutput": { - "type": "object", - "value": { - "nested_bool": true, - "nested_array": ["value_1", "value_2"], - "nested_object": { - "key_0": 0 - } - } - }, - "arrayOutput": { - "type": "array", - "value": ["value_1", "value_2"] - } - } - } -''' } } diff --git a/settings/remarks/microsoft.sql/remarks.json b/settings/remarks/microsoft.sql/remarks.json index 4435dec1..7c2e5798 100644 --- a/settings/remarks/microsoft.sql/remarks.json +++ b/settings/remarks/microsoft.sql/remarks.json @@ -257,6 +257,11 @@ "ResourceType": "Microsoft.Sql/servers/virtualNetworkRules", "Path": "samples/servers/virtualnetworkrules/main.bicep", "Description": "A basic example of deploying Azure SQL Virtual Network Rule." + }, + { + "ResourceType": "Microsoft.Sql/servers/jobAgents/jobs/steps", + "Path": "samples/servers/jobagents/jobs/steps/main.bicep", + "Description": "A basic example of deploying Elastic Job Step." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.sql/samples/instancepools/main.bicep b/settings/remarks/microsoft.sql/samples/instancepools/main.bicep index b18f9384..cf725c55 100644 --- a/settings/remarks/microsoft.sql/samples/instancepools/main.bicep +++ b/settings/remarks/microsoft.sql/samples/instancepools/main.bicep @@ -1,32 +1,82 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource subnet 'Microsoft.Network/virtualNetworks/subnets@2023-04-01' existing = { + name: resourceName parent: virtualNetwork +} + +resource routeTable 'Microsoft.Network/routeTables@2023-04-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + disableBgpRoutePropagation: false + } } -resource instancePool 'Microsoft.Sql/instancePools@2022-05-01-preview' = { +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' properties: { - licenseType: 'LicenseIncluded' - subnetId: subnet.id - vCores: 8 + subnets: [ + { + name: 'Default' + properties: { + addressPrefix: '10.0.0.0/24' + } + } + { + name: resourceName + properties: { + addressPrefix: '10.0.1.0/24' + networkSecurityGroup: { + id: networkSecurityGroup.id + } + routeTable: { + id: routeTable.id + } + delegations: [ + { + name: 'miDelegation' + properties: { + serviceName: 'Microsoft.Sql/managedInstances' + } + } + ] + } + } + ] + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } } +} + +resource instancePool 'Microsoft.Sql/instancePools@2022-05-01-preview' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' sku: { family: 'Gen5' name: 'GP_Gen5' tier: 'GeneralPurpose' } + properties: { + licenseType: 'LicenseIncluded' + subnetId: subnet.id + vCores: 8 + } } resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2023-04-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' properties: { securityRules: [ { name: 'allow_tds_inbound' properties: { - access: 'Allow' description: 'Allow access to data' destinationAddressPrefix: '*' destinationPortRange: '1433' @@ -35,62 +85,63 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2023-04-0 protocol: 'TCP' sourceAddressPrefix: 'VirtualNetwork' sourcePortRange: '*' + access: 'Allow' } } { name: 'allow_redirect_inbound' properties: { - access: 'Allow' - description: 'Allow inbound redirect traffic to Managed Instance inside the virtual network' destinationAddressPrefix: '*' - destinationPortRange: '11000-11999' - direction: 'Inbound' priority: 1100 protocol: 'Tcp' - sourceAddressPrefix: 'VirtualNetwork' sourcePortRange: '*' + destinationPortRange: '11000-11999' + direction: 'Inbound' + sourceAddressPrefix: 'VirtualNetwork' + access: 'Allow' + description: 'Allow inbound redirect traffic to Managed Instance inside the virtual network' } } { name: 'allow_geodr_inbound' properties: { - access: 'Allow' description: 'Allow inbound geodr traffic inside the virtual network' destinationAddressPrefix: '*' destinationPortRange: '5022' - direction: 'Inbound' - priority: 1200 protocol: 'Tcp' sourceAddressPrefix: 'VirtualNetwork' sourcePortRange: '*' + access: 'Allow' + direction: 'Inbound' + priority: 1200 } } { name: 'deny_all_inbound' properties: { + protocol: '*' access: 'Deny' description: 'Deny all other inbound traffic' + sourceAddressPrefix: '*' + sourcePortRange: '*' destinationAddressPrefix: '*' destinationPortRange: '*' direction: 'Inbound' priority: 4096 - protocol: '*' - sourceAddressPrefix: '*' - sourcePortRange: '*' } } { name: 'allow_linkedserver_outbound' properties: { - access: 'Allow' description: 'Allow outbound linkedserver traffic inside the virtual network' - destinationAddressPrefix: 'VirtualNetwork' destinationPortRange: '1433' + sourceAddressPrefix: '*' + destinationAddressPrefix: 'VirtualNetwork' direction: 'Outbound' priority: 1000 protocol: 'Tcp' - sourceAddressPrefix: '*' sourcePortRange: '*' + access: 'Allow' } } { @@ -98,88 +149,42 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2023-04-0 properties: { access: 'Allow' description: 'Allow outbound redirect traffic to Managed Instance inside the virtual network' - destinationAddressPrefix: 'VirtualNetwork' - destinationPortRange: '11000-11999' direction: 'Outbound' priority: 1100 - protocol: 'Tcp' sourceAddressPrefix: '*' sourcePortRange: '*' + destinationAddressPrefix: 'VirtualNetwork' + destinationPortRange: '11000-11999' + protocol: 'Tcp' } } { name: 'allow_geodr_outbound' properties: { - access: 'Allow' description: 'Allow outbound geodr traffic inside the virtual network' - destinationAddressPrefix: 'VirtualNetwork' destinationPortRange: '5022' - direction: 'Outbound' priority: 1200 - protocol: 'Tcp' sourceAddressPrefix: '*' + access: 'Allow' + destinationAddressPrefix: 'VirtualNetwork' + direction: 'Outbound' + protocol: 'Tcp' sourcePortRange: '*' } } { - name: 'deny_all_outbound' properties: { - access: 'Deny' - description: 'Deny all other outbound traffic' - destinationAddressPrefix: '*' destinationPortRange: '*' direction: 'Outbound' - priority: 4096 protocol: '*' sourceAddressPrefix: '*' sourcePortRange: '*' + access: 'Deny' + description: 'Deny all other outbound traffic' + destinationAddressPrefix: '*' + priority: 4096 } - } - ] - } -} - -resource routeTable 'Microsoft.Network/routeTables@2023-04-01' = { - name: resourceName - properties: { - disableBgpRoutePropagation: false - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = { - name: resourceName - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - subnets: [ - { - name: 'Default' - properties: { - addressPrefix: '10.0.0.0/24' - } - } - { - name: 'acctest0001' - properties: { - addressPrefix: '10.0.1.0/24' - delegations: [ - { - name: 'miDelegation' - properties: { - serviceName: 'Microsoft.Sql/managedInstances' - } - } - ] - networkSecurityGroup: { - id: networkSecurityGroup.id - } - routeTable: { - id: routeTable.id - } - } + name: 'deny_all_outbound' } ] } diff --git a/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep index ebcec94e..6aac6260 100644 --- a/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep @@ -4,23 +4,25 @@ param location string = 'westeurope' @description('The administrator login password for the SQL server') param administratorLoginPassword string +param clientId string + resource server 'Microsoft.Sql/servers@2015-05-01-preview' = { name: resourceName location: location properties: { administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' version: '12.0' } } resource administrator 'Microsoft.Sql/servers/administrators@2020-11-01-preview' = { - parent: server name: 'ActiveDirectory' + parent: server properties: { administratorType: 'ActiveDirectory' login: 'sqladmin' - sid: deployer().objectId - tenantId: deployer().tenantId + sid: clientId + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep b/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep index b8a48ccd..61277fad 100644 --- a/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep @@ -8,18 +8,18 @@ resource server 'Microsoft.Sql/servers@2022-05-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null - minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' } } resource auditingSettings 'Microsoft.Sql/servers/auditingSettings@2022-05-01-preview' = { - parent: server name: 'default' + parent: server properties: { auditActionsAndGroups: [ 'FAILED_DATABASE_AUTHENTICATION_GROUP' diff --git a/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep b/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep index 80a772ec..089989b8 100644 --- a/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep @@ -10,18 +10,18 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: null - administratorLoginPassword: null minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' } } resource connectionPolicy 'Microsoft.Sql/servers/connectionPolicies@2014-04-01' = { - parent: server name: 'default' + parent: server properties: { connectionType: 'Default' } diff --git a/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep b/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep index b6fb2f83..cc660811 100644 --- a/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep @@ -8,30 +8,30 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' } } resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { + minCapacity: 0 + readScale: 'Disabled' autoPauseDelay: 0 + requestedBackupStorageRedundancy: 'Geo' + zoneRedundant: false createMode: 'Default' elasticPoolId: '' highAvailabilityReplicaCount: 0 isLedgerOn: false licenseType: 'LicenseIncluded' maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') - minCapacity: 0 - readScale: 'Disabled' - requestedBackupStorageRedundancy: 'Geo' - zoneRedundant: false } } diff --git a/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep b/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep index 3250298c..46dfb85d 100644 --- a/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep @@ -1,35 +1,35 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null - minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' } } resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { autoPauseDelay: 0 - createMode: 'Default' elasticPoolId: '' - highAvailabilityReplicaCount: 0 - isLedgerOn: false licenseType: 'LicenseIncluded' maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') minCapacity: 0 + createMode: 'Default' + highAvailabilityReplicaCount: 0 + isLedgerOn: false readScale: 'Disabled' requestedBackupStorageRedundancy: 'Geo' zoneRedundant: false @@ -37,8 +37,8 @@ resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { } resource securityAlertPolicy 'Microsoft.Sql/servers/databases/securityAlertPolicies@2020-11-01-preview' = { - parent: database name: 'default' + parent: database properties: { state: 'Disabled' } diff --git a/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep b/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep index a2dfb33b..714fd6bd 100644 --- a/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep @@ -8,37 +8,37 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null - minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' } } resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { - autoPauseDelay: 0 - createMode: 'Default' elasticPoolId: '' - highAvailabilityReplicaCount: 0 isLedgerOn: false - licenseType: 'LicenseIncluded' maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') minCapacity: 0 readScale: 'Disabled' - requestedBackupStorageRedundancy: 'Geo' zoneRedundant: false + autoPauseDelay: 0 + highAvailabilityReplicaCount: 0 + licenseType: 'LicenseIncluded' + requestedBackupStorageRedundancy: 'Geo' + createMode: 'Default' } } resource transparentDataEncryption 'Microsoft.Sql/servers/databases/transparentDataEncryption@2014-04-01' = { - parent: database name: 'current' + parent: database properties: { status: 'Enabled' } diff --git a/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep b/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep index 6401087e..6848a4d9 100644 --- a/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep @@ -10,16 +10,16 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: null - administratorLoginPassword: null - minimalTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' } } resource dnsAlias 'Microsoft.Sql/servers/dnsAliases@2020-11-01-preview' = { - parent: server name: resourceName + parent: server } diff --git a/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep b/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep index 9051a2ab..d529aab8 100644 --- a/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep @@ -8,19 +8,25 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: '4dm1n157r470r' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: '4dm1n157r470r' } } resource elasticPool 'Microsoft.Sql/servers/elasticPools@2020-11-01-preview' = { - parent: server name: resourceName location: location + parent: server + sku: { + name: 'BasicPool' + tier: 'Basic' + capacity: 50 + family: '' + } properties: { maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') maxSizeBytes: 5242880000 @@ -30,10 +36,4 @@ resource elasticPool 'Microsoft.Sql/servers/elasticPools@2020-11-01-preview' = { } zoneRedundant: false } - sku: { - capacity: 50 - family: '' - name: 'BasicPool' - tier: 'Basic' - } } diff --git a/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep b/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep index 15f96329..f50c8197 100644 --- a/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep @@ -8,18 +8,18 @@ resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' } } resource encryptionProtector 'Microsoft.Sql/servers/encryptionProtector@2023-08-01-preview' = { - parent: server name: 'current' + parent: server properties: { autoRotationEnabled: false serverKeyName: '' diff --git a/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep b/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep index c7a6ba1c..980ee33a 100644 --- a/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep @@ -9,56 +9,57 @@ resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-primary' location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null - minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' } } resource server1 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-secondary' + location: secondaryLocation properties: { + restrictOutboundNetworkAccess: 'Disabled' + version: '12.0' administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' - version: '12.0' } } resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { - parent: server name: '${resourceName}-db' location: location + parent: server + sku: { + name: 'S1' + } properties: { - autoPauseDelay: 0 - collation: 'SQL_Latin1_General_CP1_CI_AS' - createMode: 'Default' elasticPoolId: '' - encryptionProtectorAutoRotation: false highAvailabilityReplicaCount: 0 - isLedgerOn: false + requestedBackupStorageRedundancy: 'Geo' licenseType: '' + readScale: 'Disabled' + secondaryType: '' + autoPauseDelay: 0 + encryptionProtectorAutoRotation: false maxSizeBytes: 214748364800 minCapacity: 0 - readScale: 'Disabled' - requestedBackupStorageRedundancy: 'Geo' sampleName: '' - secondaryType: '' zoneRedundant: false - } - sku: { - name: 'S1' + collation: 'SQL_Latin1_General_CP1_CI_AS' + createMode: 'Default' + isLedgerOn: false } } resource failoverGroup 'Microsoft.Sql/servers/failoverGroups@2023-08-01-preview' = { - parent: server name: '${resourceName}-fg' + parent: server properties: { databases: [ database.id diff --git a/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep b/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep index aa411a36..26015afe 100644 --- a/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep @@ -8,18 +8,18 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'msincredible' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'msincredible' } } resource firewallRule 'Microsoft.Sql/servers/firewallRules@2020-11-01-preview' = { - parent: server name: resourceName + parent: server properties: { endIpAddress: '255.255.255.255' startIpAddress: '0.0.0.0' diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep index 1520d8b1..d1d6b4af 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep @@ -13,47 +13,47 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { + version: '12.0' administratorLogin: '4dministr4t0r' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' - version: '12.0' } } resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { + minCapacity: 0 + requestedBackupStorageRedundancy: 'Geo' + zoneRedundant: false autoPauseDelay: 0 - collation: 'SQL_Latin1_General_CP1_CI_AS' - createMode: 'Default' - elasticPoolId: '' highAvailabilityReplicaCount: 0 isLedgerOn: false - minCapacity: 0 readScale: 'Disabled' - requestedBackupStorageRedundancy: 'Geo' - zoneRedundant: false + collation: 'SQL_Latin1_General_CP1_CI_AS' + createMode: 'Default' + elasticPoolId: '' } } resource jobAgent 'Microsoft.Sql/servers/jobAgents@2020-11-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { databaseId: database.id } } resource credential 'Microsoft.Sql/servers/jobAgents/credentials@2020-11-01-preview' = { - parent: jobAgent name: resourceName + parent: jobAgent properties: { - password: null - username: null + password: '${sqlAdminPassword}' + username: '${sqlAdminUsername}' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep index 67bbb970..19eb34d5 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep @@ -8,56 +8,56 @@ resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-server' location: location properties: { - administratorLogin: '4dm1n157r470r' - administratorLoginPassword: null minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: '4dm1n157r470r' + administratorLoginPassword: '${administratorLoginPassword}' } } resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { - parent: server name: '${resourceName}-db' location: location + parent: server + sku: { + name: 'S1' + } properties: { autoPauseDelay: 0 + maintenanceConfigurationId: '/subscriptions/${subscription().subscriptionId}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' + sampleName: '' collation: 'SQL_Latin1_General_CP1_CI_AS' - createMode: 'Default' elasticPoolId: '' + readScale: 'Disabled' + zoneRedundant: false + createMode: 'Default' encryptionProtectorAutoRotation: false + licenseType: '' highAvailabilityReplicaCount: 0 isLedgerOn: false - licenseType: '' - maintenanceConfigurationId: '/subscriptions/subscription().subscriptionId/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' minCapacity: 0 - readScale: 'Disabled' requestedBackupStorageRedundancy: 'Geo' - sampleName: '' secondaryType: '' - zoneRedundant: false - } - sku: { - name: 'S1' } } resource jobAgent 'Microsoft.Sql/servers/jobAgents@2023-08-01-preview' = { - parent: server name: '${resourceName}-job-agent' location: location - properties: { - databaseId: database.id - } + parent: server sku: { name: 'JA100' } + properties: { + databaseId: database.id + } } resource job 'Microsoft.Sql/servers/jobAgents/jobs@2023-08-01-preview' = { - parent: jobAgent name: '${resourceName}-job' + parent: jobAgent properties: { description: '' } diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep new file mode 100644 index 00000000..e4c12a5f --- /dev/null +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep @@ -0,0 +1,99 @@ +param resourceName string = 'acctest0001' +param location string = 'westus' +@secure() +@description('The administrator login password for the SQL server') +param administratorLoginPassword string +@secure() +@description('The password for the SQL job credential') +param jobCredentialPassword string + +var maintenanceConfigId = '/subscriptions/${subscription().subscriptionId}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' + +resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { + name: '${resourceName}-server' + location: location + properties: { + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: 'Disabled' + version: '12.0' + administratorLogin: '4dm1n157r470r' + } +} + +resource jobAgent 'Microsoft.Sql/servers/jobAgents@2023-08-01-preview' = { + name: '${resourceName}-job-agent' + location: location + parent: server + sku: { + name: 'JA100' + } + properties: { + databaseId: database.id + } +} + +resource job 'Microsoft.Sql/servers/jobAgents/jobs@2023-08-01-preview' = { + name: '${resourceName}-job' + parent: jobAgent + properties: { + description: '' + } +} + +resource targetGroup 'Microsoft.Sql/servers/jobAgents/targetGroups@2023-08-01-preview' = { + name: '${resourceName}-target-group' + parent: jobAgent + properties: { + members: [] + } +} + +resource step 'Microsoft.Sql/servers/jobAgents/jobs/steps@2023-08-01-preview' = { + name: '${resourceName}-job-step' + parent: job + properties: { + credential: credential.id + executionOptions: { + initialRetryIntervalSeconds: 1 + maximumRetryIntervalSeconds: 120 + retryAttempts: 10 + retryIntervalBackoffMultiplier: 2 + timeoutSeconds: 43200 + } + stepId: 1 + targetGroup: targetGroup.id + action: { + value: '''IF NOT EXISTS (SELECT * FROM sys.objects WHERE [name] = N''Person'') + CREATE TABLE Person ( + FirstName NVARCHAR(50), + LastName NVARCHAR(50), + ); +''' + } + } +} + +resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { + name: '${resourceName}-db' + location: location + parent: server + sku: { + name: 'S1' + } + properties: { + collation: 'SQL_Latin1_General_CP1_CI_AS' + createMode: 'Default' + maintenanceConfigurationId: '${maintenanceConfigId}' + } +} + +resource credential 'Microsoft.Sql/servers/jobAgents/credentials@2023-08-01-preview' = { + name: '${resourceName}-job-credential' + parent: jobAgent + properties: { + password: '${jobCredentialPassword}' + username: 'testusername' + } +} diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep index a30fcdd9..bfc38e00 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep @@ -8,38 +8,38 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: '4dministr4t0r' - administratorLoginPassword: null + administratorLoginPassword: '${sqlAdministratorPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: '4dministr4t0r' } } resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { - autoPauseDelay: 0 - collation: 'SQL_Latin1_General_CP1_CI_AS' - createMode: 'Default' - elasticPoolId: '' - highAvailabilityReplicaCount: 0 isLedgerOn: false maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') + zoneRedundant: false + autoPauseDelay: 0 + elasticPoolId: '' minCapacity: 0 readScale: 'Disabled' requestedBackupStorageRedundancy: 'Geo' - zoneRedundant: false + collation: 'SQL_Latin1_General_CP1_CI_AS' + createMode: 'Default' + highAvailabilityReplicaCount: 0 } } resource jobAgent 'Microsoft.Sql/servers/jobAgents@2020-11-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { databaseId: database.id } diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep index 008aa16c..b5d99dde 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep @@ -11,66 +11,66 @@ resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-server' location: location properties: { + version: '12.0' administratorLogin: '4dm1n157r470r' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' - version: '12.0' } } -resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { +resource jobAgent 'Microsoft.Sql/servers/jobAgents@2023-08-01-preview' = { + name: '${resourceName}-job-agent' + location: location parent: server + sku: { + name: 'JA100' + } + properties: { + databaseId: database.id + } +} + +resource targetGroup 'Microsoft.Sql/servers/jobAgents/targetGroups@2023-08-01-preview' = { + name: '${resourceName}-target-group' + parent: jobAgent + properties: { + members: [] + } +} + +resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { name: '${resourceName}-db' location: location + parent: server + sku: { + name: 'S1' + } properties: { autoPauseDelay: 0 - collation: 'SQL_Latin1_General_CP1_CI_AS' - createMode: 'Default' - elasticPoolId: '' - encryptionProtectorAutoRotation: false highAvailabilityReplicaCount: 0 isLedgerOn: false + zoneRedundant: false + elasticPoolId: '' + requestedBackupStorageRedundancy: 'Geo' + secondaryType: '' + collation: 'SQL_Latin1_General_CP1_CI_AS' licenseType: '' - maintenanceConfigurationId: '/subscriptions/subscription().subscriptionId/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' - minCapacity: 0 + maintenanceConfigurationId: '/subscriptions/${subscription().subscriptionId}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' readScale: 'Disabled' - requestedBackupStorageRedundancy: 'Geo' + createMode: 'Default' + encryptionProtectorAutoRotation: false + minCapacity: 0 sampleName: '' - secondaryType: '' - zoneRedundant: false - } - sku: { - name: 'S1' - } -} - -resource jobAgent 'Microsoft.Sql/servers/jobAgents@2023-08-01-preview' = { - parent: server - name: '${resourceName}-job-agent' - location: location - properties: { - databaseId: database.id - } - sku: { - name: 'JA100' } } resource credential 'Microsoft.Sql/servers/jobAgents/credentials@2023-08-01-preview' = { - parent: jobAgent name: '${resourceName}-job-credential' - properties: { - password: null - username: 'testusername' - } -} - -resource targetGroup 'Microsoft.Sql/servers/jobAgents/targetGroups@2023-08-01-preview' = { parent: jobAgent - name: '${resourceName}-target-group' properties: { - members: [] + password: '${jobCredentialPassword}' + username: 'testusername' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/main.bicep b/settings/remarks/microsoft.sql/samples/servers/main.bicep index 2df7ea10..a3d53b80 100644 --- a/settings/remarks/microsoft.sql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/main.bicep @@ -8,11 +8,11 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${sqlAdministratorPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep b/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep index 9e3d5381..ee37e2d7 100644 --- a/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep @@ -9,7 +9,7 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { location: location properties: { administratorLogin: 'msincredible' - administratorLoginPassword: null + administratorLoginPassword: '${adminPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Enabled' @@ -18,7 +18,7 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { } resource outboundFirewallRule 'Microsoft.Sql/servers/outboundFirewallRules@2021-02-01-preview' = { - parent: server name: 'sql230630033612934212.database.windows.net' + parent: server properties: {} } diff --git a/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep b/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep index e63e42f1..9923fcb9 100644 --- a/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep @@ -1,24 +1,24 @@ +@secure() +@description('The administrator login password for the SQL server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the SQL server') param administratorLogin string -@secure() -@description('The administrator login password for the SQL server') -param administratorLoginPassword string resource server 'Microsoft.Sql/servers@2015-05-01-preview' = { name: resourceName location: location properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' version: '12.0' } } resource securityAlertPolicy 'Microsoft.Sql/servers/securityAlertPolicies@2017-03-01-preview' = { - parent: server name: 'Default' + parent: server properties: { state: 'Disabled' } diff --git a/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep b/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep index ba2ba40a..120d09ba 100644 --- a/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep @@ -9,7 +9,7 @@ resource server 'Microsoft.Sql/servers@2022-05-01-preview' = { location: location properties: { administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' @@ -18,8 +18,8 @@ resource server 'Microsoft.Sql/servers@2022-05-01-preview' = { } resource sqlVulnerabilityAssessments 'Microsoft.Sql/servers/sqlVulnerabilityAssessments@2022-05-01-preview' = { - parent: server name: 'default' + parent: server properties: { state: 'Enabled' } diff --git a/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep index 9cab05b5..c0f0b60c 100644 --- a/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep @@ -1,19 +1,19 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The administrator password for the SQL server') param sqlAdministratorPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'missadmin' - administratorLoginPassword: null + administratorLoginPassword: '${sqlAdministratorPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'missadmin' } } @@ -34,25 +34,25 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.7.28.0/25' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [ { service: 'Microsoft.Sql' } ] + addressPrefix: '10.7.28.0/25' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' } } resource virtualNetworkRule 'Microsoft.Sql/servers/virtualNetworkRules@2020-11-01-preview' = { - parent: server name: resourceName + parent: server properties: { ignoreMissingVnetServiceEndpoint: false virtualNetworkSubnetId: subnet.id diff --git a/settings/remarks/microsoft.sqlvirtualmachine/remarks.json b/settings/remarks/microsoft.sqlvirtualmachine/remarks.json index 806f1091..49519a97 100644 --- a/settings/remarks/microsoft.sqlvirtualmachine/remarks.json +++ b/settings/remarks/microsoft.sqlvirtualmachine/remarks.json @@ -27,6 +27,11 @@ "ResourceType": "Microsoft.SqlVirtualMachine/sqlVirtualMachines", "Path": "samples/sqlvirtualmachines/basic/main.bicep", "Description": "A basic example of deploying Microsoft SQL Virtual Machine." + }, + { + "ResourceType": "Microsoft.SqlVirtualMachine/sqlVirtualMachines", + "Path": "samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep", + "Description": "A sqlbestpracticesassessment example of deploying Microsoft SQL Virtual Machine." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep index 386b1a28..093e3697 100644 --- a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep +++ b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep @@ -8,14 +8,14 @@ resource sqlVirtualMachineGroup 'Microsoft.SqlVirtualMachine/sqlVirtualMachineGr sqlImageOffer: 'SQL2017-WS2016' sqlImageSku: 'Developer' wsfcDomainProfile: { - clusterBootstrapAccount: '' clusterOperatorAccount: '' - clusterSubnetType: 'SingleSubnet' - domainFqdn: 'testdomain.com' ouPath: '' sqlServiceAccount: '' - storageAccountPrimaryKey: '' storageAccountUrl: '' + clusterBootstrapAccount: '' + clusterSubnetType: 'SingleSubnet' + domainFqdn: 'testdomain.com' + storageAccountPrimaryKey: '' } } } diff --git a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep index dc0fcf1d..fdf94dcd 100644 --- a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep +++ b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep @@ -1,61 +1,59 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The administrator password for the SQL virtual machine') param vmAdminPassword string +param resourceName string = 'acctest0001' resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' properties: { - auxiliaryMode: 'None' - auxiliarySku: 'None' disableTcpStateTracking: false dnsSettings: { dnsServers: [] } - enableAcceleratedNetworking: false - enableIPForwarding: false ipConfigurations: [ { - name: 'testconfiguration1' properties: { primary: true privateIPAddress: '10.0.0.4' privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - publicIPAddress: { - id: publicIPAddress.id - } - subnet: { - id: subnet.id - } + publicIPAddress: {} + subnet: {} } type: 'Microsoft.Network/networkInterfaces/ipConfigurations' + name: 'testconfiguration1' } ] nicType: 'Standard' + auxiliaryMode: 'None' + enableAcceleratedNetworking: false + enableIPForwarding: false + auxiliarySku: 'None' } } resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2024-05-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' properties: { securityRules: [ { name: 'MSSQLRule' properties: { access: 'Allow' - destinationAddressPrefix: '*' - destinationAddressPrefixes: [] destinationPortRange: '1433' - destinationPortRanges: [] - direction: 'Inbound' priority: 1001 protocol: 'Tcp' - sourceAddressPrefix: '167.220.255.0/25' sourceAddressPrefixes: [] sourcePortRange: '*' sourcePortRanges: [] + destinationAddressPrefix: '*' + destinationAddressPrefixes: [] + destinationPortRanges: [] + direction: 'Inbound' + sourceAddressPrefix: '167.220.255.0/25' } } ] @@ -64,6 +62,11 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2024-05-0 resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' + sku: { + name: 'Basic' + tier: 'Regional' + } properties: { ddosSettings: { protectionMode: 'VirtualNetworkInherited' @@ -73,78 +76,75 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { publicIPAddressVersion: 'IPv4' publicIPAllocationMethod: 'Dynamic' } - sku: { - name: 'Basic' - tier: 'Regional' - } } resource sqlvirtualMachine 'Microsoft.SqlVirtualMachine/sqlVirtualMachines@2023-10-01' = { - name: 'virtualMachine.name' + name: 'azapi_resource.virtualMachine.name' + location: 'azapi_resource.virtualMachine.location' properties: { + sqlManagement: 'Full' + sqlServerLicenseType: 'PAYG' enableAutomaticUpgrade: true leastPrivilegeMode: 'Enabled' sqlImageOffer: 'SQL2017-WS2016' sqlImageSku: 'Developer' - sqlManagement: 'Full' - sqlServerLicenseType: 'PAYG' - virtualMachineResourceId: virtualMachine.id } } resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-07-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' properties: { - hardwareProfile: { - vmSize: 'Standard_F2s' - } - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: false - } - } - ] - } osProfile: { - adminPassword: null - adminUsername: 'testadmin' - allowExtensionOperations: true computerName: 'winhost01' secrets: [] windowsConfiguration: { enableAutomaticUpdates: true patchSettings: { - assessmentMode: 'ImageDefault' patchMode: 'AutomaticByOS' + assessmentMode: 'ImageDefault' } provisionVMAgent: true timeZone: 'Pacific Standard Time' } + adminUsername: 'testadmin' + adminPassword: vmAdminPassword + allowExtensionOperations: true } storageProfile: { - dataDisks: [] - imageReference: { - offer: 'SQL2017-WS2016' - publisher: 'MicrosoftSQLServer' - sku: 'SQLDEV' - version: 'latest' - } osDisk: { - caching: 'ReadOnly' - createOption: 'FromImage' + name: 'acctvm-250116171212663925OSDisk' + writeAcceleratorEnabled: false deleteOption: 'Detach' diskSizeGB: 127 managedDisk: { storageAccountType: 'Premium_LRS' } - name: 'acctvm-250116171212663925OSDisk' osType: 'Windows' - writeAcceleratorEnabled: false + caching: 'ReadOnly' + createOption: 'FromImage' + } + dataDisks: [] + imageReference: { + sku: 'SQLDEV' + version: 'latest' + offer: 'SQL2017-WS2016' + publisher: 'MicrosoftSQLServer' } } + hardwareProfile: { + vmSize: 'Standard_F2s' + } + networkProfile: { + networkInterfaces: [ + { + properties: { + primary: false + } + id: networkInterface.id + } + ] + } } } @@ -161,8 +161,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.0.0/24' networkSecurityGroup: { diff --git a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep new file mode 100644 index 00000000..affbf7b1 --- /dev/null +++ b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep @@ -0,0 +1,320 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' +@secure() +@description('The administrator password for the virtual machine') +param adminPassword string + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: resourceName + parent: virtualNetwork + properties: { + addressPrefix: '10.0.0.0/24' + networkSecurityGroup: { + id: networkSecurityGroup.id + } + } +} + +resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-07-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + osProfile: { + adminUsername: 'testadmin' + adminPassword: adminPassword + allowExtensionOperations: true + computerName: 'winhost01' + secrets: [] + windowsConfiguration: { + timeZone: 'Pacific Standard Time' + enableAutomaticUpdates: true + patchSettings: { + patchMode: 'AutomaticByOS' + assessmentMode: 'ImageDefault' + } + provisionVMAgent: true + } + } + storageProfile: { + dataDisks: [] + imageReference: { + offer: 'SQL2017-WS2016' + publisher: 'MicrosoftSQLServer' + sku: 'SQLDEV' + version: 'latest' + } + osDisk: { + managedDisk: { + storageAccountType: 'Premium_LRS' + } + name: 'acctvm-250116171212663925OSDisk' + caching: 'ReadOnly' + deleteOption: 'Detach' + diskSizeGB: 127 + osType: 'Windows' + writeAcceleratorEnabled: false + createOption: 'FromImage' + } + } + hardwareProfile: { + vmSize: 'Standard_F2s' + } + networkProfile: { + networkInterfaces: [ + { + properties: { + primary: false + } + id: networkInterface.id + } + ] + } + } +} + +resource dataCollectionRuleAssociation 'Microsoft.Insights/dataCollectionRuleAssociations@2022-06-01' = { + name: 'azapi_resource.workspace.output.properties.customerId_azapi_resource.resourceGroup.location_DCRA_1' + scope: virtualMachine + properties: { + dataCollectionRuleId: dataCollectionRule.id + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + dnsSettings: { + dnsServers: [] + } + enableAcceleratedNetworking: false + ipConfigurations: [ + { + properties: { + subnet: {} + primary: true + privateIPAddress: '10.0.0.4' + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + publicIPAddress: {} + } + type: 'Microsoft.Network/networkInterfaces/ipConfigurations' + name: 'testconfiguration1' + } + ] + disableTcpStateTracking: false + enableIPForwarding: false + nicType: 'Standard' + auxiliaryMode: 'None' + auxiliarySku: 'None' + } +} + +resource workspace 'Microsoft.OperationalInsights/workspaces@2020-08-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + legacy: 0 + searchVersion: 1 + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } + workspaceCapping: { + dailyQuotaGb: -1 + } + } +} + +resource table 'Microsoft.OperationalInsights/workspaces/tables@2023-09-01' = { + name: 'SqlAssessment_CL' + parent: workspace + properties: { + schema: { + columns: [ + { + name: 'TimeGenerated' + type: 'datetime' + } + { + name: 'RawData' + type: 'string' + } + ] + name: 'SqlAssessment_CL' + } + } +} + +resource dataCollectionEndpoint 'Microsoft.Insights/dataCollectionEndpoints@2022-06-01' = { + name: '${location}-DCE-1' + location: 'azapi_resource.resourceGroup.location' + properties: { + networkAcls: { + publicNetworkAccess: 'Enabled' + } + } +} + +resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { + name: 'azapi_resource.workspace.output.properties.customerId_azapi_resource.resourceGroup.location_DCR_1' + location: 'azapi_resource.resourceGroup.location' + dependsOn: [ + table + ] + properties: { + dataFlows: [ + { + outputStream: 'Custom-SqlAssessment_CL' + streams: [ + 'Custom-SqlAssessment_CL' + ] + transformKql: 'source' + destinations: [] + } + ] + dataSources: { + logFiles: [ + { + filePatterns: [ + 'C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\Microsoft SQL Server IaaS Agent\\Assessment\\*.csv' + ] + format: 'text' + name: 'Custom-SqlAssessment_CL' + settings: { + text: { + recordStartTimestampFormat: 'ISO 8601' + } + } + streams: [ + 'Custom-SqlAssessment_CL' + ] + } + ] + } + description: '' + destinations: { + logAnalytics: [ + {} + ] + } + streamDeclarations: { + 'Custom-SqlAssessment_CL': { + columns: [ + { + name: 'TimeGenerated' + type: 'datetime' + } + { + type: 'string' + name: 'RawData' + } + ] + } + } + dataCollectionEndpointId: dataCollectionEndpoint.id + } +} + +resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + securityRules: [ + { + name: 'MSSQLRule' + properties: { + destinationPortRange: '1433' + priority: 1001 + sourceAddressPrefix: '167.220.255.0/25' + sourcePortRange: '*' + access: 'Allow' + destinationAddressPrefixes: [] + destinationPortRanges: [] + direction: 'Inbound' + protocol: 'Tcp' + sourceAddressPrefixes: [] + sourcePortRanges: [] + destinationAddressPrefix: '*' + } + } + ] + } +} + +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + sku: { + name: 'Basic' + tier: 'Regional' + } + properties: { + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + idleTimeoutInMinutes: 4 + ipTags: [] + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Dynamic' + } +} + +resource extension 'Microsoft.Compute/virtualMachines/extensions@2024-07-01' = { + name: 'AzureMonitorWindowsAgent' + location: 'westeurope' + parent: virtualMachine + properties: { + suppressFailures: false + type: 'AzureMonitorWindowsAgent' + typeHandlerVersion: '1.0' + autoUpgradeMinorVersion: true + enableAutomaticUpgrade: true + publisher: 'Microsoft.Azure.Monitor' + } +} + +resource sqlvirtualMachine 'Microsoft.SqlVirtualMachine/sqlVirtualMachines@2023-10-01' = { + name: 'azapi_resource.virtualMachine.name' + location: 'azapi_resource.virtualMachine.location' + dependsOn: [ + dataCollectionRuleAssociation + extension + ] + properties: { + sqlImageSku: 'Developer' + sqlManagement: 'Full' + assessmentSettings: { + enable: true + runImmediately: false + schedule: { + dayOfWeek: 'Monday' + enable: true + startTime: '00:00' + weeklyInterval: 1 + } + } + sqlServerLicenseType: 'PAYG' + enableAutomaticUpgrade: true + leastPrivilegeMode: 'Enabled' + sqlImageOffer: 'SQL2017-WS2016' + } +} diff --git a/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep b/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep index 05908b4d..4ac3b4cd 100644 --- a/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep +++ b/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep @@ -1,17 +1,44 @@ param resourceName string = 'acctest0001' param location string = 'eastus' +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: '${resourceName}-vnet' + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: '${resourceName}-subnet' + parent: virtualNetwork + properties: { + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + } +} + resource containerGroupProfile 'Microsoft.ContainerInstance/containerGroupProfiles@2024-05-01-preview' = { name: '${resourceName}-contianerGroup' location: location properties: { + sku: 'Standard' containers: [ { name: 'mycontainergroupprofile' properties: { - command: [] - environmentVariables: [] - image: 'mcr.microsoft.com/azuredocs/aci-helloworld:latest' ports: [ { port: 8000 @@ -23,6 +50,9 @@ resource containerGroupProfile 'Microsoft.ContainerInstance/containerGroupProfil memoryInGB: any('1.5') } } + command: [] + environmentVariables: [] + image: 'mcr.microsoft.com/azuredocs/aci-helloworld:latest' } } ] @@ -37,62 +67,29 @@ resource containerGroupProfile 'Microsoft.ContainerInstance/containerGroupProfil type: 'Public' } osType: 'Linux' - sku: 'Standard' } } resource standbyContainerGroupPool 'Microsoft.StandbyPool/standbyContainerGroupPools@2025-03-01' = { name: '${resourceName}-CGPool' - location: 'eastus' properties: { + zones: [ + '1' + '2' + '3' + ] containerGroupProperties: { containerGroupProfile: { id: containerGroupProfile.id revision: 1 } subnetIds: [ - { - id: subnet.id - } + {} ] } elasticityProfile: { - maxReadyCapacity: 5 refillPolicy: 'always' + maxReadyCapacity: 5 } - zones: [ - '1' - '2' - '3' - ] - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: '${resourceName}-vnet' - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork - name: '${resourceName}-subnet' - properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.storage/remarks.json b/settings/remarks/microsoft.storage/remarks.json index 52ce7558..7c107a8e 100644 --- a/settings/remarks/microsoft.storage/remarks.json +++ b/settings/remarks/microsoft.storage/remarks.json @@ -107,6 +107,11 @@ "ResourceType": "Microsoft.Storage/storageAccounts/tableServices/tables", "Path": "samples/storageaccounts/tableservices/tables/main.bicep", "Description": "A basic example of deploying Table within Azure Storage." + }, + { + "ResourceType": "Microsoft.Storage/storageAccounts/encryptionScopes", + "Path": "samples/storageaccounts/encryptionscopes/main.bicep", + "Description": "A basic example of deploying Storage Encryption Scope." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep index 5c7e206f..a893d66e 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep @@ -1,14 +1,23 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: true + isHnsEnabled: false + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { @@ -22,17 +31,8 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + accessTier: 'Hot' } } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep index c7c59b53..8bf8ac41 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep @@ -2,22 +2,13 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - properties: {} - sku: { - name: 'Standard_LRS' - } + parent: storageAccount } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' @@ -26,10 +17,19 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } resource immutabilityPolicy 'Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies@2023-05-01' = { - parent: container name: 'default' + parent: container properties: { allowProtectedAppendWrites: false immutabilityPeriodSinceCreationInDays: 4 } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + properties: {} +} diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/main.bicep index 4efc6c29..efb64a7a 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/main.bicep @@ -2,22 +2,22 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard_LRS' } + properties: {} } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep index e53e1805..530e54d4 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep @@ -4,13 +4,13 @@ param location string = 'westeurope' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -23,24 +23,30 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' + accessTier: 'Hot' + defaultToOAuthAuthentication: false + isNfsV3Enabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowBlobPublicAccess: true } } resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2021-09-01' = { - parent: storageAccount name: 'default' + parent: storageAccount properties: { + lastAccessTimeTrackingPolicy: { + enable: false + } + restorePolicy: { + enabled: false + } changeFeed: { enabled: true } @@ -52,11 +58,5 @@ resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2021-09-01' enabled: false } isVersioningEnabled: true - lastAccessTimeTrackingPolicy: { - enable: false - } - restorePolicy: { - enabled: false - } } } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep new file mode 100644 index 00000000..f109f86b --- /dev/null +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep @@ -0,0 +1,138 @@ +param resourceName string = 'acctest0001' +param location string = 'westus' + +resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { + name: '${resourceName}sa' + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: { + accessTier: 'Hot' + allowBlobPublicAccess: true + allowCrossTenantReplication: false + defaultToOAuthAuthentication: false + minimumTlsVersion: 'TLS1_2' + supportsHttpsTrafficOnly: true + encryption: { + keySource: 'Microsoft.Storage' + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + } + isHnsEnabled: false + isLocalUserEnabled: true + networkAcls: { + resourceAccessRules: [] + virtualNetworkRules: [] + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + } + publicNetworkAccess: 'Enabled' + allowSharedKeyAccess: true + dnsEndpointType: 'Standard' + isNfsV3Enabled: false + isSftpEnabled: false + } +} + +resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { + name: '${resourceName}-kv' + location: location + dependsOn: [ + storageAccount + ] + properties: { + createMode: 'default' + enableRbacAuthorization: false + enableSoftDelete: true + enabledForDiskEncryption: false + publicNetworkAccess: 'Enabled' + tenantId: tenant().tenantId + accessPolicies: [ + { + permissions: { + keys: [ + 'Get' + 'Create' + 'Delete' + 'List' + 'Restore' + 'Recover' + 'UnwrapKey' + 'WrapKey' + 'Purge' + 'Encrypt' + 'Decrypt' + 'Sign' + 'Verify' + 'GetRotationPolicy' + ] + secrets: [] + storage: [] + certificates: [] + } + tenantId: tenant().tenantId + objectId: deployer().objectId + } + { + permissions: { + certificates: [] + keys: [ + 'Get' + 'UnwrapKey' + 'WrapKey' + ] + secrets: [] + storage: [] + } + tenantId: tenant().tenantId + objectId: storageAccount.identity.principalId + } + ] + enablePurgeProtection: true + enabledForDeployment: false + enabledForTemplateDeployment: false + sku: { + family: 'A' + name: 'standard' + } + } +} + +resource encryptionScope 'Microsoft.Storage/storageAccounts/encryptionScopes@2023-05-01' = { + name: '${resourceName}-scope' + parent: storageAccount + dependsOn: [ + vault + ] + properties: { + keyVaultProperties: {} + source: 'Microsoft.KeyVault' + state: 'Enabled' + } +} + +resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { + name: '${resourceName}-key' + parent: vault + properties: { + keyOps: [ + 'encrypt' + 'decrypt' + 'sign' + 'verify' + 'wrapKey' + 'unwrapKey' + ] + keySize: 2048 + kty: 'RSA' + } +} diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/fileservices/shares/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/fileservices/shares/main.bicep index 0ba2cdcb..399462b2 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/fileservices/shares/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/fileservices/shares/main.bicep @@ -1,23 +1,23 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource fileService 'Microsoft.Storage/storageAccounts/fileServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard_LRS' } + properties: {} } resource share 'Microsoft.Storage/storageAccounts/fileServices/shares@2022-09-01' = { - parent: fileService name: resourceName + parent: fileService properties: { accessTier: 'Cool' } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep index 3575fd63..828bbddc 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep @@ -4,13 +4,16 @@ param location string = 'westeurope' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' + isHnsEnabled: false + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + supportsHttpsTrafficOnly: true allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -22,35 +25,32 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + accessTier: 'Hot' + allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false } } resource localUser 'Microsoft.Storage/storageAccounts/localUsers@2021-09-01' = { - parent: storageAccount name: resourceName + parent: storageAccount properties: { - hasSharedKey: true - hasSshKey: false hasSshPassword: false homeDirectory: 'containername/' permissionScopes: [ { + service: 'blob' permissions: 'cwl' resourceName: 'containername' - service: 'blob' } ] + hasSharedKey: true + hasSshKey: false } } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep index 7464c6f1..b2045bed 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep @@ -4,15 +4,25 @@ param location string = 'westeurope' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'BlobStorage' properties: { + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true defaultToOAuthAuthentication: false + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false encryption: { - keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -21,29 +31,20 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } resource managementPolicy 'Microsoft.Storage/storageAccounts/managementPolicies@2021-09-01' = { - parent: storageAccount name: 'default' + parent: storageAccount properties: { policy: { rules: [ { + type: 'Lifecycle' definition: { actions: { baseBlob: { @@ -74,7 +75,6 @@ resource managementPolicy 'Microsoft.Storage/storageAccounts/managementPolicies@ } enabled: true name: 'rule-1' - type: 'Lifecycle' } ] } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep index 4a063a33..72b6812f 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep @@ -2,22 +2,22 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' resource queueService 'Microsoft.Storage/storageAccounts/queueServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard_LRS' } + properties: {} } resource queue 'Microsoft.Storage/storageAccounts/queueServices/queues@2022-09-01' = { - parent: queueService name: resourceName + parent: queueService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/tableservices/tables/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/tableservices/tables/main.bicep index a5e05ede..0dd9805a 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/tableservices/tables/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/tableservices/tables/main.bicep @@ -2,22 +2,22 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' resource tableService 'Microsoft.Storage/storageAccounts/tableServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard_LRS' } + properties: {} } resource table 'Microsoft.Storage/storageAccounts/tableServices/tables@2022-09-01' = { - parent: tableService name: resourceName + parent: tableService properties: { signedIdentifiers: [] } diff --git a/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep b/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep index 6eb0dde6..83835bb3 100644 --- a/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep +++ b/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep @@ -1,29 +1,12 @@ -param resourceName string = 'acctest0001' param location string = 'westus' - -resource amlFilesystem 'Microsoft.StorageCache/amlFilesystems@2024-07-01' = { - name: '${resourceName}-amlfs' - location: location - properties: { - filesystemSubnet: subnet.id - maintenanceWindow: { - dayOfWeek: 'Friday' - timeOfDayUTC: '22:00' - } - storageCapacityTiB: 8 - } - sku: { - name: 'AMLFS-Durable-Premium-250' - } - zones: [ - '1' - ] -} +param resourceName string = 'acctest0001' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: '${resourceName}-vnet' location: location properties: { + privateEndpointVNetPolicies: 'Disabled' + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -32,21 +15,34 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { dhcpOptions: { dnsServers: [] } - privateEndpointVNetPolicies: 'Disabled' - subnets: [] } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: '${resourceName}-subnet' + parent: virtualNetwork properties: { + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' defaultOutboundAccess: true delegations: [] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] - serviceEndpoints: [] + } +} + +resource amlFilesystem 'Microsoft.StorageCache/amlFilesystems@2024-07-01' = { + name: '${resourceName}-amlfs' + location: location + sku: { + name: 'AMLFS-Durable-Premium-250' + } + properties: { + maintenanceWindow: { + dayOfWeek: 'Friday' + timeOfDayUTC: '22:00' + } + storageCapacityTiB: 8 } } diff --git a/settings/remarks/microsoft.storagecache/samples/caches/main.bicep b/settings/remarks/microsoft.storagecache/samples/caches/main.bicep index 459e9c0d..2e65192d 100644 --- a/settings/remarks/microsoft.storagecache/samples/caches/main.bicep +++ b/settings/remarks/microsoft.storagecache/samples/caches/main.bicep @@ -1,22 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource cach 'Microsoft.StorageCache/caches@2023-01-01' = { - name: resourceName - location: location - properties: { - cacheSizeGB: 3072 - networkSettings: { - mtu: 1500 - ntpServer: 'time.windows.com' - } - subnet: subnet.id - } - sku: { - name: 'Standard_2G' - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location @@ -34,14 +18,29 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + } +} + +resource cach 'Microsoft.StorageCache/caches@2023-01-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_2G' + } + properties: { + networkSettings: { + mtu: 1500 + ntpServer: 'time.windows.com' + } + cacheSizeGB: 3072 } } diff --git a/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep b/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep index 7163200e..586d5994 100644 --- a/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep +++ b/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep @@ -8,8 +8,8 @@ resource storageMover 'Microsoft.StorageMover/storageMovers@2023-03-01' = { } resource endpoint 'Microsoft.StorageMover/storageMovers/endpoints@2023-03-01' = { - parent: storageMover name: resourceName + parent: storageMover properties: { endpointType: 'NfsMount' export: '' diff --git a/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep b/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep index f621af83..58772540 100644 --- a/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep +++ b/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' +param resourceName string = 'acctest0001' resource storageMover 'Microsoft.StorageMover/storageMovers@2023-03-01' = { name: resourceName @@ -8,7 +8,7 @@ resource storageMover 'Microsoft.StorageMover/storageMovers@2023-03-01' = { } resource project 'Microsoft.StorageMover/storageMovers/projects@2023-03-01' = { - parent: storageMover name: resourceName + parent: storageMover properties: {} } diff --git a/settings/remarks/microsoft.storagesync/samples/storagesyncservices/syncgroups/main.bicep b/settings/remarks/microsoft.storagesync/samples/storagesyncservices/syncgroups/main.bicep index cc582be8..58353ad4 100644 --- a/settings/remarks/microsoft.storagesync/samples/storagesyncservices/syncgroups/main.bicep +++ b/settings/remarks/microsoft.storagesync/samples/storagesyncservices/syncgroups/main.bicep @@ -10,6 +10,6 @@ resource storageSyncService 'Microsoft.StorageSync/storageSyncServices@2020-03-0 } resource syncGroup 'Microsoft.StorageSync/storageSyncServices/syncGroups@2020-03-01' = { - parent: storageSyncService name: resourceName + parent: storageSyncService } diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep index 1e464e7a..485e81d0 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep @@ -5,18 +5,6 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { name: resourceName location: location properties: { - cluster: {} - compatibilityLevel: '1.0' - contentStoragePolicy: 'SystemAccount' - dataLocale: 'en-GB' - eventsLateArrivalMaxDelayInSeconds: 60 - eventsOutOfOrderMaxDelayInSeconds: 50 - eventsOutOfOrderPolicy: 'Adjust' - jobType: 'Cloud' - outputErrorPolicy: 'Drop' - sku: { - name: 'Standard' - } transformation: { name: 'main' properties: { @@ -27,12 +15,24 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { streamingUnits: 3 } } + cluster: {} + compatibilityLevel: '1.0' + contentStoragePolicy: 'SystemAccount' + eventsOutOfOrderMaxDelayInSeconds: 50 + outputErrorPolicy: 'Drop' + dataLocale: 'en-GB' + eventsLateArrivalMaxDelayInSeconds: 60 + eventsOutOfOrderPolicy: 'Adjust' + jobType: 'Cloud' + sku: { + name: 'Standard' + } } } resource function 'Microsoft.StreamAnalytics/streamingJobs/functions@2020-03-01' = { - parent: streamingJob name: resourceName + parent: streamingJob properties: { properties: { binding: { diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep index 444d70e6..26a40090 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep @@ -1,47 +1,22 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { - name: resourceName - location: location - properties: { - cloudToDevice: {} - enableFileUploadNotifications: false - messagingEndpoints: {} - routing: { - fallbackRoute: { - condition: 'true' - endpointNames: [ - 'events' - ] - isEnabled: true - source: 'DeviceMessages' - } - } - storageEndpoints: {} - } - sku: { - capacity: 1 - name: 'S1' - } -} - resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { name: resourceName location: location properties: { cluster: {} compatibilityLevel: '1.0' - contentStoragePolicy: 'SystemAccount' dataLocale: 'en-GB' eventsLateArrivalMaxDelayInSeconds: 60 eventsOutOfOrderMaxDelayInSeconds: 50 eventsOutOfOrderPolicy: 'Adjust' - jobType: 'Cloud' outputErrorPolicy: 'Drop' sku: { name: 'Standard' } + contentStoragePolicy: 'SystemAccount' + jobType: 'Cloud' transformation: { name: 'main' properties: { @@ -56,15 +31,15 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { } resource input 'Microsoft.StreamAnalytics/streamingJobs/inputs@2020-03-01' = { - parent: streamingJob name: resourceName + parent: streamingJob properties: { datasource: { properties: { consumerGroupName: '$Default' endpoint: 'messages/events' - iotHubNamespace: iothub.name - sharedAccessPolicyKey: iothub.listkeys().value[0].primaryKey + iotHubNamespace: iotHub.name + sharedAccessPolicyKey: iotHub.listKeys().value[0].primaryKey sharedAccessPolicyName: 'iothubowner' } type: 'Microsoft.Devices/IotHubs' @@ -76,3 +51,28 @@ resource input 'Microsoft.StreamAnalytics/streamingJobs/inputs@2020-03-01' = { type: 'Stream' } } + +resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { + name: resourceName + location: location + sku: { + capacity: 1 + name: 'S1' + } + properties: { + routing: { + fallbackRoute: { + endpointNames: [ + 'events' + ] + isEnabled: true + source: 'DeviceMessages' + condition: 'true' + } + } + storageEndpoints: {} + cloudToDevice: {} + enableFileUploadNotifications: false + messagingEndpoints: {} + } +} diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep index d84d889c..0b564dec 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep @@ -5,14 +5,7 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { name: resourceName location: location properties: { - cluster: {} - compatibilityLevel: '1.0' - contentStoragePolicy: 'SystemAccount' dataLocale: 'en-GB' - eventsLateArrivalMaxDelayInSeconds: 60 - eventsOutOfOrderMaxDelayInSeconds: 50 - eventsOutOfOrderPolicy: 'Adjust' - jobType: 'Cloud' outputErrorPolicy: 'Drop' sku: { name: 'Standard' @@ -27,5 +20,12 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { streamingUnits: 3 } } + compatibilityLevel: '1.0' + contentStoragePolicy: 'SystemAccount' + eventsLateArrivalMaxDelayInSeconds: 60 + eventsOutOfOrderMaxDelayInSeconds: 50 + eventsOutOfOrderPolicy: 'Adjust' + jobType: 'Cloud' + cluster: {} } } diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep index a164e7d9..643315ba 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep @@ -1,58 +1,11 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' - properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - encryption: { - keySource: 'Microsoft.Storage' - services: { - queue: { - keyType: 'Service' - } - table: { - keyType: 'Service' - } - } - } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' - } -} - resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { name: resourceName location: location properties: { - cluster: {} - compatibilityLevel: '1.0' - contentStoragePolicy: 'SystemAccount' - dataLocale: 'en-GB' - eventsLateArrivalMaxDelayInSeconds: 60 eventsOutOfOrderMaxDelayInSeconds: 50 - eventsOutOfOrderPolicy: 'Adjust' - jobType: 'Cloud' - outputErrorPolicy: 'Drop' - sku: { - name: 'Standard' - } transformation: { name: 'main' properties: { @@ -63,24 +16,71 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { streamingUnits: 3 } } + cluster: {} + compatibilityLevel: '1.0' + contentStoragePolicy: 'SystemAccount' + eventsLateArrivalMaxDelayInSeconds: 60 + eventsOutOfOrderPolicy: 'Adjust' + jobType: 'Cloud' + outputErrorPolicy: 'Drop' + sku: { + name: 'Standard' + } + dataLocale: 'en-GB' } } resource output 'Microsoft.StreamAnalytics/streamingJobs/outputs@2021-10-01-preview' = { - parent: streamingJob name: resourceName + parent: streamingJob properties: { + serialization: null datasource: { properties: { - accountKey: storageAccount.listKeys().keys[0].value - accountName: storageAccount.name batchSize: 100 partitionKey: 'foo' rowKey: 'bar' table: 'foobar' + accountKey: storageAccount.listKeys().keys[0].value + accountName: storageAccount.name } type: 'Microsoft.Storage/Table' } - serialization: null + } +} + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: { + allowBlobPublicAccess: true + allowCrossTenantReplication: true + defaultToOAuthAuthentication: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowSharedKeyAccess: true + encryption: { + keySource: 'Microsoft.Storage' + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + } + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' } } diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep index 9c13441c..764a8af2 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep @@ -7,49 +7,48 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' - properties: {} - sku: { - name: 'Standard_LRS' - } + parent: storageAccount } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } managedVirtualNetwork: '' - publicNetworkAccess: 'Enabled' - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource synapseAzureadOnlyAuthentication 'Microsoft.Synapse/workspaces/azureADOnlyAuthentications@2021-06-01-preview' = { - parent: workspace name: 'default' + parent: workspace properties: { azureADOnlyAuthentication: true } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' } } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep index 8414c368..f2f22d6f 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep @@ -1,73 +1,71 @@ +@secure() +@description('The SQL administrator login password for the Synapse workspace') +param sqlAdministratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The SQL administrator login for the Synapse workspace') param sqlAdministratorLogin string -@secure() -@description('The SQL administrator login password for the Synapse workspace') -param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource bigDataPool 'Microsoft.Synapse/workspaces/bigDataPools@2021-06-01-preview' = { - parent: workspace name: resourceName location: location + parent: workspace properties: { - autoPause: { - enabled: false - } - autoScale: { - enabled: false - } - cacheSize: 0 defaultSparkLogFolder: '/logs' dynamicExecutorAllocation: { + minExecutors: 0 enabled: false maxExecutors: 0 - minExecutors: 0 } - isComputeIsolationEnabled: false nodeCount: 3 nodeSize: 'Small' nodeSizeFamily: 'MemoryOptimized' + isComputeIsolationEnabled: false sessionLevelPackagesEnabled: false sparkEventsFolder: '/events' sparkVersion: '2.4' + autoPause: { + enabled: false + } + autoScale: { + enabled: false + } + cacheSize: 0 } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/firewallrules/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/firewallrules/main.bicep index b556f446..5315008a 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/firewallrules/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/firewallrules/main.bicep @@ -1,24 +1,14 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The SQL administrator login for the Synapse workspace') param sqlAdministratorLogin string @secure() @description('The SQL administrator login password for the Synapse workspace') param sqlAdministratorLoginPassword string +param resourceName string = 'acctest0001' resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' - properties: {} - sku: { - name: 'Standard_LRS' - } + parent: storageAccount } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { @@ -27,9 +17,7 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { properties: { defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin @@ -38,8 +26,8 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { } resource firewallRule 'Microsoft.Synapse/workspaces/firewallRules@2021-06-01' = { - parent: workspace name: 'AllowAll' + parent: workspace properties: { endIpAddress: '255.255.255.255' startIpAddress: '0.0.0.0' @@ -47,11 +35,21 @@ resource firewallRule 'Microsoft.Synapse/workspaces/firewallRules@2021-06-01' = } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' } } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep index 32629f13..28246e5a 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep @@ -7,39 +7,27 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' - properties: {} - sku: { - name: 'Standard_LRS' - } + parent: storageAccount } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: 'default' - publicNetworkAccess: 'Enabled' - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource integrationRuntime 'Microsoft.Synapse/workspaces/integrationRuntimes@2021-06-01-preview' = { - parent: workspace name: resourceName + parent: workspace properties: { description: 'test' type: 'SelfHosted' @@ -47,11 +35,21 @@ resource integrationRuntime 'Microsoft.Synapse/workspaces/integrationRuntimes@20 } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' } } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep index 63bdfeb2..070a8e49 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep @@ -7,41 +7,40 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' - properties: {} - sku: { - name: 'Standard_LRS' - } + parent: storageAccount } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' } } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep index 2b54ab6d..aed187c0 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep @@ -7,18 +7,28 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount +} + +resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { + name: resourceName + parent: blobService + properties: { + metadata: { + key: 'value' + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { @@ -27,9 +37,7 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { properties: { defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin @@ -38,21 +46,11 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { } resource managedIdentitySqlControlSetting 'Microsoft.Synapse/workspaces/managedIdentitySqlControlSettings@2021-06-01' = { - parent: workspace name: 'default' + parent: workspace properties: { grantSqlControlToManagedIdentity: { desiredState: 'Disabled' } } } - -resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService - name: resourceName - properties: { - metadata: { - key: 'value' - } - } -} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep index 2a327d4b..abc963de 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep @@ -1,24 +1,24 @@ +@secure() +@description('The SQL administrator login password for the Synapse workspace') +param sqlAdministratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The SQL administrator login name for the Synapse workspace') param sqlAdministratorLogin string -@secure() -@description('The SQL administrator login password for the Synapse workspace') -param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { @@ -27,9 +27,7 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { properties: { defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin @@ -38,8 +36,8 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { } resource securityAlertPolicy 'Microsoft.Synapse/workspaces/securityAlertPolicies@2021-06-01' = { - parent: workspace name: 'Default' + parent: workspace properties: { state: 'Enabled' storageAccountAccessKey: storageAccount.listKeys().keys[0].value @@ -48,8 +46,8 @@ resource securityAlertPolicy 'Microsoft.Synapse/workspaces/securityAlertPolicies } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep index b6f07408..86f971a0 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep @@ -7,54 +7,52 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount +} + +resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { + name: resourceName + parent: blobService + properties: { + metadata: { + key: 'value' + } + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' - publicNetworkAccess: 'Enabled' - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource sqlPool 'Microsoft.Synapse/workspaces/sqlPools@2021-06-01' = { - parent: workspace name: resourceName location: location - properties: { - createMode: 'Default' - } + parent: workspace sku: { name: 'DW100c' } -} - -resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService - name: resourceName properties: { - metadata: { - key: 'value' - } + createMode: 'Default' } } diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep index efbceb15..5c29a75c 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep @@ -7,50 +7,49 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource sqlPool 'Microsoft.Synapse/workspaces/sqlPools@2021-06-01' = { - parent: workspace name: resourceName location: location - properties: { - createMode: 'Default' - } + parent: workspace sku: { name: 'DW100c' } + properties: { + createMode: 'Default' + } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' @@ -59,8 +58,8 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } resource vulnerabilityAssessment 'Microsoft.Synapse/workspaces/sqlPools/vulnerabilityAssessments@2021-06-01' = { - parent: sqlPool name: 'default' + parent: sqlPool properties: { storageAccountAccessKey: storageAccount.listKeys().keys[0].value storageContainerPath: 'https://${storageAccount.name}.blob.core.windows.net/${container.name}/' diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep index b92ed4a2..9cd2219a 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep @@ -1,24 +1,24 @@ +@secure() +@description('The SQL administrator login password for the Synapse workspace') +param sqlAdministratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The SQL administrator login for the Synapse workspace') param sqlAdministratorLogin string -@secure() -@description('The SQL administrator login password for the Synapse workspace') -param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { @@ -27,7 +27,6 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { properties: { defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' @@ -37,20 +36,20 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { } resource sqlPool 'Microsoft.Synapse/workspaces/sqlPools@2021-06-01' = { - parent: workspace name: resourceName location: location - properties: { - createMode: 'Default' - } + parent: workspace sku: { name: 'DW100c' } + properties: { + createMode: 'Default' + } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' @@ -59,8 +58,8 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } resource workloadGroup 'Microsoft.Synapse/workspaces/sqlPools/workloadGroups@2021-06-01' = { - parent: sqlPool name: resourceName + parent: sqlPool properties: { importance: 'normal' maxResourcePercent: 100 diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep index 54aadcb8..d973c11b 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep @@ -7,51 +7,39 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' - properties: {} - sku: { - name: 'Standard_LRS' - } + parent: storageAccount } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { - defaultDataLakeStorage: { - accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name - } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin sqlAdministratorLoginPassword: sqlAdministratorLoginPassword + defaultDataLakeStorage: { + accountUrl: storageAccount.properties.primaryEndpoints.dfs + } } } resource sqlPool 'Microsoft.Synapse/workspaces/sqlPools@2021-06-01' = { - parent: workspace name: resourceName location: location - properties: { - createMode: 'Default' - } + parent: workspace sku: { name: 'DW100c' } + properties: { + createMode: 'Default' + } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' @@ -60,21 +48,31 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } resource workloadGroup 'Microsoft.Synapse/workspaces/sqlPools/workloadGroups@2021-06-01' = { - parent: sqlPool name: resourceName + parent: sqlPool properties: { + minResourcePercent: 0 + minResourcePercentPerRequest: 3 importance: 'normal' maxResourcePercent: 100 maxResourcePercentPerRequest: 3 - minResourcePercent: 0 - minResourcePercentPerRequest: 3 } } resource workloadClassifier 'Microsoft.Synapse/workspaces/sqlPools/workloadGroups/workloadClassifiers@2021-06-01' = { - parent: workloadGroup name: resourceName + parent: workloadGroup properties: { memberName: 'dbo' } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep index da33ae18..0fd1e511 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep @@ -4,20 +4,20 @@ param location string = 'westeurope' resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'S1' + } kind: 'Gen1' properties: { dataRetentionTime: 'P30D' storageLimitExceededBehavior: 'PurgeOldData' } - sku: { - capacity: 1 - name: 'S1' - } } resource accessPolicy 'Microsoft.TimeSeriesInsights/environments/accessPolicies@2020-05-15' = { - parent: environment name: resourceName + parent: environment properties: { description: '' principalObjectId: 'aGUID' diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep index 9d649fbb..2b154826 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep @@ -1,41 +1,16 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { +resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { name: resourceName location: location - properties: { - cloudToDevice: {} - enableFileUploadNotifications: false - messagingEndpoints: {} - routing: { - fallbackRoute: { - condition: 'true' - endpointNames: [ - 'events' - ] - isEnabled: true - source: 'DeviceMessages' - } - } - storageEndpoints: {} - } sku: { capacity: 1 - name: 'B1' - } - tags: { - purpose: 'testing' + name: 'L1' } -} - -resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { - name: resourceName - location: location kind: 'Gen2' properties: { storageConfiguration: { - accountName: storageAccount.name managementKey: storageAccount.listKeys().keys[0].value } timeSeriesIdProperties: [ @@ -45,22 +20,18 @@ resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { } ] } - sku: { - capacity: 1 - name: 'L1' - } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -72,32 +43,60 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' + allowBlobPublicAccess: true + defaultToOAuthAuthentication: false + isHnsEnabled: false + isNfsV3Enabled: false supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + accessTier: 'Hot' } } resource eventSource 'Microsoft.TimeSeriesInsights/environments/eventSources@2020-05-15' = { - parent: environment name: resourceName location: location + parent: environment kind: 'Microsoft.IoTHub' properties: { + sharedAccessKey: iotHub.listKeys().value[0].primaryKey + timestampPropertyName: '' consumerGroupName: 'test' - eventSourceResourceId: iothub.id - iotHubName: iothub.name + eventSourceResourceId: iotHub.id + iotHubName: iotHub.name keyName: 'iothubowner' - sharedAccessKey: iothub.listkeys().value[0].primaryKey - timestampPropertyName: '' + } +} + +resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { + name: resourceName + location: location + sku: { + capacity: 1 + name: 'B1' + } + properties: { + cloudToDevice: {} + enableFileUploadNotifications: false + messagingEndpoints: {} + routing: { + fallbackRoute: { + condition: 'true' + endpointNames: [ + 'events' + ] + isEnabled: true + source: 'DeviceMessages' + } + } + storageEndpoints: {} + } + tags: { + purpose: 'testing' } } diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/main.bicep index 773185ef..08f2ef40 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/main.bicep @@ -4,13 +4,13 @@ param location string = 'westeurope' resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { name: resourceName location: location + sku: { + name: 'S1' + capacity: 1 + } kind: 'Gen1' properties: { dataRetentionTime: 'P30D' storageLimitExceededBehavior: 'PurgeOldData' } - sku: { - capacity: 1 - name: 'S1' - } } diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep index f7bf257f..d3cdcd15 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep @@ -4,28 +4,28 @@ param location string = 'westeurope' resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'S1' + } kind: 'Gen1' properties: { dataRetentionTime: 'P30D' storageLimitExceededBehavior: 'PurgeOldData' } - sku: { - capacity: 1 - name: 'S1' - } } resource referenceDataSet 'Microsoft.TimeSeriesInsights/environments/referenceDataSets@2020-05-15' = { - parent: environment name: resourceName location: location + parent: environment properties: { - dataStringComparisonBehavior: 'Ordinal' keyProperties: [ { - name: 'keyProperty1' type: 'String' + name: 'keyProperty1' } ] + dataStringComparisonBehavior: 'Ordinal' } } diff --git a/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep b/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep index 305a02af..d2c42689 100644 --- a/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep +++ b/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep @@ -6,7 +6,6 @@ resource account 'Microsoft.VideoIndexer/accounts@2025-04-01' = { location: location properties: { storageServices: { - resourceId: storageAccount.id userAssignedIdentity: '' } } @@ -15,14 +14,26 @@ resource account 'Microsoft.VideoIndexer/accounts@2025-04-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: '${replace(resourceName, '-', '')}sa' location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + minimumTlsVersion: 'TLS1_2' + networkAcls: { + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + } accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: false allowSharedKeyAccess: true - defaultToOAuthAuthentication: false dnsEndpointType: 'Standard' + isLocalUserEnabled: true + allowCrossTenantReplication: false + isNfsV3Enabled: false + defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -35,22 +46,10 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } isHnsEnabled: false - isLocalUserEnabled: true - isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - bypass: 'AzureServices' - defaultAction: 'Allow' - ipRules: [] - resourceAccessRules: [] - virtualNetworkRules: [] - } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowBlobPublicAccess: true + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep index 259c0806..ecf4b9b7 100644 --- a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep +++ b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep @@ -5,6 +5,7 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 name: resourceName location: location properties: { + teamsVoicemailPilotNumber: '1234567890' autoGeneratedDomainNameLabelScope: 'NoReuse' codecs: [ 'PCMA' @@ -44,6 +45,5 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 } } ] - teamsVoicemailPilotNumber: '1234567890' } } diff --git a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep index 66d475f3..2c48e352 100644 --- a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep +++ b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep @@ -5,12 +5,6 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 name: resourceName location: location properties: { - autoGeneratedDomainNameLabelScope: 'NoReuse' - codecs: [ - 'PCMA' - ] - connectivity: 'PublicAddress' - e911Type: 'Standard' platforms: [ 'OperatorConnect' ] @@ -45,13 +39,19 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 } ] teamsVoicemailPilotNumber: '1234567890' + autoGeneratedDomainNameLabelScope: 'NoReuse' + codecs: [ + 'PCMA' + ] + connectivity: 'PublicAddress' + e911Type: 'Standard' } } -resource testline 'Microsoft.VoiceServices/communicationsGateways/testLines@2023-01-31' = { - parent: communicationsGateway +resource testLine 'Microsoft.VoiceServices/communicationsGateways/testLines@2023-01-31' = { name: resourceName location: location + parent: communicationsGateway properties: { phoneNumber: '123456789' purpose: 'Automated' diff --git a/settings/remarks/microsoft.web/remarks.json b/settings/remarks/microsoft.web/remarks.json index 893c9a34..00e9d0d9 100644 --- a/settings/remarks/microsoft.web/remarks.json +++ b/settings/remarks/microsoft.web/remarks.json @@ -121,6 +121,11 @@ "ResourceType": "Microsoft.Web/staticSites/customDomains", "Path": "samples/staticsites/customdomains/main.bicep", "Description": "A basic example of deploying Static Web App Custom Domain." + }, + { + "ResourceType": "Microsoft.Web/sourcecontrols", + "Path": "samples/sourcecontrols/main.bicep", + "Description": "A basic example of deploying App Service GitHub Token." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.web/samples/serverfarms/main.bicep b/settings/remarks/microsoft.web/samples/serverfarms/main.bicep index ac77f6af..1e1d261f 100644 --- a/settings/remarks/microsoft.web/samples/serverfarms/main.bicep +++ b/settings/remarks/microsoft.web/samples/serverfarms/main.bicep @@ -4,13 +4,13 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { hyperV: false perSiteScaling: false reserved: false zoneRedundant: false } - sku: { - name: 'S1' - } } diff --git a/settings/remarks/microsoft.web/samples/sites/config/main.bicep b/settings/remarks/microsoft.web/samples/sites/config/main.bicep index bdfaa837..ec3bfea2 100644 --- a/settings/remarks/microsoft.web/samples/sites/config/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/config/main.bicep @@ -1,17 +1,17 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { + zoneRedundant: false hyperV: false perSiteScaling: false reserved: false - zoneRedundant: false - } - sku: { - name: 'S1' } } @@ -20,37 +20,37 @@ resource site 'Microsoft.Web/sites@2022-09-01' = { location: location properties: { clientAffinityEnabled: false - clientCertEnabled: false clientCertMode: 'Required' - enabled: true httpsOnly: false publicNetworkAccess: 'Enabled' - serverFarmId: serverfarm.id siteConfig: { - acrUseManagedIdentityCreds: false alwaysOn: true autoHealEnabled: false - ftpsState: 'Disabled' http20Enabled: false - loadBalancing: 'LeastRequests' + remoteDebuggingEnabled: false localMySqlEnabled: false managedPipelineMode: 'Integrated' minTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' - remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false - scmMinTlsVersion: '1.2' - use32BitWorkerProcess: true vnetRouteAllEnabled: false webSocketsEnabled: false + publicNetworkAccess: 'Enabled' + acrUseManagedIdentityCreds: false + ftpsState: 'Disabled' + loadBalancing: 'LeastRequests' + scmMinTlsVersion: '1.2' + use32BitWorkerProcess: true windowsFxVersion: '' } + clientCertEnabled: false + enabled: true + serverFarmId: serverfarm.id vnetRouteAllEnabled: false } } resource config 'Microsoft.Web/sites/config@2022-09-01' = { - parent: site name: 'azurestorageaccounts' + parent: site properties: {} } diff --git a/settings/remarks/microsoft.web/samples/sites/main.bicep b/settings/remarks/microsoft.web/samples/sites/main.bicep index 84754e11..826bdab9 100644 --- a/settings/remarks/microsoft.web/samples/sites/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/main.bicep @@ -4,47 +4,47 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { hyperV: false perSiteScaling: false reserved: false zoneRedundant: false } - sku: { - name: 'S1' - } } resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceName location: location properties: { - clientAffinityEnabled: false clientCertEnabled: false clientCertMode: 'Required' enabled: true httpsOnly: false publicNetworkAccess: 'Enabled' + vnetRouteAllEnabled: false + clientAffinityEnabled: false serverFarmId: serverfarm.id siteConfig: { + windowsFxVersion: '' + scmMinTlsVersion: '1.2' acrUseManagedIdentityCreds: false alwaysOn: true - autoHealEnabled: false ftpsState: 'Disabled' http20Enabled: false loadBalancing: 'LeastRequests' localMySqlEnabled: false - managedPipelineMode: 'Integrated' minTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' + managedPipelineMode: 'Integrated' remoteDebuggingEnabled: false - scmIpSecurityRestrictionsUseMain: false - scmMinTlsVersion: '1.2' use32BitWorkerProcess: true vnetRouteAllEnabled: false webSocketsEnabled: false - windowsFxVersion: '' + scmIpSecurityRestrictionsUseMain: false + autoHealEnabled: false + publicNetworkAccess: 'Enabled' } - vnetRouteAllEnabled: false } } diff --git a/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep b/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep index b98d9d7a..6e6d45c3 100644 --- a/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = { name: resourceName location: location - kind: 'Windows' - properties: { - isXenon: false - } sku: { - capacity: 1 name: 'S1' size: 'S1' tier: 'Standard' + capacity: 1 + } + kind: 'Windows' + properties: { + isXenon: false } } @@ -20,18 +20,18 @@ resource site 'Microsoft.Web/sites@2021-02-01' = { name: resourceName location: location properties: { + siteConfig: {} clientAffinityEnabled: false clientCertEnabled: false enabled: true httpsOnly: false serverFarmId: serverfarm.id - siteConfig: {} } } resource publicCertificate 'Microsoft.Web/sites/publicCertificates@2022-09-01' = { - parent: site name: resourceName + parent: site properties: { blob: 'LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNzakNDQVpvQ0NRQ01kdDdEdnlnUHREQU5CZ2txaGtpRzl3MEJBUXNGQURBYk1Sa3dGd1lEVlFRRERCQmgKY0drdWRHVnljbUZtYjNKdExtbHZNQjRYRFRFNE1EY3dOVEV3TXpNek1Gb1hEVEk0TURjd01qRXdNek16TUZvdwpHekVaTUJjR0ExVUVBd3dRWVhCcExuUmxjbkpoWm05eWJTNXBiekNDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFECmdnRVBBRENDQVFvQ2dnRUJBS1FXMzMyT2wyOENzaWRBaGVEMWFMOVVsOEpXbktMZGFWeEtaM3NzbDVDWGpQRE8KbU03SVhrMFNnYlFuVUM4bElsUEZaaURHYlExc0I2T1RNdW42Wlo0aXBMcDgwZHRsMHJvQ0x0Q25EUU9CR3pDTgpBckNZQW9YUnVyamtYRVk3dHBEMHd3dFU3MiszN2gzSFE0ZzBWUzZWSXRKQ3FKOVFBRFYrSE8yWld1WlRlejcwCk1ob0w2T0xmWlA3SEdZZEpES2dmRVZORjVYbGJWek5BR2tESUpGZGhqTnh5R0d1NU5mc20xcGZRaEF5dW5razcKSlZhbWpVZzVJb2pSZG82M0lTOXd3ek1PZGVHU0FiQmNzSmZZZUNmVmcya3VwUjhxMFRtWit4OTNSbW1PbGJTaQo2NmtFWXhSelo5WUNRZUhKbW4xWWZKOTJCcENVaXk5QTZaMWlhS1VDQXdFQUFUQU5CZ2txaGtpRzl3MEJBUXNGCkFBT0NBUUVBSjdKaGxlY1A3SjQ4d0kyUUhUTWJBTWtrV0J2L2lXcTEvUUlGNHVnSDNaYjVQb3JPditOZmhRMEwKbFdpdy9Tek44QWU5NXZVaXhBR1lITVNhMjhvdW1NNUsxT3NxS0VrVklvMUFvQkg4bkJ6K1ZjVHBSRC9tSFhvdApBSFBBWnQ5ajVMcWVIWCtlblI2UmJJTkFmM2puK1lVM01kVmUwTXNBRGRGQVNWRGZqbVFQMlI3bzlhSmIvUXFPCmczYlpCV3NpQkRFSVNmeWFIMitwZ1VNN3d0d0VvRldtRU1sZ2pMSzFNUkJzMWNEWlhxbkhhQ2QvcnMrTm1XVjkKbmFFdTd4NWZ5UU9rNEhvemtwd2VSK0p4MXNCbFRSc2E0OS9xU0h0LzZVTEtmTzAxL2NUczRpRjcxeWtYUGJoMwpLajljSTJ1bzlhWXRYa3hraEtyR3lVcEE3RkpxV3c9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==' publicCertificateLocation: 'Unknown' diff --git a/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep b/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep index 94f2c216..7e69e425 100644 --- a/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep @@ -1,57 +1,57 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' param resourceSiteName string = 'acctestsite0001' -param location string = 'westeurope' - -resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { - name: resourceName - location: location - properties: { - hyperV: false - perSiteScaling: false - reserved: false - zoneRedundant: false - } - sku: { - name: 'S1' - } -} resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceSiteName location: location properties: { - clientAffinityEnabled: false - clientCertEnabled: false - clientCertMode: 'Required' - enabled: true - httpsOnly: false publicNetworkAccess: 'Enabled' serverFarmId: serverfarm.id + clientAffinityEnabled: false + clientCertEnabled: false siteConfig: { acrUseManagedIdentityCreds: false - alwaysOn: true autoHealEnabled: false ftpsState: 'Disabled' http20Enabled: false + use32BitWorkerProcess: true loadBalancing: 'LeastRequests' - localMySqlEnabled: false managedPipelineMode: 'Integrated' minTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' + webSocketsEnabled: false + windowsFxVersion: '' remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false scmMinTlsVersion: '1.2' - use32BitWorkerProcess: true + alwaysOn: true + localMySqlEnabled: false + publicNetworkAccess: 'Enabled' vnetRouteAllEnabled: false - webSocketsEnabled: false - windowsFxVersion: '' } vnetRouteAllEnabled: false + clientCertMode: 'Required' + enabled: true + httpsOnly: false } } resource dynatraceSiteExtension 'Microsoft.Web/sites/siteextensions@2022-09-01' = { - parent: site name: 'Dynatrace' location: location + parent: site +} + +resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { + name: resourceName + location: location + sku: { + name: 'S1' + } + properties: { + hyperV: false + perSiteScaling: false + reserved: false + zoneRedundant: false + } } diff --git a/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep b/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep index a261a10d..adba0877 100644 --- a/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { hyperV: false perSiteScaling: false reserved: false zoneRedundant: false } - sku: { - name: 'S1' - } } resource site 'Microsoft.Web/sites@2022-09-01' = { @@ -22,71 +22,71 @@ resource site 'Microsoft.Web/sites@2022-09-01' = { clientAffinityEnabled: false clientCertEnabled: false clientCertMode: 'Required' - enabled: true httpsOnly: false - publicNetworkAccess: 'Enabled' serverFarmId: serverfarm.id siteConfig: { - acrUseManagedIdentityCreds: false - alwaysOn: true - autoHealEnabled: false ftpsState: 'Disabled' - http20Enabled: false - loadBalancing: 'LeastRequests' - localMySqlEnabled: false - managedPipelineMode: 'Integrated' minTlsVersion: '1.2' publicNetworkAccess: 'Enabled' + webSocketsEnabled: false + windowsFxVersion: '' + acrUseManagedIdentityCreds: false + http20Enabled: false + managedPipelineMode: 'Integrated' remoteDebuggingEnabled: false - scmIpSecurityRestrictionsUseMain: false scmMinTlsVersion: '1.2' use32BitWorkerProcess: true + alwaysOn: true + autoHealEnabled: false + loadBalancing: 'LeastRequests' + localMySqlEnabled: false + scmIpSecurityRestrictionsUseMain: false vnetRouteAllEnabled: false - webSocketsEnabled: false - windowsFxVersion: '' } vnetRouteAllEnabled: false + enabled: true + publicNetworkAccess: 'Enabled' } } resource slot 'Microsoft.Web/sites/slots@2022-09-01' = { - parent: site name: resourceName location: location + parent: site properties: { + publicNetworkAccess: 'Enabled' + serverFarmId: serverfarm.id + vnetRouteAllEnabled: false clientAffinityEnabled: false - clientCertEnabled: false clientCertExclusionPaths: '' clientCertMode: 'Required' enabled: true httpsOnly: false - publicNetworkAccess: 'Enabled' - serverFarmId: serverfarm.id siteConfig: { acrUseManagedIdentityCreds: false - alwaysOn: true autoHealEnabled: false + loadBalancing: 'LeastRequests' + minTlsVersion: '1.2' ftpsState: 'Disabled' http20Enabled: false - loadBalancing: 'LeastRequests' + vnetRouteAllEnabled: false localMySqlEnabled: false - managedPipelineMode: 'Integrated' - minTlsVersion: '1.2' publicNetworkAccess: 'Enabled' remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false scmMinTlsVersion: '1.2' use32BitWorkerProcess: false - vnetRouteAllEnabled: false + alwaysOn: true + managedPipelineMode: 'Integrated' webSocketsEnabled: false windowsFxVersion: '' } - vnetRouteAllEnabled: false + clientCertEnabled: false } } resource config 'Microsoft.Web/sites/slots/config@2022-09-01' = { - parent: slot name: 'azurestorageaccounts' + parent: slot properties: {} } diff --git a/settings/remarks/microsoft.web/samples/sites/slots/main.bicep b/settings/remarks/microsoft.web/samples/sites/slots/main.bicep index a38c7b91..c5ec42b8 100644 --- a/settings/remarks/microsoft.web/samples/sites/slots/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/slots/main.bicep @@ -1,86 +1,86 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { hyperV: false perSiteScaling: false reserved: false zoneRedundant: false } - sku: { - name: 'S1' - } } resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceName location: location properties: { - clientAffinityEnabled: false clientCertEnabled: false clientCertMode: 'Required' - enabled: true httpsOnly: false - publicNetworkAccess: 'Enabled' serverFarmId: serverfarm.id + enabled: true + publicNetworkAccess: 'Enabled' siteConfig: { acrUseManagedIdentityCreds: false alwaysOn: true - autoHealEnabled: false - ftpsState: 'Disabled' http20Enabled: false + scmIpSecurityRestrictionsUseMain: false + windowsFxVersion: '' + ftpsState: 'Disabled' + publicNetworkAccess: 'Enabled' + webSocketsEnabled: false + autoHealEnabled: false + minTlsVersion: '1.2' + remoteDebuggingEnabled: false loadBalancing: 'LeastRequests' localMySqlEnabled: false managedPipelineMode: 'Integrated' - minTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' - remoteDebuggingEnabled: false - scmIpSecurityRestrictionsUseMain: false scmMinTlsVersion: '1.2' use32BitWorkerProcess: true vnetRouteAllEnabled: false - webSocketsEnabled: false - windowsFxVersion: '' } vnetRouteAllEnabled: false + clientAffinityEnabled: false } } resource slot 'Microsoft.Web/sites/slots@2022-09-01' = { - parent: site name: resourceName location: location + parent: site properties: { - clientAffinityEnabled: false - clientCertEnabled: false - clientCertExclusionPaths: '' clientCertMode: 'Required' - enabled: true - httpsOnly: false publicNetworkAccess: 'Enabled' - serverFarmId: serverfarm.id siteConfig: { + use32BitWorkerProcess: false acrUseManagedIdentityCreds: false + minTlsVersion: '1.2' + remoteDebuggingEnabled: false + scmMinTlsVersion: '1.2' + webSocketsEnabled: false alwaysOn: true autoHealEnabled: false - ftpsState: 'Disabled' http20Enabled: false - loadBalancing: 'LeastRequests' - localMySqlEnabled: false - managedPipelineMode: 'Integrated' - minTlsVersion: '1.2' publicNetworkAccess: 'Enabled' - remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false - scmMinTlsVersion: '1.2' - use32BitWorkerProcess: false + ftpsState: 'Disabled' + managedPipelineMode: 'Integrated' vnetRouteAllEnabled: false - webSocketsEnabled: false windowsFxVersion: '' + loadBalancing: 'LeastRequests' + localMySqlEnabled: false } vnetRouteAllEnabled: false + clientCertExclusionPaths: '' + enabled: true + httpsOnly: false + serverFarmId: serverfarm.id + clientAffinityEnabled: false + clientCertEnabled: false } } diff --git a/settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep b/settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep new file mode 100644 index 00000000..a2fbe90d --- /dev/null +++ b/settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep @@ -0,0 +1,18 @@ +targetScope = 'tenant' + +@secure() +@description('The GitHub access token for source control integration') +param githubToken string +@secure() +@description('The GitHub token secret for source control integration') +param githubTokenSecret string +param resourceName string = 'acctest0001' +param location string = 'eastus' + +resource sourcecontrol 'Microsoft.Web/sourcecontrols@2021-02-01' = { + name: 'GitHub' + properties: { + token: '${githubToken}' + tokenSecret: '${githubTokenSecret}' + } +} diff --git a/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep b/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep index a9b765ba..0f5b6540 100644 --- a/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep +++ b/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep @@ -4,15 +4,15 @@ param location string = 'westus' resource staticSite 'Microsoft.Web/staticSites@2021-02-01' = { name: resourceName location: location - properties: {} sku: { name: 'Free' } + properties: {} } resource customDomain 'Microsoft.Web/staticSites/customDomains@2021-02-01' = { - parent: staticSite name: '${resourceName}.contoso.com' + parent: staticSite properties: { validationMethod: 'dns-txt-token' } diff --git a/settings/remarks/microsoft.web/samples/staticsites/main.bicep b/settings/remarks/microsoft.web/samples/staticsites/main.bicep index 722c6511..4d747091 100644 --- a/settings/remarks/microsoft.web/samples/staticsites/main.bicep +++ b/settings/remarks/microsoft.web/samples/staticsites/main.bicep @@ -4,9 +4,9 @@ param location string = 'westeurope' resource staticSite 'Microsoft.Web/staticSites@2021-02-01' = { name: resourceName location: location - properties: {} sku: { name: 'Free' tier: 'Free' } + properties: {} } diff --git a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep index ea30bb24..ef5224b8 100644 --- a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep +++ b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep @@ -1,72 +1,53 @@ param resourceName string = 'acctest0001' param location string = 'westus' +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { + name: '${resourceName}-vnet' + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + privateEndpointVNetPolicies: 'Disabled' + subnets: [] + } +} + resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = { name: '${resourceName}-nginx' location: location + sku: { + name: 'standardv2_Monthly' + } properties: { - autoUpgradeProfile: { - upgradeChannel: 'stable' - } enableDiagnosticsSupport: false networkProfile: { frontEndIPConfiguration: { publicIPAddresses: [ - { - id: publicIPAddress.id - } + {} ] } - networkInterfaceConfiguration: { - subnetId: subnet.id - } + networkInterfaceConfiguration: {} } scalingProperties: { capacity: 10 } - } - sku: { - name: 'standardv2_Monthly' - } -} - -resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { - name: '${resourceName}-pip' - location: location - properties: { - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' - } - idleTimeoutInMinutes: 4 - publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Static' - } - sku: { - name: 'Standard' - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { - name: '${resourceName}-vnet' - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] + autoUpgradeProfile: { + upgradeChannel: 'stable' } - privateEndpointVNetPolicies: 'Disabled' - subnets: [] } } resource configuration 'Nginx.NginxPlus/nginxDeployments/configurations@2024-11-01-preview' = { - parent: nginxDeployment name: 'default' + parent: nginxDeployment properties: { + rootFile: '/etc/nginx/nginx.conf' files: [ { content: 'aHR0cCB7CiAgICBzZXJ2ZXIgewogICAgICAgIGxpc3RlbiA4MDsKICAgICAgICBsb2NhdGlvbiAvIHsKICAgICAgICAgICAgYXV0aF9iYXNpYyAiUHJvdGVjdGVkIEFyZWEiOwogICAgICAgICAgICBhdXRoX2Jhc2ljX3VzZXJfZmlsZSAvb3B0Ly5odHBhc3N3ZDsKICAgICAgICAgICAgZGVmYXVsdF90eXBlIHRleHQvaHRtbDsKICAgICAgICAgICAgcmV0dXJuIDIwMCAnPCFkb2N0eXBlIGh0bWw+PGh0bWwgbGFuZz0iZW4iPjxoZWFkPjwvaGVhZD48Ym9keT4KICAgICAgICAgICAgICAgIDxkaXY+dGhpcyBvbmUgd2lsbCBiZSB1cGRhdGVkPC9kaXY+CiAgICAgICAgICAgICAgICA8ZGl2PmF0IDEwOjM4IGFtPC9kaXY+CiAgICAgICAgICAgIDwvYm9keT48L2h0bWw+JzsKICAgICAgICB9CiAgICAgICAgaW5jbHVkZSBzaXRlLyouY29uZjsKICAgIH0KfQo=' @@ -79,14 +60,15 @@ resource configuration 'Nginx.NginxPlus/nginxDeployments/configurations@2024-11- virtualPath: '/opt/.htpasswd' } ] - rootFile: '/etc/nginx/nginx.conf' } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: '${resourceName}-subnet' + parent: virtualNetwork properties: { + serviceEndpointPolicies: [] + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' defaultOutboundAccess: true delegations: [ @@ -99,7 +81,21 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { ] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] + } +} + +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { + name: '${resourceName}-pip' + location: location + sku: { + name: 'Standard' + } + properties: { + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + idleTimeoutInMinutes: 4 + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Static' } } diff --git a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep index 21aa7c31..d31d5805 100644 --- a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep +++ b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep @@ -1,25 +1,83 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { + name: '${resourceName}-vnet' + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + privateEndpointVNetPolicies: 'Disabled' + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { + name: '${resourceName}-subnet' + parent: virtualNetwork + properties: { + defaultOutboundAccess: true + delegations: [ + { + name: 'delegation' + properties: { + serviceName: 'NGINX.NGINXPLUS/nginxDeployments' + } + } + ] + privateEndpointNetworkPolicies: 'Disabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + } +} + +resource subnet1 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { + name: '${resourceName}-subnet2' + parent: virtualNetwork + properties: { + serviceEndpoints: [] + addressPrefix: '10.0.3.0/24' + defaultOutboundAccess: true + delegations: [ + { + name: 'delegation' + properties: { + serviceName: 'NGINX.NGINXPLUS/nginxDeployments' + } + } + ] + privateEndpointNetworkPolicies: 'Disabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + } +} resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = { name: '${resourceName}-nginx' location: location + sku: { + name: 'standardv2_Monthly' + } properties: { autoUpgradeProfile: { upgradeChannel: 'stable' } enableDiagnosticsSupport: false networkProfile: { + networkInterfaceConfiguration: {} frontEndIPConfiguration: { publicIPAddresses: [ - { - id: publicIPAddress.id - } + {} ] } - networkInterfaceConfiguration: { - subnetId: subnet.id - } } scalingProperties: { autoScaleSettings: { @@ -38,14 +96,15 @@ resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = preferredEmail: 'test@test.com' } } - sku: { - name: 'standardv2_Monthly' - } } resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { name: '${resourceName}-pip' location: location + sku: { + name: 'Standard' + tier: 'Regional' + } properties: { ddosSettings: { protectionMode: 'VirtualNetworkInherited' @@ -54,84 +113,21 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { publicIPAddressVersion: 'IPv4' publicIPAllocationMethod: 'Static' } - sku: { - name: 'Standard' - tier: 'Regional' - } } resource publicipaddress1 'Microsoft.Network/publicIPAddresses@2024-05-01' = { name: '${resourceName}-pip2' location: location - properties: { - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' - } - idleTimeoutInMinutes: 4 - publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Static' - } sku: { name: 'Standard' tier: 'Regional' } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { - name: '${resourceName}-vnet' - location: location properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] + idleTimeoutInMinutes: 4 + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Static' + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' } - privateEndpointVNetPolicies: 'Disabled' - subnets: [] - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork - name: '${resourceName}-subnet' - properties: { - addressPrefix: '10.0.2.0/24' - defaultOutboundAccess: true - delegations: [ - { - name: 'delegation' - properties: { - serviceName: 'NGINX.NGINXPLUS/nginxDeployments' - } - } - ] - privateEndpointNetworkPolicies: 'Disabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - } -} - -resource subnet1 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork - name: '${resourceName}-subnet2' - properties: { - addressPrefix: '10.0.3.0/24' - defaultOutboundAccess: true - delegations: [ - { - name: 'delegation' - properties: { - serviceName: 'NGINX.NGINXPLUS/nginxDeployments' - } - } - ] - privateEndpointNetworkPolicies: 'Disabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] } } diff --git a/settings/remarks/qumulo.storage/samples/filesystems/main.bicep b/settings/remarks/qumulo.storage/samples/filesystems/main.bicep index 526a60f7..f6849b71 100644 --- a/settings/remarks/qumulo.storage/samples/filesystems/main.bicep +++ b/settings/remarks/qumulo.storage/samples/filesystems/main.bicep @@ -8,13 +8,12 @@ resource qumuloFileSystem 'Qumulo.Storage/fileSystems@2024-06-19' = { name: resourceName location: location properties: { - adminPassword: null + adminPassword: qumuloPassword availabilityZone: '1' - delegatedSubnetId: subnet.id marketplaceDetails: { + publisherId: 'qumulo1584033880660' offerId: 'qumulo-saas-mpp' planId: 'azure-native-qumulo-v3' - publisherId: 'qumulo1584033880660' } storageSku: 'Cold_LRS' userDetails: { @@ -38,12 +37,10 @@ resource vnet 'Microsoft.Network/virtualNetworks@2024-05-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: vnet name: resourceName location: location + parent: vnet properties: { - addressPrefix: '10.0.1.0/24' - defaultOutboundAccess: true delegations: [ { name: 'delegation' @@ -57,5 +54,7 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { ] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' + addressPrefix: '10.0.1.0/24' + defaultOutboundAccess: true } } diff --git a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.authorization/2022-04-01/roledefinitions.md b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.authorization/2022-04-01/roledefinitions.md index 1007121e..120408b0 100644 --- a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.authorization/2022-04-01/roledefinitions.md +++ b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.authorization/2022-04-01/roledefinitions.md @@ -100,10 +100,12 @@ A basic example of deploying custom Role Definition. targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-preview' = { name: '6faae21a-0cd6-4536-8c23-a278823d12ed' properties: { + type: 'CustomRole' assignableScopes: [ subscription().id ] @@ -118,8 +120,7 @@ resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-prev notDataActions: [] } ] - roleName: 'acctest0001' - type: 'CustomRole' + roleName: resourceName } } ``` diff --git a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.compute/2024-03-02/disks.md b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.compute/2024-03-02/disks.md index b5950790..923ada7a 100644 --- a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.compute/2024-03-02/disks.md +++ b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.compute/2024-03-02/disks.md @@ -311,20 +311,20 @@ param location string = 'westeurope' resource disk 'Microsoft.Compute/disks@2022-03-02' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } properties: { - creationData: { - createOption: 'Empty' - } - diskSizeGB: 10 encryption: { type: 'EncryptionAtRestWithPlatformKey' } networkAccessPolicy: 'AllowAll' osType: '' publicNetworkAccess: 'Enabled' - } - sku: { - name: 'Standard_LRS' + creationData: { + createOption: 'Empty' + } + diskSizeGB: 10 } } ``` diff --git a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.documentdb/2024-05-15/databaseaccounts.md b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.documentdb/2024-05-15/databaseaccounts.md index 4642b1fb..b82315a4 100644 --- a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.documentdb/2024-05-15/databaseaccounts.md +++ b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.documentdb/2024-05-15/databaseaccounts.md @@ -435,33 +435,33 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] - consistencyPolicy: { - defaultConsistencyLevel: 'BoundedStaleness' - maxIntervalInSeconds: 10 - maxStalenessPrefix: 200 - } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { - failoverPriority: 0 isZoneRedundant: false locationName: 'West Europe' + failoverPriority: 0 } ] networkAclBypass: 'None' + databaseAccountOfferType: 'Standard' + enableAnalyticalStorage: false + defaultIdentity: 'FirstPartyIdentity' + isVirtualNetworkFilterEnabled: false networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' virtualNetworkRules: [] + capabilities: [] + enableFreeTier: false + enableMultipleWriteLocations: false + ipRules: [] + publicNetworkAccess: 'Enabled' + consistencyPolicy: { + defaultConsistencyLevel: 'BoundedStaleness' + maxIntervalInSeconds: 10 + maxStalenessPrefix: 200 + } } } ``` diff --git a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.keyvault/2023-07-01/vaults.md b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.keyvault/2023-07-01/vaults.md index a9035a7e..7aa708bb 100644 --- a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.keyvault/2023-07-01/vaults.md +++ b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.keyvault/2023-07-01/vaults.md @@ -210,37 +210,37 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' + sku: { + family: 'A' + name: 'standard' + } + softDeleteRetentionInDays: 7 + tenantId: tenant().tenantId accessPolicies: [ { objectId: deployer().objectId permissions: { + secrets: [ + 'Set' + ] + storage: [] certificates: [ 'ManageContacts' ] keys: [ 'Create' ] - secrets: [ - 'Set' - ] - storage: [] } - tenantId: deployer().tenantId + tenantId: tenant().tenantId } ] - createMode: 'default' enableRbacAuthorization: false - enableSoftDelete: true enabledForDeployment: false enabledForDiskEncryption: false enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' - sku: { - family: 'A' - name: 'standard' - } - softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId + createMode: 'default' + enableSoftDelete: true } } ```