diff --git a/settings/remarks/microsoft.aadiam/remarks.json b/settings/remarks/microsoft.aadiam/remarks.json index bc501e82..caa4ff83 100644 --- a/settings/remarks/microsoft.aadiam/remarks.json +++ b/settings/remarks/microsoft.aadiam/remarks.json @@ -1,10 +1,17 @@ -{ - "$schema": "../../schemas/remarks.schema.json", - "TerraformSamples": [ - { - "ResourceType": "Microsoft.AADIAM/diagnosticSettings", - "Path": "samples/diagnosticsettings/main.tf", - "Description": "A basic example of deploying Azure Active Directory Diagnostic Setting for Azure Monitor." - } - ] -} +{ + "$schema": "../../schemas/remarks.schema.json", + "TerraformSamples": [ + { + "ResourceType": "Microsoft.AADIAM/diagnosticSettings", + "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." + } + ] +} \ No newline at end of file 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..a75b3d86 --- /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 + } + { + category: 'B2CRequestLogs' + enabled: true + } + { + 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..19282e2f 100644 --- a/settings/remarks/microsoft.advisor/remarks.json +++ b/settings/remarks/microsoft.advisor/remarks.json @@ -1,10 +1,17 @@ -{ - "$schema": "../../schemas/remarks.schema.json", - "TerraformSamples": [ - { - "ResourceType": "Microsoft.Advisor/recommendations/suppressions", - "Path": "samples/recommendations/suppressions/main.tf", - "Description": "A basic example of deploying Specifies a suppression for an Azure Advisor recommendation." - } - ] -} +{ + "$schema": "../../schemas/remarks.schema.json", + "TerraformSamples": [ + { + "ResourceType": "Microsoft.Advisor/recommendations/suppressions", + "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." + } + ] +} \ No newline at end of file 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..a36a9683 --- /dev/null +++ b/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep @@ -0,0 +1,11 @@ +param location string = 'westus' +param recommendationId string +param resourceName string = 'acctest0001' + +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..67f871e3 100644 --- a/settings/remarks/microsoft.alertsmanagement/samples/actionrules/main.bicep +++ b/settings/remarks/microsoft.alertsmanagement/samples/actionrules/main.bicep @@ -1,4 +1,5 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource actionRule 'Microsoft.AlertsManagement/actionRules@2021-08-08' = { name: resourceName @@ -11,8 +12,6 @@ resource actionRule 'Microsoft.AlertsManagement/actionRules@2021-08-08' = { ] description: '' enabled: true - scopes: [ - resourceGroup().id - ] + scopes: [] } } diff --git a/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep b/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep index 7c2efcf8..8342ea46 100644 --- a/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep +++ b/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep @@ -5,19 +5,19 @@ resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { name: resourceName location: 'global' properties: { - armRoleReceivers: [] - automationRunbookReceivers: [] - azureAppPushReceivers: [] - azureFunctionReceivers: [] emailReceivers: [] enabled: true - eventHubReceivers: [] groupShortName: 'acctestag' itsmReceivers: [] logicAppReceivers: [] - smsReceivers: [] voiceReceivers: [] webhookReceivers: [] + armRoleReceivers: [] + automationRunbookReceivers: [] + azureAppPushReceivers: [] + azureFunctionReceivers: [] + eventHubReceivers: [] + smsReceivers: [] } } @@ -26,13 +26,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' + DisableLocalAuth: false + SamplingPercentage: 100 publicNetworkAccessForQuery: 'Enabled' } } @@ -41,13 +41,6 @@ resource smartDetectorAlertRule 'microsoft.alertsManagement/smartDetectorAlertRu name: resourceName location: 'global' properties: { - actionGroups: { - customEmailSubject: '' - customWebhookPayload: '' - groupIds: [ - actionGroup.id - ] - } description: '' detector: { id: 'FailureAnomaliesDetector' @@ -58,5 +51,12 @@ resource smartDetectorAlertRule 'microsoft.alertsManagement/smartDetectorAlertRu ] severity: 'Sev0' state: 'Enabled' + actionGroups: { + customWebhookPayload: '' + groupIds: [ + actionGroup.id + ] + customEmailSubject: '' + } } } 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..ef3f4b22 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/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: { - 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@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { apiType: 'http' apiVersion: '' @@ -55,8 +39,8 @@ 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: { credentials: { instrumentationKey: component.properties.InstrumentationKey @@ -68,10 +52,26 @@ resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { } resource diagnostic 'Microsoft.ApiManagement/service/apis/diagnostics@2021-08-01' = { - parent: api name: 'applicationinsights' + parent: api properties: { loggerId: logger.id operationNameFormat: 'Name' } } + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + Application_Type: 'web' + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + SamplingPercentage: 100 + publicNetworkAccessForQuery: 'Enabled' + DisableIpMasking: false + RetentionInDays: 90 + publicNetworkAccessForIngestion: 'Enabled' + } +} diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep index c15f73f6..f4b5ff99 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/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' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -19,23 +23,19 @@ 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: { - apiRevisionDescription: '' apiType: 'http' - apiVersion: '' - apiVersionDescription: '' authenticationSettings: {} description: '' displayName: 'api1' + apiRevisionDescription: '' + apiVersion: '' + apiVersionDescription: '' path: 'api1' protocols: [ 'https' 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..44b75dbd 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep @@ -4,35 +4,31 @@ param location string = 'westus' resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-am' 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 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' @@ -40,19 +36,23 @@ resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { 'http' 'https' ] + subscriptionRequired: true + type: 'http' + apiRevisionDescription: '' + apiType: 'http' serviceUrl: 'https://example.com/foo/bar' subscriptionKeyParameterNames: { header: 'X-Butter-Robot-API-Key' query: 'location' } - subscriptionRequired: true - type: 'http' + apiVersionDescription: '' + authenticationSettings: {} } } 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..98f8748b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/policies/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/policies/main.bicep @@ -4,6 +4,10 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { @@ -19,36 +23,32 @@ 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: { + type: 'http' apiRevisionDescription: '' apiType: 'http' apiVersion: '' apiVersionDescription: '' - authenticationSettings: {} description: '' displayName: 'api1' path: 'api1' protocols: [ 'https' ] + authenticationSettings: {} 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..8606577b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep @@ -1,17 +1,21 @@ -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: { 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' @@ -19,36 +23,32 @@ 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: { - apiRevisionDescription: '' - apiType: 'http' - apiVersion: '' - apiVersionDescription: '' - authenticationSettings: {} - description: '' displayName: 'api1' - path: 'api1' protocols: [ 'https' ] serviceUrl: '' subscriptionRequired: true + apiType: 'http' + authenticationSettings: {} + description: '' + path: 'api1' type: 'http' + apiRevisionDescription: '' + apiVersion: '' + apiVersionDescription: '' } } 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..3c42f457 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: { + 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 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 type: 'http' + apiRevisionDescription: '' + authenticationSettings: {} + displayName: 'api1' + path: 'api1' + subscriptionRequired: true } } 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..526ec5a5 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep @@ -4,8 +4,11 @@ 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.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' @@ -18,35 +21,32 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { 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: {} displayName: 'api1' - path: 'api1' protocols: [ 'https' ] + path: 'api1' subscriptionRequired: true 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' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep index 079e3fb3..3dbc4c61 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep @@ -4,7 +4,12 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + name: 'Consumption' + capacity: 0 + } properties: { + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -17,17 +22,12 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } 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..b7ec2d02 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep @@ -9,7 +9,15 @@ param oauthClientSecret string 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' @@ -19,38 +27,30 @@ 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 authorizationServer 'Microsoft.ApiManagement/service/authorizationServers@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - authorizationEndpoint: 'https://azacceptance.hashicorptest.com/client/authorize' - authorizationMethods: [ - 'GET' - ] clientAuthenticationMethod: [] - clientId: null clientRegistrationEndpoint: 'https://azacceptance.hashicorptest.com/client/register' - clientSecret: null + clientSecret: '${oauthClientSecret}' defaultScope: '' - description: '' - displayName: 'Test Group' grantTypes: [ 'implicit' ] resourceOwnerPassword: '' - resourceOwnerUsername: '' supportState: false + authorizationMethods: [ + 'GET' + ] + clientId: '${oauthClientId}' + description: '' + displayName: 'Test Group' + resourceOwnerUsername: '' tokenBodyParameters: [] + authorizationEndpoint: 'https://azacceptance.hashicorptest.com/client/authorize' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/backends/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/backends/main.bicep index aa963401..95fb3074 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/backends/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/backends/main.bicep @@ -4,6 +4,10 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { @@ -19,15 +23,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 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..f674bbe2 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep @@ -1,23 +1,17 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource redis 'Microsoft.Cache/redis@2023-04-01' = { - name: resourceName - properties: { - enableNonSslPort: true - minimumTlsVersion: '1.2' - sku: { - capacity: 2 - family: 'C' - name: 'Standard' - } - } -} - 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.Backend.Protocols.Ssl30': 'false' @@ -28,21 +22,28 @@ 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' } } + +resource redis 'Microsoft.Cache/redis@2023-04-01' = { + name: resourceName + location: 'eastus' + properties: { + enableNonSslPort: true + minimumTlsVersion: '1.2' + sku: { + capacity: 2 + family: 'C' + name: 'Standard' + } + } +} diff --git a/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep index 9fa37d0f..c9981a55 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep @@ -1,10 +1,19 @@ -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.Backend.Protocols.Ssl30': 'false' @@ -13,21 +22,12 @@ 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 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..dc67aa9a 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep @@ -6,21 +6,26 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - Application_Type: 'web' DisableIpMasking: false + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' 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: { + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -33,26 +38,20 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 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: { credentials: { instrumentationKey: component.properties.InstrumentationKey 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..4fc94795 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep @@ -1,74 +1,74 @@ +@secure() +@description('The password for the certificate') +param certificatePassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The base64-encoded certificate data') param certificateData string -@secure() -@description('The password for the certificate') -param certificatePassword string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { + 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_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': '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.Backend.Protocols.Tls10': '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_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.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_RSA_WITH_AES_256_CBC_SHA': '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 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' + city: '' + countryOrRegion: '' } } } 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..b9439f10 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep @@ -4,42 +4,42 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + name: 'Developer' + capacity: 1 + } properties: { + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + '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.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.Protocols.Tls10': '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.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': '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.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_RSA_WITH_AES_128_CBC_SHA': 'false' } - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - 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,8 +61,8 @@ 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' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep index e8c528a7..67eec3fd 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: { + name: 'Developer' + capacity: 1 + } 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_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_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.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': '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_128_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.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' + certificates: [] } } resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - description: '' locationData: { - city: '' countryOrRegion: '' district: '' name: 'test' + city: '' } + description: '' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep index dd41d7a0..0d86305b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep @@ -4,46 +4,46 @@ 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.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.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_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_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_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': '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_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - 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' externalId: '' type: 'custom' + description: '' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep index 53ae60d6..4acd22b7 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.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.Backend.Protocols.Tls10': '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.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_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.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_RSA_WITH_AES_128_CBC_SHA': '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 type: 'twitter' + clientId: '${identityProviderClientId}' + clientSecret: '${identityProviderClientSecret}' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep index 5c044a15..9ca416ee 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/loggers/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 + Application_Type: 'web' publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false } } 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.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' @@ -35,15 +39,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 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 diff --git a/settings/remarks/microsoft.apimanagement/samples/service/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/main.bicep index 6d40bf73..2b39c5bc 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: { + 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.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.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': '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_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.TLS_ECDHE_ECDSA_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.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 - 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..21c4b3ac 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: { + 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 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..ca775dc0 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep @@ -1,16 +1,19 @@ +@secure() +@description('The client secret for the OpenID Connect provider') +param openidClientSecret string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The client ID for the OpenID Connect provider') param openidClientId string -@secure() -@description('The client secret for the OpenID Connect provider') -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' @@ -23,21 +26,18 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 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 + clientSecret: '${openidClientSecret}' description: '' displayName: 'Initial Name' metadataEndpoint: 'https://azacceptance.hashicorptest.com/example/foo' + clientId: '${openidClientId}' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep index b0ee6500..bae6ffd0 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_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': '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.Ciphers.TripleDes168': '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.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': '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_256_GCM_SHA384': '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..779b3c12 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep @@ -4,24 +4,28 @@ 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.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_ECDHE_ECDSA_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.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.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } @@ -31,21 +35,17 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 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: { - consentRequired: false enabled: false text: '' + consentRequired: false } } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep index f85e8ff6..1aa1454c 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/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.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,20 +23,16 @@ 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: '' } } 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..099b9aec 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep @@ -4,42 +4,42 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName 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 product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - description: '' - displayName: 'Test Product' state: 'notPublished' subscriptionRequired: false terms: '' + description: '' + displayName: 'Test Product' } } 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..d4a1ef50 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/tags/main.bicep @@ -4,7 +4,13 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -16,18 +22,12 @@ 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 product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' displayName: 'Test Product' @@ -38,14 +38,14 @@ resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { } resource serviceTag 'Microsoft.ApiManagement/service/tags@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - displayName: 'acctest0001' + displayName: '${resourceName}' } } 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..000547bc 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep @@ -1,36 +1,34 @@ -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: { - 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 schema 'Microsoft.ApiManagement/service/schemas@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - description: '' - schemaType: 'xml' value: ''' @@ -53,5 +51,7 @@ resource schema 'Microsoft.ApiManagement/service/schemas@2021-08-01' = { ''' + 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..6cbdb991 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.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.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.Protocols.Tls11': '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_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.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': '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' } } 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: { + description: '' + displayName: 'Test Product' + state: 'published' + subscriptionRequired: true + terms: '' + } +} diff --git a/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep index bcdae209..c6d358b6 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep @@ -1,11 +1,14 @@ -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: { + name: 'Consumption' + capacity: 0 + } 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..b2903f08 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: { + 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.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_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.Backend.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_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.Protocols.Tls11': '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_256_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 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..8b42b784 100644 --- a/settings/remarks/microsoft.app/samples/containerapps/main.bicep +++ b/settings/remarks/microsoft.app/samples/containerapps/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { name: resourceName @@ -8,11 +8,9 @@ resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { configuration: { activeRevisionsMode: 'Single' } - managedEnvironmentId: managedEnvironment.id template: { containers: [ { - env: [] image: 'jackofallops/azure-containerapps-python-acctest:v0.0.1' name: 'acctest-cont-230630032906865620' probes: [] @@ -22,6 +20,7 @@ resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { memory: '0.5Gi' } volumeMounts: [] + env: [] } ] scale: { @@ -39,7 +38,6 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } } @@ -51,6 +49,9 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { + workspaceCapping: { + dailyQuotaGb: -1 + } features: { disableLocalAuth: false enableLogAccessUsingOnlyResourcePermissions: true @@ -61,8 +62,5 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { 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..9b201470 100644 --- a/settings/remarks/microsoft.app/samples/jobs/main.bicep +++ b/settings/remarks/microsoft.app/samples/jobs/main.bicep @@ -7,18 +7,17 @@ resource job 'Microsoft.App/jobs@2025-01-01' = { properties: { configuration: { manualTriggerConfig: { - parallelism: 4 replicaCompletionCount: 1 + parallelism: 4 } replicaRetryLimit: 10 replicaTimeout: 10 triggerType: 'Manual' } - environmentId: managedEnvironment.id template: { + volumes: [] containers: [ { - env: [] image: 'jackofallops/azure-containerapps-python-acctest:v0.0.1' name: 'testcontainerappsjob0' probes: [] @@ -27,10 +26,10 @@ resource job 'Microsoft.App/jobs@2025-01-01' = { memory: '1Gi' } volumeMounts: [] + env: [] } ] initContainers: [] - volumes: [] } } } @@ -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..dce19cb4 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 } } @@ -40,11 +39,11 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { } 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..49658a2a 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/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 } } @@ -20,6 +19,9 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { + workspaceCapping: { + dailyQuotaGb: -1 + } features: { disableLocalAuth: false enableLogAccessUsingOnlyResourcePermissions: true @@ -30,20 +32,17 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { sku: { name: 'PerGB2018' } - workspaceCapping: { - dailyQuotaGb: -1 - } } } resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-03-01' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { + version: 'v1' componentType: 'state.azure.blobstorage' ignoreErrors: false initTimeout: '5s' scopes: null - version: 'v1' } } diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep index 9e0a93f6..bba52e05 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 } } @@ -20,6 +19,12 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { + sku: { + name: 'PerGB2018' + } + workspaceCapping: { + dailyQuotaGb: -1 + } features: { disableLocalAuth: false enableLogAccessUsingOnlyResourcePermissions: true @@ -27,18 +32,12 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 - sku: { - name: 'PerGB2018' - } - workspaceCapping: { - dailyQuotaGb: -1 - } } } 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..ed67c51f 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/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 @@ -35,3 +20,17 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { } } } + +resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { + name: resourceName + location: location + properties: { + appLogsConfiguration: { + logAnalyticsConfiguration: { + 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..0ef79761 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { name: resourceName @@ -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 } } @@ -19,10 +18,11 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-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 @@ -37,18 +37,17 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } + accessTier: 'Hot' + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowBlobPublicAccess: true } tags: { environment: 'accTest' @@ -59,6 +58,12 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { + sku: { + name: 'PerGB2018' + } + workspaceCapping: { + dailyQuotaGb: -1 + } features: { disableLocalAuth: false enableLogAccessUsingOnlyResourcePermissions: true @@ -66,24 +71,18 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 - sku: { - name: 'PerGB2018' - } - workspaceCapping: { - dailyQuotaGb: -1 - } } } resource storage 'Microsoft.App/managedEnvironments/storages@2022-03-01' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { azureFile: { + shareName: 'testsharehkez7' accessMode: 'ReadWrite' accountKey: storageAccount.listKeys().keys[0].value - accountName: storageAccount.properties.name - shareName: 'testsharehkez7' + accountName: storageAccount.name } } } diff --git a/settings/remarks/microsoft.appconfiguration/samples/configurationstores/main.bicep b/settings/remarks/microsoft.appconfiguration/samples/configurationstores/main.bicep index e443bc1f..d2041a6b 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 + sku: { + name: 'standard' + } properties: { disableLocalAuth: false enablePurgeProtection: false } - sku: { - name: 'standard' - } } 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..9df2da1a 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' - properties: { - gatewayIds: [] - httpsOnly: false - public: false - } + parent: spring sku: { + tier: 'Enterprise' capacity: 1 name: 'E0' - tier: 'Enterprise' + } + properties: { + httpsOnly: false + public: false + gatewayIds: [] } } 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..1a145ec2 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep @@ -4,33 +4,33 @@ 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: '' gitRepository: { + gitTag: '' + url: 'https://github.com/Azure-Samples/piggymetrics' authSetting: { authType: 'Public' } branch: 'master' commit: '' - gitTag: '' - url: 'https://github.com/Azure-Samples/piggymetrics' } iconUrl: '' } 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..667b579a 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep @@ -1,15 +1,15 @@ -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: 'S0' } + properties: { + zoneRedundant: false + } } resource redis 'Microsoft.Cache/redis@2023-04-01' = { @@ -27,9 +27,9 @@ resource redis 'Microsoft.Cache/redis@2023-04-01' = { } resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { - parent: spring name: resourceName location: location + parent: spring properties: { customPersistentDisks: [] enableEndToEndTLS: false @@ -38,13 +38,13 @@ resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { } 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 } } 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..2b6c9df7 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,8 +24,13 @@ 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: {} @@ -41,9 +46,4 @@ resource deployment 'Microsoft.AppPlatform/Spring/apps/deployments@2023-05-01-pr 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..99d8ce01 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apps/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apps/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 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..a91811bc 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 @@ -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 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..eef01af6 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/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: {} } 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..f2cd6301 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/configurationservices/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/configurationservices/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 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..701e1f08 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/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 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: { features: { applicationAccelerator: { 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..6251607d 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: { + tier: 'Enterprise' 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..91d5a21f 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,26 +24,26 @@ 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' routes: [] ssoEnabled: false + 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..4d6e3fe5 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep @@ -4,24 +4,36 @@ 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: { - accessTier: 'Hot' + isNfsV3Enabled: false + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true defaultToOAuthAuthentication: false + isHnsEnabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + accessTier: 'Hot' encryption: { keySource: 'Microsoft.Storage' services: { @@ -33,27 +45,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_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 storageType: 'StorageAccount' + accountKey: storageAccount.listKeys().keys[0].value } } diff --git a/settings/remarks/microsoft.attestation/samples/attestationproviders/main.bicep b/settings/remarks/microsoft.attestation/samples/attestationproviders/main.bicep index 945985a0..3dbe0d72 100644 --- a/settings/remarks/microsoft.attestation/samples/attestationproviders/main.bicep +++ b/settings/remarks/microsoft.attestation/samples/attestationproviders/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource attestationProvider 'Microsoft.Attestation/attestationProviders@2020-10-01' = { name: resourceName diff --git a/settings/remarks/microsoft.authorization/samples/locks/main.bicep b/settings/remarks/microsoft.authorization/samples/locks/main.bicep index 01847652..9ecbaf8f 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: '' - } -} - 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..58417c9f 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,7 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { name: resourceName properties: { + policyType: 'Custom' description: '' displayName: 'my-policy-definition' mode: 'All' @@ -41,13 +43,12 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } 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..f38b2427 100644 --- a/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep @@ -1,6 +1,7 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { name: resourceName @@ -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..80305494 100644 --- a/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep @@ -1,14 +1,26 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' + +resource policyExemption 'Microsoft.Authorization/policyExemptions@2020-07-01-preview' = { + name: resourceName + scope: subscription() + properties: { + exemptionCategory: 'Mitigated' + policyAssignmentId: policyAssignment.id + policyDefinitionReferenceIds: [] + } +} resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' = { name: resourceName + location: 'westeurope' + scope: subscription() properties: { + scope: subscription().id displayName: '' enforcementMode: 'Default' - policyDefinitionId: policyDefinition.id - scope: subscription().id } } @@ -21,9 +33,9 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' parameters: { allowedLocations: { metadata: { + strongType: 'location' description: 'The list of allowed locations for resources.' displayName: 'Allowed locations' - strongType: 'location' } type: 'Array' } @@ -32,7 +44,7 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } then: { @@ -42,12 +54,3 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' policyType: 'Custom' } } - -resource policyExemption 'Microsoft.Authorization/policyExemptions@2020-07-01-preview' = { - name: resourceName - properties: { - exemptionCategory: 'Mitigated' - policyAssignmentId: policyAssignment.id - policyDefinitionReferenceIds: [] - } -} diff --git a/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep index 9dd7d3ef..f24bd46a 100644 --- a/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep @@ -1,35 +1,36 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'westus' 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' parameters: { allowedLocations: { metadata: { - description: 'The list of allowed locations for resources.' displayName: 'Allowed locations' strongType: 'location' + description: 'The list of allowed locations for resources.' } type: 'Array' } } - policyRule: { - if: { - not: { - field: 'location' - in: '[parameters(\'allowedLocations\')]' - } - } - then: { - effect: 'audit' - } - } - policyType: 'Custom' } } @@ -37,7 +38,7 @@ resource policySetDefinition 'Microsoft.Authorization/policySetDefinitions@2025- name: 'acctestpolset-${resourceName}' properties: { description: '' - displayName: 'acctestpolset-acctest0001' + displayName: 'acctestpolset-${resourceName}' parameters: { allowedLocations: { metadata: { @@ -50,14 +51,14 @@ resource policySetDefinition 'Microsoft.Authorization/policySetDefinitions@2025- } policyDefinitions: [ { + policyDefinitionId: policyDefinition.id + policyDefinitionReferenceId: '' 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..01a63b3c 100644 --- a/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep @@ -1,6 +1,7 @@ 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' @@ -11,15 +12,15 @@ resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-prev description: '' permissions: [ { + notDataActions: [] actions: [ '*' ] dataActions: [] notActions: [] - notDataActions: [] } ] - roleName: 'acctest0001' + roleName: resourceName type: 'CustomRole' } } diff --git a/settings/remarks/microsoft.automanage/samples/configurationprofiles/main.bicep b/settings/remarks/microsoft.automanage/samples/configurationprofiles/main.bicep index c9c9fb65..ee5285a4 100644 --- a/settings/remarks/microsoft.automanage/samples/configurationprofiles/main.bicep +++ b/settings/remarks/microsoft.automanage/samples/configurationprofiles/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource configurationProfile 'Microsoft.Automanage/configurationProfiles@2022-05-04' = { name: 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..3ad5d005 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/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 configuration 'Microsoft.Automation/automationAccounts/configurations@2022-08-08' = { - parent: automationAccount name: resourceName location: location + parent: automationAccount properties: { description: 'test' logVerbose: false diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep index d8df2325..643e2339 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 + ApplicationId: servicePrincipalApplicationId CertificateThumbprint: '''AEB97B81A68E8988850972916A8B8B6CD8F39813 ''' SubscriptionId: subscription().subscriptionId - TenantId: deployer().tenantId + TenantId: tenant().tenantId } } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep index 192e8d59..7b1ea389 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = { name: resourceName @@ -16,8 +16,8 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } 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..6b05cb52 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep @@ -8,22 +8,22 @@ 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 credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { - description: '' - password: null userName: 'test_user' + description: '' + password: '${automationCredentialPassword}' } } 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..38a64db0 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep @@ -11,35 +11,13 @@ 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 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 - } - } - } - ] } } @@ -47,10 +25,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - additionalCapabilities: {} - applicationProfile: { - galleryApplications: [] - } diagnosticsProfile: { bootDiagnostics: { enabled: false @@ -72,10 +46,9 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { disablePasswordAuthentication: false patchSettings: { @@ -88,6 +61,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } } secrets: [] + adminPassword: vmAdminPassword } priority: 'Regular' storageProfile: { @@ -99,15 +73,19 @@ 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 } } + additionalCapabilities: {} + applicationProfile: { + galleryApplications: [] + } } } @@ -127,40 +105,57 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } } -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 - } + parent: automationAccount } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { + serviceEndpointPolicies: [] + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] + } +} + +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: {} + } + } + ] + } +} + +resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { + name: resourceName + parent: automationAccount + properties: { + description: '' + password: '${automationWorkerPassword}' + userName: 'test_user' } } resource hybridRunbookWorker 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups/hybridRunbookWorkers@2021-06-22' = { - parent: hybridRunbookWorkerGroup name: 'c7714056-5ba8-4bbe-920e-2993171164eb' + parent: hybridRunbookWorkerGroup properties: { vmResourceId: virtualMachine.id } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep index 07bf40b6..a0441027 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep @@ -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 userName: 'test_user' + description: '' + password: '${credentialPassword}' } } 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/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/main.bicep index a0e7dac9..e22b9fd8 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/main.bicep @@ -5,12 +5,12 @@ 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' - } } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep index d664d2d8..c5c6cd00 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: { + sku: { + name: 'Basic' + } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true - sku: { - name: 'Basic' - } } } 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..b05aa278 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep @@ -16,9 +16,9 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } 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..3456a2f3 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep @@ -16,15 +16,15 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } 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: {} logActivityTrace: 0 logProgress: true logVerbose: true runbookType: 'PowerShell' + description: 'This is a test runbook for terraform acceptance test' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep index bf571ec0..be877f21 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep @@ -1,23 +1,23 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' 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..53bb8561 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep @@ -1,23 +1,23 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' 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 softwareUpdateConfiguration 'Microsoft.Automation/automationAccounts/softwareUpdateConfigurations@2019-06-01' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { scheduleInfo: { description: '' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep index 5a18a7a3..c8104778 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 + branch: 'master' + folderPath: '/' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep index b64904b1..9d739cba 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep @@ -1,26 +1,26 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' 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 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..0d284818 100644 --- a/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep +++ b/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep @@ -4,14 +4,14 @@ param location string = 'centralus' resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { name: resourceName location: location + sku: { + name: 'av36' + } properties: { - internet: 'Disabled' managementCluster: { clusterSize: 3 } networkBlock: '192.168.48.0/22' - } - sku: { - name: 'av36' + internet: 'Disabled' } } 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..4adaac13 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep @@ -1,32 +1,32 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { name: resourceName location: location properties: { + poolAllocationMode: 'BatchService' + 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: { - accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -42,23 +42,22 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { isNfsV3Enabled: false isSftpEnabled: false minimumTlsVersion: 'TLS1_2' + accessTier: 'Hot' + defaultToOAuthAuthentication: false 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..39587855 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep @@ -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/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/main.bicep index 7d5bccd0..884b8da7 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/main.bicep @@ -5,10 +5,10 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' encryption: { keySource: 'Microsoft.Batch' } poolAllocationMode: 'BatchService' - publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep index f4661451..bc25c22a 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { name: resourceName @@ -14,12 +14,30 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { } resource pool 'Microsoft.Batch/batchAccounts/pools@2022-10-01' = { - parent: batchAccount name: resourceName + parent: batchAccount properties: { + displayName: '' + interNodeCommunication: 'Enabled' + scaleSettings: { + fixedScale: { + targetLowPriorityNodes: 0 + nodeDeallocationOption: '' + resizeTimeout: 'PT15M' + targetDedicatedNodes: 1 + } + } + taskSlotsPerNode: 1 + metadata: [] + vmSize: 'STANDARD_A1' certificates: null deploymentConfiguration: { virtualMachineConfiguration: { + osDisk: { + ephemeralOSDiskSettings: { + placement: '' + } + } imageReference: { offer: 'UbuntuServer' publisher: 'Canonical' @@ -27,25 +45,7 @@ resource pool 'Microsoft.Batch/batchAccounts/pools@2022-10-01' = { version: 'latest' } nodeAgentSkuId: 'batch.node.ubuntu 18.04' - osDisk: { - ephemeralOSDiskSettings: { - placement: '' - } - } - } - } - displayName: '' - interNodeCommunication: 'Enabled' - metadata: [] - scaleSettings: { - fixedScale: { - nodeDeallocationOption: '' - resizeTimeout: 'PT15M' - targetDedicatedNodes: 1 - targetLowPriorityNodes: 0 } } - taskSlotsPerNode: 1 - vmSize: 'STANDARD_A1' } } diff --git a/settings/remarks/microsoft.billing/remarks.json b/settings/remarks/microsoft.billing/remarks.json index 58191af5..3071a2a7 100644 --- a/settings/remarks/microsoft.billing/remarks.json +++ b/settings/remarks/microsoft.billing/remarks.json @@ -1,10 +1,17 @@ -{ - "$schema": "../../schemas/remarks.schema.json", - "TerraformSamples": [ - { - "ResourceType": "Microsoft.Billing/billingAccounts/billingProfiles", - "Path": "samples/billingaccounts/billingprofiles/main.tf", - "Description": "A basic example of deploying Billing Accounts Billing Profiles." - } - ] -} +{ + "$schema": "../../schemas/remarks.schema.json", + "TerraformSamples": [ + { + "ResourceType": "Microsoft.Billing/billingAccounts/billingProfiles", + "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." + } + ] +} \ No newline at end of file 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..de243b23 --- /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: { + billTo: { + city: 'Redmond' + companyName: 'TestCompany' + country: 'US' + isValidAddress: true + postalCode: '12345-1234' + region: 'WA' + addressLine1: 'TestWay' + } + displayName: '${resourceName}' + enabledAzurePlans: [ + { + skuId: '0001' + } + ] + shipTo: { + companyName: 'TestCompany' + country: 'US' + isValidAddress: true + postalCode: '12345-1234' + region: 'WA' + addressLine1: 'TestWay' + city: 'Redmond' + } + } +} diff --git a/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep b/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep index 2b1fa1b6..4cd40253 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: { + developerAppInsightsApplicationId: '' + displayName: '${resourceName}' + isStreamingSupported: false + msaAppId: '12345678-1234-1234-1234-123456789012' 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' } } 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..66b8772a 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: { + msaAppId: clientId developerAppInsightKey: '' + displayName: resourceName + luisKey: '' 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..6e816e11 100644 --- a/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep @@ -23,8 +23,8 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { } 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..f25e7432 100644 --- a/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep @@ -8,16 +8,16 @@ resource redis 'Microsoft.Cache/redis@2023-04-01' = { enableNonSslPort: true minimumTlsVersion: '1.2' sku: { + name: 'Standard' capacity: 2 family: 'C' - name: 'Standard' } } } resource accessPolicyAssignment 'Microsoft.Cache/redis/accessPolicyAssignments@2024-03-01' = { - parent: redis name: resourceName + parent: redis properties: { accessPolicyName: 'Data Contributor' objectId: deployer().objectId diff --git a/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep b/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep index 7785eb12..dc601571 100644 --- a/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep @@ -1,12 +1,10 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource redis 'Microsoft.Cache/redis@2024-11-01' = { name: resourceName location: location properties: { - disableAccessKeyAuthentication: false - enableNonSslPort: false minimumTlsVersion: '1.2' publicNetworkAccess: 'Enabled' redisConfiguration: { @@ -17,16 +15,18 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { } redisVersion: '6.0' sku: { + name: 'Premium' capacity: 1 family: 'P' - name: 'Premium' } + disableAccessKeyAuthentication: false + enableNonSslPort: false } } 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' 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..9f17bbde --- /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: { + 'maxmemory-delta': '642' + 'maxmemory-policy': 'allkeys-lru' + 'maxmemory-reserved': '642' + 'preferred-data-persistence-auth-method': '' + } + redisVersion: '6' + sku: { + capacity: 1 + family: 'P' + name: 'Premium' + } + } +} + +resource linkedServer 'Microsoft.Cache/redis/linkedServers@2024-11-01' = { + name: '${resourceName}-secondary' + parent: redisPrimary + properties: { + linkedRedisCacheId: redisSecondary.id + linkedRedisCacheLocation: location + serverRole: 'Secondary' + } +} + +resource redisSecondary 'Microsoft.Cache/redis@2024-11-01' = { + name: '${resourceName}-secondary' + 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' + } + } +} 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..2405ab0f --- /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: { + location: location + resourceName: resourceName + } +} diff --git a/settings/remarks/microsoft.cache/samples/redis/main.bicep b/settings/remarks/microsoft.cache/samples/redis/main.bicep index b4171f1a..7d269276 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 diff --git a/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep b/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep index 332151c3..dcefc4b2 100644 --- a/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep @@ -4,19 +4,19 @@ 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: { clientProtocol: 'Encrypted' clusteringPolicy: 'OSSCluster' 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..a8031f48 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 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' } 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..aecc6fcc 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep @@ -1,48 +1,49 @@ 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: { + sessionAffinityState: 'Enabled' + 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 + enabledState: 'Enabled' + httpPort: 80 originHostHeader: 'www.contoso.com' priority: 1 weight: 1 @@ -50,8 +51,8 @@ resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2021-06-01' = { } resource route 'Microsoft.Cdn/profiles/afdEndpoints/routes@2021-06-01' = { - parent: afdEndpoint name: resourceName + parent: afdEndpoint properties: { enabledState: 'Enabled' forwardingProtocol: 'MatchRequest' diff --git a/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep index 96d9bbca..cb9c5ff3 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 resourceName string = 'acctest0001' - -resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { - name: '${resourceName}.com' - location: 'global' -} +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 + } } 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' + certificateType: 'ManagedCertificate' } } } + +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..6b741f18 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep @@ -1,19 +1,20 @@ 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 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..d2fb1e1b 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/origins/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/origins/main.bicep @@ -1,19 +1,20 @@ 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 @@ -26,16 +27,16 @@ resource originGroup 'Microsoft.Cdn/profiles/originGroups@2021-06-01' = { } resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2021-06-01' = { - parent: originGroup name: resourceName + parent: originGroup properties: { + httpPort: 80 + priority: 1 enabledState: 'Enabled' enforceCertificateNameCheck: false hostName: 'contoso.com' - httpPort: 80 httpsPort: 443 originHostHeader: 'www.contoso.com' - priority: 1 weight: 1 } } 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..6c1f7fb9 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,67 @@ 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' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource originGroup 'Microsoft.Cdn/profiles/originGroups@2024-09-01' = { - parent: profile name: '${resourceName}-origingroup' + parent: profile properties: { + sessionAffinityState: 'Enabled' + trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 loadBalancingSettings: { additionalLatencyInMilliseconds: 0 sampleSize: 16 successfulSamplesRequired: 3 } - sessionAffinityState: 'Enabled' - trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 } } 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' + parent: originGroup properties: { + priority: 1 + weight: 1 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: { + order: 1 actions: [ { name: 'RouteConfigurationOverride' parameters: { cacheConfiguration: { + queryParameters: 'clientIp={client_ip}' + queryStringCachingBehavior: 'IgnoreSpecifiedQueryStrings' cacheBehavior: 'OverrideIfOriginMissing' cacheDuration: '23:59:59' isCompressionEnabled: 'Disabled' - queryParameters: 'clientIp={client_ip}' - queryStringCachingBehavior: 'IgnoreSpecifiedQueryStrings' } originGroupOverride: { forwardingProtocol: 'HttpsOnly' @@ -72,6 +75,5 @@ resource rule 'Microsoft.Cdn/profiles/ruleSets/rules@2024-09-01' = { ] conditions: [] matchProcessingBehavior: 'Continue' - order: 1 } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep index 59c3d517..7a587857 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep @@ -1,36 +1,19 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' -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: [ - { - action: 'Block' - enabledState: 'Enabled' - matchConditions: [ - { - matchValue: [ - '192.168.1.0/24' - '10.0.0.0/24' - ] - matchVariable: 'RemoteAddr' - negateCondition: false - operator: 'IPMatch' - } - ] - name: 'Rule1' - priority: 1 - rateLimitDurationInMinutes: 1 - rateLimitThreshold: 10 - ruleType: 'MatchRule' - } - ] - } managedRules: { managedRuleSets: [ { + ruleSetAction: 'Block' + ruleSetType: 'DefaultRuleSet' + ruleSetVersion: 'preview-0.1' ruleGroupOverrides: [ { ruleGroupName: 'PHP' @@ -43,9 +26,6 @@ resource frontdoorwebapplicationfirewallpolicy 'Microsoft.Network/FrontDoorWebAp ] } ] - ruleSetAction: 'Block' - ruleSetType: 'DefaultRuleSet' - ruleSetVersion: 'preview-0.1' } { ruleSetAction: 'Block' @@ -61,9 +41,30 @@ resource frontdoorwebapplicationfirewallpolicy 'Microsoft.Network/FrontDoorWebAp mode: 'Prevention' redirectUrl: 'https://www.fabrikam.com' } - } - sku: { - name: 'Premium_AzureFrontDoor' + customRules: { + rules: [ + { + enabledState: 'Enabled' + rateLimitDurationInMinutes: 1 + rateLimitThreshold: 10 + ruleType: 'MatchRule' + matchConditions: [ + { + operator: 'IPMatch' + matchValue: [ + '192.168.1.0/24' + '10.0.0.0/24' + ] + matchVariable: 'RemoteAddr' + negateCondition: false + } + ] + name: 'Rule1' + priority: 1 + action: 'Block' + } + ] + } } } @@ -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,10 +100,13 @@ 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: { + wafPolicy: { + id: frontDoorWebApplicationFirewallPolicy.id + } associations: [ { domains: [ @@ -116,9 +120,6 @@ resource securityPolicy 'Microsoft.Cdn/profiles/securityPolicies@2021-06-01' = { } ] type: 'WebApplicationFirewall' - wafPolicy: { - 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..97a5f03a 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: { - autoRenew: true distinguishedName: 'CN=example.com' keySize: 2048 productType: 'StandardDomainValidatedSsl' validityInYears: 1 + autoRenew: true } } diff --git a/settings/remarks/microsoft.codesigning/samples/codesigningaccounts/main.bicep b/settings/remarks/microsoft.codesigning/samples/codesigningaccounts/main.bicep index 6fc40d4d..89ad9f77 100644 --- a/settings/remarks/microsoft.codesigning/samples/codesigningaccounts/main.bicep +++ b/settings/remarks/microsoft.codesigning/samples/codesigningaccounts/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource codeSigningAccount 'Microsoft.CodeSigning/codeSigningAccounts@2024-09-30-preview' = { name: resourceName diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep index a8ce9a6c..70341004 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep @@ -1,28 +1,28 @@ -param resourceName string = 'acctest0003' param location string = 'eastus' +param resourceName string = 'acctest0003' 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 + dynamicThrottlingEnabled: 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' diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep index f5ae4140..c11e1855 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep @@ -4,6 +4,10 @@ param location string = 'westus2' resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { name: resourceName location: location + sku: { + name: 'S0' + tier: 'Standard' + } kind: 'SpeechServices' properties: { allowedFqdnList: [] @@ -14,10 +18,6 @@ resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false } - sku: { - name: 'S0' - tier: 'Standard' - } } resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep index 9c0ebd8c..d7b103d5 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: { + publicNetworkAccess: 'Enabled' + 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: { description: 'test project' - displayName: 'project-acctest0001' + displayName: 'project-${resourceName}' } } diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep index de03fb57..387e3beb 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: [] } } 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..1a37755e 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,14 +14,11 @@ 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: [ diff --git a/settings/remarks/microsoft.communication/samples/communicationservices/main.bicep b/settings/remarks/microsoft.communication/samples/communicationservices/main.bicep index df28431d..aecb9e5d 100644 --- a/settings/remarks/microsoft.communication/samples/communicationservices/main.bicep +++ b/settings/remarks/microsoft.communication/samples/communicationservices/main.bicep @@ -1,4 +1,5 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource communicationService 'Microsoft.Communication/communicationServices@2023-03-31' = { name: resourceName diff --git a/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep b/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep index f41783c0..6a559db2 100644 --- a/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep +++ b/settings/remarks/microsoft.communication/samples/emailservices/domains/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' 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..798aad02 100644 --- a/settings/remarks/microsoft.compute/samples/availabilitysets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/availabilitysets/main.bicep @@ -1,14 +1,14 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' 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/diskencryptionsets/main.bicep b/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep index bcc6162e..aa2ac550 100644 --- a/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep @@ -5,14 +5,11 @@ resource diskEncryptionSet 'Microsoft.Compute/diskEncryptionSets@2022-03-02' = { name: resourceName location: location properties: { + rotationToLatestKeyVersionEnabled: false activeKey: { - keyUrl: key.properties.keyUriWithVersion - sourceVault: { - id: vault.id - } + sourceVault: {} } encryptionType: 'EncryptionAtRestWithCustomerKey' - rotationToLatestKeyVersionEnabled: false } } @@ -20,20 +17,21 @@ 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: { + kty: 'RSA' keyOps: [ 'encrypt' 'decrypt' @@ -43,6 +41,5 @@ resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { 'unwrapKey' ] keySize: 2048 - kty: 'RSA' } } diff --git a/settings/remarks/microsoft.compute/samples/disks/main.bicep b/settings/remarks/microsoft.compute/samples/disks/main.bicep index 9da32a6f..7983a4b7 100644 --- a/settings/remarks/microsoft.compute/samples/disks/main.bicep +++ b/settings/remarks/microsoft.compute/samples/disks/main.bicep @@ -4,7 +4,11 @@ param location string = 'westeurope' resource disk 'Microsoft.Compute/disks@2022-03-02' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } properties: { + publicNetworkAccess: 'Enabled' creationData: { createOption: 'Empty' } @@ -14,9 +18,5 @@ resource disk 'Microsoft.Compute/disks@2022-03-02' = { } networkAccessPolicy: 'AllowAll' osType: '' - publicNetworkAccess: 'Enabled' - } - sku: { - name: 'Standard_LRS' } } 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..fe79fb64 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep @@ -12,13 +12,30 @@ resource gallery 'Microsoft.Compute/galleries@2022-03-03' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: '${resourceName}acc' location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + isLocalUserEnabled: true + minimumTlsVersion: 'TLS1_2' + isNfsV3Enabled: false + isSftpEnabled: false + publicNetworkAccess: 'Enabled' accessTier: 'Hot' - allowBlobPublicAccess: true + defaultToOAuthAuthentication: false + isHnsEnabled: false + supportsHttpsTrafficOnly: true allowCrossTenantReplication: false allowSharedKeyAccess: true - defaultToOAuthAuthentication: false + networkAcls: { + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + } + allowBlobPublicAccess: true dnsEndpointType: 'Standard' encryption: { keySource: 'Microsoft.Storage' @@ -31,79 +48,61 @@ 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 + parent: gallery 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 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]' - update: '' - } source: { defaultConfigurationLink: '' mediaLink: 'https://${storageAccount.name}.blob.core.windows.net/mycontainer/myblob' } targetRegions: [ { - name: 'westus' + name: location regionalReplicaCount: 1 storageAccountType: 'Standard_LRS' } ] + enableHealthCheck: false + excludeFromLatest: false + manageActions: { + install: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + remove: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + update: '' + } } safetyProfile: { 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..da1c9ea5 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep @@ -10,29 +10,29 @@ 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: [] + recommended: { + memory: {} + vCPUs: {} } + releaseNoteUri: '' + architecture: 'x64' features: null - hyperVGeneration: 'V1' identifier: { offer: 'AccTesOffer230630032848825313' publisher: 'AccTesPublisher230630032848825313' sku: 'AccTesSku230630032848825313' } - osState: 'Generalized' - osType: 'Linux' privacyStatementUri: '' - recommended: { - memory: {} - vCPUs: {} + description: '' + disallowed: { + diskTypes: [] } - releaseNoteUri: '' + hyperVGeneration: 'V1' + osState: 'Generalized' + osType: 'Linux' } } diff --git a/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep b/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep index 7d01a4fb..46d003d3 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: { + platformFaultDomain: 1 autoReplaceOnFailure: true licenseType: 'None' - platformFaultDomain: 1 - } - sku: { - name: 'DSv3-Type1' } } diff --git a/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep b/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep index 1963c586..c5bb65e5 100644 --- a/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep +++ b/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep @@ -5,8 +5,6 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { name: resourceName location: location properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false ipConfigurations: [ { name: 'internal' @@ -14,12 +12,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 +25,7 @@ resource restorePointCollection 'Microsoft.Compute/restorePointCollections@2024- name: resourceName location: location properties: { - source: { - id: virtualMachine.id - } + source: {} } } @@ -37,7 +33,27 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: resourceName location: location properties: { + priority: 'Regular' + storageProfile: { + osDisk: { + osType: 'Linux' + writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' + managedDisk: { + storageAccountType: 'Standard_LRS' + } + } + dataDisks: [] + imageReference: { + offer: '0001-com-ubuntu-server-jammy' + publisher: 'Canonical' + sku: '22_04-lts' + version: 'latest' + } + } additionalCapabilities: {} + extensionsTimeBudget: 'PT1H30M' applicationProfile: { galleryApplications: [] } @@ -47,7 +63,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { storageUri: '' } } - extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_F2' } @@ -64,14 +79,8 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { osProfile: { adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { - disablePasswordAuthentication: true - patchSettings: { - assessmentMode: 'ImageDefault' - patchMode: 'ImageDefault' - } - provisionVMAgent: true ssh: { publicKeys: [ { @@ -80,27 +89,14 @@ 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' + disablePasswordAuthentication: true + patchSettings: { + patchMode: 'ImageDefault' + assessmentMode: 'ImageDefault' } - osType: 'Linux' - writeAcceleratorEnabled: false + provisionVMAgent: true } + secrets: [] } } } @@ -123,15 +119,15 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] addressPrefix: '10.0.0.0/24' defaultOutboundAccess: true delegations: [] privateEndpointNetworkPolicies: 'Disabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep b/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep index 79442794..2696c261 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,41 +13,11 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: '${resourceName}-vm' location: location properties: { - additionalCapabilities: {} - applicationProfile: { - galleryApplications: [] - } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - extensionsTimeBudget: 'PT1H30M' - hardwareProfile: { - vmSize: 'Standard_F2' - } - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: true - } - } - ] - } osProfile: { adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001-vm' + computerName: '${resourceName}-vm' linuxConfiguration: { - disablePasswordAuthentication: true - patchSettings: { - assessmentMode: 'ImageDefault' - patchMode: 'ImageDefault' - } - provisionVMAgent: true ssh: { publicKeys: [ { @@ -80,6 +26,12 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } ] } + disablePasswordAuthentication: true + patchSettings: { + assessmentMode: 'ImageDefault' + patchMode: 'ImageDefault' + } + provisionVMAgent: true } secrets: [] } @@ -87,21 +39,45 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { storageProfile: { dataDisks: [] imageReference: { + version: 'latest' 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 + caching: 'ReadWrite' + } + } + applicationProfile: { + galleryApplications: [] + } + extensionsTimeBudget: 'PT1H30M' + networkProfile: { + networkInterfaces: [ + { + properties: { + primary: true + } + id: networkInterface.id + } + ] + } + additionalCapabilities: {} + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' } } + hardwareProfile: { + vmSize: 'Standard_F2' + } } } @@ -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' + } +} + +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: {} + } + } + ] } } diff --git a/settings/remarks/microsoft.compute/samples/snapshots/main.bicep b/settings/remarks/microsoft.compute/samples/snapshots/main.bicep index a79e0b2c..3008c7ff 100644 --- a/settings/remarks/microsoft.compute/samples/snapshots/main.bicep +++ b/settings/remarks/microsoft.compute/samples/snapshots/main.bicep @@ -1,9 +1,12 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource disk 'Microsoft.Compute/disks@2023-04-02' = { name: '${resourceName}disk' location: location + sku: { + name: 'Standard_LRS' + } properties: { creationData: { createOption: 'Empty' @@ -17,9 +20,6 @@ resource disk 'Microsoft.Compute/disks@2023-04-02' = { optimizedForFrequentAttach: false publicNetworkAccess: 'Enabled' } - sku: { - name: 'Standard_LRS' - } } resource snapshot 'Microsoft.Compute/snapshots@2022-03-02' = { diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep index f176ad72..5a299e82 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep @@ -13,10 +13,10 @@ var dataDiskName = 'mydatadisk1' resource attachedDisk 'Microsoft.Compute/disks@2022-03-02' = { name: attachedDataDiskName location: location + sku: { + name: 'Standard_LRS' + } properties: { - creationData: { - createOption: 'Empty' - } diskSizeGB: 1 encryption: { type: 'EncryptionAtRestWithPlatformKey' @@ -24,9 +24,9 @@ resource attachedDisk 'Microsoft.Compute/disks@2022-03-02' = { networkAccessPolicy: 'AllowAll' osType: 'Linux' publicNetworkAccess: 'Enabled' - } - sku: { - name: 'Standard_LRS' + creationData: { + createOption: 'Empty' + } } } @@ -40,12 +40,10 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { { name: 'testconfiguration1' properties: { - primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} + primary: true } } ] @@ -132,14 +130,14 @@ 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: [] } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep index f066b25c..b2faa4c8 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep @@ -1,52 +1,23 @@ -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 attachedResourceName string = 'acctest0002' +param resourceName string = 'acctest0001' +param location string = 'westeurope' +@description('The administrator username for the virtual machine') +param adminUsername string -var osDiskName = 'myosdisk1' var attachedOsDiskName = 'myosdisk2' +var osDiskName = 'myosdisk1' resource managedDisk 'Microsoft.Compute/disks@2023-10-02' existing = { name: osDiskName } -resource attachedManagedDisk 'Microsoft.Compute/disks@2023-10-02' = { - name: attachedOsDiskName - location: location - properties: { - creationData: { - createOption: 'Copy' - sourceResourceId: snapshot.id - } - diskSizeGB: 30 - encryption: { - type: 'EncryptionAtRestWithPlatformKey' - } - hyperVGeneration: 'V1' - networkAccessPolicy: 'AllowAll' - osType: 'Linux' - publicNetworkAccess: 'Enabled' - supportedCapabilities: { - architecture: 'x64' - } - } - sku: { - name: 'Standard_LRS' - } - zones: [ - '1' - ] -} - resource attachedNetworkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: attachedResourceName location: location properties: { - enableAcceleratedNetworking: false enableIPForwarding: false ipConfigurations: [ { @@ -55,72 +26,20 @@ resource attachedNetworkInterface 'Microsoft.Network/networkInterfaces@2022-07-0 primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] - } -} - -resource attachedVirtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { - name: attachedResourceName - location: location - properties: { - hardwareProfile: { - vmSize: 'Standard_F2' - } - networkProfile: { - networkInterfaces: [ - { - id: attachedNetworkInterface.id - properties: { - primary: false - } - } - ] - } - storageProfile: { - osDisk: { - caching: 'ReadWrite' - createOption: 'Attach' - name: attachedOsDiskName - osType: 'Linux' - writeAcceleratorEnabled: false - managedDisk: { - id: attachedManagedDisk.id - } - } - } - } -} - -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 - } - } - } - ] } } resource snapshot 'Microsoft.Compute/snapshots@2023-10-02' = { name: resourceName location: location + sku: { + name: 'Standard_ZRS' + } properties: { creationData: { createOption: 'Copy' @@ -130,17 +49,14 @@ resource snapshot 'Microsoft.Compute/snapshots@2023-10-02' = { encryption: { type: 'EncryptionAtRestWithPlatformKey' } + osType: 'Linux' hyperVGeneration: 'V1' incremental: true - networkAccessPolicy: 'AllowAll' - osType: 'Linux' - publicNetworkAccess: 'Enabled' supportedCapabilities: { architecture: 'x64' } - } - sku: { - name: 'Standard_ZRS' + networkAccessPolicy: 'AllowAll' + publicNetworkAccess: 'Enabled' } } @@ -148,9 +64,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - hardwareProfile: { - vmSize: 'Standard_F2' - } networkProfile: { networkInterfaces: [ { @@ -162,12 +75,12 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: adminPassword - adminUsername: adminUsername computerName: 'hostname230630032848831819' linuxConfiguration: { disablePasswordAuthentication: false } + adminPassword: adminPassword + adminUsername: adminUsername } storageProfile: { imageReference: { @@ -183,6 +96,9 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { writeAcceleratorEnabled: false } } + hardwareProfile: { + vmSize: 'Standard_F2' + } } } @@ -202,15 +118,91 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } } +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' + hyperVGeneration: 'V1' + publicNetworkAccess: 'Enabled' + supportedCapabilities: { + architecture: 'x64' + } + osType: 'Linux' + } +} + +resource attachedVirtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { + name: attachedResourceName + location: location + properties: { + hardwareProfile: { + vmSize: 'Standard_F2' + } + networkProfile: { + networkInterfaces: [ + { + id: attachedNetworkInterface.id + properties: { + primary: false + } + } + ] + } + storageProfile: { + osDisk: { + managedDisk: { + id: attachedManagedDisk.id + } + caching: 'ReadWrite' + createOption: 'Attach' + name: attachedOsDiskName + osType: 'Linux' + writeAcceleratorEnabled: false + } + } + } +} + +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: {} + } + } + ] + } +} + 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: [] } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep index 93a31595..84b56bd9 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/basic/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' +param location string = 'westeurope' resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName @@ -16,12 +16,10 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { { name: 'testconfiguration1' properties: { + subnet: {} primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } } } ] @@ -32,41 +30,41 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { + 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 } + id: networkInterface.id } ] } osProfile: { - adminPassword: null - adminUsername: null + adminPassword: adminPassword + adminUsername: adminUsername computerName: 'hostname230630032848831819' linuxConfiguration: { disablePasswordAuthentication: false } } - storageProfile: { - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '16.04-LTS' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - name: 'myosdisk1' - writeAcceleratorEnabled: false - } - } } } @@ -87,14 +85,14 @@ 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' } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep index 1092716f..52cf41ff 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep @@ -1,30 +1,8 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The administrator password for the virtual machine') param vmAdminPassword 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 @@ -44,7 +22,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null + adminPassword: vmAdminPassword adminUsername: 'testadmin' computerName: 'hostname230630032848831819' linuxConfiguration: { @@ -59,10 +37,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { version: 'latest' } osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' name: 'myosdisk1' writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' } } } @@ -85,9 +63,9 @@ 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 @@ -105,14 +83,34 @@ 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: { + serviceEndpointPolicies: [] + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + enableIPForwarding: false + ipConfigurations: [ + { + properties: { + privateIPAllocationMethod: 'Dynamic' + subnet: {} + primary: true + privateIPAddressVersion: 'IPv4' + } + name: 'testconfiguration1' + } + ] + enableAcceleratedNetworking: false } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep index 7a26f542..b00f29ff 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep @@ -4,25 +4,54 @@ param location string = 'eastus' @description('The administrator password for the virtual machine') param adminPassword string +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: 'internal' + parent: virtualNetwork + properties: { + serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + defaultOutboundAccess: true + delegations: [] + privateEndpointNetworkPolicies: 'Disabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + } +} + resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { name: '${resourceName}-nic' location: location properties: { - enableAcceleratedNetworking: false enableIPForwarding: false ipConfigurations: [ { name: 'internal' properties: { + subnet: {} primary: false privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } } } ] + enableAcceleratedNetworking: false } } @@ -39,13 +68,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { applicationProfile: { galleryApplications: [] } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_B2s' } @@ -60,10 +82,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { ] } osProfile: { - adminPassword: null + adminPassword: adminPassword adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001-vm' + computerName: '${resourceName}-vm' linuxConfiguration: { disablePasswordAuthentication: false patchSettings: { @@ -87,65 +109,41 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { version: 'latest' } osDisk: { + writeAcceleratorEnabled: false caching: 'ReadWrite' createOption: 'FromImage' managedDisk: { storageAccountType: 'Premium_LRS' } osType: 'Linux' - writeAcceleratorEnabled: false } } - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { - name: '${resourceName}-vnet' - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' + } } - privateEndpointVNetPolicies: 'Disabled' - subnets: [] + extensionsTimeBudget: 'PT1H30M' } } resource runCommand 'Microsoft.Compute/virtualMachines/runCommands@2023-03-01' = { - parent: virtualMachine name: '${resourceName}-runcommand' location: location + parent: virtualMachine properties: { + outputBlobUri: '' + runAsPassword: '' + runAsUser: '' + timeoutInSeconds: 1200 asyncExecution: false errorBlobUri: '' - outputBlobUri: '' parameters: [] protectedParameters: [] - runAsPassword: '' - runAsUser: '' source: { script: 'echo \'hello world\'' } - timeoutInSeconds: 1200 treatFailureAsDeploymentFailure: true } } - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork - name: 'internal' - properties: { - addressPrefix: '10.0.2.0/24' - defaultOutboundAccess: true - delegations: [] - privateEndpointNetworkPolicies: 'Disabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - } -} diff --git a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep index 7fd25e57..1744c736 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep @@ -4,18 +4,19 @@ 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: [ 'Default' ] } - singlePlacementGroup: true upgradePolicy: { mode: 'Manual' } @@ -49,9 +50,7 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- loadBalancerInboundNatPools: [] primary: true privateIPAddressVersion: 'IPv4' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -62,9 +61,8 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } osProfile: { adminUsername: 'adminuser' - computerNamePrefix: 'acctest0001' + computerNamePrefix: resourceName linuxConfiguration: { - disablePasswordAuthentication: true provisionVMAgent: true ssh: { publicKeys: [ @@ -74,34 +72,34 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } ] } + disablePasswordAuthentication: true } 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 + caching: 'ReadWrite' + } + dataDisks: [] + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' } } } - } - sku: { - capacity: 1 - name: 'Standard_F2' - tier: 'Standard' + additionalCapabilities: {} + orchestrationMode: 'Uniform' + overprovision: true + singlePlacementGroup: true } } @@ -122,25 +120,25 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource extension 'Microsoft.Compute/virtualMachineScaleSets/extensions@2023-03-01' = { - parent: virtualMachineScaleSet name: resourceName + parent: virtualMachineScaleSet properties: { + typeHandlerVersion: '2.0' autoUpgradeMinorVersion: true enableAutomaticUpgrade: false - provisionAfterExtensions: [] publisher: 'Microsoft.Azure.Extensions' + type: 'CustomScript' + provisionAfterExtensions: [] settings: { commandToExecute: 'echo $HOSTNAME' } suppressFailures: false - type: 'CustomScript' - typeHandlerVersion: '2.0' } } 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.compute/samples/virtualmachinescalesets/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep index 149cea35..aed8e600 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep @@ -1,14 +1,45 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +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: { + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + } +} + 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: [ @@ -34,6 +65,7 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- { name: 'example' properties: { + primary: true dnsSettings: { dnsServers: [] } @@ -43,26 +75,23 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- { name: 'internal' properties: { + subnet: {} applicationGatewayBackendAddressPools: [] applicationSecurityGroups: [] loadBalancerBackendAddressPools: [] loadBalancerInboundNatPools: [] primary: true privateIPAddressVersion: 'IPv4' - subnet: { - id: subnet.id - } } } ] - primary: true } } ] } osProfile: { adminUsername: 'adminuser' - computerNamePrefix: 'acctest0001' + computerNamePrefix: resourceName linuxConfiguration: { disablePasswordAuthentication: true provisionVMAgent: true @@ -81,10 +110,10 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- storageProfile: { dataDisks: [] imageReference: { - offer: 'UbuntuServer' publisher: 'Canonical' sku: '16.04-LTS' version: 'latest' + offer: 'UbuntuServer' } osDisk: { caching: 'ReadWrite' @@ -97,39 +126,8 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } } } - } - sku: { - capacity: 1 - name: 'Standard_F2' - tier: 'Standard' - } -} - -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: 'internal' - properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] + additionalCapabilities: {} + orchestrationMode: 'Uniform' + overprovision: true } } diff --git a/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep b/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep index 248c723d..ebea904b 100644 --- a/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep +++ b/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep @@ -10,14 +10,14 @@ resource ledger 'Microsoft.ConfidentialLedger/ledgers@2022-05-13' = { properties: { aadBasedSecurityPrincipals: [ { - ledgerRoleName: 'Administrator' principalId: deployer().objectId - tenantId: deployer().tenantId + tenantId: tenant().tenantId + ledgerRoleName: 'Administrator' } ] certBasedSecurityPrincipals: [ { - cert: null + cert: ledgerCertificate ledgerRoleName: 'Administrator' } ] diff --git a/settings/remarks/microsoft.consumption/samples/budgets/main.bicep b/settings/remarks/microsoft.consumption/samples/budgets/main.bicep index d8ab99ee..57f61a96 100644 --- a/settings/remarks/microsoft.consumption/samples/budgets/main.bicep +++ b/settings/remarks/microsoft.consumption/samples/budgets/main.bicep @@ -1,4 +1,12 @@ +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 @@ -16,16 +24,16 @@ resource budget 'Microsoft.Consumption/budgets@2019-10-01' = { } notifications: { 'Actual_EqualTo_90.000000_Percent': { + enabled: true + operator: 'EqualTo' + threshold: 90 + thresholdType: 'Actual' contactEmails: [ 'foo@example.com' 'bar@example.com' ] contactGroups: [] contactRoles: [] - enabled: true - operator: 'EqualTo' - threshold: 90 - thresholdType: 'Actual' } } timeGrain: 'Monthly' diff --git a/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep b/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep index cd16892d..9cc0a5f2 100644 --- a/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep +++ b/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep @@ -9,8 +9,6 @@ resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' { name: 'hw' properties: { - command: [] - environmentVariables: [] image: 'ubuntu:20.04' ports: [ { @@ -24,11 +22,14 @@ resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' memoryInGB: any('0.5') } } + command: [] + environmentVariables: [] } } ] initContainers: [] ipAddress: { + type: 'Public' autoGeneratedDomainNameLabelScope: 'Unsecure' ports: [ { @@ -36,7 +37,6 @@ resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' protocol: 'TCP' } ] - type: 'Public' } osType: 'Linux' restartPolicy: 'Always' @@ -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..aa1a8d13 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/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: { adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false encryption: { status: 'disabled' } - networkRuleBypassOptions: 'AzureServices' policies: { exportPolicy: { status: 'enabled' @@ -26,22 +27,21 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = status: 'disabled' } } - publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Premium' - tier: 'Premium' + anonymousPullEnabled: false + dataEndpointEnabled: false + networkRuleBypassOptions: 'AzureServices' + publicNetworkAccess: 'Enabled' } } resource agentPool 'Microsoft.ContainerRegistry/registries/agentPools@2019-06-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { - count: 1 os: 'Linux' tier: 'S1' + count: 1 } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep index a4ecf510..d274455f 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep @@ -4,11 +4,10 @@ param location string = 'westus' resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = { name: '${resourceName}registry' location: location + sku: { + name: 'Basic' + } properties: { - adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false - networkRuleBypassOptions: 'AzureServices' policies: { exportPolicy: { status: 'enabled' @@ -21,15 +20,16 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = } publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Basic' + adminUserEnabled: false + anonymousPullEnabled: false + dataEndpointEnabled: false + networkRuleBypassOptions: 'AzureServices' } } 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..70cf1a0b 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep @@ -4,12 +4,16 @@ param location string = 'westus' resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = { name: '${resourceName}registry' location: location + sku: { + name: 'Premium' + } properties: { adminUserEnabled: false anonymousPullEnabled: false dataEndpointEnabled: true networkRuleBypassOptions: 'AzureServices' policies: { + trustPolicy: {} exportPolicy: { status: 'enabled' } @@ -17,19 +21,15 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = status: 'disabled' } 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: { @@ -42,15 +42,14 @@ resource connectedRegistry 'Microsoft.ContainerRegistry/registries/connectedRegi 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..9334d6a6 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep @@ -1,36 +1,36 @@ -param resourceName string = 'acctest0001' -param location string = 'eastus' @secure() @description('The username for the container registry credential') param credentialUsername string = 'testuser' @secure() @description('The password for the container registry credential') param credentialPassword string +param resourceName string = 'acctest0001' +param location string = 'eastus' resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = { name: resourceName location: location + sku: { + name: 'Basic' + } properties: { 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 vault 'Microsoft.KeyVault/vaults@2023-02-01' = { @@ -39,7 +39,6 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { properties: { accessPolicies: [ { - objectId: deployer().objectId permissions: { certificates: [] keys: [] @@ -51,34 +50,35 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { ] storage: [] } - tenantId: deployer().tenantId + tenantId: tenant().tenantId + objectId: deployer().objectId } ] - createMode: 'default' enableRbacAuthorization: false enableSoftDelete: true enabledForDeployment: false enabledForDiskEncryption: false - enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' sku: { family: 'A' name: 'standard' } + tenantId: tenant().tenantId + createMode: 'default' + enabledForTemplateDeployment: false + publicNetworkAccess: 'Enabled' softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId } } resource credentialSet 'Microsoft.ContainerRegistry/registries/credentialSets@2023-07-01' = { - parent: registry name: '${resourceName}-acr-credential-set' + parent: registry properties: { authCredentials: [ { 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' + usernameSecretIdentifier: 'https://${resourceName}vault.vault.azure.net/secrets/username' } ] 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..c3f34bbf 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep @@ -4,18 +4,21 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Standard' + tier: 'Standard' + } properties: { + publicNetworkAccess: 'Enabled' adminUserEnabled: false - anonymousPullEnabled: false dataEndpointEnabled: false + zoneRedundancy: 'Disabled' + anonymousPullEnabled: false encryption: { status: 'disabled' } networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } quarantinePolicy: { status: 'disabled' } @@ -25,12 +28,9 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } } - publicNetworkAccess: 'Enabled' - 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..99d9e9fb 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep @@ -4,15 +4,23 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Premium' + tier: 'Premium' + } properties: { adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false encryption: { status: 'disabled' } + publicNetworkAccess: 'Enabled' + anonymousPullEnabled: false + dataEndpointEnabled: false networkRuleBypassOptions: 'AzureServices' policies: { + trustPolicy: { + status: 'disabled' + } exportPolicy: { status: 'enabled' } @@ -22,22 +30,14 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = retentionPolicy: { status: 'disabled' } - trustPolicy: { - status: 'disabled' - } } - publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Premium' - tier: 'Premium' - } } 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..321f6f99 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep @@ -4,10 +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' } @@ -26,31 +29,28 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = status: 'disabled' } } - publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Standard' - tier: 'Standard' + dataEndpointEnabled: false + publicNetworkAccess: 'Enabled' } } resource taskRun 'Microsoft.ContainerRegistry/registries/taskRuns@2019-06-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { runRequest: { - dockerFilePath: 'Dockerfile' - imageNames: [ - 'helloworld:{{.Run.ID}}' - 'helloworld:latest' - ] platform: { os: 'Linux' } sourceLocation: 'https://github.com/Azure-Samples/aci-helloworld.git#master' type: 'DockerBuildRequest' + dockerFilePath: 'Dockerfile' + imageNames: [ + 'helloworld:{{.Run.ID}}' + 'helloworld:latest' + ] } } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep index c31bbd8c..501bf1ce 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep @@ -4,41 +4,41 @@ 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' + publicNetworkAccess: 'Enabled' + zoneRedundancy: 'Disabled' + adminUserEnabled: false policies: { - exportPolicy: { - status: 'enabled' - } - quarantinePolicy: { - status: 'disabled' - } retentionPolicy: { status: 'disabled' } trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } + quarantinePolicy: { + status: 'disabled' + } } - 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' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep index b4380ac1..d1bd000c 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep @@ -4,15 +4,17 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Premium' + tier: 'Premium' + } properties: { - adminUserEnabled: true anonymousPullEnabled: false - dataEndpointEnabled: false - encryption: { - status: 'disabled' - } networkRuleBypassOptions: 'AzureServices' policies: { + trustPolicy: { + status: 'disabled' + } exportPolicy: { status: 'enabled' } @@ -22,22 +24,20 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = retentionPolicy: { status: 'disabled' } - trustPolicy: { - status: 'disabled' - } } - publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Premium' - tier: 'Premium' + adminUserEnabled: true + dataEndpointEnabled: false + encryption: { + status: 'disabled' + } + publicNetworkAccess: 'Enabled' } } 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..fc3087a1 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep @@ -4,18 +4,18 @@ 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 + networkRuleBypassOptions: 'AzureServices' + zoneRedundancy: 'Disabled' anonymousPullEnabled: false - dataEndpointEnabled: false encryption: { status: 'disabled' } - networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } quarantinePolicy: { status: 'disabled' } @@ -25,20 +25,20 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } } publicNetworkAccess: 'Enabled' - zoneRedundancy: 'Disabled' - } - sku: { - name: 'Standard' - tier: 'Standard' + adminUserEnabled: false + dataEndpointEnabled: false } } resource webHook 'Microsoft.ContainerRegistry/registries/webHooks@2021-08-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { actions: [ 'push' diff --git a/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep b/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep index 627308ea..be35065e 100644 --- a/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep @@ -10,29 +10,32 @@ resource fleet 'Microsoft.ContainerService/fleets@2024-04-01' = { resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' = { name: resourceName location: location + sku: { + tier: 'Free' + name: 'Base' + } properties: { - addonProfiles: {} agentPoolProfiles: [ { - count: 1 - enableAutoScaling: false enableEncryptionAtHost: false - enableFIPS: false - enableNodePublicIP: false - enableUltraSSD: false kubeletDiskType: '' mode: 'System' + osDiskType: 'Managed' + tags: {} + type: 'VirtualMachineScaleSets' + enableAutoScaling: false + enableFIPS: false name: 'default' + enableNodePublicIP: false nodeLabels: {} - osDiskType: 'Managed' osType: 'Linux' scaleDownMode: 'Delete' - tags: {} - type: 'VirtualMachineScaleSets' + count: 1 + enableUltraSSD: false upgradeSettings: { - drainTimeoutInMinutes: 0 maxSurge: '10%' nodeSoakDurationInMinutes: 0 + drainTimeoutInMinutes: 0 } vmSize: 'Standard_B2s' } @@ -42,6 +45,13 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' enablePrivateCluster: false enablePrivateClusterPublicFQDN: false } + disableLocalAccounts: false + dnsPrefix: '${resourceName}' + enableRBAC: true + kubernetesVersion: '' + servicePrincipalProfile: { + clientId: 'msi' + } autoUpgradeProfile: { nodeOSUpgradeChannel: 'NodeImage' upgradeChannel: 'none' @@ -51,10 +61,6 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' enabled: false } } - disableLocalAccounts: false - dnsPrefix: 'acctest0001' - enableRBAC: true - kubernetesVersion: '' metricsProfile: { costAnalysis: { enabled: false @@ -62,20 +68,14 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' } nodeResourceGroup: '' securityProfile: {} - servicePrincipalProfile: { - clientId: 'msi' - } supportPlan: 'KubernetesOfficial' - } - sku: { - name: 'Base' - tier: 'Free' + addonProfiles: {} } } resource member 'Microsoft.ContainerService/fleets/members@2024-04-01' = { - parent: fleet name: resourceName + parent: fleet properties: { clusterResourceId: managedCluster.id group: 'default' diff --git a/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep b/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep index c752f464..11b3c03d 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep @@ -7,22 +7,22 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p properties: { agentPoolProfiles: [ { - count: 1 mode: 'System' name: 'default' vmSize: 'Standard_DS2_v2' + count: 1 } ] - dnsPrefix: 'acctest0001' + dnsPrefix: '${resourceName}' } } resource agentPool 'Microsoft.ContainerService/managedClusters/agentPools@2023-04-02-preview' = { - parent: managedCluster name: 'internal' + parent: managedCluster properties: { + vmSize: 'Standard_DS2_v2' count: 1 mode: 'User' - vmSize: 'Standard_DS2_v2' } } diff --git a/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep b/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep index 786bb9f1..ec81acfc 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep @@ -13,6 +13,6 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p vmSize: 'Standard_DS2_v2' } ] - dnsPrefix: 'acctest0001' + dnsPrefix: '${resourceName}' } } diff --git a/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep b/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep index 25a49290..2943afd6 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep @@ -1,99 +1,139 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: 'ai-${resourceName}' +resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-04-01' = { + name: 'mlw-${resourceName}' location: location - kind: 'web' + sku: { + name: 'Basic' + tier: 'Basic' + } + kind: 'Default' properties: { - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' + applicationInsights: component.id + keyVault: vault.id + publicNetworkAccess: 'Enabled' + storageAccount: storageAccount.id + v1LegacyMode: false } } resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' = { name: 'aks-${resourceName}' location: location + sku: { + name: 'Base' + tier: 'Free' + } properties: { - addonProfiles: {} + supportPlan: 'KubernetesOfficial' 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' + vmSize: 'Standard_B2s' + enableEncryptionAtHost: false + enableUltraSSD: false upgradeSettings: { drainTimeoutInMinutes: 0 maxSurge: '10%' nodeSoakDurationInMinutes: 0 } - vmSize: 'Standard_B2s' + mode: 'System' + count: 1 + enableNodePublicIP: false + name: 'default' + osDiskType: 'Managed' + tags: {} + type: 'VirtualMachineScaleSets' + enableAutoScaling: false + enableFIPS: false + kubeletDiskType: '' } ] - apiServerAccessProfile: { - disableRunCommand: false - enablePrivateCluster: false - enablePrivateClusterPublicFQDN: false - } autoUpgradeProfile: { nodeOSUpgradeChannel: 'NodeImage' upgradeChannel: 'none' } + disableLocalAccounts: false + dnsPrefix: 'aks-${resourceName}' + enableRBAC: true + kubernetesVersion: '' + nodeResourceGroup: '' + addonProfiles: {} + apiServerAccessProfile: { + enablePrivateClusterPublicFQDN: false + disableRunCommand: false + enablePrivateCluster: false + } 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 trustedAccessRoleBinding 'Microsoft.ContainerService/managedClusters/trustedAccessRoleBindings@2025-02-01' = { + name: 'tarb-${resourceName}' + parent: managedCluster + properties: { + sourceResourceId: workspace.id + roles: [ + 'Microsoft.MachineLearningServices/workspaces/mlworkload' + ] + } +} + +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 + publicNetworkAccessForIngestion: 'Enabled' + RetentionInDays: 90 + SamplingPercentage: 100 + publicNetworkAccessForQuery: 'Enabled' } } resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: 'st${resourceName}' location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' + isNfsV3Enabled: false + publicNetworkAccess: 'Enabled' allowBlobPublicAccess: true - allowCrossTenantReplication: false - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false dnsEndpointType: 'Standard' + isSftpEnabled: false + networkAcls: { + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + } + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowSharedKeyAccess: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -106,22 +146,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' + allowCrossTenantReplication: false + defaultToOAuthAuthentication: false + isLocalUserEnabled: true } } @@ -129,46 +157,18 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: 'kv${resourceName}' location: location properties: { - accessPolicies: [] - createMode: 'default' + tenantId: tenant().tenantId enableRbacAuthorization: false enabledForDeployment: false - enabledForDiskEncryption: false - enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' sku: { family: 'A' name: 'standard' } - softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId - } -} - -resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-04-01' = { - name: 'mlw-${resourceName}' - location: location - kind: 'Default' - properties: { - applicationInsights: component.id - keyVault: vault.id + accessPolicies: [] + createMode: 'default' + enabledForDiskEncryption: false + enabledForTemplateDeployment: false publicNetworkAccess: 'Enabled' - storageAccount: storageAccount.id - v1LegacyMode: false - } - sku: { - name: 'Basic' - tier: 'Basic' - } -} - -resource trustedAccessRoleBinding 'Microsoft.ContainerService/managedClusters/trustedAccessRoleBindings@2025-02-01' = { - parent: managedCluster - name: 'tarb-${resourceName}' - properties: { - roles: [ - 'Microsoft.MachineLearningServices/workspaces/mlworkload' - ] - sourceResourceId: workspace.id + softDeleteRetentionInDays: 7 } } diff --git a/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep b/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep index 1eb2dc82..ed6c126e 100644 --- a/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep +++ b/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep @@ -1,22 +1,25 @@ targetScope = 'subscription' +param location string = 'eastus' param resourceName string = 'acctest0001' resource scheduledAction 'Microsoft.CostManagement/scheduledActions@2022-10-01' = { name: resourceName + scope: subscription() kind: 'Email' properties: { + viewId: resourceId('Microsoft.CostManagement/views', 'ms:CostByService') displayName: 'CostByServiceViewerz3k' fileDestination: { fileFormats: [] } notification: { - message: '' subject: 'Cost Management Report for Terraform Testing on Azure with TTL = 2 Day' to: [ 'test@test.com' 'hashicorp@test.com' ] + message: '' } notificationEmail: 'test@test.com' schedule: { @@ -29,6 +32,5 @@ resource scheduledAction 'Microsoft.CostManagement/scheduledActions@2022-10-01' 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.customproviders/samples/resourceproviders/main.bicep b/settings/remarks/microsoft.customproviders/samples/resourceproviders/main.bicep index 9cfb6695..8464410a 100644 --- a/settings/remarks/microsoft.customproviders/samples/resourceproviders/main.bicep +++ b/settings/remarks/microsoft.customproviders/samples/resourceproviders/main.bicep @@ -7,9 +7,9 @@ resource resourceProvider 'Microsoft.CustomProviders/resourceProviders@2018-09-0 properties: { resourceTypes: [ { - endpoint: 'https://example.com/' name: 'dEf1' routingType: 'Proxy' + endpoint: 'https://example.com/' } ] } 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..91f5c747 100644 --- a/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep @@ -12,29 +12,29 @@ 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' - deterministicOutboundIP: 'Disabled' grafanaMajorVersion: '11' publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Standard' + apiKey: 'Disabled' + autoGeneratedDomainNameLabelScope: 'TenantReuse' + deterministicOutboundIP: 'Disabled' } } 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: '' } 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..a958c089 100644 --- a/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep +++ b/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep @@ -20,18 +20,18 @@ 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: { + managedResourceGroupId: resourceGroup().id + publicNetworkAccess: 'Enabled' + } } resource virtualNetworkPeering 'Microsoft.Databricks/workspaces/virtualNetworkPeerings@2023-02-01' = { - parent: workspace name: resourceName + parent: workspace properties: { allowForwardedTraffic: false allowGatewayTransit: false diff --git a/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep index 74ba3e81..bc0fc241 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep @@ -1,5 +1,10 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' + +resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' +} resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { name: resourceName @@ -10,19 +15,15 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } } -resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { - name: resourceName -} - 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..34192ef7 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep @@ -10,45 +10,9 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } } -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 dataflow 'Microsoft.DataFactory/factories/dataflows@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'Flowlet' @@ -70,7 +34,6 @@ source1 sink( description: '' linkedService: { parameters: {} - referenceName: linkedservice.name type: 'LinkedServiceReference' } name: 'sink1' @@ -81,7 +44,6 @@ source1 sink( description: '' linkedService: { parameters: {} - referenceName: linkedservice.name type: 'LinkedServiceReference' } name: 'source1' @@ -92,8 +54,8 @@ source1 sink( } resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'AzureBlobStorage' @@ -102,3 +64,39 @@ resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-0 } } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: { + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + encryption: { + keySource: 'Microsoft.Storage' + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + } + isHnsEnabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + accessTier: 'Hot' + defaultToOAuthAuthentication: false + isNfsV3Enabled: false + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + } +} diff --git a/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep index 8f874454..9854b6c7 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep @@ -1,22 +1,24 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' - -resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { - name: resourceName - location: location - properties: { - publicNetworkAccess: 'Enabled' - repoConfiguration: null - } -} +param resourceName string = 'acctest0001' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + supportsHttpsTrafficOnly: true accessTier: 'Hot' allowBlobPublicAccess: true + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' allowCrossTenantReplication: true allowSharedKeyAccess: true defaultToOAuthAuthentication: false @@ -32,45 +34,42 @@ 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 factory 'Microsoft.DataFactory/factories@2018-06-01' = { + name: resourceName + location: location + properties: { + publicNetworkAccess: 'Enabled' + repoConfiguration: null } } 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' typeProperties: { encodingName: 'UTF-8' location: { - container: 'container' - fileName: 'bar.txt' folderPath: 'foo/bar/' type: 'AzureBlobStorageLocation' + container: 'container' + fileName: 'bar.txt' } } + description: '' + linkedServiceName: { + type: 'LinkedServiceReference' + } } } 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..6d04151b 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep @@ -5,14 +5,14 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { name: resourceName location: location properties: { - publicNetworkAccess: 'Enabled' repoConfiguration: null + publicNetworkAccess: 'Enabled' } } 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..55957f79 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep @@ -1,24 +1,14 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { - name: resourceName - location: location - properties: { - publicNetworkAccess: 'Enabled' - repoConfiguration: null - } -} - 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' @@ -32,23 +22,33 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + isNfsV3Enabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true } - sku: { - name: 'Standard_LRS' +} + +resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { + name: resourceName + location: location + properties: { + publicNetworkAccess: 'Enabled' + repoConfiguration: null } } 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/managedvirtualnetworks/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep index bf26c35b..affba0d1 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep @@ -12,7 +12,7 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } 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..abcbf666 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep @@ -14,48 +14,48 @@ 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: { accessTier: 'Hot' - allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + allowBlobPublicAccess: 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' - } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } } 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..972874d7 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep @@ -11,11 +11,9 @@ 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: '' parameters: { test: { defaultValue: 'testparameter' @@ -23,13 +21,21 @@ resource pipeline 'Microsoft.DataFactory/factories/pipelines@2018-06-01' = { } } variables: {} + annotations: [] + description: '' } } 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..55935afe 100644 --- a/settings/remarks/microsoft.datamigration/samples/services/main.bicep +++ b/settings/remarks/microsoft.datamigration/samples/services/main.bicep @@ -4,13 +4,11 @@ param location string = 'westeurope' 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,14 +28,14 @@ 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: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + 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..40a2de4b 100644 --- a/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep +++ b/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep @@ -1,18 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource service 'Microsoft.DataMigration/services@2018-04-19' = { - name: resourceName - location: location - kind: 'Cloud' - properties: { - virtualSubnetId: subnet.id - } - sku: { - name: 'Standard_1vCores' - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location @@ -29,10 +17,20 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } } +resource service 'Microsoft.DataMigration/services@2018-04-19' = { + name: resourceName + location: location + sku: { + name: 'Standard_1vCores' + } + kind: 'Cloud' + properties: {} +} + resource project 'Microsoft.DataMigration/services/projects@2018-04-19' = { - parent: service name: resourceName location: location + parent: service properties: { sourcePlatform: 'SQL' targetPlatform: 'SQLDB' @@ -40,8 +38,8 @@ 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: [] diff --git a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep index 85769b4f..95b698c8 100644 --- a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep @@ -17,76 +17,15 @@ resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { } } -resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { - name: resourceName - location: location - properties: { - administratorLogin: 'psqladmin' - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' - storageProfile: { - backupRetentionDays: 7 - storageAutogrow: 'Enabled' - storageMB: 5120 - } - version: '9.5' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'B_Gen5_2' - tier: 'Basic' - } -} - -resource backupInstance 'Microsoft.DataProtection/backupVaults/backupInstances@2022-04-01' = { - parent: backupVault - name: resourceName - 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: { - datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' - objectType: 'DatasourceSet' - resourceID: server.id - resourceLocation: 'server.location' - resourceName: server.name - resourceType: 'Microsoft.DBForPostgreSQL/servers' - resourceUri: '' - } - datasourceAuthCredentials: null - friendlyName: 'acctest0001' - objectType: 'BackupInstance' - policyInfo: { - policyId: backupPolicy.id - } - } -} - 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: { - backupType: 'Full' objectType: 'AzureBackupParams' + backupType: 'Full' } dataStore: { dataStoreType: 'VaultStore' @@ -114,32 +53,88 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 } } { - isDefault: true lifecycles: [ { - deleteAfter: { - duration: 'P4M' - objectType: 'AbsoluteDeleteOption' - } sourceDataStore: { dataStoreType: 'VaultStore' objectType: 'DataStoreInfoBase' } targetDataStoreCopySettings: [] + deleteAfter: { + duration: 'P4M' + objectType: 'AbsoluteDeleteOption' + } } ] name: 'Default' objectType: 'AzureRetentionRule' + isDefault: true } ] + datasourceTypes: [ + 'Microsoft.DBforPostgreSQL/servers/databases' + ] + objectType: 'BackupPolicy' + } +} + +resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { + name: resourceName + location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'B_Gen5_2' + tier: 'Basic' + } + properties: { + infrastructureEncryption: 'Disabled' + version: '9.5' + administratorLogin: 'psqladmin' + minimalTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' + storageProfile: { + backupRetentionDays: 7 + storageAutogrow: 'Enabled' + storageMB: 5120 + } + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' } } resource database 'Microsoft.DBforPostgreSQL/servers/databases@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { charset: 'UTF8' collation: 'English_United States.1252' } } + +resource backupInstance 'Microsoft.DataProtection/backupVaults/backupInstances@2022-04-01' = { + name: resourceName + parent: backupVault + properties: { + dataSourceInfo: { + datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' + objectType: 'Datasource' + resourceType: 'Microsoft.DBforPostgreSQL/servers/databases' + resourceUri: '' + } + dataSourceSetInfo: { + resourceID: server.id + resourceLocation: server.location + resourceName: server.name + resourceType: 'Microsoft.DBForPostgreSQL/servers' + resourceUri: '' + datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' + objectType: 'DatasourceSet' + } + datasourceAuthCredentials: null + friendlyName: resourceName + objectType: 'BackupInstance' + policyInfo: {} + } +} diff --git a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep index 0e11a48b..19cfe72f 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: { @@ -52,24 +44,32 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 } ] } + backupParameters: { + backupType: 'Full' + objectType: 'AzureBackupParams' + } + dataStore: { + dataStoreType: 'VaultStore' + objectType: 'DataStoreInfoBase' + } } { + objectType: 'AzureRetentionRule' isDefault: true lifecycles: [ { + targetDataStoreCopySettings: [] deleteAfter: { duration: 'P4M' objectType: 'AbsoluteDeleteOption' } sourceDataStore: { - dataStoreType: 'VaultStore' objectType: 'DataStoreInfoBase' + dataStoreType: 'VaultStore' } - targetDataStoreCopySettings: [] } ] name: 'Default' - objectType: 'AzureRetentionRule' } ] } diff --git a/settings/remarks/microsoft.dataprotection/samples/backupvaults/main.bicep b/settings/remarks/microsoft.dataprotection/samples/backupvaults/main.bicep index 00c95459..6197b89f 100644 --- a/settings/remarks/microsoft.dataprotection/samples/backupvaults/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/backupvaults/main.bicep @@ -7,8 +7,8 @@ resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { properties: { storageSettings: [ { - datastoreType: 'VaultStore' type: 'LocallyRedundant' + 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..f1c4af72 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep @@ -1,39 +1,39 @@ +@secure() +@description('The administrator login password for the MariaDB server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the MariaDB server') param administratorLogin string -@secure() -@description('The administrator login password for the MariaDB server') -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' + version: '10.2' + administratorLoginPassword: '${administratorLoginPassword}' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } - version: '10.2' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' } } 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..4ecb5f88 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep @@ -1,39 +1,39 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the MariaDB server') param administratorLogin string @secure() @description('The administrator login password for the MariaDB server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'B_Gen5_2' + tier: 'Basic' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } + createMode: 'Default' + publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' version: '10.2' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'B_Gen5_2' - tier: 'Basic' - } } 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..4f4eb737 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep @@ -9,31 +9,31 @@ 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' + version: '10.2' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' 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}' } } 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' diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep index 2f777e9f..bb48197e 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' + administratorLogin: '${administratorLogin}' + minimalTlsVersion: 'TLS1_2' 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' + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep index a29902eb..3fcb1ad0 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep @@ -1,19 +1,22 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the MariaDB server') param administratorLogin string @secure() @description('The administrator login password for the MariaDB server') param administratorLoginPassword string +param resourceName string = 'acctest0001' 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' + administratorLogin: '${administratorLogin}' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { @@ -22,12 +25,9 @@ resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { storageMB: 51200 } version: '10.2' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + minimalTlsVersion: 'TLS1_2' } } @@ -48,10 +48,9 @@ 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: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' @@ -61,14 +60,15 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { service: 'Microsoft.Sql' } ] + addressPrefix: '10.7.29.0/29' } } resource virtualNetworkRule 'Microsoft.DBforMariaDB/servers/virtualNetworkRules@2018-06-01' = { - parent: server name: resourceName + parent: server properties: { - ignoreMissingVnetServiceEndpoint: false virtualNetworkSubnetId: subnet.id + ignoreMissingVnetServiceEndpoint: false } } diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep index e74f865d..20a63a2d 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep @@ -7,9 +7,13 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { name: '${resourceName}-mysql' location: location + sku: { + name: 'Standard_B1ms' + tier: 'Burstable' + } properties: { administratorLogin: 'tfadmin' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' @@ -22,9 +26,17 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { } version: '8.0.21' } - sku: { - name: 'Standard_B1ms' - tier: 'Burstable' +} + +resource administrator 'Microsoft.DBforMySQL/flexibleServers/administrators@2023-12-30' = { + name: 'ActiveDirectory' + parent: flexibleServer + properties: { + sid: deployer().objectId + tenantId: tenant().tenantId + administratorType: 'ActiveDirectory' + identityResourceId: userAssignedIdentity.id + login: 'sqladmin' } } @@ -37,15 +49,3 @@ resource userassignedidentity1 'Microsoft.ManagedIdentity/userAssignedIdentities name: '${resourceName}-uai2' location: location } - -resource administrator 'Microsoft.DBforMySQL/flexibleServers/administrators@2023-12-30' = { - parent: flexibleServer - name: 'ActiveDirectory' - properties: { - 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..4e9293f0 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep @@ -7,9 +7,13 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { name: '${resourceName}-mysql' location: location + sku: { + name: 'Standard_B1ms' + tier: 'Burstable' + } properties: { administratorLogin: 'tfadmin' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' @@ -22,15 +26,11 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { } 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..d3400219 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: { + name: 'Standard_B1s' + tier: 'Burstable' + } properties: { - administratorLogin: null - administratorLoginPassword: null backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' } createMode: '' - dataEncryption: { - type: 'SystemManaged' - } highAvailability: { mode: 'Disabled' } network: {} version: '' - } - sku: { - name: 'Standard_B1s' - tier: 'Burstable' + dataEncryption: { + type: 'SystemManaged' + } + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' } } 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..f4591008 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep @@ -7,32 +7,32 @@ param mysqlAdministratorPassword string 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' } + network: {} + createMode: '' highAvailability: { mode: 'Disabled' } - network: {} 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..0b7b7c35 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep @@ -1,17 +1,21 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the MySQL flexible server') param administratorLogin string @secure() @description('The administrator login password for the MySQL flexible server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { name: resourceName location: location + sku: { + name: 'Standard_B1s' + tier: 'Burstable' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' @@ -25,8 +29,4 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { } 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..4404f640 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep @@ -1,44 +1,46 @@ -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' + +param clientId string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + tier: 'GeneralPurpose' + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } + createMode: 'Default' + publicNetworkAccess: 'Enabled' version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + infrastructureEncryption: 'Disabled' } } resource administrator 'Microsoft.DBforMySQL/servers/administrators@2017-12-01' = { - parent: server name: 'activeDirectory' + parent: server properties: { + tenantId: tenant().tenantId administratorType: 'ActiveDirectory' login: 'sqladmin' - sid: deployer().objectId - tenantId: deployer().tenantId + sid: clientId } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep index 28c38190..33fff895 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep @@ -9,32 +9,32 @@ 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_2' + version: '5.7' + infrastructureEncryption: 'Disabled' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { + storageMB: 51200 backupRetentionDays: 7 storageAutogrow: 'Enabled' - storageMB: 51200 } - version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' } } 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..98b47973 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: { + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + family: 'Gen5' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' + administratorLoginPassword: '${administratorLoginPassword}' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_1' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { - storageAutogrow: 'Enabled' storageMB: 51200 + storageAutogrow: 'Enabled' } + administratorLogin: '${administratorLogin}' + createMode: 'Default' 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..5d729e23 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep @@ -9,32 +9,32 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + } properties: { - administratorLogin: null - administratorLoginPassword: null + version: '5.7' createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + infrastructureEncryption: 'Disabled' + minimalTlsVersion: 'TLS1_2' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } - version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' } } 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..a2d2ed16 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep @@ -1,32 +1,32 @@ -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 + administratorLoginPassword: '${administratorLoginPassword}' createMode: 'Default' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_1' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + version: '5.7' + administratorLogin: '${administratorLogin}' + infrastructureEncryption: 'Disabled' storageProfile: { storageAutogrow: 'Enabled' storageMB: 51200 } - version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep index 8e5a7693..48d70e30 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep @@ -9,26 +9,26 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + tier: 'GeneralPurpose' + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' + administratorLoginPassword: '${administratorLoginPassword}' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + createMode: 'Default' + publicNetworkAccess: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' } } @@ -49,10 +49,9 @@ 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: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' @@ -62,12 +61,13 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { service: 'Microsoft.Sql' } ] + addressPrefix: '10.7.29.0/29' } } resource virtualNetworkRule 'Microsoft.DBforMySQL/servers/virtualNetworkRules@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { ignoreMissingVnetServiceEndpoint: false virtualNetworkSubnetId: subnet.id diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep index a53943c6..54e403db 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep @@ -1,21 +1,24 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the PostgreSQL flexible server') param administratorLogin string @secure() @description('The administrator login password for the PostgreSQL flexible server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = { name: resourceName location: location + sku: { + tier: 'GeneralPurpose' + name: 'Standard_D2s_v3' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLoginPassword: administratorLoginPassword authConfig: { + tenantId: tenant().tenantId activeDirectoryAuth: 'Enabled' passwordAuth: 'Enabled' - tenantId: deployer().tenantId } availabilityZone: '2' backup: { @@ -29,18 +32,15 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = storageSizeGB: 32 } version: '12' - } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' + administratorLogin: administratorLogin } } 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..3403eba8 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep @@ -7,49 +7,49 @@ param postgresqlAdministratorPassword 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: 'adminTerraform' - administratorLoginPassword: null - availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' } + storage: { + storageSizeGB: 32 + } + administratorLogin: 'adminTerraform' + administratorLoginPassword: '${postgresqlAdministratorPassword}' + availabilityZone: '2' highAvailability: { mode: 'Disabled' } network: {} - storage: { - storageSizeGB: 32 - } version: '12' } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' + identity: { + type: 'None' + userAssignedIdentities: null } } -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: { + value: 'true' source: 'user-override' - value: '40' } - 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: { source: 'user-override' - value: 'true' + value: '40' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep index 36781900..337eb98f 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep @@ -7,9 +7,14 @@ param postgresqlAdministratorPassword string resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = { name: resourceName location: location + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' + } properties: { + version: '12' administratorLogin: 'adminTerraform' - administratorLoginPassword: null + administratorLoginPassword: '${postgresqlAdministratorPassword}' availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' @@ -21,17 +26,12 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = storage: { storageSizeGB: 32 } - version: '12' - } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' } } 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..ae32ce8d 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/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' } highAvailability: { mode: 'Disabled' } + administratorLogin: 'adminTerraform' network: {} storage: { storageSizeGB: 32 } version: '12' - } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' + administratorLoginPassword: '${postgresqlAdministratorPassword}' + availabilityZone: '2' } } 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..01fbc488 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep @@ -9,28 +9,28 @@ 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 + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + highAvailability: { + mode: 'Disabled' + } + version: '12' availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' } - highAvailability: { - mode: 'Disabled' - } network: {} storage: { storageSizeGB: 32 } - version: '12' } - 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..a02dba1a 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep @@ -1,22 +1,13 @@ -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' +resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { + name: '${resourceName}-replica' location: location properties: { - administratorLogin: 'psqladmin' - administratorLoginPassword: null - availabilityZone: '1' - backup: { - geoRedundantBackup: 'Disabled' - } - highAvailability: { - mode: 'Disabled' - } network: { publicNetworkAccess: 'Disabled' } @@ -25,42 +16,51 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = storageSizeGB: 32 tier: 'P30' } + backup: { + geoRedundantBackup: 'Disabled' + } + sourceServerResourceId: flexibleServer.id version: '16' + availabilityZone: '1' + createMode: 'Replica' + highAvailability: { + mode: 'Disabled' + } } +} + +resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { + name: '${resourceName}-primary' + location: location sku: { name: 'Standard_D2ads_v5' tier: 'GeneralPurpose' } -} - -resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { - name: '${resourceName}-replica' - location: location properties: { - availabilityZone: '1' backup: { geoRedundantBackup: 'Disabled' } - createMode: 'Replica' + storage: { + autoGrow: 'Disabled' + storageSizeGB: 32 + tier: 'P30' + } + administratorLogin: 'psqladmin' + administratorLoginPassword: '${administratorLoginPassword}' + availabilityZone: '1' highAvailability: { mode: 'Disabled' } network: { publicNetworkAccess: 'Disabled' } - sourceServerResourceId: flexibleServer.id - storage: { - autoGrow: 'Disabled' - storageSizeGB: 32 - tier: 'P30' - } version: '16' } } 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..26b94bbf 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep @@ -8,14 +8,14 @@ resource serverGroupsv2 'Microsoft.DBforPostgreSQL/serverGroupsv2@2022-11-08' = name: resourceName location: location properties: { - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' coordinatorEnablePublicIpAccess: true - coordinatorServerEdition: 'GeneralPurpose' - coordinatorStorageQuotaInMb: 131072 coordinatorVCores: 2 enableHa: false nodeCount: 0 nodeEnablePublicIpAccess: false + coordinatorServerEdition: 'GeneralPurpose' + coordinatorStorageQuotaInMb: 131072 nodeServerEdition: 'MemoryOptimized' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep index 042fc32c..d21b6032 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep @@ -1,3 +1,5 @@ +@description('The administrator login name for the PostgreSQL server admin') +param adminLogin string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the PostgreSQL server') @@ -5,42 +7,42 @@ param administratorLogin string @secure() @description('The administrator login password for the PostgreSQL server') 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}' createMode: 'Default' + publicNetworkAccess: 'Enabled' + version: '9.6' + administratorLoginPassword: '${administratorLoginPassword}' 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' } } 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..c3cb52be 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep @@ -9,32 +9,32 @@ param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + tier: 'GeneralPurpose' + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' + administratorLogin: '${administratorLogin}' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' + 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..5e9d024c 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep @@ -9,32 +9,32 @@ 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 + administratorLoginPassword: '${administratorLoginPassword}' createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' + administratorLogin: '${administratorLogin}' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { + storageMB: 51200 backupRetentionDays: 7 storageAutogrow: 'Enabled' - storageMB: 51200 } 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..c5e00b45 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep @@ -9,32 +9,32 @@ 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' + administratorLogin: '${administratorLogin}' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + version: '9.6' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } - version: '9.6' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' } } 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..88b254e3 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' + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } + administratorLogin: '${administratorLogin}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' + sslEnforcement: 'Enabled' version: '9.5' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep index 471521bb..38efaa44 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep @@ -9,26 +9,26 @@ param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/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' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + publicNetworkAccess: 'Enabled' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } version: '9.5' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' } } @@ -49,25 +49,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.29.0/29' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [ { service: 'Microsoft.Sql' } ] + addressPrefix: '10.7.29.0/29' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' } } 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..93ec41f8 100644 --- a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep +++ b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep @@ -1,12 +1,11 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@2023-09-05' = { name: resourceName location: location properties: { applicationGroupType: 'RemoteApp' - hostPoolArmPath: hostPool.id } } @@ -25,9 +24,9 @@ resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' = { } resource application 'Microsoft.DesktopVirtualization/applicationGroups/applications@2023-09-05' = { - parent: applicationGroup name: resourceName location: location + parent: applicationGroup properties: { commandLineSetting: 'DoNotAllow' filePath: 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' diff --git a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep index 75e4a4c3..d7df0203 100644 --- a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep +++ b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep @@ -5,10 +5,9 @@ resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@202 name: '${resourceName}-ag' location: location properties: { - applicationGroupType: 'Desktop' description: '' friendlyName: '' - hostPoolArmPath: hostPool.id + applicationGroupType: 'Desktop' } } @@ -16,17 +15,17 @@ resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-03' = { name: '${resourceName}-hp' location: location properties: { + vmTemplate: '' customRdpProperty: '' - description: '' friendlyName: '' hostPoolType: 'Pooled' - loadBalancerType: 'BreadthFirst' maxSessionLimit: 999999 personalDesktopAssignmentType: '' preferredAppGroupType: 'Desktop' + validationEnvironment: false + description: '' + loadBalancerType: 'BreadthFirst' publicNetworkAccess: 'Enabled' startVMOnConnect: false - validationEnvironment: false - 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..1770ac2b 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/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 @@ -12,10 +12,8 @@ resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { resource networkConnection 'Microsoft.DevCenter/networkConnections@2023-04-01' = { name: resourceName - location: 'westeurope' properties: { domainJoinType: 'AzureADJoin' - subnetId: subnet.id } } @@ -32,16 +30,16 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } 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' } diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep index a6a3809a..9d1e3ad6 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep @@ -8,14 +8,14 @@ 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' path: '/template' secretIdentifier: 'https://amlim-kv.vault.azure.net/secrets/ado/6279752c2bdd4a38a3e79d958cc36a75' uri: 'https://amlim@dev.azure.com/amlim/testCatalog/_git/testCatalog' + 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..e4a7054a 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep @@ -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/networkconnections/main.bicep b/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep index b1655e53..c642e839 100644 --- a/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep @@ -1,12 +1,11 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource networkConnection 'Microsoft.DevCenter/networkConnections@2023-04-01' = { name: resourceName 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..283b47fe 100644 --- a/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep @@ -18,15 +18,15 @@ resource project 'Microsoft.DevCenter/projects@2025-02-01' = { } 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.devices/samples/iothubs/certificates/main.bicep b/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep index eaac0850..8a189b49 100644 --- a/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep +++ b/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep @@ -4,36 +4,36 @@ param location string = 'westeurope' @description('The Base64 encoded certificate content for the IoT Hub') param certificateContent string -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: {} routing: { fallbackRoute: { - condition: 'true' endpointNames: [ 'events' ] isEnabled: true source: 'DeviceMessages' + condition: 'true' } } - 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..fcf6ba48 100644 --- a/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep +++ b/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep @@ -1,31 +1,6 @@ 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 account 'Microsoft.DeviceUpdate/accounts@2022-10-01' = { name: resourceName location: location @@ -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: { + messagingEndpoints: {} + routing: { + fallbackRoute: { + condition: 'true' + endpointNames: [ + 'events' + ] + isEnabled: true + source: 'DeviceMessages' + } + } + storageEndpoints: {} + cloudToDevice: {} + enableFileUploadNotifications: false + } +} 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..37a24343 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/policysets/policies/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/policysets/policies/main.bicep @@ -6,20 +6,13 @@ 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' factData: '' factName: 'LabVmCount' threshold: '999' + 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..7c56340b 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep @@ -10,9 +10,9 @@ 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: { dailyRecurrence: { time: '0100' diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep index ce588176..4e8d849a 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep @@ -13,41 +13,45 @@ 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 + labSubnetName: '${resourceName}Subnet' + osType: 'Windows' + size: 'Standard_F2' + userName: 'acct5stU5er' galleryImageReference: { - offer: 'WindowsServer' osType: 'Windows' publisher: 'MicrosoftWindowsServer' sku: '2012-Datacenter' version: 'latest' + offer: 'WindowsServer' } - isAuthenticationWithSshKey: false - labSubnetName: '\'${resourceName}Subnet\'' - labVirtualNetworkId: virtualNetwork.id networkInterface: {} notes: '' - osType: 'Windows' - password: null - size: 'Standard_F2' + password: vmPassword storageType: 'Standard' - userName: 'acct5stU5er' + allowClaim: true + disallowPublicIpAddress: false + isAuthenticationWithSshKey: false } } 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..9f6d7df2 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep @@ -10,14 +10,19 @@ 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') + 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/schedules/main.bicep b/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep index 6aa87538..d6bdf33e 100644 --- a/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep @@ -4,51 +4,6 @@ param location string = 'westeurope' @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 - } - } - } - ] - } -} - -resource schedule 'Microsoft.DevTestLab/schedules@2018-09-15' = { - name: resourceName - location: location - properties: { - dailyRecurrence: { - time: '0100' - } - notificationSettings: { - emailRecipient: '' - status: 'Disabled' - timeInMinutes: 30 - webhookUrl: '' - } - status: 'Enabled' - targetResourceId: virtualMachine.id - taskType: 'ComputeVmShutdownTask' - timeZoneId: 'Pacific Standard Time' - } - tags: { - environment: 'Production' - } -} - resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location @@ -63,10 +18,30 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { storageUri: '' } } - extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_B2s' } + priority: 'Regular' + storageProfile: { + osDisk: { + managedDisk: { + storageAccountType: 'Standard_LRS' + } + name: 'myosdisk-230630033106863551' + osType: 'Linux' + writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' + } + dataDisks: [] + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '18.04-LTS' + version: 'latest' + } + } + extensionsTimeBudget: 'PT1H30M' networkProfile: { networkInterfaces: [ { @@ -78,43 +53,23 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null + adminPassword: adminPassword adminUsername: 'testadmin' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { + provisionVMAgent: true + ssh: { + publicKeys: [] + } disablePasswordAuthentication: false patchSettings: { assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' } - provisionVMAgent: true - ssh: { - publicKeys: [] - } } 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 - } - } } } @@ -135,8 +90,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: [] @@ -146,3 +101,45 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { serviceEndpoints: [] } } + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration1' + properties: { + privateIPAllocationMethod: 'Dynamic' + subnet: {} + primary: true + privateIPAddressVersion: 'IPv4' + } + } + ] + } +} + +resource schedule 'Microsoft.DevTestLab/schedules@2018-09-15' = { + name: resourceName + location: location + properties: { + dailyRecurrence: { + time: '0100' + } + notificationSettings: { + emailRecipient: '' + status: 'Disabled' + timeInMinutes: 30 + webhookUrl: '' + } + status: 'Enabled' + taskType: 'ComputeVmShutdownTask' + timeZoneId: 'Pacific Standard Time' + } + tags: { + environment: 'Production' + } +} diff --git a/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep b/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep index 7ed9bdf0..8f160520 100644 --- a/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep +++ b/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep @@ -1,58 +1,58 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' - -resource digitalTwinsInstance 'Microsoft.DigitalTwins/digitalTwinsInstances@2020-12-01' = { - name: resourceName - location: location -} +param resourceName string = 'acctest0001' resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { name: resourceName location: location - properties: { - disableLocalAuth: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false - } 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 enablePartitioning: false maxSizeInMegabytes: 5120 requiresDuplicateDetection: false status: 'Active' supportOrdering: false + enableBatchedOperations: false } } resource authorizationRule 'Microsoft.ServiceBus/namespaces/topics/authorizationRules@2021-06-01-preview' = { - parent: topic name: resourceName + parent: topic properties: { rights: [ 'Send' ] } } + +resource digitalTwinsInstance 'Microsoft.DigitalTwins/digitalTwinsInstances@2020-12-01' = { + name: resourceName + location: location +} + +resource endpoint 'Microsoft.DigitalTwins/digitalTwinsInstances/endpoints@2020-12-01' = { + name: resourceName + parent: digitalTwinsInstance + properties: { + authenticationType: 'KeyBased' + deadLetterSecret: '' + endpointType: 'ServiceBus' + primaryConnectionString: authorizationRule.listKeys().primaryConnectionString + secondaryConnectionString: authorizationRule.listKeys().secondaryConnectionString + } +} diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep index 6c9cc2f6..adb90ec2 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep @@ -6,26 +6,18 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + ipRules: [] + isVirtualNetworkFilterEnabled: false capabilities: [ { name: 'EnableCassandra' } ] - consistencyPolicy: { - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } + enableAnalyticalStorage: false + networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -34,19 +26,27 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } ] networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' + enableAutomaticFailover: false + enableFreeTier: false virtualNetworkRules: [] + consistencyPolicy: { + maxStalenessPrefix: 100 + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + } + defaultIdentity: 'FirstPartyIdentity' + disableLocalAuth: false + enableMultipleWriteLocations: false } } 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..f645a6ea 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep @@ -1,73 +1,76 @@ param resourceName string = 'acctest0001' param location string = 'eastus' -var keyspaceName = '${toLower(resourceName)}ks' -var tableName = '${toLower(resourceName)}tbl' -var accountName = toLower(replace(resourceName, '-', '')) +var accountName = 'resourcename' +var keyspaceName = 'resourcenameks' +var tableName = 'resourcenametbl' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: accountName location: location kind: 'GlobalDocumentDB' properties: { - backupPolicy: null - capabilities: [ - { - name: 'EnableCassandra' - } - ] + disableLocalAuth: false + enableFreeTier: false + ipRules: [] consistencyPolicy: { + maxStalenessPrefix: 100 defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: true - enableAutomaticFailover: false enableBurstCapacity: false - enableFreeTier: false - enableMultipleWriteLocations: false enablePartitionMerge: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { - failoverPriority: 0 isZoneRedundant: false - locationName: 'eastus' + locationName: '${location}' + failoverPriority: 0 + } + ] + networkAclBypassResourceIds: [] + capabilities: [ + { + name: 'EnableCassandra' } ] + databaseAccountOfferType: 'Standard' + disableKeyBasedMetadataWriteAccess: false + virtualNetworkRules: [] + enableAnalyticalStorage: true + enableAutomaticFailover: false + enableMultipleWriteLocations: false + isVirtualNetworkFilterEnabled: false minimalTlsVersion: 'Tls12' networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + backupPolicy: null } } 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 schema: { + partitionKeys: [ + { + name: 'test1' + } + ] clusterKeys: [] columns: [ { @@ -79,12 +82,9 @@ resource table 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces/tables@ type: 'int' } ] - partitionKeys: [ - { - name: 'test1' - } - ] } + analyticalStorageTtl: 1 + id: '${tableName}' } } } 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..2ff1a69f 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep @@ -11,21 +11,14 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: 'EnableGremlin' } ] - consistencyPolicy: { - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } - databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false + virtualNetworkRules: [] + databaseAccountOfferType: 'Standard' + disableKeyBasedMetadataWriteAccess: false enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -35,31 +28,38 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { ] networkAclBypass: 'None' networkAclBypassResourceIds: [] + consistencyPolicy: { + maxStalenessPrefix: 100 + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + } publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + enableAutomaticFailover: false + enableFreeTier: false + isVirtualNetworkFilterEnabled: false } } 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..3490c095 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep @@ -6,6 +6,7 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + networkAclBypassResourceIds: [] capabilities: [ { name: 'EnableGremlin' @@ -16,16 +17,19 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false + ipRules: [] + virtualNetworkRules: [] + networkAclBypass: 'None' disableLocalAuth: false enableAnalyticalStorage: false enableAutomaticFailover: false + databaseAccountOfferType: 'Standard' + isVirtualNetworkFilterEnabled: false + publicNetworkAccess: 'Enabled' + defaultIdentity: 'FirstPartyIdentity' + disableKeyBasedMetadataWriteAccess: false enableFreeTier: false enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -33,20 +37,16 @@ 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..a1560784 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep @@ -6,21 +6,10 @@ 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: [ { @@ -29,9 +18,20 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' + disableLocalAuth: false + enableAnalyticalStorage: false + ipRules: [] + databaseAccountOfferType: 'Standard' + enableAutomaticFailover: false networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' virtualNetworkRules: [] + networkAclBypass: 'None' + capabilities: [] + 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..b8fa9a5f 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep @@ -1,31 +1,22 @@ -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: 'MongoDB' properties: { - capabilities: [ - { - name: 'EnableMongo' - } - ] - consistencyPolicy: { - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' + publicNetworkAccess: 'Enabled' + virtualNetworkRules: [] disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false enableAutomaticFailover: false + databaseAccountOfferType: 'Standard' + defaultIdentity: 'FirstPartyIdentity' + enableAnalyticalStorage: false enableFreeTier: false enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -33,20 +24,29 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + capabilities: [ + { + name: 'EnableMongo' + } + ] + isVirtualNetworkFilterEnabled: false + networkAclBypass: 'None' + consistencyPolicy: { + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } } } 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..23078d70 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' -var accountName = toLower(replace(resourceName, '-', '')) -var dbName = '${toLower(resourceName)}db' -var roleName = '${toLower(resourceName)}role' +var accountName = 'resourcename' +var dbName = 'resourcenamedb' +var roleName = 'resourcenamerole' 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 + defaultConsistencyLevel: 'Strong' } 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}' + failoverPriority: 0 } ] - minimalTlsVersion: 'Tls12' networkAclBypass: 'None' networkAclBypassResourceIds: [] + enableBurstCapacity: false + enablePartitionMerge: false + ipRules: [] + backupPolicy: null + disableLocalAuth: false + enableAnalyticalStorage: false + enableAutomaticFailover: false + isVirtualNetworkFilterEnabled: false publicNetworkAccess: 'Enabled' + capabilities: [ + { + name: 'EnableMongoRoleBasedAccessControl' + } + { + name: 'EnableMongo' + } + ] + enableFreeTier: false + enableMultipleWriteLocations: false + minimalTlsVersion: 'Tls12' virtualNetworkRules: [] } } 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..32516524 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep @@ -9,7 +9,13 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { location: location kind: 'MongoDB' properties: { + networkAclBypass: 'None' backupPolicy: null + disableLocalAuth: false + enableAnalyticalStorage: false + enableAutomaticFailover: false + enableFreeTier: false + isVirtualNetworkFilterEnabled: false capabilities: [ { name: 'EnableMongoRoleBasedAccessControl' @@ -18,55 +24,49 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: 'EnableMongo' } ] + enableBurstCapacity: false + enableMultipleWriteLocations: false + enablePartitionMerge: false + ipRules: [] + virtualNetworkRules: [] + databaseAccountOfferType: 'Standard' + disableKeyBasedMetadataWriteAccess: false + networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' consistencyPolicy: { 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: [ { + locationName: '${location}' 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: { + password: mongodbUserPassword + userName: 'myUserName' databaseName: mongodbDatabas.name mechanisms: 'SCRAM-SHA-256' - password: null - 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..2c91304d 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep @@ -6,39 +6,39 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] - consistencyPolicy: { - defaultConsistencyLevel: 'BoundedStaleness' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false enableFreeTier: false enableMultipleWriteLocations: false + publicNetworkAccess: 'Enabled' + defaultIdentity: 'FirstPartyIdentity' + enableAutomaticFailover: false + networkAclBypassResourceIds: [] ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { - failoverPriority: 0 isZoneRedundant: false locationName: 'West Europe' + failoverPriority: 0 } ] networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' + capabilities: [] + consistencyPolicy: { + defaultConsistencyLevel: 'BoundedStaleness' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + databaseAccountOfferType: 'Standard' + enableAnalyticalStorage: false + isVirtualNetworkFilterEnabled: false virtualNetworkRules: [] + disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false } } 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..5f783e8d 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep @@ -6,22 +6,25 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] + disableKeyBasedMetadataWriteAccess: false + enableAnalyticalStorage: false + networkAclBypass: 'None' + enableAutomaticFailover: false + virtualNetworkRules: [] 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 + publicNetworkAccess: 'Enabled' + capabilities: [] + databaseAccountOfferType: 'Standard' + enableFreeTier: false + enableMultipleWriteLocations: false locations: [ { failoverPriority: 0 @@ -29,38 +32,35 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] } } 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 container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = { - parent: sqlDatabase name: resourceName + parent: sqlDatabase properties: { options: {} resource: { id: 'test-containerWest Europe' partitionKey: { - kind: 'Hash' paths: [ '/definition' ] + kind: 'Hash' } } } 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..ce445583 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,26 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + networkAclBypassResourceIds: [] + virtualNetworkRules: [] capabilities: [] + defaultIdentity: 'FirstPartyIdentity' + enableAutomaticFailover: false + enableFreeTier: false + ipRules: [] + networkAclBypass: 'None' + publicNetworkAccess: 'Enabled' + enableAnalyticalStorage: false consistencyPolicy: { defaultConsistencyLevel: 'Session' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } + disableLocalAuth: false + isVirtualNetworkFilterEnabled: false databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -29,44 +33,40 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] - 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: [ '/definition/id' ] + kind: 'Hash' } } } } 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..0f666b57 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 @@ -6,22 +6,8 @@ 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 locations: [ { failoverPriority: 0 @@ -30,30 +16,44 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } ] networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' + isVirtualNetworkFilterEnabled: false + consistencyPolicy: { + defaultConsistencyLevel: 'Session' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + databaseAccountOfferType: 'Standard' + defaultIdentity: 'FirstPartyIdentity' + disableLocalAuth: false + enableFreeTier: false + ipRules: [] + capabilities: [] + enableAutomaticFailover: false + enableMultipleWriteLocations: false + networkAclBypassResourceIds: [] 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,15 +65,15 @@ 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' triggerOperation: 'All' triggerType: 'Pre' + body: 'function trigger(){}' + id: '${resourceName}' } } } 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..ec86414f 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,24 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + networkAclBypass: 'None' + defaultIdentity: 'FirstPartyIdentity' + enableFreeTier: false + ipRules: [] capabilities: [] + databaseAccountOfferType: 'Standard' + disableLocalAuth: false + enableAutomaticFailover: false + isVirtualNetworkFilterEnabled: false + networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' + virtualNetworkRules: [] 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 @@ -29,31 +31,29 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + disableKeyBasedMetadataWriteAccess: 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,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..5e61acd8 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep @@ -6,22 +6,12 @@ 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 + publicNetworkAccess: 'Enabled' + enableAnalyticalStorage: false enableFreeTier: false - enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -29,22 +19,32 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' + capabilities: [] + disableLocalAuth: false + isVirtualNetworkFilterEnabled: false + enableMultipleWriteLocations: false networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' virtualNetworkRules: [] + networkAclBypass: 'None' + consistencyPolicy: { + defaultConsistencyLevel: 'BoundedStaleness' + maxIntervalInSeconds: 10 + maxStalenessPrefix: 200 + } + databaseAccountOfferType: 'Standard' + defaultIdentity: 'FirstPartyIdentity' } } 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..5db65510 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,21 +11,23 @@ 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: [] + networkAclBypassResourceIds: [] + disableLocalAuth: false + virtualNetworkRules: [] + capabilities: [] + consistencyPolicy: { + defaultConsistencyLevel: 'Session' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + enableAutomaticFailover: false isVirtualNetworkFilterEnabled: false locations: [ { @@ -57,26 +37,46 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } ] networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] } } -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: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' } + properties: { + enableDiskEncryption: false + enableDoubleEncryption: false + enableStreamingIngest: false + engineType: 'V2' + trustedExternalTenants: [] + enableAutoStop: true + enablePurge: false + publicIPType: 'IPv4' + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: 'Disabled' + } +} + +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..4152b83d 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep @@ -6,22 +6,20 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] + disableLocalAuth: false + enableMultipleWriteLocations: false + networkAclBypass: 'None' + networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' + disableKeyBasedMetadataWriteAccess: false + enableAutomaticFailover: false + ipRules: [] + isVirtualNetworkFilterEnabled: false 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,17 +27,20 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' + capabilities: [] + databaseAccountOfferType: 'Standard' + defaultIdentity: 'FirstPartyIdentity' + enableAnalyticalStorage: false + enableFreeTier: false virtualNetworkRules: [] } } resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions@2021-10-15' = { - parent: databaseAccount name: 'c3ce1661-d0b9-3476-0a7c-2654ce2f3055' + parent: databaseAccount properties: { + type: 'CustomRole' assignableScopes: [ databaseAccount.id ] @@ -50,7 +51,6 @@ resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinit ] } ] - roleName: 'acctest0001' - type: 'CustomRole' + roleName: resourceName } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep index 210b7112..8db8e18f 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep @@ -6,26 +6,29 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + databaseAccountOfferType: 'Standard' + enableAutomaticFailover: false + enableFreeTier: false capabilities: [ { name: 'EnableTable' } ] consistencyPolicy: { + maxStalenessPrefix: 100 defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false ipRules: [] + virtualNetworkRules: [] + disableKeyBasedMetadataWriteAccess: false + enableAnalyticalStorage: false isVirtualNetworkFilterEnabled: false + networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' + defaultIdentity: 'FirstPartyIdentity' + enableMultipleWriteLocations: false locations: [ { failoverPriority: 0 @@ -34,19 +37,16 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } ] networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] } } 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..37511746 100644 --- a/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep @@ -5,25 +5,25 @@ 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 } + authConfig: { + allowedModes: [ + 'MicrosoftEntraID' + ] + } + highAvailability: { + targetMode: 'Disabled' + } + serverVersion: '5.0' storage: { sizeGb: 32 } @@ -31,8 +31,8 @@ resource mongoCluster 'Microsoft.DocumentDB/mongoClusters@2025-09-01' = { } 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..3193751b 100644 --- a/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep @@ -28,14 +28,9 @@ resource mongoClusterSSDv2 'Microsoft.DocumentDB/mongoClusters@2025-09-01' = { } } -resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { - name: resourceName - location: location -} - 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: { @@ -51,3 +46,8 @@ resource mongouserEntraserviceprincipal 'Microsoft.DocumentDB/mongoClusters/user ] } } + +resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: resourceName + location: location +} diff --git a/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep index 9e0b659a..fbe50598 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep @@ -5,11 +5,11 @@ 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 + extendedCapacitySizeTiB: 0 } } diff --git a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep index c9205983..1998fa20 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep @@ -8,15 +8,15 @@ resource elasticSan 'Microsoft.ElasticSan/elasticSans@2023-01-01' = { baseSizeTiB: 1 extendedCapacitySizeTiB: 0 sku: { - name: 'Premium_LRS' tier: 'Premium' + name: 'Premium_LRS' } } } 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..c38dac16 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/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: { @@ -27,8 +27,8 @@ resource volumeGroup 'Microsoft.ElasticSan/elasticSans/volumeGroups@2023-01-01' } 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..484c73f2 100644 --- a/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep @@ -1,15 +1,15 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { name: resourceName location: location properties: { - autoCreateTopicWithFirstSubscription: true - autoDeleteTopicWithLastSubscription: true disableLocalAuth: false inputSchema: 'EventGridSchema' inputSchemaMapping: null publicNetworkAccess: 'Enabled' + autoCreateTopicWithFirstSubscription: true + autoDeleteTopicWithLastSubscription: true } } diff --git a/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep index 200dc074..31c7a7e8 100644 --- a/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep @@ -5,16 +5,16 @@ resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' autoCreateTopicWithFirstSubscription: true autoDeleteTopicWithLastSubscription: true disableLocalAuth: false inputSchema: 'EventGridSchema' inputSchemaMapping: null - publicNetworkAccess: 'Enabled' } } 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..7f4bea3c 100644 --- a/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep @@ -1,19 +1,46 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' -resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = { - scope: storageAccount +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' properties: { - deadLetterDestination: null - destination: { - endpointType: 'EventHub' - properties: { - deliveryAttributeMappings: null - resourceId: eventhub.id + isNfsV3Enabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' + defaultToOAuthAuthentication: false + encryption: { + keySource: 'Microsoft.Storage' + services: { + table: { + keyType: 'Service' + } + queue: { + keyType: 'Service' + } } } - eventDeliverySchema: 'EventGridSchema' + isHnsEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + } +} + +resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = { + name: resourceName + scope: storageAccount + properties: { filter: { includedEventTypes: [ 'Microsoft.Storage.BlobCreated' @@ -25,67 +52,39 @@ resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = eventTimeToLiveInMinutes: 144 maxDeliveryAttempts: 10 } + deadLetterDestination: null + destination: { + endpointType: 'EventHub' + properties: { + deliveryAttributeMappings: null + } + } + eventDeliverySchema: 'EventGridSchema' } } 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' - } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + zoneRedundant: false + disableLocalAuth: false + isAutoInflateEnabled: false } } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { + status: 'Active' messageRetentionInDays: 1 partitionCount: 1 - status: 'Active' } } 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..f85f37ca 100644 --- a/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep @@ -1,23 +1,30 @@ 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 systemTopicName = 'resourceName-st' +var storageAccountName = 'resourceNamesa01' +var queueName = 'resourceNamequeue' +var eventSubscription1Name = 'resourceName-es1' +var eventSubscription2Name = 'resourceName-es2' +var queueServiceId = '${storageAccount.id}/queueServices/default' 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 - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - dnsEndpointType: 'Standard' + isLocalUserEnabled: true + isSftpEnabled: false + networkAcls: { + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + } encryption: { keySource: 'Microsoft.Storage' services: { @@ -29,23 +36,17 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } + publicNetworkAccess: 'Enabled' isHnsEnabled: false - isLocalUserEnabled: true + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + defaultToOAuthAuthentication: false 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 + allowCrossTenantReplication: false + allowSharedKeyAccess: true + dnsEndpointType: 'Standard' } } @@ -58,9 +59,19 @@ resource systemTopic 'Microsoft.EventGrid/systemTopics@2022-06-15' = { } } +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,57 +87,43 @@ 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 - } - } - eventDeliverySchema: 'EventGridSchema' filter: { advancedFilters: [ { + values: [ + 'bar' + ] key: 'subject' operatorType: 'StringEndsWith' - values: ['bar'] } ] } labels: [] + deadLetterDestination: null + destination: { + endpointType: 'StorageQueue' + properties: { + queueName: queueName + resourceId: storageAccount.id + } + } + eventDeliverySchema: 'EventGridSchema' } - 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.eventhub/samples/namespaces/authorizationrules/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/authorizationrules/main.bicep index b2e9ba33..12652f1c 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: { + capacity: 1 + name: 'Basic' + tier: '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..25499a90 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep @@ -4,38 +4,39 @@ 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 } - sku: { - capacity: 1 - name: 'Standard' - tier: 'Standard' - } } resource disasterRecoveryConfig 'Microsoft.EventHub/namespaces/disasterRecoveryConfigs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { partnerNamespace: namespace2.id } } + +resource namespace2 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { + name: resourceName + location: 'westus2' + sku: { + capacity: 1 + name: 'Standard' + tier: 'Standard' + } + properties: { + disableLocalAuth: false + isAutoInflateEnabled: false + publicNetworkAccess: 'Enabled' + zoneRedundant: false + } +} 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..fc971ee4 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/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: { + capacity: 1 + name: 'Basic' + tier: 'Basic' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Basic' - tier: 'Basic' - } } 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..1fd26319 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/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: { + capacity: 1 + name: 'Standard' + tier: '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 @@ -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..38a5fa38 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep @@ -4,22 +4,22 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + name: 'Standard' + tier: 'Standard' + capacity: 1 + } 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..9194ceb9 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 + sku: { + name: 'Standard' + tier: 'Standard' + capacity: 1 + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Standard' - tier: 'Standard' - } } diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep index b61787f7..c6baac52 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: { + name: 'Standard' + tier: 'Standard' + capacity: 1 + } 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..75577bad 100644 --- a/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep +++ b/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep @@ -4,49 +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 - 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: resourceName location: location @@ -62,6 +19,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } } extensionsTimeBudget: 'PT1H30M' + priority: 'Regular' hardwareProfile: { vmSize: 'Standard_F2' } @@ -76,9 +34,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null - adminUsername: 'adminuser' - allowExtensionOperations: true computerName: 'acctestvmdro23' secrets: [] windowsConfiguration: { @@ -93,15 +48,17 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { listeners: [] } } + adminPassword: adminPassword + adminUsername: 'adminuser' + allowExtensionOperations: true } - priority: 'Regular' storageProfile: { dataDisks: [] imageReference: { + version: 'latest' offer: 'WindowsServer' publisher: 'MicrosoftWindowsServer' sku: '2016-Datacenter' - version: 'latest' } osDisk: { caching: 'ReadWrite' @@ -116,31 +73,72 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } } +resource guestConfigurationAssignment 'Microsoft.GuestConfiguration/guestConfigurationAssignments@2020-06-25' = { + name: 'WhitelistedApplication' + location: location + scope: virtualMachine + properties: { + guestConfiguration: { + name: 'WhitelistedApplication' + version: '1.*' + assignmentType: '' + configurationParameter: [ + { + value: 'NotePad,sql' + name: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + } + ] + contentHash: '' + contentUri: '' + } + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + ipConfigurations: [ + { + name: 'internal' + properties: { + subnet: {} + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + } + } + ] + enableAcceleratedNetworking: false + enableIPForwarding: false + } +} + 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 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: [] } } diff --git a/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep b/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep index ce8260ec..9488589b 100644 --- a/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep @@ -10,14 +10,24 @@ param vmPassword string param restCredentialPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { name: resourceName location: location properties: { + storageProfile: { + storageaccounts: [ + { + isDefault: true + key: storageAccount.listKeys().keys[0].value + name: '.blob.core.windows.net' + } + ] + } + tier: 'standard' clusterDefinition: { componentVersion: { Spark: '2.4' @@ -32,6 +42,11 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { kind: 'Spark' } clusterVersion: '4.0.3000.1' + encryptionInTransitProperties: { + isEncryptionInTransitEnabled: false + } + minSupportedTlsVersion: '1.2' + osType: 'Linux' computeProfile: { roles: [ { @@ -48,9 +63,6 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { targetInstanceCount: 2 } { - hardwareProfile: { - vmSize: 'standard_a4_v2' - } name: 'workernode' osProfile: { linuxOperatingSystemProfile: { @@ -59,6 +71,9 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { } } targetInstanceCount: 3 + hardwareProfile: { + vmSize: 'standard_a4_v2' + } } { hardwareProfile: { @@ -75,36 +90,17 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { } ] } - 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: { @@ -119,21 +115,23 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { isHnsEnabled: false isNfsV3Enabled: false isSftpEnabled: false + accessTier: 'Hot' minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false } } 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.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..60655fe3 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { name: resourceName @@ -7,37 +7,37 @@ 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' - smartProxyEnabled: false - } corsConfiguration: { + origins: [] allowCredentials: false headers: [] methods: [] - origins: [] + } + acrConfiguration: {} + authenticationConfiguration: { + audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' + authority: 'https://login.microsoftonline.com/${tenant().tenantId}' + smartProxyEnabled: false } } } resource fhirService2 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace kind: 'fhir-R4' properties: { acrConfiguration: {} authenticationConfiguration: { - audience: fhirService.properties.authenticationConfiguration.audience authority: fhirService.properties.authenticationConfiguration.authority smartProxyEnabled: false + audience: fhirService.properties.authenticationConfiguration.audience } corsConfiguration: { allowCredentials: false 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..5d8d3b7c 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep @@ -4,27 +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 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: { messageRetentionInDays: 1 partitionCount: 2 @@ -32,31 +27,23 @@ resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { } } -resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { - parent: workspace +resource consumerGroup 'Microsoft.EventHub/namespaces/eventhubs/consumerGroups@2021-11-01' = { name: resourceName - location: location - kind: 'fhir-R4' + parent: eventhub properties: { - acrConfiguration: {} - authenticationConfiguration: { - audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' - authority: 'https://login.microsoftonline.com/deployer().tenantId' - smartProxyEnabled: false - } - corsConfiguration: { - allowCredentials: false - headers: [] - methods: [] - origins: [] - } + userMetadata: '' } } +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: { @@ -65,25 +52,16 @@ resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12 } } 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 - properties: { - userMetadata: '' - } -} - resource fhirDestination 'Microsoft.HealthcareApis/workspaces/iotConnectors/fhirDestinations@2022-12-01' = { - parent: iotConnector name: resourceName location: location + parent: iotConnector properties: { fhirMapping: { content: { @@ -95,3 +73,24 @@ resource fhirDestination 'Microsoft.HealthcareApis/workspaces/iotConnectors/fhir resourceIdentityResolutionType: 'Create' } } + +resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { + name: resourceName + location: location + parent: workspace + kind: 'fhir-R4' + properties: { + acrConfiguration: {} + authenticationConfiguration: { + audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' + authority: 'https://login.microsoftonline.com/${tenant().tenantId}' + smartProxyEnabled: false + } + corsConfiguration: { + allowCredentials: false + headers: [] + methods: [] + origins: [] + } + } +} diff --git a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep index eefb1927..1dae1bd7 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep @@ -1,30 +1,30 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { + name: resourceName + location: location +} + 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: { messageRetentionInDays: 1 partitionCount: 2 @@ -33,9 +33,9 @@ resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { } 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..7e935631 --- /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 virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { + name: resourceName + location: location + properties: { + hardwareProfile: { + vmSize: 'Standard_F2' + } + networkProfile: { + networkInterfaces: [ + { + properties: { + primary: false + } + id: networkInterface.id + } + ] + } + osProfile: { + adminPassword: adminPassword + adminUsername: 'testadmin' + computerName: 'hostname230630032848831819' + linuxConfiguration: { + disablePasswordAuthentication: false + } + } + storageProfile: { + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' + } + osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' + name: 'myosdisk1' + 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 workloadImpact 'Microsoft.Impact/workloadImpacts@2023-12-01-preview' = { + name: resourceName + properties: { + startDateTime: '2024-12-03T01:15:00Z' + workload: { + context: 'context' + toolset: 'Ansible' + } + armCorrelationIds: [ + 'id1' + 'id2' + ] + clientIncidentDetails: { + clientIncidentId: 'id' + clientIncidentSource: 'AzureDevops' + } + errorDetails: { + errorCode: 'code' + errorMessage: 'errorMessage' + } + impactCategory: 'Resource.Availability' + impactDescription: 'impact description' + impactedResourceId: virtualMachine.id + performance: [ + { + unit: 'ByteSeconds' + actual: 2 + expected: 2 + expectedValueRange: { + min: 1 + max: 5 + } + metricName: 'example' + } + ] + additionalProperties: { + VmUniqueId: 'vm-unique-id' + Location: 'DataCenter1' + LogUrl: 'http://example.com/log' + Manufacturer: 'ManufacturerName' + PhysicalHostName: 'host123' + CollectTelemetry: true + ModelNumber: 'Model123' + NodeId: 'node-123' + SerialNumber: 'SN123456' + } + confidenceLevel: 'High' + connectivity: { + port: 1443 + protocol: 'TCP' + source: { + azureResourceId: virtualMachine.id + } + target: { + azureResourceId: virtualMachine.id + } + } + endDateTime: '2024-12-04T01:15:00Z' + impactGroupId: 'impact groupid' + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: resourceName + parent: virtualNetwork + properties: { + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + ipConfigurations: [ + { + name: 'testconfiguration1' + properties: { + subnet: {} + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + } + } + ] + enableAcceleratedNetworking: false + enableIPForwarding: false + } +} 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..71993d5f 100644 --- a/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep +++ b/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep @@ -1,21 +1,22 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { name: resourceName location: 'global' properties: { - armRoleReceivers: [] - automationRunbookReceivers: [] - azureAppPushReceivers: [] - azureFunctionReceivers: [] emailReceivers: [] enabled: true eventHubReceivers: [] - groupShortName: 'acctestag' - itsmReceivers: [] logicAppReceivers: [] - smsReceivers: [] voiceReceivers: [] webhookReceivers: [] + automationRunbookReceivers: [] + azureAppPushReceivers: [] + azureFunctionReceivers: [] + groupShortName: 'acctestag' + itsmReceivers: [] + smsReceivers: [] + armRoleReceivers: [] } } diff --git a/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep b/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep index fe95dfcf..d9a15191 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: { - armRoleReceivers: [] - automationRunbookReceivers: [] azureAppPushReceivers: [] azureFunctionReceivers: [] - emailReceivers: [] - enabled: true eventHubReceivers: [] groupShortName: 'acctestag1' itsmReceivers: [] - logicAppReceivers: [] smsReceivers: [] voiceReceivers: [] webhookReceivers: [] + armRoleReceivers: [] + automationRunbookReceivers: [] + emailReceivers: [] + enabled: true + logicAppReceivers: [] } } @@ -25,19 +25,19 @@ resource actionGroup2 'Microsoft.Insights/actionGroups@2023-01-01' = { name: resourceName location: 'global' properties: { + webhookReceivers: [] armRoleReceivers: [] automationRunbookReceivers: [] + emailReceivers: [] + eventHubReceivers: [] + logicAppReceivers: [] azureAppPushReceivers: [] azureFunctionReceivers: [] - emailReceivers: [] enabled: true - eventHubReceivers: [] groupShortName: 'acctestag2' itsmReceivers: [] - logicAppReceivers: [] smsReceivers: [] voiceReceivers: [] - webhookReceivers: [] } } @@ -45,6 +45,7 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { name: resourceName location: 'global' properties: { + scopes: [] actions: { actionGroups: [ { @@ -85,8 +86,8 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { field: 'properties.previousHealthStatus' } { - equals: 'Available' field: 'properties.previousHealthStatus' + equals: 'Available' } ] } @@ -106,22 +107,20 @@ 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: { + isNfsV3Enabled: false + publicNetworkAccess: 'Enabled' accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -135,16 +134,14 @@ 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 + allowSharedKeyAccess: true } } diff --git a/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep b/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep index a1ef6631..8c406d8a 100644 --- a/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep +++ b/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep @@ -6,6 +6,35 @@ param adminUsername string @description('The administrator password for the virtual machine scale set') 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: 'internal' + parent: virtualNetwork + properties: { + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + } +} + resource autoScaleSetting 'Microsoft.Insights/autoScaleSettings@2022-10-01' = { name: resourceName location: location @@ -23,50 +52,39 @@ resource autoScaleSetting 'Microsoft.Insights/autoScaleSettings@2022-10-01' = { rules: [ { metricTrigger: { - dimensions: [] + timeGrain: 'PT1M' + timeWindow: 'PT5M' dividePerInstance: true + timeAggregation: 'Last' + dimensions: [] 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' } } ] } ] - targetResourceUri: virtualMachineScaleSet.id } } resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023-03-01' = { name: resourceName location: location + sku: { + tier: 'Standard' + capacity: 2 + name: 'Standard_F2' + } properties: { - additionalCapabilities: {} - doNotRunExtensionsOnOverprovisionedVMs: false - orchestrationMode: 'Uniform' - overprovision: true - scaleInPolicy: { - forceDeletion: false - rules: [ - 'Default' - ] - } - singlePlacementGroup: true - upgradePolicy: { - mode: 'Manual' - } virtualMachineProfile: { diagnosticsProfile: { bootDiagnostics: { @@ -97,9 +115,7 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- loadBalancerInboundNatPools: [] primary: true privateIPAddressVersion: 'IPv4' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -109,9 +125,6 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- ] } osProfile: { - adminPassword: null - adminUsername: null - computerNamePrefix: 'testvm-230630033559396108' linuxConfiguration: { disablePasswordAuthentication: false provisionVMAgent: true @@ -125,15 +138,18 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } } secrets: [] + adminPassword: adminPassword + adminUsername: adminUsername + computerNamePrefix: 'testvm-230630033559396108' } priority: 'Regular' storageProfile: { dataDisks: [] imageReference: { - offer: 'UbuntuServer' publisher: 'Canonical' sku: '16.04-LTS' version: 'latest' + offer: 'UbuntuServer' } osDisk: { caching: 'ReadWrite' @@ -146,39 +162,19 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } } } - } - sku: { - capacity: 2 - name: 'Standard_F2' - tier: 'Standard' - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' + additionalCapabilities: {} + doNotRunExtensionsOnOverprovisionedVMs: false + orchestrationMode: 'Uniform' + singlePlacementGroup: true + overprovision: true + scaleInPolicy: { + forceDeletion: false + rules: [ + 'Default' ] } - dhcpOptions: { - dnsServers: [] + upgradePolicy: { + mode: 'Manual' } - subnets: [] - } -} - -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: [] } } diff --git a/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep b/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep index c22f4fd2..3f1b96c8 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: { + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + publicNetworkAccessForQuery: 'Enabled' Application_Type: 'web' DisableIpMasking: false DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' } } 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..b61771fe 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 } } 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..e49442eb --- /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: { + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' + RetentionInDays: 90 + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + SamplingPercentage: 100 + } +} + +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..fcb904e3 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep @@ -4,38 +4,6 @@ param location string = 'westeurope' @description('The administrator password for the virtual machine') param adminPassword string -resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { - name: resourceName - location: location - properties: { - dataFlows: [ - { - destinations: [ - 'test-destination-metrics' - ] - streams: [ - 'Microsoft-InsightsMetrics' - ] - } - ] - description: '' - destinations: { - azureMonitorMetrics: { - name: 'test-destination-metrics' - } - } - } -} - -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 @@ -49,9 +17,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -62,40 +28,16 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: 'machine-230630033559397415' location: location properties: { - additionalCapabilities: {} - applicationProfile: { - galleryApplications: [] - } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - extensionsTimeBudget: 'PT1H30M' - 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: { disablePasswordAuthentication: false patchSettings: { - assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' + assessmentMode: 'ImageDefault' } provisionVMAgent: true ssh: { @@ -104,25 +46,49 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } secrets: [] } - priority: 'Regular' storageProfile: { dataDisks: [] imageReference: { - offer: 'UbuntuServer' publisher: 'Canonical' sku: '16.04-LTS' version: 'latest' + offer: 'UbuntuServer' } osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' managedDisk: { storageAccountType: 'Standard_LRS' } osType: 'Linux' writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' } } + additionalCapabilities: {} + networkProfile: { + networkInterfaces: [ + { + id: networkInterface.id + properties: { + primary: true + } + } + ] + } + priority: 'Regular' + applicationProfile: { + galleryApplications: [] + } + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' + } + } + extensionsTimeBudget: 'PT1H30M' + hardwareProfile: { + vmSize: 'Standard_B1ls' + } } } @@ -130,21 +96,21 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: 'network-230630033559397415' location: location properties: { + dhcpOptions: { + dnsServers: [] + } + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' ] } - dhcpOptions: { - dnsServers: [] - } - subnets: [] } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'subnet-230630033559397415' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' delegations: [] @@ -154,3 +120,35 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { serviceEndpoints: [] } } + +resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { + name: resourceName + location: location + properties: { + description: '' + destinations: { + azureMonitorMetrics: { + name: 'test-destination-metrics' + } + } + dataFlows: [ + { + destinations: [ + 'test-destination-metrics' + ] + streams: [ + 'Microsoft-InsightsMetrics' + ] + } + ] + } +} + +resource dataCollectionRuleAssociation 'Microsoft.Insights/dataCollectionRuleAssociations@2022-06-01' = { + name: resourceName + scope: virtualMachine + properties: { + dataCollectionRuleId: dataCollectionRule.id + description: '' + } +} diff --git a/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep b/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep index 30fee3fa..e4f9c1a6 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep @@ -5,6 +5,12 @@ resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' name: resourceName location: location properties: { + description: '' + destinations: { + azureMonitorMetrics: { + name: 'test-destination-metrics' + } + } dataFlows: [ { destinations: [ @@ -15,11 +21,5 @@ resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' ] } ] - description: '' - destinations: { - azureMonitorMetrics: { - name: 'test-destination-metrics' - } - } } } diff --git a/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep b/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep index 0b673c3a..fe040ff0 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: { + tier: 'Basic' + capacity: 1 + name: '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' } - tenantId: deployer().tenantId + enableRbacAuthorization: false + enabledForTemplateDeployment: false + tenantId: tenant().tenantId } } 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..942311db --- /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: { + publicNetworkAccess: 'Enabled' + allowSharedKeyAccess: true + encryption: { + keySource: 'Microsoft.Storage' + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + } + isHnsEnabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + defaultToOAuthAuthentication: false + isNfsV3Enabled: false + isSftpEnabled: false + } +} 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..8df98c8b --- /dev/null +++ b/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep @@ -0,0 +1,35 @@ +targetScope = 'subscription' + +param location string = 'westeurope' +param resourceName string = 'acctest0001' + +resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: resourceName + location: location +} + +resource logProfile 'Microsoft.Insights/logProfiles@2016-03-01' = { + name: resourceName + properties: { + retentionPolicy: { + days: 7 + enabled: true + } + categories: [ + 'Action' + ] + locations: [ + 'westeurope' + 'westeurope' + ] + } +} + +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..07cc690a 100644 --- a/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep +++ b/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep @@ -1,38 +1,36 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = { name: resourceName location: 'global' properties: { - actions: [] - autoMitigate: true + targetResourceRegion: '' + targetResourceType: '' criteria: { allOf: [ { - criterionType: 'StaticThresholdCriterion' dimensions: [] - metricName: 'UsedCapacity' metricNamespace: 'Microsoft.Storage/storageAccounts' name: 'Metric1' operator: 'GreaterThan' + timeAggregation: 'Average' + criterionType: 'StaticThresholdCriterion' + metricName: 'UsedCapacity' skipMetricValidation: false threshold: any('55.5') - timeAggregation: 'Average' } ] 'odata.type': 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria' } + evaluationFrequency: 'PT1M' + windowSize: 'PT1H' + actions: [] + autoMitigate: true description: '' enabled: true - evaluationFrequency: 'PT1M' - scopes: [ - storageAccount.id - ] + scopes: [] severity: 3 - targetResourceRegion: '' - targetResourceType: '' - windowSize: 'PT1H' } tags: { CUSTOMER: 'CUSTOMERx' @@ -45,35 +43,35 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-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 + isHnsEnabled: false + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + allowBlobPublicAccess: 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' } publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + accessTier: 'Hot' } } diff --git a/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep b/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep index 59efc1be..25ba4bcf 100644 --- a/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep +++ b/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep @@ -1,6 +1,8 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' 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..1acbd281 100644 --- a/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep +++ b/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/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 @@ -10,21 +10,22 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { DisableIpMasking: false DisableLocalAuth: false ForceCustomerStorageForProfiler: false - RetentionInDays: 90 SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' + RetentionInDays: 90 } } 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..1e6c519c 100644 --- a/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep +++ b/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep @@ -6,14 +6,14 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + publicNetworkAccessForQuery: 'Enabled' Application_Type: 'web' DisableIpMasking: false DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' } } @@ -37,14 +37,14 @@ resource scheduledQueryRule 'Microsoft.Insights/scheduledQueryRules@2021-08-01' } ] } + severity: 3 + targetResourceTypes: null + windowSize: 'PT5M' enabled: true evaluationFrequency: 'PT5M' scopes: [ component.id ] - severity: 3 skipQueryValidation: false - targetResourceTypes: null - windowSize: 'PT5M' } } diff --git a/settings/remarks/microsoft.insights/samples/webtests/main.bicep b/settings/remarks/microsoft.insights/samples/webtests/main.bicep index 072fc674..22c750a8 100644 --- a/settings/remarks/microsoft.insights/samples/webtests/main.bicep +++ b/settings/remarks/microsoft.insights/samples/webtests/main.bicep @@ -1,22 +1,6 @@ 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 webTest 'Microsoft.Insights/webTests@2022-06-15' = { name: resourceName location: location @@ -24,16 +8,8 @@ resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { properties: { Description: '' Enabled: false - Frequency: 300 - Kind: 'standard' - Locations: [ - { - Id: 'us-tx-sn1-azr' - } - ] - Name: 'acctest0001' + Name: resourceName Request: { - FollowRedirects: false Headers: [ { key: 'x-header' @@ -47,16 +23,40 @@ resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { HttpVerb: 'GET' ParseDependentRequests: false RequestUrl: 'http://microsoft.com' + FollowRedirects: false } - RetryEnabled: false - SyntheticMonitorId: 'acctest0001' + SyntheticMonitorId: resourceName Timeout: 30 + Frequency: 300 + Kind: 'standard' + Locations: [ + { + Id: 'us-tx-sn1-azr' + } + ] + RetryEnabled: false ValidationRules: { ExpectedHttpStatusCode: 200 SSLCheck: false } } tags: { - 'hidden-link:azapi_resource.component.id': 'Resource' + 'hidden-link:${component.id}': 'Resource' + } +} + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + Application_Type: 'web' + ForceCustomerStorageForProfiler: false + publicNetworkAccessForQuery: 'Enabled' + DisableIpMasking: false + DisableLocalAuth: false + RetentionInDays: 90 + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' } } 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..1384b88f 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: [ { - category: 'workbook' - name: 'test' order: 0 resourceType: 'Azure Monitor' type: 'workbook' + category: 'workbook' + name: 'test' } ] priority: 0 diff --git a/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep b/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep index 464310e5..266adc33 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' publicNetworkAccess: 'Enabled' subdomain: 'subdomain-2306300333537' template: 'iotc-pnp-preview@1.0.0' - } - sku: { - name: 'ST1' + displayName: '${resourceName}' } } diff --git a/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep b/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep index bed18d28..1db1bad5 100644 --- a/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep @@ -1,8 +1,13 @@ +param resourceName string = 'acctest0001' param location string = 'westeurope' resource managedHSM 'Microsoft.KeyVault/managedHSMs@2021-10-01' = { name: 'kvHsm230630033342437496' location: location + sku: { + name: 'Standard_B1' + family: 'B' + } properties: { createMode: 'default' enablePurgeProtection: false @@ -12,10 +17,6 @@ resource managedHSM 'Microsoft.KeyVault/managedHSMs@2021-10-01' = { ] publicNetworkAccess: 'Enabled' softDeleteRetentionInDays: 90 - tenantId: deployer().tenantId - } - sku: { - family: 'B' - name: 'Standard_B1' + tenantId: tenant().tenantId } } 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..6a4e6d1b 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep @@ -5,25 +5,29 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName location: location properties: { - accessPolicies: [] - enablePurgeProtection: true - enableSoftDelete: true sku: { family: 'A' name: 'standard' } - 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: [ { objectId: deployer().objectId permissions: { + secrets: [ + 'Get' + ] + storage: [] certificates: [ 'ManageContacts' ] @@ -42,20 +46,19 @@ resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = 'Sign' 'Verify' ] - secrets: [ - 'Get' - ] - storage: [] } - tenantId: deployer().tenantId + tenantId: tenant().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..ce681013 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep @@ -5,6 +5,12 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { + softDeleteRetentionInDays: 7 + enableRbacAuthorization: false + enabledForDiskEncryption: false + enabledForTemplateDeployment: false + publicNetworkAccess: 'Enabled' + tenantId: tenant().tenantId accessPolicies: [ { objectId: deployer().objectId @@ -20,21 +26,15 @@ 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' + family: 'A' } - softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId } } 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..98db6444 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: [ + { + vmSize: 'Standard_DS2_v2' + count: 1 + mode: 'System' + name: 'default' + } + ] + dnsPrefix: '${resourceName}' + } +} + resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = { - scope: managedCluster name: resourceName + scope: managedCluster properties: { autoUpgradeMinorVersion: true extensionType: 'microsoft.flux' @@ -11,19 +27,25 @@ 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: { + sourceKind: 'GitRepository' + suspend: false gitRepository: { - repositoryRef: { - branch: 'branch' - } syncIntervalInSeconds: 120 timeoutInSeconds: 120 url: 'https://github.com/Azure/arc-k8s-demo' + repositoryRef: { + branch: 'branch' + } } kustomizations: { applications: { + timeoutInSeconds: 600 dependsOn: [ 'shared' ] @@ -32,39 +54,17 @@ resource fluxConfiguration 'Microsoft.KubernetesConfiguration/fluxConfigurations prune: false retryIntervalInSeconds: 60 syncIntervalInSeconds: 60 - 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..9e244e0c 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 enablePurge: false enableStreamingIngest: false engineType: 'V2' - publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' + enableDoubleEncryption: false + publicIPType: 'IPv4' 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..f1b7fbd9 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: { - enableAutoStop: true - enableDiskEncryption: false + trustedExternalTenants: [] 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 + enableDiskEncryption: false + publicNetworkAccess: 'Enabled' } } 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..78d8ba67 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep @@ -4,36 +4,36 @@ 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' + enableAutoStop: true + enableDiskEncryption: false + enablePurge: false + publicNetworkAccess: 'Enabled' trustedExternalTenants: [] - } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' + enableDoubleEncryption: false } } 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' diff --git a/settings/remarks/microsoft.kusto/samples/clusters/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/main.bicep index 1a464e0e..158dd904 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 + enableStreamingIngest: false + enableAutoStop: true 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' - } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep index d595fe4c..40a4ad8e 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep @@ -4,35 +4,36 @@ 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 + restrictOutboundNetworkAccess: 'Disabled' + trustedExternalTenants: [] + enablePurge: false engineType: 'V2' publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' - trustedExternalTenants: [] - } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' + enableAutoStop: true } } 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: { @@ -45,25 +46,24 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } isHnsEnabled: false + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + allowCrossTenantReplication: true + defaultToOAuthAuthentication: 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 + parent: cluster properties: { - groupId: 'blob' privateLinkResourceId: storageAccount.id + groupId: 'blob' } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep index bfe0741d..8682a730 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: { enableAutoStop: true - enableDiskEncryption: false enableDoubleEncryption: false - enablePurge: false enableStreamingIngest: false - engineType: 'V2' publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' + enableDiskEncryption: false + enablePurge: false + engineType: 'V2' 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..fd5efa59 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/main.bicep @@ -24,11 +24,17 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { } title: 'Test Title' virtualMachineProfile: { + sku: { + capacity: 1 + name: 'Classic_Fsv2_2_4GB_128_S_SSD' + } + usageQuota: 'PT0S' + useSharedPassword: 'Disabled' additionalCapabilities: { installGpuDrivers: 'Disabled' } adminUser: { - password: null + password: '${adminPassword}' username: 'testadmin' } createOption: 'Image' @@ -38,12 +44,6 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { sku: '20_04-lts' version: 'latest' } - sku: { - capacity: 1 - name: 'Classic_Fsv2_2_4GB_128_S_SSD' - } - usageQuota: 'PT0S' - useSharedPassword: '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..d0b21a31 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep @@ -9,26 +9,27 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { location: location properties: { autoShutdownProfile: { + shutdownWhenNotConnected: 'Disabled' shutdownOnDisconnect: 'Disabled' shutdownOnIdle: 'None' - shutdownWhenNotConnected: 'Disabled' } connectionProfile: { + webSshAccess: 'None' clientRdpAccess: 'None' clientSshAccess: 'None' webRdpAccess: 'None' - webSshAccess: 'None' } securityProfile: { openAccess: 'Disabled' } title: 'Test Title' virtualMachineProfile: { + useSharedPassword: 'Disabled' additionalCapabilities: { installGpuDrivers: 'Disabled' } adminUser: { - password: null + password: '${adminPassword}' username: 'testadmin' } createOption: 'Image' @@ -43,14 +44,13 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { name: 'Classic_Fsv2_2_4GB_128_S_SSD' } usageQuota: 'PT0S' - useSharedPassword: 'Disabled' } } } 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..6ef85d3d 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep @@ -1,8 +1,8 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator password for the lab virtual machine') param adminPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource lab 'Microsoft.LabServices/labs@2022-08-01' = { name: resourceName @@ -28,7 +28,7 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { installGpuDrivers: 'Disabled' } adminUser: { - password: null + password: '${adminPassword}' username: 'testadmin' } createOption: 'Image' @@ -39,8 +39,8 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { version: 'latest' } sku: { - capacity: 1 name: 'Classic_Fsv2_2_4GB_128_S_SSD' + capacity: 1 } usageQuota: 'PT0S' useSharedPassword: 'Disabled' @@ -49,8 +49,8 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { } resource user 'Microsoft.LabServices/labs/users@2022-08-01' = { - parent: lab name: resourceName + parent: lab properties: { additionalUsageQuota: 'PT0S' email: 'terraform-acctest@hashicorp.com' diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep index 21d7e4b9..6ed6e6ba 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep @@ -1,81 +1,85 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' 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: { + hostIdentity: { + qualifier: 'AS2Identity' + value: 'FabrikamNY' + } agreementType: 'AS2' content: { aS2: { receiveAgreement: { protocolSettings: { - acknowledgementConnectionSettings: { - ignoreCertificateNameMismatch: false - keepHttpConnectionAlive: false - supportHttpStatusCodeContinue: false - 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' } messageConnectionSettings: { - ignoreCertificateNameMismatch: false - keepHttpConnectionAlive: true supportHttpStatusCodeContinue: true unfoldHttpHeaders: true + ignoreCertificateNameMismatch: false + keepHttpConnectionAlive: true } securitySettings: { - enableNRRForInboundDecodedMessages: false - enableNRRForInboundEncodedMessages: false - enableNRRForInboundMDN: false enableNRRForOutboundDecodedMessages: false enableNRRForOutboundEncodedMessages: false enableNRRForOutboundMDN: false overrideGroupSigningCertificate: false + enableNRRForInboundDecodedMessages: false + enableNRRForInboundEncodedMessages: false + enableNRRForInboundMDN: false } validationSettings: { + compressMessage: false + encryptionAlgorithm: 'DES3' + overrideMessageProperties: false + signMessage: false checkCertificateRevocationListOnReceive: false checkCertificateRevocationListOnSend: false checkDuplicateMessage: false - compressMessage: false encryptMessage: false - encryptionAlgorithm: 'DES3' interchangeDuplicatesValidityDays: 5 - overrideMessageProperties: false - signMessage: false signingAlgorithm: 'Default' } + acknowledgementConnectionSettings: { + keepHttpConnectionAlive: false + supportHttpStatusCodeContinue: false + unfoldHttpHeaders: false + ignoreCertificateNameMismatch: false + } } receiverBusinessIdentity: { - qualifier: 'AS2Identity' value: 'FabrikamNY' + qualifier: 'AS2Identity' } senderBusinessIdentity: { qualifier: 'AS2Identity' @@ -83,69 +87,69 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = } } sendAgreement: { + receiverBusinessIdentity: { + qualifier: 'AS2Identity' + value: 'FabrikamDC' + } + senderBusinessIdentity: { + qualifier: 'AS2Identity' + value: 'FabrikamNY' + } protocolSettings: { acknowledgementConnectionSettings: { - ignoreCertificateNameMismatch: false - keepHttpConnectionAlive: false supportHttpStatusCodeContinue: false unfoldHttpHeaders: false + ignoreCertificateNameMismatch: false + keepHttpConnectionAlive: 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' } messageConnectionSettings: { - ignoreCertificateNameMismatch: false keepHttpConnectionAlive: true supportHttpStatusCodeContinue: true unfoldHttpHeaders: true + ignoreCertificateNameMismatch: false } securitySettings: { + enableNRRForOutboundMDN: false + overrideGroupSigningCertificate: false 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 + checkCertificateRevocationListOnReceive: false + checkDuplicateMessage: false + encryptionAlgorithm: 'DES3' signingAlgorithm: 'Default' } } - receiverBusinessIdentity: { - qualifier: 'AS2Identity' - value: 'FabrikamDC' - } - senderBusinessIdentity: { - qualifier: 'AS2Identity' - value: 'FabrikamNY' - } } } } @@ -153,18 +157,12 @@ 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..d7c3c7a6 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep @@ -4,23 +4,39 @@ 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: { + isSftpEnabled: false + networkAcls: { + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + bypass: 'AzureServices' + defaultAction: 'Allow' + } + isLocalUserEnabled: true + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + defaultToOAuthAuthentication: false + dnsEndpointType: 'Standard' accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: false allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - dnsEndpointType: 'Standard' encryption: { keySource: 'Microsoft.Storage' services: { @@ -33,35 +49,19 @@ 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 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' } } 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..05dec948 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep @@ -1,11 +1,11 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' 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: '''