diff --git a/settings/remarks/microsoft.aadiam/remarks.json b/settings/remarks/microsoft.aadiam/remarks.json index bc501e82..86d36c40 100644 --- a/settings/remarks/microsoft.aadiam/remarks.json +++ b/settings/remarks/microsoft.aadiam/remarks.json @@ -6,5 +6,17 @@ "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." + }, + { + "ResourceType": "Microsoft.AADIAM/diagnosticSettings", + "Path": "samples/diagnosticsettings/main-rg-module.bicep", + "Description": "A basic example of deploying Azure Active Directory Diagnostic Setting for Azure Monitor." + } ] } diff --git a/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main-rg-module.bicep b/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main-rg-module.bicep new file mode 100644 index 00000000..c7898d95 --- /dev/null +++ b/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main-rg-module.bicep @@ -0,0 +1,44 @@ +param resourceName string = 'acctest0001' +param location string = 'westus' + +resource namespace 'Microsoft.EventHub/namespaces@2024-01-01' = { + name: '${resourceName}-EHN-unique' + location: location + sku: { + capacity: 1 + name: 'Basic' + tier: 'Basic' + } + properties: { + disableLocalAuth: false + isAutoInflateEnabled: false + minimumTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' + } +} + +resource authorizationRule 'Microsoft.EventHub/namespaces/authorizationRules@2024-01-01' = { + name: 'example' + parent: namespace + properties: { + rights: [ + 'Listen' + 'Send' + 'Manage' + ] + } +} + +resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2024-01-01' = { + name: '${resourceName}-EH-unique' + parent: namespace + properties: { + messageRetentionInDays: 1 + partitionCount: 2 + status: 'Active' + } +} + +// Module outputs for cross-scope references +output authorizationRuleId string = authorizationRule.id +output eventhubName string = eventhub.name 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..4dccfa87 --- /dev/null +++ b/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep @@ -0,0 +1,53 @@ +targetScope = 'tenant' + +param resourceName string = 'acctest0001' +param location string = 'westus' + +param subscriptionId string + +resource diagnosticSetting 'Microsoft.AADIAM/diagnosticSettings@2017-04-01' = { + name: '${resourceName}-DS-unique' + properties: { + eventHubAuthorizationRuleId: module1.outputs.authorizationRuleId + eventHubName: module1.outputs.eventhubName + 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 + } + ] + } +} + +module module1 'main-subscription-module.bicep' = { + name: 'deploy-rg-resources' + scope: subscription(subscriptionId) + params: { + resourceName: resourceName + location: location + } +} diff --git a/settings/remarks/microsoft.advisor/remarks.json b/settings/remarks/microsoft.advisor/remarks.json index c0325475..b9c1d588 100644 --- a/settings/remarks/microsoft.advisor/remarks.json +++ b/settings/remarks/microsoft.advisor/remarks.json @@ -6,5 +6,12 @@ "Path": "samples/recommendations/suppressions/main.tf", "Description": "A basic example of deploying Specifies a suppression for an Azure Advisor recommendation." } + ], + "BicepSamples": [ + { + "ResourceType": "Microsoft.Advisor/recommendations/suppressions", + "Path": "samples/recommendations/suppressions/main.bicep", + "Description": "A basic example of deploying Specifies a suppression for an Azure Advisor recommendation." + } ] } diff --git a/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep b/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep new file mode 100644 index 00000000..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..d36d9327 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 diff --git a/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep b/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep index 828a8406..ecfb3f0f 100644 --- a/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep +++ b/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep @@ -4,6 +4,9 @@ param location string = 'westeurope' resource server 'Microsoft.AnalysisServices/servers@2017-08-01' = { name: resourceName location: location + sku: { + name: 'B1' + } properties: { asAdministrators: { members: [] @@ -13,7 +16,4 @@ resource server 'Microsoft.AnalysisServices/servers@2017-08-01' = { firewallRules: [] } } - sku: { - name: 'B1' - } } 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..ce211be2 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep @@ -20,6 +20,10 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { @@ -35,15 +39,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' - } } resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { apiType: 'http' apiVersion: '' @@ -55,8 +55,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,8 +68,8 @@ 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' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep index c15f73f6..31a9cbe2 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/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 api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { apiRevisionDescription: '' apiType: 'http' 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..7b762618 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep @@ -1,9 +1,13 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-am' location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { @@ -19,15 +23,11 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' - } } resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { - parent: service name: '${resourceName}-api;rev=1' + parent: service properties: { apiRevisionDescription: '' apiType: 'http' @@ -51,8 +51,8 @@ resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { } 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..4f3ffbc0 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,15 +23,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' - } } resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { apiRevisionDescription: '' apiType: 'http' @@ -47,8 +47,8 @@ resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { } 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..0714684d 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/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 api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { apiRevisionDescription: '' apiType: 'http' @@ -47,8 +47,8 @@ resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { } 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..902ec4fa 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/tagdescriptions/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/tagdescriptions/main.bicep @@ -4,6 +4,10 @@ param location string = 'westus' resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-service' location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { @@ -19,15 +23,19 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' +} + +resource tag 'Microsoft.ApiManagement/service/tags@2022-08-01' = { + name: '${resourceName}-tag' + parent: service + properties: { + displayName: '${resourceName}-tag' } } resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { - parent: service name: '${resourceName}-api;rev=1' + parent: service properties: { apiRevisionDescription: '' apiType: 'http' @@ -43,17 +51,9 @@ resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { } } -resource tag 'Microsoft.ApiManagement/service/tags@2022-08-01' = { - parent: service - name: '${resourceName}-tag' - properties: { - displayName: 'acctest0001-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..93312e65 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep @@ -4,6 +4,10 @@ param location string = 'westus' resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-service' location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { @@ -19,15 +23,11 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' - } } resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { - parent: service name: '${resourceName}-api;rev=1' + parent: service properties: { apiRevisionDescription: '' apiType: 'http' @@ -44,9 +44,9 @@ resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { } 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..df4081c4 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/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 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..11aa07a8 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep @@ -9,6 +9,10 @@ param oauthClientSecret string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { @@ -24,24 +28,20 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 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 + clientId: oauthClientId clientRegistrationEndpoint: 'https://azacceptance.hashicorptest.com/client/register' - clientSecret: null + clientSecret: oauthClientSecret defaultScope: '' description: '' displayName: 'Test Group' 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..c47cd85d 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep @@ -3,6 +3,7 @@ param location string = 'westeurope' resource redis 'Microsoft.Cache/redis@2023-04-01' = { name: resourceName + location: 'eastus' properties: { enableNonSslPort: true minimumTlsVersion: '1.2' @@ -17,6 +18,10 @@ resource redis 'Microsoft.Cache/redis@2023-04-01' = { resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { @@ -32,17 +37,13 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' - } } resource cache 'Microsoft.ApiManagement/service/caches@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - connectionString: '${redis.name}.redis.cache.windows.net:6380,password=redis.listKeys().primaryKey,ssl=true,abortConnect=False' + connectionString: '${redis.name}.redis.cache.windows.net:6380,password=${redis.listKeys().primaryKey},ssl=true,abortConnect=False' useFromLocation: 'default' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep index 9fa37d0f..05769bb8 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/certificates/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 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..3308a4e6 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/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 @@ -20,6 +20,10 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { @@ -35,15 +39,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 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' @@ -51,8 +51,8 @@ resource diagnostic 'Microsoft.ApiManagement/service/diagnostics@2021-08-01' = { } 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..471aa0d2 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep @@ -10,6 +10,10 @@ param certificatePassword string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { @@ -37,24 +41,20 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource certificate 'Microsoft.ApiManagement/service/certificates@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - data: null - password: null + data: certificateData + password: certificatePassword } } resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' locationData: { @@ -67,8 +67,8 @@ resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { } 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..daaebc25 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep @@ -1,9 +1,13 @@ -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: { @@ -31,15 +35,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource certificate 'Microsoft.ApiManagement/service/certificates@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { data: 'MIIKmQIBAzCCCl8GCSqGSIb3DQEHAaCCClAEggpMMIIKSDCCBP8GCSqGSIb3DQEHBqCCBPAwggTsAgEAMIIE5QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIp1c0ydxiVG0CAggAgIIEuA5qATScE+dBHsldt+cfd/PjV+FAei7+lyYXm2IN1TZ1mFEce3T6MlGaqXoHMlYlIEVtvxNp2qpbYyGbboCRYTmB1tHbDbwDAg0bO8J8ing2xOvkoKx+sFX7L0I+FcGz5ucJRoDus6K6GdMgWOi+vlEdliBpH7Lgk+8+SXpFf/JadnEY49Dr4XMUBs/fXe6BxB89b9H/5mUg1SQFuxnGQrdvEW7tNFJR7k9BUO/95X8b4mQZdqfXBzgayOKTcB7JShXA9gjyAbxsF2g5EXlmWNJoRVo8xPcybPgarDdfjM4L0eEzvB4mgn6JimCaHxt9Gb3PGhPJ0mFzVbJTPQgiFpjpREwDWVYk7LeKvjyLn70O9pQyCi8tjZGw5XfIHlt7P+EHEdXXYR7z7gbgNQmWFMjYEX2puAKjYyjYsZ3ZxlWWNsrWZA/lNE5BgIBAcNAT2NBGAGbe4floniM8RPpQJ/Tj53nFQxav2sY/toWRSA8z7/bMGmQZEh9Dun61YJc+yb0dzn0K98FlEw1+Uu4fR8l6/e4xvmpdH3tOVak0xFRJLdILlO9VwJ3Ins8CODFHV4J4DnuMyINonctjTl9qy66+pVf6ePX0Io5k+49hU3u19jZy/oN8xxTGDMGVQinZ19yNC5TJ7RJ4fb682Jk+P8dwc+1icbBydZo3a/n1JdglMjPJK4+f0iW/+KIBFD2oZlEt8/Hi+IzyXT2BJHuZJmPa61vxHurA/urGH06ybpcrSEkBC0Lcm07Ie5Ov/UQVcdwF2MM3f3Iv5hrdRogBmB5pe1sYwNGJanCy4dABwpu+qVrtBGZEdBRl4h6IUTTzFDJltVcAmi60blvB8pCufDnD+PdJobAD5FIcsMDl0hiB7AgDbtOWygE1i/b5GnoVsfOGt4iUclikKxCig4m500IgX/XgUBiY1RwkHIXZQ1mXyWBAnaFgPA7BOt70Qbj9wy9S60FvrElVG9NWXuTdGY+ECWkoEzjiGnCEL+T1Cv43b8SlL5GCCftIUHlM/ss8oBzcJmUJsUsv/ZHTcj3GKyHud5cIT4rli542dDkoZj0O6fsvE+yFM7kZaQrTzuPlstfnvi5OeJQ4+aJBeL+rEXvEspLn02i2Rg1afZAll6fk+epPJOxW2pkrVslDMj/0RfLr4dRi5uzBiJb3pILfCDJs9Nqzj2GMWOFudQn5OHbcbx6dtoB1RcdsZHSGTn+MrjoXey2nmIlg372aLR7tCH06Z66U9FagAr51DZAKq2ry0T6gR4sWtzHlS063xFH4JeCHAJouWqEwgxeBu1zSZneDlMaC1ifcB0fOML8658vi1B697wLP0Muc6UW4mqfuN7AMl1fJQ7vO5oTDgWbPd6bSrLk46zmN3vC3VzMqQVa/1BbKgGkTOaVIZJuK0OuN2hyaVLNvm8XQ2O5QWE6aY2l3fm7m4hbT2AXRd/ulquZRhbQa7jIyjTb6SwLZG9wpvRJ5pR/C1V/QitI4GrViMOgEX+LV2TzXZxmkBV45/dDJ9Vh+2LEUKvcbkWjxZEbgltyCOdDHbTA5ydcNCHi/t/L371N6mCcXJH4FC7za1LpNmXeRIZa4lUuW602YH0DCYTnZ95UqMNyXMIIFQQYJKoZIhvcNAQcBoIIFMgSCBS4wggUqMIIFJgYLKoZIhvcNAQwKAQKgggTuMIIE6jAcBgoqhkiG9w0BDAEDMA4ECMwUHG/3/JVkAgIIAASCBMivDxcmzXtuXLPeu468SGYRJk994sSYqjK6fKP4090KXsDgX+IkggKJWqZqyRb0Dq7EusKpMyrSJNtz9Cfl3+S/vsbX6mGz4TY1g4VNvkyJyUjqUjKIDL2SlULRa7ldEvpOciy0Ms/6PBQXOTyVr5Rd1dFUFSbkLAruIWTULK0OfQoFjuQXmDvunRBrqSbHtjID9m1OwdcTfzMGHjsXth3iSWSTTh5+Eg/6H+/9kGC9VEEURqFD3Gx2kWKjqSlZyf/LSOTBcQ6+qRQZT1B1ZnPAVBU9Xn9Z6Tq0EMNfNg9+pv1GlLBUg1Hqo8RAW1nNOBSBHXS0nq062j48luQOotthKOc1rkjQd91Q9qTLFlU12gllQw+ejHVVvEEPHtxJ7HVr/lvM/5mt2oObTJb01JcfVnYrnI3NnNSWRULx/tznhB2yoKqjtrnZAW3zNU9TQQVyLVjt2lIXhE4oXk0I+Cxmvbh+YJF6XLrATGc6yuL02ZInrC59ufkclcnjnTSGnXWr9gzIndZ6wSS0B+6bMpLxamvE4XDhAQCn6MEGGVcY9nMydxaWU3o7Is0J1nd/KZWgfXeOoZx10olSR22+PBKy8Gsge2mMbR2QvhUKNyXLTV3pOnxtjGf88PhseqDpwZ5++DOSFfi0spsDvfXJNO0F0f0JYrMNXbqlxO4uExj146thivXZVlR1n5Bo4eL0OoVIXn1w/MuU0suQvZm+kD8uVuajyBnJsnhsCWx2eTZ2vzHQTKB2EtYeDPioWSomTVVjIdg8A9pTzvvhe8MzFXvRMXFc9+ToN+uLjJqHRSmpZIGJvZQXCKrlCC9KRjP1HIhJhyfuYoEjTkF3IVeXS1tnA5CH5oilOG+guLKXNPWsrCXEpewz6i907ugx/VWTAmEMzYwMCDzCnW2l+mI8P56nWrwI0vDuk1GhIs6nn+Nhc6FPHD1996zyZ7hfmO7h25tto00IoVgI9QlhwtWLz10ZltLG581JvO7jEwT4u/nYxD7aO0Llb3ytNKihalFZMaY20a1dhVBsPwiWUpZcMmPoYySSiukyw350WiV/Z2NAsyeGRTWpdKcBi7gna0NN6fn0QLSdTcPKutASCplNExnI1IkkBFb3TmlF5HrrwmVht+vqxEHbRjDwEnKkvGcUbLWdjUjSWVNNbCbo8KbLAXcBPcjTHxIRw3gkLcS+yL0//uSENgo/LpHBZsO5d6as820lpYmHIjvyxhAMpMNlOPmUIW+cOgcf328wNaHaVWalIwfSGJdqGgC4msvP8vOcGWYgLkdrqJGWjhDs40x7LuFEBWgpgu6E2FfPOPTsqs5QxNKTgCw/eXjK92dZkdqO0Y7oLavU3OaJeWFJpAuZcC84Rwup2K0d4CXvZ0bOtpISSTr3VZeXRl8SkN2bQtgit9BJ2qGAy9blNObk1q8yOaVppercZMgG96DK23ZQ9uLRmliqytE1tXFKNKegwxGorKodoMwpRzClBz37KIYGJvFOYVya11v3gdcfeMcRTPdZG5dbI6US9DNk6fbShBJpc7PvYgMc8Vr+xEfzZXPnY2M8d+uJJomrU5ZQXcjy9jtyE4ToBz5ajh4Hq6Khlv6v5y2C+GrXb5+2KoSkcAYpTxlzAnjk9pYMZkwxJTAjBgkqhkiG9w0BCRUxFgQURdOwIJIHIprOPt5IqfZOf/7JJoQwMTAhMAkGBSsOAwIaBQAEFCaYzKHAOxuYPxNGezkbQ8Tp9cGsBAiTp8/jb7QK5AICCAAK' password: '' @@ -47,8 +47,8 @@ resource certificate 'Microsoft.ApiManagement/service/certificates@2021-08-01' = } resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' locationData: { @@ -61,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..7b77fb39 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep @@ -1,9 +1,13 @@ -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: { @@ -31,15 +35,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' locationData: { diff --git a/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep index dd41d7a0..2029cf6a 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep @@ -4,6 +4,10 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { @@ -31,15 +35,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource group 'Microsoft.ApiManagement/service/groups@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' displayName: 'Test Group' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep index 53ae60d6..8f87a089 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep @@ -9,6 +9,10 @@ param identityProviderClientSecret string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { @@ -36,18 +40,14 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource identityProvider 'Microsoft.ApiManagement/service/identityProviders@2021-08-01' = { - parent: service name: 'twitter' + parent: service properties: { - clientId: null - clientSecret: null + clientId: identityProviderClientId + clientSecret: identityProviderClientSecret type: 'twitter' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep index 5c044a15..e0cd272f 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep @@ -1,25 +1,13 @@ 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: { @@ -35,15 +23,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 @@ -53,3 +37,19 @@ resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { loggerType: 'applicationInsights' } } + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + Application_Type: 'web' + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + } +} diff --git a/settings/remarks/microsoft.apimanagement/samples/service/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/main.bicep index 6d40bf73..dae82c0b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/main.bicep @@ -4,6 +4,10 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { @@ -31,8 +35,4 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 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..b428aa30 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/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 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..5858988b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep @@ -1,14 +1,18 @@ +@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: { @@ -24,18 +28,14 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' - } } resource openidConnectProvider 'Microsoft.ApiManagement/service/openidConnectProviders@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - clientId: null - clientSecret: null + clientId: openidClientId + clientSecret: openidClientSecret description: '' displayName: 'Initial Name' metadataEndpoint: 'https://azacceptance.hashicorptest.com/example/foo' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep index b0ee6500..2f5cb037 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep @@ -4,6 +4,10 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { @@ -31,15 +35,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 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..3a1dddbf 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep @@ -4,6 +4,10 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { @@ -31,15 +35,11 @@ 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: { diff --git a/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep index f85e8ff6..7ea8c92c 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/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 product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' displayName: 'Test Product' 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..8b50d71b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/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,15 +23,11 @@ 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: { description: '' displayName: 'Test Product' @@ -38,8 +38,8 @@ resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { } 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..5e1910dc 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/tags/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 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..b4a32005 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/schemas/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 schema 'Microsoft.ApiManagement/service/schemas@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' schemaType: 'xml' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep index bd723fb6..3d1d86d5 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep @@ -4,6 +4,10 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { @@ -31,15 +35,11 @@ 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 + parent: service properties: { description: '' displayName: 'Test Product' @@ -50,8 +50,8 @@ resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { } 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' @@ -62,8 +62,8 @@ resource subscription 'Microsoft.ApiManagement/service/subscriptions@2021-08-01' } 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.apimanagement/samples/service/tags/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep index bcdae209..d3712ce3 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep @@ -1,9 +1,13 @@ -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: { @@ -19,16 +23,12 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 0 - name: 'Consumption' - } } 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..0378517d 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep @@ -1,9 +1,13 @@ -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: { @@ -31,15 +35,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 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..a12636c4 100644 --- a/settings/remarks/microsoft.app/samples/containerapps/main.bicep +++ b/settings/remarks/microsoft.app/samples/containerapps/main.bicep @@ -1,6 +1,26 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { + name: resourceName + location: location + properties: { + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } + workspaceCapping: { + dailyQuotaGb: -1 + } + } +} + resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { name: resourceName location: location @@ -46,23 +66,3 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { vnetConfiguration: {} } } - -resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { - name: resourceName - location: location - properties: { - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - retentionInDays: 30 - sku: { - name: 'PerGB2018' - } - workspaceCapping: { - dailyQuotaGb: -1 - } - } -} diff --git a/settings/remarks/microsoft.app/samples/jobs/main.bicep b/settings/remarks/microsoft.app/samples/jobs/main.bicep index 890a500a..2d51c1f5 100644 --- a/settings/remarks/microsoft.app/samples/jobs/main.bicep +++ b/settings/remarks/microsoft.app/samples/jobs/main.bicep @@ -1,6 +1,17 @@ param resourceName string = 'acctest0001' param location string = 'westus' +resource workspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' = { + name: '${resourceName}-law' + location: location + properties: { + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } + } +} + resource job 'Microsoft.App/jobs@2025-01-01' = { name: '${resourceName}-cajob' location: location @@ -48,14 +59,3 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2025-01-01' = { } } } - -resource workspace 'Microsoft.OperationalInsights/workspaces@2023-09-01' = { - name: '${resourceName}-law' - location: location - properties: { - retentionInDays: 30 - sku: { - name: 'PerGB2018' - } - } -} diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep index eb160a33..9b2590cc 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep @@ -40,11 +40,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..277f47e9 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep @@ -37,13 +37,12 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { } resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-03-01' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { 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..a8665a74 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/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 @@ -37,8 +37,8 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { } resource aspireDashboard 'Microsoft.App/managedEnvironments/dotNetComponents@2024-10-02-preview' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { componentType: 'AspireDashboard' configurations: [] diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep index 88753ea0..c9f0da2d 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,18 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { } } } + +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: {} + } +} diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep index c819d4ca..7e42e87b 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep @@ -19,6 +19,9 @@ 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' @@ -47,9 +50,6 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } tags: { environment: 'accTest' } @@ -76,13 +76,13 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { } resource storage 'Microsoft.App/managedEnvironments/storages@2022-03-01' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { azureFile: { accessMode: 'ReadWrite' accountKey: storageAccount.listKeys().keys[0].value - accountName: storageAccount.properties.name + accountName: storageAccount.name shareName: 'testsharehkez7' } } diff --git a/settings/remarks/microsoft.appconfiguration/samples/configurationstores/main.bicep b/settings/remarks/microsoft.appconfiguration/samples/configurationstores/main.bicep index e443bc1f..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..aebaea03 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: { capacity: 1 name: 'E0' tier: 'Enterprise' } + properties: { + gatewayIds: [] + httpsOnly: false + public: false + } } resource domain 'Microsoft.AppPlatform/Spring/apiPortals/domains@2023-05-01-preview' = { - parent: apiPortal name: '${resourceName}.azuremicroservices.io' + parent: apiPortal properties: { thumbprint: '' } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep index 8397c83d..863457af 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep @@ -4,25 +4,25 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource apiPortal 'Microsoft.AppPlatform/Spring/apiPortals@2023-05-01-preview' = { - parent: spring name: 'default' - properties: { - gatewayIds: [] - httpsOnly: false - public: false - } + parent: spring sku: { capacity: 1 name: 'E0' tier: 'Enterprise' } + properties: { + gatewayIds: [] + httpsOnly: false + public: false + } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep index cae0847c..b1011c14 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep @@ -4,22 +4,22 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource applicationAccelerator 'Microsoft.AppPlatform/Spring/applicationAccelerators@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring } resource customizedAccelerator 'Microsoft.AppPlatform/Spring/applicationAccelerators/customizedAccelerators@2023-05-01-preview' = { - parent: applicationAccelerator name: resourceName + parent: applicationAccelerator properties: { description: '' displayName: '' diff --git a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/main.bicep index 63c0908a..de11f7a9 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource applicationAccelerator 'Microsoft.AppPlatform/Spring/applicationAccelerators@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/applicationliveviews/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/applicationliveviews/main.bicep index bfd66a0c..97507179 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/applicationliveviews/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/applicationliveviews/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource applicationLiveView 'Microsoft.AppPlatform/Spring/applicationLiveViews@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep index f1b5e915..6873baf8 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep @@ -4,32 +4,18 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'S0' } -} - -resource redis 'Microsoft.Cache/redis@2023-04-01' = { - name: resourceName - location: location properties: { - enableNonSslPort: true - minimumTlsVersion: '1.2' - sku: { - capacity: 2 - family: 'C' - name: 'Standard' - } + zoneRedundant: false } } resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { - parent: spring name: resourceName location: location + parent: spring properties: { customPersistentDisks: [] enableEndToEndTLS: false @@ -38,13 +24,27 @@ 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 } } + +resource redis 'Microsoft.Cache/redis@2023-04-01' = { + name: resourceName + location: location + properties: { + enableNonSslPort: true + minimumTlsVersion: '1.2' + sku: { + capacity: 2 + family: 'C' + name: 'Standard' + } + } +} 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..abcadd49 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep @@ -4,17 +4,17 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource buildService 'Microsoft.AppPlatform/Spring/buildServices@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring properties: {} } @@ -39,8 +39,8 @@ resource builder 'Microsoft.AppPlatform/Spring/buildServices/builders@2023-05-01 } resource buildpackBinding 'Microsoft.AppPlatform/Spring/buildServices/builders/buildpackBindings@2023-05-01-preview' = { - parent: builder name: resourceName + parent: builder properties: { bindingType: 'ApplicationInsights' } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/main.bicep index 649a93ba..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..f11837f6 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep @@ -4,24 +4,24 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource gateway 'Microsoft.AppPlatform/Spring/gateways@2023-05-01-preview' = { - parent: spring name: 'default' - properties: { - httpsOnly: false - public: false - } + parent: spring sku: { capacity: 1 name: 'E0' tier: 'Enterprise' } + properties: { + httpsOnly: false + public: false + } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep index dd36bcdb..53721608 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep @@ -4,42 +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' } -} - -resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { - parent: spring - name: resourceName - location: location properties: { - customPersistentDisks: [] - enableEndToEndTLS: false - public: false + 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 routeConfig 'Microsoft.AppPlatform/Spring/gateways/routeConfigs@2023-05-01-preview' = { - parent: gateway name: resourceName + parent: gateway properties: { appResourceId: app.id protocol: 'HTTP' @@ -47,3 +36,14 @@ resource routeConfig 'Microsoft.AppPlatform/Spring/gateways/routeConfigs@2023-05 ssoEnabled: false } } + +resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { + name: resourceName + location: location + parent: spring + properties: { + customPersistentDisks: [] + enableEndToEndTLS: false + public: false + } +} 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..717b2845 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep @@ -1,20 +1,12 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { - name: 'S0' + name: 'Standard_GRS' } -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location kind: 'StorageV2' properties: { accessTier: 'Hot' @@ -43,14 +35,22 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } +} + +resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { + name: resourceName + location: location sku: { - name: 'Standard_GRS' + name: 'S0' + } + properties: { + zoneRedundant: false } } resource storage 'Microsoft.AppPlatform/Spring/storages@2023-05-01-preview' = { - parent: spring name: resourceName + parent: spring properties: { accountKey: storageAccount.listKeys().keys[0].value accountName: storageAccount.name diff --git a/settings/remarks/microsoft.authorization/samples/locks/main.bicep b/settings/remarks/microsoft.authorization/samples/locks/main.bicep index 01847652..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..1229c800 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' @@ -41,7 +43,7 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } then: { diff --git a/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep index e4cd4a97..344037fc 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 @@ -22,7 +23,7 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } then: { diff --git a/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep b/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep index 0b94be00..436c9004 100644 --- a/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep @@ -1,9 +1,12 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' = { name: resourceName + location: 'westeurope' + scope: subscription() properties: { displayName: '' enforcementMode: 'Default' @@ -32,7 +35,7 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } then: { @@ -45,6 +48,7 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' resource policyExemption 'Microsoft.Authorization/policyExemptions@2020-07-01-preview' = { name: resourceName + scope: subscription() properties: { exemptionCategory: 'Mitigated' policyAssignmentId: policyAssignment.id diff --git a/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep index 9dd7d3ef..00bc9178 100644 --- a/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep @@ -1,6 +1,7 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'westus' resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { name: resourceName @@ -22,7 +23,7 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } then: { @@ -37,7 +38,7 @@ resource policySetDefinition 'Microsoft.Authorization/policySetDefinitions@2025- name: 'acctestpolset-${resourceName}' properties: { description: '' - displayName: 'acctestpolset-acctest0001' + displayName: 'acctestpolset-${resourceName}' parameters: { allowedLocations: { metadata: { @@ -53,7 +54,7 @@ resource policySetDefinition 'Microsoft.Authorization/policySetDefinitions@2025- groupNames: [] parameters: { listOfAllowedLocations: { - value: '[parameters(\'allowedLocations\')]' + value: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } policyDefinitionId: policyDefinition.id diff --git a/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep index 5f726a3e..09389be6 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' @@ -19,7 +20,7 @@ resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-prev notDataActions: [] } ] - roleName: 'acctest0001' + roleName: resourceName type: 'CustomRole' } } 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..47b2e853 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep @@ -16,9 +16,9 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } 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..8b9c6912 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep @@ -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..7a7b77d2 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep @@ -19,11 +19,11 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { description: '' - password: null + password: automationCredentialPassword userName: 'test_user' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep index 7782f89a..fbccfb3d 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep @@ -7,6 +7,35 @@ param automationWorkerPassword string @description('The administrator password for the virtual machine') param vmAdminPassword 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 automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = { name: resourceName location: location @@ -21,25 +50,16 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } } -resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { +resource hybridRunbookWorkerGroup 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups@2021-06-22' = { name: resourceName - location: location + parent: automationAccount +} + +resource hybridRunbookWorker 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups/hybridRunbookWorkers@2021-06-22' = { + name: 'c7714056-5ba8-4bbe-920e-2993171164eb' + parent: hybridRunbookWorkerGroup properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'testconfiguration1' - properties: { - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] + vmResourceId: virtualMachine.id } } @@ -72,10 +92,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null + adminPassword: vmAdminPassword adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { disablePasswordAuthentication: false patchSettings: { @@ -111,57 +131,34 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } } -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName location: location properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration1' + properties: { + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: { + id: subnet.id + } + } + } + ] } } resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { description: '' - password: null + password: automationWorkerPassword userName: 'test_user' } } - -resource hybridRunbookWorkerGroup 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups@2021-06-22' = { - parent: automationAccount - name: resourceName - credential: { - name: credential.name - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork - name: 'internal' - properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - } -} - -resource hybridRunbookWorker 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups/hybridRunbookWorkers@2021-06-22' = { - parent: hybridRunbookWorkerGroup - name: 'c7714056-5ba8-4bbe-920e-2993171164eb' - properties: { - vmResourceId: virtualMachine.id - } -} diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep index 07bf40b6..3958b8e8 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 + password: credentialPassword userName: 'test_user' } } resource hybridRunbookWorkerGroup 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups@2021-06-22' = { - parent: automationAccount name: resourceName - credential: { - name: credential.name - } + parent: automationAccount } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep index d664d2d8..e006f99e 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep @@ -16,8 +16,8 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } 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..7f2961bc 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/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: {} diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep index bf571ec0..ccbf55e7 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep @@ -16,8 +16,8 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } 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..a71e8940 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep @@ -16,8 +16,8 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource softwareUpdateConfiguration 'Microsoft.Automation/automationAccounts/softwareUpdateConfigurations@2019-06-01' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { scheduleInfo: { description: '' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep index 5a18a7a3..3db9115b 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep @@ -1,8 +1,8 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('GitHub Personal Access Token') param pat string +param resourceName string = 'acctest0001' resource automationAccount 'Microsoft.Automation/automationAccounts@2023-11-01' = { name: resourceName @@ -19,8 +19,8 @@ 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' @@ -28,7 +28,7 @@ resource sourceControl 'Microsoft.Automation/automationAccounts/sourceControls@2 publishRunbook: false repoUrl: 'https://github.com/Azure-Samples/acr-build-helloworld-node.git' securityToken: { - accessToken: null + accessToken: pat tokenType: 'PersonalAccessToken' } sourceType: 'GitHub' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep index b64904b1..1a42425c 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep @@ -16,11 +16,11 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource variable 'Microsoft.Automation/automationAccounts/variables@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { description: '' isEncrypted: false - value: '"Hello, Terraform Basic Test."' + value: 'Hello, Terraform Basic Test.' } } diff --git a/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep b/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep index afde51c0..878f8c7b 100644 --- a/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep +++ b/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep @@ -4,6 +4,9 @@ param location string = 'centralus' resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { name: resourceName location: location + sku: { + name: 'av36' + } properties: { internet: 'Disabled' managementCluster: { @@ -11,12 +14,9 @@ resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { } networkBlock: '192.168.48.0/22' } - sku: { - name: 'av36' - } } resource authorization 'Microsoft.AVS/privateClouds/authorizations@2022-05-01' = { - parent: privateCloud name: resourceName + parent: privateCloud } diff --git a/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep b/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep index 96933b18..afe52b87 100644 --- a/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep +++ b/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep @@ -1,9 +1,12 @@ -param resourceName string = 'acctest0001' param location string = 'centralus' +param resourceName string = 'acctest0001' resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { name: resourceName location: location + sku: { + name: 'av36' + } properties: { internet: 'Disabled' managementCluster: { @@ -11,7 +14,4 @@ resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { } networkBlock: '192.168.48.0/22' } - sku: { - name: 'av36' - } } diff --git a/settings/remarks/microsoft.azureactivedirectory/samples/b2cdirectories/main.bicep b/settings/remarks/microsoft.azureactivedirectory/samples/b2cdirectories/main.bicep index 5a6c877c..473d0b28 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..d5691e8a 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep @@ -20,6 +20,9 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' @@ -48,14 +51,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { 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: '' diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep index 52dc66f5..72e2f24e 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep @@ -1,10 +1,10 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The base64-encoded certificate data') param certificateData string @description('The thumbprint of the certificate') param certificateThumbprint string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { name: resourceName @@ -19,12 +19,12 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { } resource certificate 'Microsoft.Batch/batchAccounts/certificates@2022-10-01' = { - parent: batchAccount name: 'SHA1-${certificateThumbprint}' + parent: batchAccount properties: { - data: null + data: certificateData format: 'Cer' - thumbprint: null + thumbprint: certificateThumbprint thumbprintAlgorithm: 'sha1' } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep index f4661451..3ebd9cd1 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep @@ -14,10 +14,9 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { } resource pool 'Microsoft.Batch/batchAccounts/pools@2022-10-01' = { - parent: batchAccount name: resourceName + parent: batchAccount properties: { - certificates: null deploymentConfiguration: { virtualMachineConfiguration: { imageReference: { diff --git a/settings/remarks/microsoft.billing/remarks.json b/settings/remarks/microsoft.billing/remarks.json index 58191af5..3f70f053 100644 --- a/settings/remarks/microsoft.billing/remarks.json +++ b/settings/remarks/microsoft.billing/remarks.json @@ -6,5 +6,12 @@ "Path": "samples/billingaccounts/billingprofiles/main.tf", "Description": "A basic example of deploying Billing Accounts Billing Profiles." } + ], + "BicepSamples": [ + { + "ResourceType": "Microsoft.Billing/billingAccounts/billingProfiles", + "Path": "samples/billingaccounts/billingprofiles/main.bicep", + "Description": "A basic example of deploying Billing Accounts Billing Profiles." + } ] } diff --git a/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep b/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep new file mode 100644 index 00000000..46b427bf --- /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: { + addressLine1: 'TestWay' + city: 'Redmond' + companyName: 'TestCompany' + country: 'US' + isValidAddress: true + postalCode: '12345-1234' + region: 'WA' + } + displayName: resourceName + enabledAzurePlans: [ + { + skuId: '0001' + } + ] + shipTo: { + addressLine1: 'TestWay' + city: 'Redmond' + companyName: 'TestCompany' + country: 'US' + isValidAddress: true + postalCode: '12345-1234' + region: 'WA' + } + } +} diff --git a/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep b/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep index 2b1fa1b6..a678a1ac 100644 --- a/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep +++ b/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep @@ -4,6 +4,9 @@ param location string = 'westus' resource botService 'Microsoft.BotService/botServices@2021-05-01-preview' = { name: resourceName location: location + sku: { + name: 'F0' + } kind: 'bot' properties: { cmekKeyVaultUrl: '' @@ -11,22 +14,19 @@ resource botService 'Microsoft.BotService/botServices@2021-05-01-preview' = { developerAppInsightKey: '' developerAppInsightsApiKey: '' developerAppInsightsApplicationId: '' - displayName: 'acctest0001' + displayName: resourceName 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..a1e759f1 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: { developerAppInsightKey: '' developerAppInsightsApiKey: '' developerAppInsightsApplicationId: '' - displayName: 'acctest0001' + displayName: resourceName endpoint: '' luisAppIds: [] luisKey: '' - msaAppId: deployer().objectId - } - sku: { - name: 'F0' + msaAppId: clientId } 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..a16b2f3c 100644 --- a/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep @@ -16,8 +16,8 @@ resource redis 'Microsoft.Cache/redis@2023-04-01' = { } 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..1d900f04 100644 --- a/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep @@ -25,8 +25,8 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { } 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..951c282f --- /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 redisSecondary 'Microsoft.Cache/redis@2024-11-01' = { + name: '${resourceName}-secondary' + 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' + } +} diff --git a/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep b/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep new file mode 100644 index 00000000..ad12030e --- /dev/null +++ b/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep @@ -0,0 +1,23 @@ +targetScope = 'subscription' + +param resourceName string = 'acctest0001' +param location string = 'westus' + +resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: resourceName + location: location +} + +resource resourcegroupSecondary 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: '${resourceName}-secondary' + location: location +} + +module module1 'main-rg-module.bicep' = { + name: 'deploy-rg-resources' + scope: resourceGroup + params: { + resourceName: resourceName + location: location + } +} diff --git a/settings/remarks/microsoft.cache/samples/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..a4c9af47 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep @@ -1,28 +1,20 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Standard_AzureFrontDoor' } -} - -resource afdEndpoint 'Microsoft.Cdn/profiles/afdEndpoints@2021-06-01' = { - parent: profile - name: resourceName - location: 'global' properties: { - enabledState: 'Enabled' + originResponseTimeoutSeconds: 120 } } resource originGroup 'Microsoft.Cdn/profiles/originGroups@2021-06-01' = { - parent: profile name: resourceName + parent: profile properties: { loadBalancingSettings: { additionalLatencyInMilliseconds: 0 @@ -35,8 +27,8 @@ 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: { enabledState: 'Enabled' enforceCertificateNameCheck: false @@ -49,9 +41,18 @@ resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2021-06-01' = { } } +resource afdEndpoint 'Microsoft.Cdn/profiles/afdEndpoints@2021-06-01' = { + name: resourceName + location: 'global' + parent: profile + properties: { + enabledState: 'Enabled' + } +} + 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..b30f440f 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep @@ -1,3 +1,4 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { @@ -8,22 +9,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' diff --git a/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep index 572ff490..b07d4ca2 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep @@ -10,9 +10,9 @@ 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 diff --git a/settings/remarks/microsoft.cdn/samples/profiles/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/main.bicep index dbd2929d..fa8f95d0 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/main.bicep @@ -1,12 +1,13 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: '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..d210eb3f 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,8 +27,8 @@ 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: { enabledState: 'Enabled' enforceCertificateNameCheck: false 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..b1a2714e 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep @@ -1,19 +1,21 @@ 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: { loadBalancingSettings: { additionalLatencyInMilliseconds: 0 @@ -25,14 +27,9 @@ resource originGroup 'Microsoft.Cdn/profiles/originGroups@2024-09-01' = { } } -resource ruleSet 'Microsoft.Cdn/profiles/ruleSets@2024-09-01' = { - 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: { enabledState: 'Enabled' enforceCertificateNameCheck: false @@ -45,9 +42,14 @@ resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2024-09-01' = { } } +resource ruleSet 'Microsoft.Cdn/profiles/ruleSets@2024-09-01' = { + name: 'ruleSet${substring(resourceName, (length(resourceName) - 4), 3)}' + parent: profile +} + resource rule 'Microsoft.Cdn/profiles/ruleSets/rules@2024-09-01' = { + name: 'rule${substring(resourceName, (length(resourceName) - 4), 3)}' parent: ruleSet - name: 'rule${substring(resourceName, length(resourceName) - 4, 4)}' properties: { actions: [ { diff --git a/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep index 59c3d517..f64ea8d3 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep @@ -1,8 +1,48 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' -resource frontdoorwebapplicationfirewallpolicy 'Microsoft.Network/FrontDoorWebApplicationFirewallPolicies@2020-11-01' = { +resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' + sku: { + name: 'Premium_AzureFrontDoor' + } + properties: { + originResponseTimeoutSeconds: 120 + } +} + +resource securityPolicy 'Microsoft.Cdn/profiles/securityPolicies@2021-06-01' = { + name: resourceName + parent: profile + properties: { + parameters: { + associations: [ + { + domains: [ + { + id: customDomain.id + } + ] + patternsToMatch: [ + '/*' + ] + } + ] + type: 'WebApplicationFirewall' + wafPolicy: { + id: frontDoorWebApplicationFirewallPolicy.id + } + } + } +} + +resource frontDoorWebApplicationFirewallPolicy 'Microsoft.Network/FrontDoorWebApplicationFirewallPolicies@2020-11-01' = { + name: resourceName + location: 'global' + sku: { + name: 'Premium_AzureFrontDoor' + } properties: { customRules: { rules: [ @@ -62,9 +102,6 @@ resource frontdoorwebapplicationfirewallpolicy 'Microsoft.Network/FrontDoorWebAp redirectUrl: 'https://www.fabrikam.com' } } - sku: { - name: 'Premium_AzureFrontDoor' - } } resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { @@ -72,53 +109,17 @@ resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { location: 'global' } -resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { - name: resourceName - location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } - sku: { - name: 'Premium_AzureFrontDoor' - } -} - 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' } } } - -resource securityPolicy 'Microsoft.Cdn/profiles/securityPolicies@2021-06-01' = { - parent: profile - name: resourceName - properties: { - parameters: { - associations: [ - { - domains: [ - { - id: customDomain.id - } - ] - patternsToMatch: [ - '/*' - ] - } - ] - 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..f5f0906d 100644 --- a/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep +++ b/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep @@ -1,4 +1,5 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource certificateOrder 'Microsoft.CertificateRegistration/certificateOrders@2021-02-01' = { 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..b4569df4 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep @@ -4,9 +4,8 @@ param location string = 'eastus' resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { name: resourceName location: location - identity: { - type: 'None' - userAssignedIdentities: null + sku: { + name: 'S0' } kind: 'OpenAI' properties: { @@ -15,14 +14,14 @@ resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false } - sku: { - name: 'S0' + identity: { + type: 'None' } } 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..afc50104 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: { 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..e16e066a 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep @@ -4,6 +4,9 @@ param location string = 'westus' resource account 'Microsoft.CognitiveServices/accounts@2024-10-01' = { name: '${resourceName}-ca' location: location + sku: { + name: 'S0' + } kind: 'OpenAI' properties: { allowedFqdnList: [] @@ -14,14 +17,11 @@ resource account 'Microsoft.CognitiveServices/accounts@2024-10-01' = { publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false } - sku: { - name: 'S0' - } } 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..079d8079 100644 --- a/settings/remarks/microsoft.compute/samples/availabilitysets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/availabilitysets/main.bicep @@ -4,11 +4,11 @@ param location string = 'westeurope' resource availabilitySet 'Microsoft.Compute/availabilitySets@2021-11-01' = { name: resourceName location: location + sku: { + name: 'Aligned' + } properties: { platformFaultDomainCount: 3 platformUpdateDomainCount: 5 } - sku: { - name: 'Aligned' - } } diff --git a/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep b/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep index db2d3eeb..e5c1a67a 100644 --- a/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep +++ b/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource capacityReservationGroup 'Microsoft.Compute/capacityReservationGroups@2022-03-01' = { name: '${resourceName}-ccrg' @@ -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/capacityreservationgroups/main.bicep b/settings/remarks/microsoft.compute/samples/capacityreservationgroups/main.bicep index 1a49be09..3bde9e74 100644 --- a/settings/remarks/microsoft.compute/samples/capacityreservationgroups/main.bicep +++ b/settings/remarks/microsoft.compute/samples/capacityreservationgroups/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource capacityReservationGroup 'Microsoft.Compute/capacityReservationGroups@2022-03-01' = { name: resourceName diff --git a/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep b/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep index bcc6162e..a488e001 100644 --- a/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep @@ -1,38 +1,23 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource diskEncryptionSet 'Microsoft.Compute/diskEncryptionSets@2022-03-02' = { - name: resourceName - location: location - properties: { - activeKey: { - keyUrl: key.properties.keyUriWithVersion - sourceVault: { - id: vault.id - } - } - encryptionType: 'EncryptionAtRestWithCustomerKey' - rotationToLatestKeyVersionEnabled: false - } -} - resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName location: location properties: { - accessPolicies: [] - enableSoftDelete: true sku: { family: 'A' name: 'standard' } - tenantId: deployer().tenantId + accessPolicies: [] + enableSoftDelete: true + tenantId: tenant().tenantId } } resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { - parent: vault name: resourceName + parent: vault properties: { keyOps: [ 'encrypt' @@ -46,3 +31,17 @@ resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { kty: 'RSA' } } + +resource diskEncryptionSet 'Microsoft.Compute/diskEncryptionSets@2022-03-02' = { + name: resourceName + location: location + properties: { + activeKey: { + sourceVault: { + id: vault.id + } + } + encryptionType: 'EncryptionAtRestWithCustomerKey' + rotationToLatestKeyVersionEnabled: false + } +} diff --git a/settings/remarks/microsoft.compute/samples/disks/main.bicep b/settings/remarks/microsoft.compute/samples/disks/main.bicep index 9da32a6f..1c5cb60e 100644 --- a/settings/remarks/microsoft.compute/samples/disks/main.bicep +++ b/settings/remarks/microsoft.compute/samples/disks/main.bicep @@ -1,9 +1,12 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource disk 'Microsoft.Compute/disks@2022-03-02' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } properties: { creationData: { createOption: 'Empty' @@ -16,7 +19,4 @@ resource disk 'Microsoft.Compute/disks@2022-03-02' = { 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..74dfe61b 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/applications/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/applications/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource gallery 'Microsoft.Compute/galleries@2022-03-03' = { name: resourceName @@ -10,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..687b64e4 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep @@ -12,6 +12,9 @@ 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: { accessTier: 'Hot' @@ -46,45 +49,44 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { 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]' + install: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + remove: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} update: '' } source: { @@ -93,7 +95,7 @@ resource version 'Microsoft.Compute/galleries/applications/versions@2022-03-03' } targetRegions: [ { - name: 'westus' + name: location regionalReplicaCount: 1 storageAccountType: 'Standard_LRS' } @@ -103,7 +105,4 @@ resource version 'Microsoft.Compute/galleries/applications/versions@2022-03-03' allowDeletionOfReplicatedLocations: true } } - dependsOn: [ - container - ] } diff --git a/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep b/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep index 58285d6e..fb19224a 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep @@ -10,16 +10,15 @@ 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: [] } - features: null hyperVGeneration: 'V1' identifier: { offer: 'AccTesOffer230630032848825313' diff --git a/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep b/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep index 7d01a4fb..89fb8eaf 100644 --- a/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep +++ b/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep @@ -10,15 +10,15 @@ resource hostGroup 'Microsoft.Compute/hostGroups@2021-11-01' = { } resource host 'Microsoft.Compute/hostGroups/hosts@2021-11-01' = { - parent: hostGroup name: resourceName location: location + parent: hostGroup + sku: { + name: 'DSv3-Type1' + } properties: { autoReplaceOnFailure: true licenseType: 'None' platformFaultDomain: 1 } - sku: { - name: 'DSv3-Type1' - } } diff --git a/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep b/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep index 1963c586..45ccd4b3 100644 --- a/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep +++ b/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep @@ -1,27 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' - -resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { - name: resourceName - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'internal' - properties: { - primary: false - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] - } -} +param resourceName string = 'acctest0001' resource restorePointCollection 'Microsoft.Compute/restorePointCollections@2024-03-01' = { name: resourceName @@ -64,7 +42,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { osProfile: { adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { disablePasswordAuthentication: true patchSettings: { @@ -123,8 +101,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.0.0/24' defaultOutboundAccess: true @@ -135,3 +113,25 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { serviceEndpoints: [] } } + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: resourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'internal' + properties: { + primary: false + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: { + id: subnet.id + } + } + } + ] + } +} diff --git a/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep b/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep index 79442794..561c06ca 100644 --- a/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep +++ b/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep @@ -1,28 +1,6 @@ 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 @@ -64,7 +42,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { osProfile: { adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001-vm' + computerName: '${resourceName}-vm' linuxConfiguration: { disablePasswordAuthentication: true patchSettings: { @@ -123,14 +101,14 @@ 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 @@ -141,3 +119,25 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { serviceEndpoints: [] } } + +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 + } + } + } + ] + } +} diff --git a/settings/remarks/microsoft.compute/samples/snapshots/main.bicep b/settings/remarks/microsoft.compute/samples/snapshots/main.bicep index a79e0b2c..28fbbf6c 100644 --- a/settings/remarks/microsoft.compute/samples/snapshots/main.bicep +++ b/settings/remarks/microsoft.compute/samples/snapshots/main.bicep @@ -4,6 +4,9 @@ param location string = 'westus' 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..3efb51f6 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep @@ -6,29 +6,9 @@ param adminUsername string @description('The administrator password for the virtual machine') param adminPassword string +var dataDiskName = 'mydatadisk1' var attachedDataDiskName = 'myattacheddatadisk1' var osDiskName = 'myosdisk1' -var dataDiskName = 'mydatadisk1' - -resource attachedDisk 'Microsoft.Compute/disks@2022-03-02' = { - name: attachedDataDiskName - location: location - properties: { - creationData: { - createOption: 'Empty' - } - diskSizeGB: 1 - encryption: { - type: 'EncryptionAtRestWithPlatformKey' - } - networkAccessPolicy: 'AllowAll' - osType: 'Linux' - publicNetworkAccess: 'Enabled' - } - sku: { - name: 'Standard_LRS' - } -} resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName @@ -132,8 +112,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: [] @@ -143,3 +123,23 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { serviceEndpoints: [] } } + +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' + } + networkAccessPolicy: 'AllowAll' + osType: 'Linux' + publicNetworkAccess: 'Enabled' + } +} diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep index f066b25c..b42a5052 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep @@ -14,56 +14,6 @@ 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: [ - { - name: 'testconfiguration2' - properties: { - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] - } -} - resource attachedVirtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: attachedResourceName location: location @@ -121,6 +71,9 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { resource snapshot 'Microsoft.Compute/snapshots@2023-10-02' = { name: resourceName location: location + sku: { + name: 'Standard_ZRS' + } properties: { creationData: { createOption: 'Copy' @@ -130,17 +83,90 @@ resource snapshot 'Microsoft.Compute/snapshots@2023-10-02' = { encryption: { type: 'EncryptionAtRestWithPlatformKey' } + networkAccessPolicy: 'AllowAll' + osType: 'Linux' hyperVGeneration: 'V1' incremental: true + publicNetworkAccess: 'Enabled' + supportedCapabilities: { + architecture: 'x64' + } + } +} + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: resourceName + parent: virtualNetwork + properties: { + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + } +} + +resource attachedManagedDisk 'Microsoft.Compute/disks@2023-10-02' = { + name: attachedOsDiskName + location: location + sku: { + name: 'Standard_LRS' + } + properties: { + creationData: { + createOption: 'Copy' + sourceResourceId: snapshot.id + } + diskSizeGB: 30 + encryption: { + type: 'EncryptionAtRestWithPlatformKey' + } networkAccessPolicy: 'AllowAll' osType: 'Linux' + hyperVGeneration: 'V1' publicNetworkAccess: 'Enabled' supportedCapabilities: { architecture: 'x64' } } - sku: { - name: 'Standard_ZRS' +} + +resource attachedNetworkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: attachedResourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration2' + properties: { + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: { + id: subnet.id + } + } + } + ] } } @@ -185,32 +211,3 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } } } - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork - name: resourceName - properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - } -} diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep index 93a31595..f25435ac 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep @@ -46,8 +46,8 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null - adminUsername: null + adminPassword: adminPassword + adminUsername: adminUsername computerName: 'hostname230630032848831819' linuxConfiguration: { disablePasswordAuthentication: false @@ -87,8 +87,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' delegations: [] diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep index 1092716f..01e257c1 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep @@ -44,7 +44,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null + adminPassword: vmAdminPassword adminUsername: 'testadmin' computerName: 'hostname230630032848831819' linuxConfiguration: { @@ -85,9 +85,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,8 +105,8 @@ 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: { addressPrefix: '10.0.2.0/24' delegations: [] diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep index 7a26f542..5182127d 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep @@ -4,28 +4,6 @@ param location string = 'eastus' @description('The administrator password for the virtual machine') param adminPassword string -resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { - name: '${resourceName}-nic' - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'internal' - properties: { - primary: false - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] - } -} - resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { name: '${resourceName}-uai' location: location @@ -60,10 +38,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: { @@ -117,9 +95,9 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } resource runCommand 'Microsoft.Compute/virtualMachines/runCommands@2023-03-01' = { - parent: virtualMachine name: '${resourceName}-runcommand' location: location + parent: virtualMachine properties: { asyncExecution: false errorBlobUri: '' @@ -137,8 +115,8 @@ resource runCommand 'Microsoft.Compute/virtualMachines/runCommands@2023-03-01' = } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' defaultOutboundAccess: true @@ -149,3 +127,25 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { serviceEndpoints: [] } } + +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 + } + } + } + ] + } +} diff --git a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep index 7fd25e57..644682bd 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep @@ -1,9 +1,30 @@ 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 virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023-03-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_F2' + tier: 'Standard' + } properties: { additionalCapabilities: {} doNotRunExtensionsOnOverprovisionedVMs: false @@ -62,7 +83,7 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } osProfile: { adminUsername: 'adminuser' - computerNamePrefix: 'acctest0001' + computerNamePrefix: resourceName linuxConfiguration: { disablePasswordAuthentication: true provisionVMAgent: true @@ -98,32 +119,11 @@ 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 extension 'Microsoft.Compute/virtualMachineScaleSets/extensions@2023-03-01' = { - parent: virtualMachineScaleSet name: resourceName + parent: virtualMachineScaleSet properties: { autoUpgradeMinorVersion: true enableAutomaticUpgrade: false @@ -139,8 +139,8 @@ resource extension 'Microsoft.Compute/virtualMachineScaleSets/extensions@2023-03 } 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..b6938073 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep @@ -4,6 +4,11 @@ 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 @@ -62,7 +67,7 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } osProfile: { adminUsername: 'adminuser' - computerNamePrefix: 'acctest0001' + computerNamePrefix: resourceName linuxConfiguration: { disablePasswordAuthentication: true provisionVMAgent: true @@ -98,11 +103,6 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } } } - sku: { - capacity: 1 - name: 'Standard_F2' - tier: 'Standard' - } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -122,8 +122,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' delegations: [] diff --git a/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep b/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep index 248c723d..45cb039c 100644 --- a/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep +++ b/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep @@ -12,12 +12,12 @@ resource ledger 'Microsoft.ConfidentialLedger/ledgers@2022-05-13' = { { ledgerRoleName: 'Administrator' principalId: deployer().objectId - tenantId: deployer().tenantId + tenantId: tenant().tenantId } ] 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..a22a15cd 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 diff --git a/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep b/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep index cd16892d..c9fa9745 100644 --- a/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep +++ b/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' = { name: resourceName @@ -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..a2d0e2c9 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep @@ -4,6 +4,10 @@ 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 @@ -29,16 +33,12 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Premium' - tier: 'Premium' - } } resource agentPool 'Microsoft.ContainerRegistry/registries/agentPools@2019-06-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { count: 1 os: 'Linux' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep index a4ecf510..b6b4bd14 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep @@ -4,6 +4,9 @@ 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 @@ -22,14 +25,11 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Basic' - } } resource cacheRule 'Microsoft.ContainerRegistry/registries/cacheRules@2023-07-01' = { - parent: registry name: '${resourceName}-cache-rule' + parent: registry properties: { sourceRepository: 'mcr.microsoft.com/hello-world' targetRepository: 'target' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep index e709e2a0..5da54f6c 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep @@ -4,6 +4,9 @@ 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 @@ -22,16 +25,12 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = 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: { auditLogStatus: 'Disabled' logLevel: 'None' @@ -49,8 +48,8 @@ resource connectedRegistry 'Microsoft.ContainerRegistry/registries/connectedRegi } 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..be55f113 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep @@ -1,4 +1,3 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' @secure() @description('The username for the container registry credential') @@ -6,32 +5,7 @@ param credentialUsername string = 'testuser' @secure() @description('The password for the container registry credential') param credentialPassword string - -resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = { - name: resourceName - location: location - properties: { - adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false - networkRuleBypassOptions: 'AzureServices' - policies: { - exportPolicy: { - status: 'enabled' - } - quarantinePolicy: { - status: 'disabled' - } - retentionPolicy: {} - trustPolicy: {} - } - publicNetworkAccess: 'Enabled' - zoneRedundancy: 'Disabled' - } - sku: { - name: 'Basic' - } -} +param resourceName string = 'acctest0001' resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: '${resourceName}vault' @@ -51,7 +25,7 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { ] storage: [] } - tenantId: deployer().tenantId + tenantId: tenant().tenantId } ] createMode: 'default' @@ -66,19 +40,45 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: 'standard' } softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId + tenantId: tenant().tenantId + } +} + +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: {} + } + publicNetworkAccess: 'Enabled' + zoneRedundancy: 'Disabled' } } 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..8301524a 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep @@ -4,6 +4,10 @@ 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 @@ -29,8 +33,4 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = 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..3dfbebf6 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep @@ -4,6 +4,10 @@ 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 @@ -29,15 +33,11 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = 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..688973da 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep @@ -4,6 +4,10 @@ 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 @@ -29,16 +33,12 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Standard' - tier: 'Standard' - } } resource taskRun 'Microsoft.ContainerRegistry/registries/taskRuns@2019-06-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { runRequest: { dockerFilePath: 'Dockerfile' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep index c31bbd8c..c2c6b09a 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep @@ -4,6 +4,10 @@ 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 @@ -29,20 +33,15 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Basic' - tier: 'Basic' - } } resource task 'Microsoft.ContainerRegistry/registries/tasks@2019-06-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { isSystemTask: true status: 'Enabled' - step: null timeout: 3600 } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep index b4380ac1..5be6e70b 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep @@ -4,6 +4,10 @@ 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 @@ -29,15 +33,11 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Premium' - tier: 'Premium' - } } 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..01ecf449 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep @@ -4,6 +4,10 @@ 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 @@ -29,16 +33,12 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Standard' - tier: 'Standard' - } } 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..d3d82bda 100644 --- a/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep @@ -10,6 +10,10 @@ resource fleet 'Microsoft.ContainerService/fleets@2024-04-01' = { resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' = { name: resourceName location: location + sku: { + name: 'Base' + tier: 'Free' + } properties: { addonProfiles: {} agentPoolProfiles: [ @@ -52,7 +56,7 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' } } disableLocalAccounts: false - dnsPrefix: 'acctest0001' + dnsPrefix: resourceName enableRBAC: true kubernetesVersion: '' metricsProfile: { @@ -67,15 +71,11 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' } supportPlan: 'KubernetesOfficial' } - sku: { - name: 'Base' - tier: 'Free' - } } 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..3844a47d 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep @@ -13,13 +13,13 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p vmSize: 'Standard_DS2_v2' } ] - dnsPrefix: 'acctest0001' + dnsPrefix: resourceName } } resource agentPool 'Microsoft.ContainerService/managedClusters/agentPools@2023-04-02-preview' = { - parent: managedCluster name: 'internal' + parent: managedCluster properties: { count: 1 mode: 'User' diff --git a/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep b/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep index 786bb9f1..90f29df7 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..ad25ac4d 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep @@ -1,25 +1,50 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: 'ai-${resourceName}' +resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { + name: 'kv${resourceName}' location: location - kind: 'web' properties: { - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' + accessPolicies: [] + createMode: 'default' + enableRbacAuthorization: false + enabledForDeployment: false + enabledForDiskEncryption: false + enabledForTemplateDeployment: false + publicNetworkAccess: 'Enabled' + sku: { + family: 'A' + name: 'standard' + } + softDeleteRetentionInDays: 7 + tenantId: tenant().tenantId + } +} + +resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-04-01' = { + name: 'mlw-${resourceName}' + location: location + sku: { + name: 'Basic' + tier: 'Basic' + } + kind: 'Default' + properties: { + applicationInsights: component.id + 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: {} agentPoolProfiles: [ @@ -62,7 +87,7 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' } } disableLocalAccounts: false - dnsPrefix: 'aks-acctest0001' + dnsPrefix: 'aks-${resourceName}' enableRBAC: true kubernetesVersion: '' metricsProfile: { @@ -77,15 +102,41 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' } supportPlan: 'KubernetesOfficial' } - sku: { - name: 'Base' - tier: 'Free' +} + +resource trustedAccessRoleBinding 'Microsoft.ContainerService/managedClusters/trustedAccessRoleBindings@2025-02-01' = { + name: 'tarb-${resourceName}' + parent: managedCluster + properties: { + roles: [ + 'Microsoft.MachineLearningServices/workspaces/mlworkload' + ] + sourceResourceId: workspace.id + } +} + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: 'ai-${resourceName}' + location: location + kind: 'web' + properties: { + Application_Type: 'web' + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' } } resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: 'st${resourceName}' location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' @@ -120,55 +171,4 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } -} - -resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { - name: 'kv${resourceName}' - location: location - properties: { - accessPolicies: [] - createMode: 'default' - 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 - 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 - } } diff --git a/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep b/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep index 1eb2dc82..708cd6fe 100644 --- a/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep +++ b/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep @@ -1,9 +1,11 @@ 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: { displayName: 'CostByServiceViewerz3k' @@ -21,12 +23,10 @@ resource scheduledAction 'Microsoft.CostManagement/scheduledActions@2022-10-01' notificationEmail: 'test@test.com' schedule: { dayOfMonth: 0 - daysOfWeek: null endDate: '2023-07-02T00:00:00Z' frequency: 'Daily' hourOfDay: 0 startDate: '2023-07-01T00:00:00Z' - weeksOfMonth: null } status: 'Enabled' viewId: resourceId('Microsoft.CostManagement/views', 'ms:CostByService') diff --git a/settings/remarks/microsoft.costmanagement/samples/views/main.bicep b/settings/remarks/microsoft.costmanagement/samples/views/main.bicep index be056d90..04f15e9f 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 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..9fe4ba36 100644 --- a/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep @@ -1,17 +1,12 @@ param resourceName string = 'acctest0001' param location string = 'eastus' -resource account 'Microsoft.Monitor/accounts@2023-04-03' = { - name: '${resourceName}-mw' - location: location - properties: { - publicNetworkAccess: 'Enabled' - } -} - resource grafana 'Microsoft.Dashboard/grafana@2023-09-01' = { name: '${resourceName}-graf' location: location + sku: { + name: 'Standard' + } properties: { apiKey: 'Disabled' autoGeneratedDomainNameLabelScope: 'TenantReuse' @@ -20,22 +15,27 @@ resource grafana 'Microsoft.Dashboard/grafana@2023-09-01' = { publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Standard' - } } resource managedPrivateEndpoint 'Microsoft.Dashboard/grafana/managedPrivateEndpoints@2023-09-01' = { - parent: grafana name: '${resourceName}-mpe' location: location + parent: grafana properties: { groupIds: [ 'prometheusMetrics' ] privateLinkResourceId: account.id - privateLinkResourceRegion: 'eastus' + privateLinkResourceRegion: location privateLinkServiceUrl: '' requestMessage: '' } } + +resource account 'Microsoft.Monitor/accounts@2023-04-03' = { + name: '${resourceName}-mw' + location: location + properties: { + publicNetworkAccess: 'Enabled' + } +} 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..c56fc7e7 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep @@ -6,25 +6,25 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { location: location properties: { publicNetworkAccess: 'Enabled' - repoConfiguration: null } } -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 } } } + +resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' +} diff --git a/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep index f8f1274a..afbd2b0a 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep @@ -6,13 +6,27 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { location: location properties: { publicNetworkAccess: 'Enabled' - repoConfiguration: null + } +} + +resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { + name: resourceName + parent: factory + properties: { + description: '' + type: 'AzureBlobStorage' + typeProperties: { + serviceEndpoint: storageAccount.properties.primaryEndpoints.blob + } } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' @@ -41,14 +55,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { 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' @@ -90,15 +101,3 @@ source1 sink( } } } - -resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { - parent: factory - name: resourceName - properties: { - description: '' - type: 'AzureBlobStorage' - typeProperties: { - serviceEndpoint: storageAccount.properties.primaryEndpoints.blob - } - } -} diff --git a/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep index 8f874454..ac8bd507 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep @@ -6,13 +6,15 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { 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' @@ -41,14 +43,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } } resource dataset 'Microsoft.DataFactory/factories/datasets@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' linkedServiceName: { @@ -69,8 +68,8 @@ resource dataset 'Microsoft.DataFactory/factories/datasets@2018-06-01' = { } resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'AzureBlobStorage' diff --git a/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep index 0b9e810d..bcac3aae 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep @@ -6,13 +6,12 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { location: location properties: { publicNetworkAccess: 'Enabled' - repoConfiguration: null } } 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..9f7c4796 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep @@ -1,18 +1,12 @@ 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' @@ -41,14 +35,19 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' +} + +resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { + name: resourceName + location: location + properties: { + publicNetworkAccess: 'Enabled' } } 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/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/main.bicep index f41575b8..9857bdb8 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/main.bicep @@ -6,6 +6,5 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { location: location properties: { publicNetworkAccess: 'Enabled' - repoConfiguration: null } } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep index bf26c35b..04eac6d5 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep @@ -7,12 +7,11 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { properties: { globalParameters: {} publicNetworkAccess: 'Enabled' - repoConfiguration: null } } resource managedVirtualNetwork 'Microsoft.DataFactory/factories/managedVirtualNetworks@2018-06-01' = { - parent: factory name: 'default' + parent: factory properties: {} } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep index aecaf32e..dadadff0 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { name: resourceName @@ -7,13 +7,30 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { properties: { globalParameters: {} publicNetworkAccess: 'Enabled' - repoConfiguration: null + } +} + +resource managedVirtualNetwork 'Microsoft.DataFactory/factories/managedVirtualNetworks@2018-06-01' = { + name: 'default' + parent: factory + properties: {} +} + +resource managedPrivateEndpoint 'Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints@2018-06-01' = { + name: resourceName + parent: managedVirtualNetwork + properties: { + groupId: 'blob' + privateLinkResourceId: storageAccount.id } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'BlobStorage' properties: { accessTier: 'Hot' @@ -42,22 +59,4 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } -} - -resource managedVirtualNetwork 'Microsoft.DataFactory/factories/managedVirtualNetworks@2018-06-01' = { - parent: factory - name: 'default' - properties: {} -} - -resource managedPrivateEndpoint 'Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints@2018-06-01' = { - parent: managedVirtualNetwork - name: resourceName - 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..7f6118f2 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/pipelines/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/pipelines/main.bicep @@ -1,18 +1,17 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { name: resourceName location: location properties: { publicNetworkAccess: 'Enabled' - repoConfiguration: null } } 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..176491b5 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep @@ -6,13 +6,12 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { location: location properties: { publicNetworkAccess: 'Enabled' - repoConfiguration: null } } resource pipeline 'Microsoft.DataFactory/factories/pipelines@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { annotations: [] description: '' @@ -27,8 +26,8 @@ resource pipeline 'Microsoft.DataFactory/factories/pipelines@2018-06-01' = { } resource trigger 'Microsoft.DataFactory/factories/triggers@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' pipeline: { diff --git a/settings/remarks/microsoft.datamigration/samples/services/main.bicep b/settings/remarks/microsoft.datamigration/samples/services/main.bicep index 655e65d7..c08af084 100644 --- a/settings/remarks/microsoft.datamigration/samples/services/main.bicep +++ b/settings/remarks/microsoft.datamigration/samples/services/main.bicep @@ -4,13 +4,13 @@ param location string = 'westeurope' resource service 'Microsoft.DataMigration/services@2018-04-19' = { name: resourceName location: location + sku: { + name: 'Standard_1vCores' + } kind: 'Cloud' properties: { virtualSubnetId: subnet.id } - sku: { - name: 'Standard_1vCores' - } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -30,8 +30,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.1.0/24' delegations: [] diff --git a/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep b/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep index 097ee330..64c2f698 100644 --- a/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep +++ b/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep @@ -4,13 +4,13 @@ param location string = 'westeurope' resource service 'Microsoft.DataMigration/services@2018-04-19' = { name: resourceName location: location + sku: { + name: 'Standard_1vCores' + } kind: 'Cloud' properties: { virtualSubnetId: subnet.id } - sku: { - name: 'Standard_1vCores' - } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -30,9 +30,9 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource project 'Microsoft.DataMigration/services/projects@2018-04-19' = { - parent: service name: resourceName location: location + parent: service properties: { sourcePlatform: 'SQL' targetPlatform: 'SQLDB' @@ -40,8 +40,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..732e956c 100644 --- a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep @@ -17,41 +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 + parent: backupVault properties: { dataSourceInfo: { datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' objectType: 'Datasource' resourceID: database.id - resourceLocation: 'database.location' + resourceLocation: database.location resourceName: database.name resourceType: 'Microsoft.DBforPostgreSQL/servers/databases' resourceUri: '' @@ -60,13 +34,12 @@ resource backupInstance 'Microsoft.DataProtection/backupVaults/backupInstances@2 datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' objectType: 'DatasourceSet' resourceID: server.id - resourceLocation: 'server.location' + resourceLocation: server.location resourceName: server.name resourceType: 'Microsoft.DBForPostgreSQL/servers' resourceUri: '' } - datasourceAuthCredentials: null - friendlyName: 'acctest0001' + friendlyName: resourceName objectType: 'BackupInstance' policyInfo: { policyId: backupPolicy.id @@ -75,8 +48,8 @@ resource backupInstance 'Microsoft.DataProtection/backupVaults/backupInstances@2 } resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022-04-01' = { - parent: backupVault name: resourceName + parent: backupVault properties: { datasourceTypes: [ 'Microsoft.DBforPostgreSQL/servers/databases' @@ -135,9 +108,35 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 } } +resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { + name: resourceName + location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'B_Gen5_2' + tier: 'Basic' + } + properties: { + administratorLogin: 'psqladmin' + administratorLoginPassword: administratorLoginPassword + createMode: 'Default' + infrastructureEncryption: 'Disabled' + minimalTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' + storageProfile: { + backupRetentionDays: 7 + storageAutogrow: 'Enabled' + storageMB: 5120 + } + version: '9.5' + } +} + resource database 'Microsoft.DBforPostgreSQL/servers/databases@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { charset: 'UTF8' collation: 'English_United States.1252' diff --git a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep index 0e11a48b..d889aa29 100644 --- a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { name: resourceName @@ -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' 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..84376c40 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep @@ -1,17 +1,23 @@ -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 + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' @@ -23,17 +29,11 @@ resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { } version: '10.2' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } 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..77d40666 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep @@ -9,9 +9,15 @@ param administratorLoginPassword string 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 + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' @@ -23,17 +29,11 @@ resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { } 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..f36ec6ae 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep @@ -9,9 +9,15 @@ 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 + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' @@ -23,17 +29,11 @@ resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { } version: '10.2' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } 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..2e274ef6 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep @@ -9,9 +9,15 @@ 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 + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' @@ -23,10 +29,4 @@ resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { } version: '10.2' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep index a29902eb..9388f074 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep @@ -9,9 +9,15 @@ 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 + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' @@ -23,12 +29,6 @@ resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { } version: '10.2' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -48,8 +48,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.7.29.0/29' delegations: [] @@ -65,8 +65,8 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { } resource virtualNetworkRule 'Microsoft.DBforMariaDB/servers/virtualNetworkRules@2018-06-01' = { - parent: server name: resourceName + parent: server properties: { ignoreMissingVnetServiceEndpoint: false virtualNetworkSubnetId: subnet.id diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep index e74f865d..ab9ba936 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,10 +26,6 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { } version: '8.0.21' } - sku: { - name: 'Standard_B1ms' - tier: 'Burstable' - } } resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { @@ -39,13 +39,13 @@ resource userassignedidentity1 'Microsoft.ManagedIdentity/userAssignedIdentities } resource administrator 'Microsoft.DBforMySQL/flexibleServers/administrators@2023-12-30' = { - parent: flexibleServer name: 'ActiveDirectory' + parent: flexibleServer properties: { administratorType: 'ActiveDirectory' identityResourceId: userAssignedIdentity.id login: 'sqladmin' sid: deployer().objectId - tenantId: deployer().tenantId + tenantId: tenant().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..4f9691be 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..9c2208c8 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep @@ -9,9 +9,13 @@ 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 + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' @@ -26,15 +30,11 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { network: {} version: '' } - sku: { - name: 'Standard_B1s' - tier: 'Burstable' - } } resource database 'Microsoft.DBforMySQL/flexibleServers/databases@2021-05-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { charset: 'utf8' collation: 'utf8_unicode_ci' diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep index 01af1e66..db98a22c 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep @@ -7,9 +7,13 @@ 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' @@ -24,15 +28,11 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { 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..8c9045fb 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..fc18bc6c 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep @@ -1,17 +1,25 @@ -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: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' @@ -24,21 +32,15 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { } version: '5.7' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } resource administrator 'Microsoft.DBforMySQL/servers/administrators@2017-12-01' = { - parent: server name: 'activeDirectory' + parent: server properties: { administratorType: 'ActiveDirectory' login: 'sqladmin' - sid: deployer().objectId - tenantId: deployer().tenantId + sid: clientId + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep index 28c38190..5745c725 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep @@ -1,17 +1,23 @@ -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' resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' @@ -24,17 +30,11 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { } version: '5.7' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } resource configuration 'Microsoft.DBforMySQL/servers/configurations@2017-12-01' = { - parent: server name: 'character_set_server' + parent: server properties: { value: 'latin1' } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep index 4464b7d9..86e75853 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep @@ -9,9 +9,15 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_1' @@ -23,17 +29,11 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { } 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..74468b49 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep @@ -9,9 +9,15 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' @@ -24,17 +30,11 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { } version: '5.7' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } resource 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..04074cfb 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep @@ -1,17 +1,23 @@ -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' resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_1' @@ -23,10 +29,4 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { } 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..2eb6dd7e 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep @@ -9,9 +9,15 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' @@ -24,12 +30,6 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { } version: '5.7' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -49,8 +49,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.7.29.0/29' delegations: [] @@ -66,8 +66,8 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { } 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..427cb8d9 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep @@ -9,13 +9,17 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = { name: resourceName location: location + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword authConfig: { activeDirectoryAuth: 'Enabled' passwordAuth: 'Enabled' - tenantId: deployer().tenantId + tenantId: tenant().tenantId } availabilityZone: '2' backup: { @@ -30,17 +34,13 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = } version: '12' } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' - } } resource administrator 'Microsoft.DBforPostgreSQL/flexibleServers/administrators@2022-12-01' = { + name: deployer().objectId parent: flexibleServer - name: 'data.azurerm_client_config.current.object_id' properties: { principalType: 'ServicePrincipal' - tenantId: deployer().tenantId + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep index 29b9710c..effb3bde 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep @@ -7,13 +7,13 @@ 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 + administratorLoginPassword: postgresqlAdministratorPassword availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' @@ -27,29 +27,28 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-pr } version: '12' } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' + identity: { + type: 'None' } } -resource pgbouncerDefaultPoolSize 'Microsoft.DBforPostgreSQL/flexibleServers/configurations@2022-12-01' = { +resource pgbouncerEnabled 'Microsoft.DBforPostgreSQL/flexibleServers/configurations@2022-12-01' = { + name: 'pgbouncer.enabled' parent: flexibleServer - name: 'pgbouncer.default_pool_size' properties: { source: 'user-override' - value: '40' + value: 'true' } - dependsOn: [ - pgbouncerEnabled - ] } -resource pgbouncerEnabled 'Microsoft.DBforPostgreSQL/flexibleServers/configurations@2022-12-01' = { +resource pgbouncerDefaultPoolSize 'Microsoft.DBforPostgreSQL/flexibleServers/configurations@2022-12-01' = { + name: 'pgbouncer.default_pool_size' parent: flexibleServer - name: 'pgbouncer.enabled' + dependsOn: [ + pgbouncerEnabled + ] properties: { 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..8daabf78 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep @@ -1,15 +1,19 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator password for the PostgreSQL flexible server') param postgresqlAdministratorPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = { name: resourceName location: location + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' + } properties: { administratorLogin: 'adminTerraform' - administratorLoginPassword: null + administratorLoginPassword: postgresqlAdministratorPassword availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' @@ -23,15 +27,11 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = } 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..26ae197c 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep @@ -7,9 +7,13 @@ 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 + administratorLoginPassword: postgresqlAdministratorPassword availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' @@ -23,15 +27,11 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = } version: '12' } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' - } } resource firewallRule 'Microsoft.DBforPostgreSQL/flexibleServers/firewallRules@2022-12-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { endIpAddress: '122.122.0.0' startIpAddress: '122.122.0.0' diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep index bd677693..065ad921 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep @@ -1,21 +1,21 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' @description('The administrator login name 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@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 availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' @@ -29,8 +29,7 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-pr } version: '12' } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' + identity: { + type: 'None' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep index f32b3bc8..a81cf2e6 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep @@ -7,9 +7,13 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { name: '${resourceName}-primary' location: location + sku: { + name: 'Standard_D2ads_v5' + tier: 'GeneralPurpose' + } properties: { administratorLogin: 'psqladmin' - administratorLoginPassword: null + administratorLoginPassword: administratorLoginPassword availabilityZone: '1' backup: { geoRedundantBackup: 'Disabled' @@ -27,9 +31,16 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = } version: '16' } - sku: { - name: 'Standard_D2ads_v5' - tier: 'GeneralPurpose' +} + +resource virtualEndpoint 'Microsoft.DBforPostgreSQL/flexibleServers/virtualEndpoints@2024-08-01' = { + name: resourceName + parent: flexibleServer + properties: { + endpointType: 'ReadWrite' + members: [ + flexibleserver1.name + ] } } @@ -57,14 +68,3 @@ resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' version: '16' } } - -resource virtualEndpoint 'Microsoft.DBforPostgreSQL/flexibleServers/virtualEndpoints@2024-08-01' = { - parent: flexibleServer - name: resourceName - properties: { - endpointType: 'ReadWrite' - members: [ - flexibleserver1.name - ] - } -} diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep index b4888c67..f8c8d7bd 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep @@ -8,7 +8,7 @@ resource serverGroupsv2 'Microsoft.DBforPostgreSQL/serverGroupsv2@2022-11-08' = name: resourceName location: location properties: { - administratorLoginPassword: null + administratorLoginPassword: administratorLoginPassword coordinatorEnablePublicIpAccess: true coordinatorServerEdition: 'GeneralPurpose' coordinatorStorageQuotaInMb: 131072 diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep index 042fc32c..1603a3c2 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep @@ -1,4 +1,3 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the PostgreSQL server') param administratorLogin string @@ -7,13 +6,22 @@ param administratorLogin string param administratorLoginPassword string @description('The administrator login name for the PostgreSQL server admin') param adminLogin string +param resourceName string = 'acctest0001' + +param clientId string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' @@ -26,21 +34,15 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { } 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..0aceb79e 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep @@ -9,9 +9,15 @@ param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' @@ -24,17 +30,11 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { } 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..069a00e3 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep @@ -9,9 +9,15 @@ param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' @@ -24,17 +30,11 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { } 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..7665a393 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep @@ -9,9 +9,15 @@ param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' @@ -24,17 +30,11 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { } 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..b2d4690a 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep @@ -1,17 +1,23 @@ +@secure() +@description('The administrator login password for the PostgreSQL server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the PostgreSQL server') param administratorLogin string -@secure() -@description('The administrator login password for the PostgreSQL server') -param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' @@ -24,10 +30,4 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { } 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..b3f87893 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep @@ -1,36 +1,10 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the PostgreSQL server') param administratorLogin string @secure() @description('The administrator login password for the PostgreSQL server') param administratorLoginPassword string - -resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { - name: resourceName - location: location - properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' - storageProfile: { - backupRetentionDays: 7 - storageAutogrow: 'Enabled' - storageMB: 51200 - } - version: '9.5' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } -} +param resourceName string = 'acctest0001' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName @@ -49,8 +23,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.7.29.0/29' delegations: [] @@ -65,9 +39,35 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { } } +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: administratorLogin + administratorLoginPassword: administratorLoginPassword + createMode: 'Default' + infrastructureEncryption: 'Disabled' + minimalTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' + storageProfile: { + backupRetentionDays: 7 + storageAutogrow: 'Enabled' + storageMB: 51200 + } + version: '9.5' + } +} + 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..a336c1fd 100644 --- a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep +++ b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep @@ -25,9 +25,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.devcenter/samples/devcenters/attachednetworks/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep index 7cb03984..f7e5177f 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep @@ -1,24 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { - name: resourceName - location: location - identity: { - type: 'SystemAssigned' - userAssignedIdentities: null - } -} - -resource networkConnection 'Microsoft.DevCenter/networkConnections@2023-04-01' = { - name: resourceName - location: 'westeurope' - properties: { - domainJoinType: 'AzureADJoin' - subnetId: subnet.id - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location @@ -31,18 +13,34 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } } +resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { + name: resourceName + location: location + identity: { + type: 'SystemAssigned' + } +} + resource attachNetwork 'Microsoft.DevCenter/devcenters/attachednetworks@2023-04-01' = { - parent: devCenter name: resourceName + parent: devCenter properties: { networkConnectionId: networkConnection.id } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' } } + +resource networkConnection 'Microsoft.DevCenter/networkConnections@2023-04-01' = { + name: resourceName + properties: { + domainJoinType: 'AzureADJoin' + subnetId: subnet.id + } +} diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep index a6a3809a..5d6fd22b 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep @@ -8,8 +8,8 @@ resource devCenter 'Microsoft.DevCenter/devCenters@2025-02-01' = { } resource catalog 'Microsoft.DevCenter/devCenters/catalogs@2025-02-01' = { - parent: devCenter name: '${substring(resourceName, 0, 17)}-catalog' + parent: devCenter properties: { adoGit: { branch: 'main' diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep index 2368eef0..a9370b0f 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep @@ -6,14 +6,13 @@ resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { location: location identity: { type: 'SystemAssigned' - userAssignedIdentities: null } } resource devBoxDefinition 'Microsoft.DevCenter/devcenters/devboxdefinitions@2024-10-01-preview' = { - parent: devCenter name: resourceName location: location + parent: devCenter properties: { hibernateSupport: 'Enabled' imageReference: { diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/environmenttypes/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/environmenttypes/main.bicep index 48152382..7321f16b 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/environmenttypes/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/environmenttypes/main.bicep @@ -8,6 +8,6 @@ resource devCenter 'Microsoft.DevCenter/devCenters@2025-02-01' = { } resource environmentType 'Microsoft.DevCenter/devCenters/environmentTypes@2025-02-01' = { - parent: devCenter name: resourceName + parent: devCenter } diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep index c091a718..9ae6d9d5 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' +param resourceName string = 'acctest0001' resource devCenter 'Microsoft.DevCenter/devCenters@2025-02-01' = { name: resourceName diff --git a/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep b/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep index b1655e53..e7d7c676 100644 --- a/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep @@ -23,8 +23,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.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..f49f6f04 100644 --- a/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep @@ -1,12 +1,6 @@ param resourceName string param location string -resource devCenter 'Microsoft.DevCenter/devCenters@2025-02-01' = { - name: resourceName - location: location - properties: {} -} - resource project 'Microsoft.DevCenter/projects@2025-02-01' = { name: '${resourceName}-proj' location: location @@ -17,16 +11,22 @@ resource project 'Microsoft.DevCenter/projects@2025-02-01' = { } } -resource environmentType 'Microsoft.DevCenter/devCenters/environmentTypes@2025-02-01' = { - parent: devCenter - name: '${resourceName}-envtype' -} - 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' } } + +resource devCenter 'Microsoft.DevCenter/devCenters@2025-02-01' = { + name: resourceName + location: location + properties: {} +} + +resource environmentType 'Microsoft.DevCenter/devCenters/environmentTypes@2025-02-01' = { + name: '${resourceName}-envtype' + parent: devCenter +} diff --git a/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep b/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep index eaac0850..050cebd0 100644 --- a/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep +++ b/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep @@ -4,9 +4,13 @@ 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: { cloudToDevice: {} enableFileUploadNotifications: false @@ -23,17 +27,13 @@ resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { } 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..1988e77c 100644 --- a/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep +++ b/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/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,10 +24,6 @@ resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { } storageEndpoints: {} } - sku: { - capacity: 1 - name: 'S1' - } } resource account 'Microsoft.DeviceUpdate/accounts@2022-10-01' = { @@ -36,15 +36,15 @@ 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 } ] } 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..2f549301 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/policysets/policies/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/policysets/policies/main.bicep @@ -1,20 +1,14 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { name: resourceName 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' + parent: policySet properties: { description: '' evaluatorType: 'MaxValuePolicy' @@ -23,3 +17,8 @@ resource policy 'Microsoft.DevTestLab/labs/policySets/policies@2018-09-15' = { threshold: '999' } } + +resource policySet 'Microsoft.DevTestLab/labs/policySets@2018-09-15' existing = { + name: 'default' + parent: lab +} 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..bc6155e6 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep @@ -12,10 +12,31 @@ resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { } } -resource virtualMachine 'Microsoft.DevTestLab/labs/virtualMachines@2018-09-15' = { +resource virtualNetwork 'Microsoft.DevTestLab/labs/virtualNetworks@2018-09-15' = { + name: resourceName parent: lab + properties: { + description: '' + subnetOverrides: [ + { + labSubnetName: '${resourceName}Subnet' + resourceId: resourceId( + 'Microsoft.Network/virtualNetworks/subnets', + resourceGroup().name, + resourceName, + '${resourceName}Subnet' + ) + useInVmCreationPermission: 'Allow' + usePublicIpAddressPermission: 'Allow' + } + ] + } +} + +resource virtualMachine 'Microsoft.DevTestLab/labs/virtualMachines@2018-09-15' = { name: resourceName location: location + parent: lab properties: { allowClaim: true disallowPublicIpAddress: false @@ -27,30 +48,14 @@ resource virtualMachine 'Microsoft.DevTestLab/labs/virtualMachines@2018-09-15' = version: 'latest' } isAuthenticationWithSshKey: false - labSubnetName: '\'${resourceName}Subnet\'' + labSubnetName: '${resourceName}Subnet' labVirtualNetworkId: virtualNetwork.id networkInterface: {} notes: '' osType: 'Windows' - password: null + password: vmPassword size: 'Standard_F2' storageType: 'Standard' userName: 'acct5stU5er' } } - -resource virtualNetwork 'Microsoft.DevTestLab/labs/virtualNetworks@2018-09-15' = { - parent: lab - name: resourceName - properties: { - description: '' - subnetOverrides: [ - { - labSubnetName: '\'${resourceName}Subnet\'' - resourceId: resourceId('Microsoft.Network/virtualNetworks/subnets', 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..d5271a3c 100644 --- a/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep @@ -4,28 +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 @@ -78,10 +56,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null + adminPassword: adminPassword adminUsername: 'testadmin' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { disablePasswordAuthentication: false patchSettings: { @@ -135,8 +113,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 +124,25 @@ 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: { + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: { + id: subnet.id + } + } + } + ] + } +} diff --git a/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep b/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep index 7ed9bdf0..bb6af959 100644 --- a/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep +++ b/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep @@ -9,33 +9,33 @@ resource digitalTwinsInstance 'Microsoft.DigitalTwins/digitalTwinsInstances@2020 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' } + properties: { + disableLocalAuth: false + publicNetworkAccess: 'Enabled' + zoneRedundant: false + } } resource endpoint 'Microsoft.DigitalTwins/digitalTwinsInstances/endpoints@2020-12-01' = { - parent: digitalTwinsInstance name: resourceName + parent: digitalTwinsInstance properties: { authenticationType: 'KeyBased' deadLetterSecret: '' endpointType: 'ServiceBus' - primaryConnectionString: 'authorizationRule.listKeys().primaryConnectionString' - secondaryConnectionString: 'authorizationRule.listKeys().secondaryConnectionString' + primaryConnectionString: authorizationRule.listKeys().primaryConnectionString + secondaryConnectionString: authorizationRule.listKeys().secondaryConnectionString } } resource topic 'Microsoft.ServiceBus/namespaces/topics@2021-06-01-preview' = { - parent: namespace name: resourceName + parent: namespace properties: { enableBatchedOperations: false enableExpress: false @@ -48,8 +48,8 @@ resource topic 'Microsoft.ServiceBus/namespaces/topics@2021-06-01-preview' = { } resource authorizationRule 'Microsoft.ServiceBus/namespaces/topics/authorizationRules@2021-06-01-preview' = { - parent: topic name: resourceName + parent: topic properties: { rights: [ 'Send' diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep index 6c9cc2f6..32889b6f 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep @@ -41,12 +41,12 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } 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..a39e3a53 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep @@ -1,16 +1,15 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' +param resourceName string = 'acctest0001' +var accountName = toLower(replace(resourceName, '-', '')) var keyspaceName = '${toLower(resourceName)}ks' var tableName = '${toLower(resourceName)}tbl' -var accountName = toLower(replace(resourceName, '-', '')) resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: accountName location: location kind: 'GlobalDocumentDB' properties: { - backupPolicy: null capabilities: [ { name: 'EnableCassandra' @@ -37,7 +36,7 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { { failoverPriority: 0 isZoneRedundant: false - locationName: 'eastus' + locationName: location } ] minimalTlsVersion: 'Tls12' @@ -49,8 +48,8 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { } resource cassandraKeyspace 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces@2021-10-15' = { - parent: databaseAccount name: keyspaceName + parent: databaseAccount properties: { options: {} resource: { @@ -60,8 +59,8 @@ resource cassandraKeyspace 'Microsoft.DocumentDB/databaseAccounts/cassandraKeysp } resource table 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces/tables@2021-10-15' = { - parent: cassandraKeyspace name: tableName + parent: cassandraKeyspace properties: { options: {} resource: { 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..d257903d 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep @@ -41,25 +41,25 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } 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..df20a18c 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep @@ -41,12 +41,12 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } 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/mongodbdatabases/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep index 55714880..a1390b07 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep @@ -41,12 +41,12 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } 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..8bebc244 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep @@ -1,16 +1,15 @@ param resourceName string = 'acctest0001' param location string = 'eastus' +var roleName = '${toLower(resourceName)}role' var accountName = toLower(replace(resourceName, '-', '')) var dbName = '${toLower(resourceName)}db' -var roleName = '${toLower(resourceName)}role' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: accountName location: location kind: 'MongoDB' properties: { - backupPolicy: null capabilities: [ { name: 'EnableMongoRoleBasedAccessControl' @@ -40,7 +39,7 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { { failoverPriority: 0 isZoneRedundant: false - locationName: 'eastus' + locationName: location } ] minimalTlsVersion: 'Tls12' @@ -52,8 +51,8 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { } resource mongodbDatabase 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2021-10-15' = { - parent: databaseAccount name: dbName + parent: databaseAccount properties: { options: {} resource: { @@ -63,14 +62,14 @@ resource mongodbDatabase 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases } resource mongodbRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions@2022-11-15' = { - parent: databaseAccount name: '${dbName}.${roleName}' + parent: databaseAccount + dependsOn: [ + mongodbDatabase + ] properties: { databaseName: dbName roleName: roleName type: 1 } - dependsOn: [ - mongodbDatabase - ] } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep index 471dae66..5bdd9ed3 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep @@ -9,7 +9,6 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { location: location kind: 'MongoDB' properties: { - backupPolicy: null capabilities: [ { name: 'EnableMongoRoleBasedAccessControl' @@ -38,7 +37,7 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { { failoverPriority: 0 isZoneRedundant: false - locationName: 'westus' + locationName: location } ] minimalTlsVersion: 'Tls12' @@ -49,24 +48,24 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { } } -resource mongodbDatabas 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2021-10-15' = { +resource mongodbUserDefinition 'Microsoft.DocumentDB/databaseAccounts/mongodbUserDefinitions@2022-11-15' = { + name: '${mongodbDatabas.name}.myUserName' parent: databaseAccount - name: '${resourceName}-mongodb' properties: { - options: {} - resource: { - id: 'acctest0001-mongodb' - } + databaseName: mongodbDatabas.name + mechanisms: 'SCRAM-SHA-256' + password: mongodbUserPassword + userName: 'myUserName' } } -resource mongodbUserDefinition 'Microsoft.DocumentDB/databaseAccounts/mongodbUserDefinitions@2022-11-15' = { +resource mongodbDatabas 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2021-10-15' = { + name: '${resourceName}-mongodb' parent: databaseAccount - name: '${mongodbDatabas.name}.myUserName' properties: { - databaseName: mongodbDatabas.name - mechanisms: 'SCRAM-SHA-256' - password: null - userName: 'myUserName' + options: {} + resource: { + id: '${resourceName}-mongodb' + } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep index fe8b85c7..260c8893 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep @@ -37,8 +37,8 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } 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..da18f016 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep @@ -37,21 +37,21 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } 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: { 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..d3ad5017 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 @@ -37,23 +37,23 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: resourceName } } } resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = { - parent: sqlDatabase name: resourceName + parent: sqlDatabase properties: { options: {} resource: { - id: 'acctest0001' + id: resourceName partitionKey: { kind: 'Hash' paths: [ @@ -65,8 +65,8 @@ resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/container } resource storedProcedure 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/storedProcedures@2021-10-15' = { - parent: container name: resourceName + parent: container properties: { options: {} resource: { @@ -76,7 +76,7 @@ resource storedProcedure 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/con response.setBody(''Hello, World''); } ''' - id: 'acctest0001' + id: resourceName } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/triggers/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/triggers/main.bicep index e580ac3c..9fccb7d2 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 @@ -37,23 +37,23 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: resourceName } } } resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = { - parent: sqlDatabase name: resourceName + parent: sqlDatabase properties: { options: {} resource: { - id: 'acctest0001' + id: resourceName partitionKey: { kind: 'Hash' paths: [ @@ -65,13 +65,13 @@ resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/container } resource trigger 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/triggers@2021-10-15' = { - parent: container name: resourceName + parent: container properties: { options: {} resource: { body: 'function trigger(){}' - id: 'acctest0001' + id: resourceName triggerOperation: 'All' triggerType: 'Pre' } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep index 4ee0c4fb..a3bddc80 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 @@ -37,23 +37,23 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } 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..abb3a58c 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep @@ -37,14 +37,14 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } 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..70fd15e9 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' = { @@ -63,20 +41,42 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } } -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 + principalId: cluster.identity.principalId roleDefinitionId: sqlRoleDefinition.id scope: databaseAccount.id } } + +resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { + name: resourceName + location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } + properties: { + enableAutoStop: true + enableDiskEncryption: false + enableDoubleEncryption: false + enablePurge: false + enableStreamingIngest: false + engineType: 'V2' + publicIPType: 'IPv4' + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: 'Disabled' + trustedExternalTenants: [] + } +} + +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..03c49730 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: resourceName @@ -37,8 +37,8 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions@2021-10-15' = { - parent: databaseAccount name: 'c3ce1661-d0b9-3476-0a7c-2654ce2f3055' + parent: databaseAccount properties: { assignableScopes: [ databaseAccount.id @@ -50,7 +50,7 @@ resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinit ] } ] - roleName: 'acctest0001' + roleName: resourceName type: 'CustomRole' } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep index 210b7112..edc2b529 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep @@ -41,12 +41,12 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } 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..04c65539 100644 --- a/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep @@ -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..101961e7 100644 --- a/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep @@ -34,8 +34,8 @@ resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@ } resource mongouserEntraserviceprincipal 'Microsoft.DocumentDB/mongoClusters/users@2025-09-01' = { + name: 'azapi_resource.userAssignedIdentity.output.properties.principalId' parent: mongoClusterSSDv2 - name: 'userAssignedIdentity.properties.principalId' properties: { identityProvider: { properties: { diff --git a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep index c9205983..63acbbac 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource elasticSan 'Microsoft.ElasticSan/elasticSans@2023-01-01' = { name: '${resourceName}-es' @@ -15,8 +15,8 @@ resource elasticSan 'Microsoft.ElasticSan/elasticSans@2023-01-01' = { } resource volumeGroup 'Microsoft.ElasticSan/elasticSans/volumeGroups@2023-01-01' = { - parent: elasticSan name: '${resourceName}-vg' + parent: elasticSan properties: { encryption: 'EncryptionAtRestWithPlatformKey' networkAcls: { diff --git a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep index ab0d9770..4e436369 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource elasticSan 'Microsoft.ElasticSan/elasticSans@2023-01-01' = { name: '${resourceName}-es' @@ -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..7aa94b1e 100644 --- a/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep @@ -9,7 +9,6 @@ resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { autoDeleteTopicWithLastSubscription: true disableLocalAuth: false inputSchema: 'EventGridSchema' - inputSchemaMapping: null publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep index 200dc074..e9acef4e 100644 --- a/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep @@ -9,12 +9,11 @@ resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { 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..8a0ac572 100644 --- a/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep @@ -1,15 +1,49 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: { + 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 + } +} + resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = { - scope: storageAccount name: resourceName + scope: storageAccount properties: { - deadLetterDestination: null destination: { endpointType: 'EventHub' properties: { - deliveryAttributeMappings: null resourceId: eventhub.id } } @@ -31,58 +65,22 @@ resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location - properties: { - disableLocalAuth: false - isAutoInflateEnabled: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false - } sku: { capacity: 1 name: 'Standard' tier: 'Standard' } -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - encryption: { - keySource: 'Microsoft.Storage' - services: { - queue: { - keyType: 'Service' - } - table: { - keyType: 'Service' - } - } - } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } + disableLocalAuth: false + isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + zoneRedundant: false } } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { messageRetentionInDays: 1 partitionCount: 1 diff --git a/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep b/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep index cac8743f..e59655c9 100644 --- a/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep @@ -4,11 +4,11 @@ param location string = 'westus' resource namespace 'Microsoft.EventGrid/namespaces@2023-12-15-preview' = { name: '${resourceName}-ns' location: location - properties: { - publicNetworkAccess: 'Enabled' - } sku: { capacity: 1 name: 'Standard' } + properties: { + publicNetworkAccess: 'Enabled' + } } diff --git a/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep b/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep index 41576cfc..08e242f0 100644 --- a/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep @@ -1,15 +1,19 @@ param resourceName string = 'acctest0001' param location string = 'westus' +var systemTopicName = '${resourceName}-st' var storageAccountName = '${resourceName}sa01' +var queueServiceId = '${storageAccount.id}/queueServices/default' var queueName = '${resourceName}queue' var eventSubscription1Name = '${resourceName}-es1' var eventSubscription2Name = '${resourceName}-es2' -var systemTopicName = '${resourceName}-st' resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: storageAccountName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' @@ -44,9 +48,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } +} + +resource queue 'Microsoft.Storage/storageAccounts/queueServices/queues@2023-05-01' = { + name: queueName + dependsOn: [ + storageAccount + ] } resource systemTopic 'Microsoft.EventGrid/systemTopics@2022-06-15' = { @@ -58,11 +66,13 @@ resource systemTopic 'Microsoft.EventGrid/systemTopics@2022-06-15' = { } } -resource eventSubscription 'Microsoft.EventGrid/systemTopics/eventSubscriptions@2022-06-15' = { +resource eventsubscription1 'Microsoft.EventGrid/systemTopics/eventSubscriptions@2022-06-15' = { + name: eventSubscription2Name parent: systemTopic - name: eventSubscription1Name + dependsOn: [ + queue + ] properties: { - deadLetterDestination: null destination: { endpointType: 'StorageQueue' properties: { @@ -75,23 +85,24 @@ resource eventSubscription 'Microsoft.EventGrid/systemTopics/eventSubscriptions@ advancedFilters: [ { key: 'subject' - operatorType: 'StringBeginsWith' - values: ['foo'] + operatorType: 'StringEndsWith' + values: [ + 'bar' + ] } ] } labels: [] } - dependsOn: [ - queue - ] } -resource eventsubscription1 'Microsoft.EventGrid/systemTopics/eventSubscriptions@2022-06-15' = { +resource eventSubscription 'Microsoft.EventGrid/systemTopics/eventSubscriptions@2022-06-15' = { + name: eventSubscription1Name parent: systemTopic - name: eventSubscription2Name + dependsOn: [ + queue + ] properties: { - deadLetterDestination: null destination: { endpointType: 'StorageQueue' properties: { @@ -104,29 +115,13 @@ resource eventsubscription1 'Microsoft.EventGrid/systemTopics/eventSubscriptions advancedFilters: [ { key: 'subject' - operatorType: 'StringEndsWith' - values: ['bar'] + operatorType: 'StringBeginsWith' + values: [ + 'foo' + ] } ] } labels: [] } - dependsOn: [ - queue - ] -} - -// The queue service is a singleton named 'default' under the storage account -resource queueService 'Microsoft.Storage/storageAccounts/queueServices@2023-05-01' existing = { - parent: storageAccount - name: 'default' -} - -resource queue 'Microsoft.Storage/storageAccounts/queueServices/queues@2023-05-01' = { - parent: queueService - name: queueName - - dependsOn: [ - storageAccount - ] } diff --git a/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep index 02267b1a..2110e234 100644 --- a/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep @@ -1,3 +1,4 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource systemTopic 'Microsoft.EventGrid/systemTopics@2021-12-01' = { diff --git a/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep index 7d52cb0d..83835116 100644 --- a/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep @@ -7,7 +7,6 @@ resource topic 'Microsoft.EventGrid/topics@2021-12-01' = { properties: { disableLocalAuth: false inputSchema: 'EventGridSchema' - inputSchemaMapping: null publicNetworkAccess: 'Enabled' } } 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..9a86144d 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep @@ -1,40 +1,41 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { +resource namespace2 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName - location: location + location: 'westus2' + sku: { + capacity: 1 + name: 'Standard' + tier: 'Standard' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } +} + +resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { + name: resourceName + location: location 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 } 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..b76dce4f 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep @@ -1,25 +1,25 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + 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..a3837e81 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep @@ -4,22 +4,22 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + 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..59991d26 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: { + 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 diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep index e41aea1f..d1c4d529 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: { + capacity: 1 + name: 'Standard' + tier: 'Standard' + } 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..77283c9e 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep @@ -4,22 +4,22 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard' + tier: 'Standard' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Standard' - tier: 'Standard' - } } resource schemaGroup 'Microsoft.EventHub/namespaces/schemaGroups@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { schemaCompatibility: 'Forward' schemaType: 'Avro' diff --git a/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep b/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep index 212e175b..260ebc51 100644 --- a/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep +++ b/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep @@ -4,46 +4,32 @@ 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' +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName location: location properties: { - guestConfiguration: { - assignmentType: '' - configurationParameter: [ - { - name: '[InstalledApplication]bwhitelistedapp;Name' - value: 'NotePad,sql' - } + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' ] - contentHash: '' - contentUri: '' - name: 'WhitelistedApplication' - version: '1.*' } + dhcpOptions: { + dnsServers: [] + } + subnets: [] } } -resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { - name: resourceName - location: location +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: 'internal' + parent: virtualNetwork properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'internal' - properties: { - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] } } @@ -76,7 +62,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null + adminPassword: adminPassword adminUsername: 'adminuser' allowExtensionOperations: true computerName: 'acctestvmdro23' @@ -116,31 +102,45 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } } -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName +resource guestConfigurationAssignment 'Microsoft.GuestConfiguration/guestConfigurationAssignments@2020-06-25' = { + name: 'WhitelistedApplication' location: location + scope: virtualMachine properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' + guestConfiguration: { + assignmentType: '' + configurationParameter: [ + { + name: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + value: 'NotePad,sql' + } ] + contentHash: '' + contentUri: '' + name: 'WhitelistedApplication' + version: '1.*' } - dhcpOptions: { - dnsServers: [] - } - subnets: [] } } -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork - name: 'internal' +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'internal' + properties: { + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: { + id: subnet.id + } + } + } + ] } } diff --git a/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep b/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep index ce8260ec..0e945d7d 100644 --- a/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep @@ -10,8 +10,54 @@ param vmPassword string param restCredentialPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount +} + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + 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 + } +} + +resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { + name: resourceName + parent: blobService + properties: { + metadata: { + key: 'value' + } + } } resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { @@ -94,49 +140,3 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { 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' - } -} - -resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService - name: resourceName - properties: { - metadata: { - key: 'value' - } - } -} diff --git a/settings/remarks/microsoft.healthbot/samples/healthbots/main.bicep b/settings/remarks/microsoft.healthbot/samples/healthbots/main.bicep index 6a54a915..b6536e24 100644 --- a/settings/remarks/microsoft.healthbot/samples/healthbots/main.bicep +++ b/settings/remarks/microsoft.healthbot/samples/healthbots/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource healthBot 'Microsoft.HealthBot/healthBots@2022-08-08' = { name: resourceName 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..85b8d7f7 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep @@ -7,15 +7,15 @@ resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { } resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace kind: 'fhir-R4' properties: { acrConfiguration: {} authenticationConfiguration: { audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' - authority: 'https://login.microsoftonline.com/deployer().tenantId' + authority: 'https://login.microsoftonline.com/${tenant().tenantId}' smartProxyEnabled: false } corsConfiguration: { @@ -28,9 +28,9 @@ resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-0 } resource fhirService2 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace kind: 'fhir-R4' properties: { acrConfiguration: {} diff --git a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep index f2bcb8fc..2e61b905 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/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,15 +33,15 @@ resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { } resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace kind: 'fhir-R4' properties: { acrConfiguration: {} authenticationConfiguration: { audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' - authority: 'https://login.microsoftonline.com/deployer().tenantId' + authority: 'https://login.microsoftonline.com/${tenant().tenantId}' smartProxyEnabled: false } corsConfiguration: { @@ -54,9 +54,9 @@ resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-0 } resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace properties: { deviceMapping: { content: { @@ -73,17 +73,17 @@ 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: '' } } resource fhirDestination 'Microsoft.HealthcareApis/workspaces/iotConnectors/fhirDestinations@2022-12-01' = { - parent: iotConnector name: resourceName location: location + parent: iotConnector properties: { fhirMapping: { content: { diff --git a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep index eefb1927..02b81503 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep @@ -1,41 +1,15 @@ -param resourceName string = 'acctest0001' 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' - } -} +param resourceName string = 'acctest0001' 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 - properties: { - messageRetentionInDays: 1 - partitionCount: 2 - status: 'Active' - } -} - resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace properties: { deviceMapping: { content: { @@ -51,9 +25,35 @@ resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12 } } +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 + } +} + +resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { + name: resourceName + parent: namespace + properties: { + messageRetentionInDays: 1 + partitionCount: 2 + status: 'Active' + } +} + 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..94a68e4e --- /dev/null +++ b/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep @@ -0,0 +1,160 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' +@secure() +@description('The administrator password for the virtual machine') +param adminPassword string + +resource workloadImpact 'Microsoft.Impact/workloadImpacts@2023-12-01-preview' = { + name: resourceName + properties: { + additionalProperties: { + CollectTelemetry: true + Location: 'DataCenter1' + LogUrl: 'http://example.com/log' + Manufacturer: 'ManufacturerName' + ModelNumber: 'Model123' + NodeId: 'node-123' + PhysicalHostName: 'host123' + SerialNumber: 'SN123456' + VmUniqueId: 'vm-unique-id' + } + armCorrelationIds: [ + 'id1' + 'id2' + ] + clientIncidentDetails: { + clientIncidentId: 'id' + clientIncidentSource: 'AzureDevops' + } + confidenceLevel: 'High' + connectivity: { + port: 1443 + protocol: 'TCP' + source: { + azureResourceId: virtualMachine.id + } + target: { + azureResourceId: virtualMachine.id + } + } + endDateTime: '2024-12-04T01:15:00Z' + errorDetails: { + errorCode: 'code' + errorMessage: 'errorMessage' + } + impactCategory: 'Resource.Availability' + impactDescription: 'impact description' + impactGroupId: 'impact groupid' + impactedResourceId: virtualMachine.id + performance: [ + { + actual: 2 + expected: 2 + expectedValueRange: { + max: 5 + min: 1 + } + metricName: 'example' + unit: 'ByteSeconds' + } + ] + startDateTime: '2024-12-03T01:15:00Z' + workload: { + context: 'context' + toolset: 'Ansible' + } + } +} + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: resourceName + parent: virtualNetwork + properties: { + 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: { + id: subnet.id + } + } + } + ] + } +} + +resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { + name: resourceName + location: location + properties: { + hardwareProfile: { + vmSize: 'Standard_F2' + } + networkProfile: { + networkInterfaces: [ + { + id: networkInterface.id + properties: { + primary: false + } + } + ] + } + 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 + } + } + } +} 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..ebfde871 100644 --- a/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep +++ b/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep @@ -1,3 +1,4 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { diff --git a/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep b/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep index fe95dfcf..8d2c8b60 100644 --- a/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep +++ b/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { name: resourceName @@ -116,6 +116,9 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' @@ -144,7 +147,4 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } } diff --git a/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep b/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep index a1ef6631..d251b047 100644 --- a/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep +++ b/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep @@ -6,52 +6,14 @@ param adminUsername string @description('The administrator password for the virtual machine scale set') param adminPassword string -resource autoScaleSetting 'Microsoft.Insights/autoScaleSettings@2022-10-01' = { - name: resourceName - location: location - properties: { - enabled: true - notifications: [] - profiles: [ - { - capacity: { - default: '1' - maximum: '10' - minimum: '1' - } - name: 'metricRules' - rules: [ - { - metricTrigger: { - dimensions: [] - dividePerInstance: true - metricName: 'Percentage CPU' - metricNamespace: '' - metricResourceUri: virtualMachineScaleSet.id - operator: 'GreaterThan' - statistic: 'Average' - threshold: 75 - timeAggregation: 'Last' - timeGrain: 'PT1M' - timeWindow: 'PT5M' - } - scaleAction: { - cooldown: 'PT1M' - direction: 'Increase' - type: 'ChangeCount' - value: '1' - } - } - ] - } - ] - targetResourceUri: virtualMachineScaleSet.id - } -} - resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023-03-01' = { name: resourceName location: location + sku: { + capacity: 2 + name: 'Standard_F2' + tier: 'Standard' + } properties: { additionalCapabilities: {} doNotRunExtensionsOnOverprovisionedVMs: false @@ -109,8 +71,8 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- ] } osProfile: { - adminPassword: null - adminUsername: null + adminPassword: adminPassword + adminUsername: adminUsername computerNamePrefix: 'testvm-230630033559396108' linuxConfiguration: { disablePasswordAuthentication: false @@ -147,11 +109,6 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } } } - sku: { - capacity: 2 - name: 'Standard_F2' - tier: 'Standard' - } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -171,8 +128,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' delegations: [] @@ -182,3 +139,46 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { serviceEndpoints: [] } } + +resource autoScaleSetting 'Microsoft.Insights/autoScaleSettings@2022-10-01' = { + name: resourceName + location: location + properties: { + enabled: true + notifications: [] + profiles: [ + { + capacity: { + default: '1' + maximum: '10' + minimum: '1' + } + name: 'metricRules' + rules: [ + { + metricTrigger: { + dimensions: [] + dividePerInstance: true + metricName: 'Percentage CPU' + metricNamespace: '' + metricResourceUri: virtualMachineScaleSet.id + operator: 'GreaterThan' + statistic: 'Average' + threshold: 75 + timeAggregation: 'Last' + timeGrain: 'PT1M' + timeWindow: 'PT5M' + } + scaleAction: { + cooldown: 'PT1M' + direction: 'Increase' + type: 'ChangeCount' + value: '1' + } + } + ] + } + ] + targetResourceUri: virtualMachineScaleSet.id + } +} diff --git a/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep b/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep index c22f4fd2..d5504cd5 100644 --- a/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep +++ b/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep @@ -18,10 +18,6 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { } 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/proactivedetectionconfigs/main.bicep b/settings/remarks/microsoft.insights/samples/components/proactivedetectionconfigs/main.bicep new file mode 100644 index 00000000..ba3206fa --- /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: { + Application_Type: 'web' + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + } +} + +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..399e11d0 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 @@ -87,7 +55,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null + adminPassword: adminPassword adminUsername: 'adminuser' allowExtensionOperations: true computerName: 'machine-230630033559397415' @@ -143,8 +111,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } 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 +122,35 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { serviceEndpoints: [] } } + +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' = { + 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..857134ab 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { name: resourceName diff --git a/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep b/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep index 0b673c3a..23829016 100644 --- a/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep +++ b/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep @@ -1,49 +1,20 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource diagnosticSetting 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = { - scope: vault - name: resourceName - properties: { - eventHubAuthorizationRuleId: authorizationRule.id - eventHubName: namespace.name - logs: [ - { - categoryGroup: 'Audit' - enabled: true - retentionPolicy: { - days: 0 - enabled: false - } - } - ] - metrics: [ - { - category: 'AllMetrics' - enabled: true - retentionPolicy: { - days: 0 - enabled: false - } - } - ] - } -} - resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Basic' + tier: 'Basic' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Basic' - tier: 'Basic' - } } resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { @@ -62,13 +33,13 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { family: 'A' name: 'standard' } - tenantId: deployer().tenantId + tenantId: tenant().tenantId } } resource authorizationRule 'Microsoft.EventHub/namespaces/authorizationRules@2021-11-01' = { - parent: namespace name: 'example' + parent: namespace properties: { rights: [ 'Listen' @@ -77,3 +48,32 @@ resource authorizationRule 'Microsoft.EventHub/namespaces/authorizationRules@202 ] } } + +resource diagnosticSetting 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = { + name: resourceName + scope: vault + 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 + } + } + ] + } +} 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..ef0a8fab --- /dev/null +++ b/settings/remarks/microsoft.insights/samples/logprofiles/main-rg-module.bicep @@ -0,0 +1,41 @@ +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: { + 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 + } +} + +// Module outputs for cross-scope references +output storageAccountId string = storageAccount.id 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..cdc0a7ca --- /dev/null +++ b/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep @@ -0,0 +1,36 @@ +targetScope = 'subscription' + +param resourceName string = 'acctest0001' +param location string = 'westeurope' + +resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: resourceName + location: location +} + +resource logProfile 'Microsoft.Insights/logProfiles@2016-03-01' = { + name: resourceName + properties: { + categories: [ + 'Action' + ] + locations: [ + 'westeurope' + 'westeurope' + ] + retentionPolicy: { + days: 7 + enabled: true + } + storageAccountId: module1.outputs.storageAccountId + } +} + +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..6f620b0b 100644 --- a/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep +++ b/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep @@ -45,6 +45,9 @@ 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' @@ -73,7 +76,4 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } } diff --git a/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep b/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep index 59efc1be..cb40125f 100644 --- a/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep +++ b/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep @@ -1,6 +1,8 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-preview' = { name: resourceName + location: 'Global' properties: {} } diff --git a/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep b/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep index 05a33bb3..970e5a09 100644 --- a/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep +++ b/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep @@ -19,12 +19,13 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { 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..f66d15d9 100644 --- a/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep +++ b/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep @@ -27,7 +27,6 @@ resource scheduledQueryRule 'Microsoft.Insights/scheduledQueryRules@2021-08-01' criteria: { allOf: [ { - dimensions: null operator: 'Equal' query: ''' requests | summarize CountByCountry=count() by client_CountryOrRegion @@ -44,7 +43,6 @@ resource scheduledQueryRule 'Microsoft.Insights/scheduledQueryRules@2021-08-01' ] 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..e607c325 100644 --- a/settings/remarks/microsoft.insights/samples/webtests/main.bicep +++ b/settings/remarks/microsoft.insights/samples/webtests/main.bicep @@ -31,7 +31,7 @@ resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { Id: 'us-tx-sn1-azr' } ] - Name: 'acctest0001' + Name: resourceName Request: { FollowRedirects: false Headers: [ @@ -49,7 +49,7 @@ resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { RequestUrl: 'http://microsoft.com' } RetryEnabled: false - SyntheticMonitorId: 'acctest0001' + SyntheticMonitorId: resourceName Timeout: 30 ValidationRules: { ExpectedHttpStatusCode: 200 @@ -57,6 +57,6 @@ resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { } } tags: { - 'hidden-link:azapi_resource.component.id': 'Resource' + 'hidden-link:${component.id}': 'Resource' } } diff --git a/settings/remarks/microsoft.insights/samples/workbooks/main.bicep b/settings/remarks/microsoft.insights/samples/workbooks/main.bicep index 50f54680..9cb7e9e0 100644 --- a/settings/remarks/microsoft.insights/samples/workbooks/main.bicep +++ b/settings/remarks/microsoft.insights/samples/workbooks/main.bicep @@ -1,3 +1,4 @@ +param resourceName string = 'acctest0001' param location string = 'westeurope' resource workbook 'Microsoft.Insights/workbooks@2022-04-01' = { @@ -7,7 +8,7 @@ resource workbook 'Microsoft.Insights/workbooks@2022-04-01' = { properties: { category: 'workbook' displayName: 'acctest-amw-230630032616547405' - serializedData: '{"fallbackResourceIds":["Azure Monitor"],"isLocked":false,"items":[{"content":{"json":"Test2022"},"name":"text - 0","type":1}],"version":"Notebook/1.0"}' + serializedData: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} sourceId: 'azure monitor' } } diff --git a/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep b/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep index 464310e5..7bd1726b 100644 --- a/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep +++ b/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep @@ -4,13 +4,13 @@ param location string = 'westeurope' resource iotApp 'Microsoft.IoTCentral/iotApps@2021-11-01-preview' = { name: resourceName location: location + sku: { + name: 'ST1' + } properties: { - displayName: 'acctest0001' + displayName: resourceName publicNetworkAccess: 'Enabled' subdomain: 'subdomain-2306300333537' template: 'iotc-pnp-preview@1.0.0' } - sku: { - name: 'ST1' - } } diff --git a/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep b/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep index bed18d28..aedab861 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: { + family: 'B' + name: 'Standard_B1' + } 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..6fe3bd75 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 sku: { family: 'A' name: 'standard' } - tenantId: deployer().tenantId + accessPolicies: [] + enableSoftDelete: true + tenantId: tenant().tenantId } } 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..4bb8ca5b 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep @@ -5,20 +5,20 @@ 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: [ { @@ -47,15 +47,18 @@ resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = ] 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..ca8ce628 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep @@ -20,7 +20,7 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { ] storage: [] } - tenantId: deployer().tenantId + tenantId: tenant().tenantId } ] createMode: 'default' @@ -35,6 +35,6 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: 'standard' } softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId + tenantId: tenant().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..fd96b3e1 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..21eb94e2 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' +param resourceName string = 'acctest0001' + +resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-preview' = { + name: resourceName + location: location + properties: { + agentPoolProfiles: [ + { + count: 1 + mode: 'System' + name: 'default' + vmSize: 'Standard_DS2_v2' + } + ] + dnsPrefix: resourceName + } +} resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = { - scope: managedCluster name: resourceName + scope: managedCluster properties: { autoUpgradeMinorVersion: true extensionType: 'microsoft.flux' @@ -11,8 +27,11 @@ 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: { gitRepository: { repositoryRef: { @@ -48,23 +67,4 @@ resource fluxConfiguration 'Microsoft.KubernetesConfiguration/fluxConfigurations 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..01ef9b51 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep @@ -4,6 +4,11 @@ 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 @@ -16,17 +21,12 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' - } } resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { - parent: cluster name: resourceName location: location + parent: cluster kind: 'ReadWrite' properties: {} } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep index fd2d641b..84543bb2 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep @@ -1,9 +1,16 @@ 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 @@ -16,28 +23,23 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' - } } resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { - parent: cluster name: resourceName location: location + parent: cluster kind: 'ReadWrite' properties: {} } resource principalAssignment 'Microsoft.Kusto/clusters/databases/principalAssignments@2023-05-02' = { - parent: database name: resourceName + parent: database properties: { - principalId: deployer().objectId + principalId: clientId principalType: 'App' role: 'Viewer' - tenantId: deployer().tenantId + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep index de6d36b8..69ff878b 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep @@ -1,9 +1,14 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' 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 @@ -16,24 +21,19 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' - } } resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { - parent: cluster name: resourceName location: location + parent: cluster kind: 'ReadWrite' properties: {} } resource 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..8b0eadf7 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/main.bicep @@ -4,6 +4,11 @@ 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 @@ -16,9 +21,4 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { 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..02489506 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep @@ -4,6 +4,11 @@ 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 @@ -16,16 +21,14 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' - } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' @@ -54,14 +57,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { 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 diff --git a/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep index bfe0741d..aab19a04 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep @@ -1,9 +1,16 @@ 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 @@ -16,20 +23,15 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' - } } resource principalAssignment 'Microsoft.Kusto/clusters/principalAssignments@2023-05-02' = { - parent: cluster name: resourceName + parent: cluster properties: { - principalId: deployer().objectId + principalId: clientId principalType: 'App' role: 'AllDatabasesViewer' - tenantId: deployer().tenantId + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.labservices/samples/labplans/main.bicep b/settings/remarks/microsoft.labservices/samples/labplans/main.bicep index 8b9e5b62..5528f0df 100644 --- a/settings/remarks/microsoft.labservices/samples/labplans/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labplans/main.bicep @@ -1,12 +1,12 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource labPlan 'Microsoft.LabServices/labPlans@2022-08-01' = { name: resourceName 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..8dbf0f7a 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/main.bicep @@ -28,7 +28,7 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { installGpuDrivers: 'Disabled' } adminUser: { - password: null + password: adminPassword username: 'testadmin' } createOption: 'Image' diff --git a/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep b/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep index 2794d8e2..aa292b95 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep @@ -28,7 +28,7 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { installGpuDrivers: 'Disabled' } adminUser: { - password: null + password: adminPassword username: 'testadmin' } createOption: 'Image' @@ -49,8 +49,8 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { } 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..6d905739 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' @@ -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..6e7baa1e 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/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 agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { agreementType: 'AS2' content: { @@ -163,8 +163,8 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = } resource partner 'Microsoft.Logic/integrationAccounts/partners@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { content: { b2b: { @@ -181,8 +181,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..16d77b1a 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep @@ -4,15 +4,18 @@ param location string = 'westus' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: '${resourceName}-ia' location: location - properties: {} sku: { name: 'Standard' } + properties: {} } resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: replace(substring(toLower('${resourceName}sa'), 0, 24), '-', '') location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' @@ -47,14 +50,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { 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' diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep index ffb5d1cd..032a54e7 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard' } + properties: {} } resource batchConfiguration 'Microsoft.Logic/integrationAccounts/batchConfigurations@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { batchGroupName: 'TestBatchGroup' releaseCriteria: { diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep index 8f755960..a3120411 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep @@ -4,8 +4,8 @@ param location string = 'westeurope' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName location: location - properties: {} sku: { name: 'Basic' } + properties: {} } diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep index 5cf9e450..6c6af484 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName location: location - properties: {} sku: { name: 'Basic' } + properties: {} } resource map 'Microsoft.Logic/integrationAccounts/maps@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { content: ''' - - Exe - - - - - - - - - - - - - + + + Exe + + + + + + + + + + + + + \ No newline at end of file