From fe59871d8708e90676c84c71617e0044be6054bd Mon Sep 17 00:00:00 2001 From: Mingzhe Jiang Date: Mon, 9 Feb 2026 16:14:39 -0800 Subject: [PATCH 1/2] Regenerate Bicep files with new translator and update baseline --- .../remarks/microsoft.aadiam/remarks.json | 27 +- .../samples/diagnosticsettings/main.bicep | 40 +++ .../remarks/microsoft.advisor/remarks.json | 27 +- .../recommendations/suppressions/main.bicep | 11 + .../samples/actionrules/main.bicep | 5 +- .../smartdetectoralertrules/main.bicep | 30 +- .../samples/servers/main.bicep | 6 +- .../service/apis/diagnostics/main.bicep | 68 ++-- .../samples/service/apis/main.bicep | 24 +- .../service/apis/operations/main.bicep | 28 +- .../samples/service/apis/policies/main.bicep | 26 +- .../samples/service/apis/schemas/main.bicep | 34 +- .../service/apis/tagdescriptions/main.bicep | 46 +-- .../samples/service/apis/tags/main.bicep | 26 +- .../samples/service/apiversionsets/main.bicep | 16 +- .../service/authorizationservers/main.bicep | 42 +-- .../samples/service/backends/main.bicep | 10 +- .../samples/service/caches/main.bicep | 47 +-- .../samples/service/certificates/main.bicep | 12 +- .../samples/service/diagnostics/main.bicep | 51 ++- .../certificateauthorities/main.bicep | 50 +-- .../hostnameconfigurations/main.bicep | 30 +- .../samples/service/gateways/main.bicep | 26 +- .../samples/service/groups/main.bicep | 24 +- .../service/identityproviders/main.bicep | 44 +-- .../samples/service/loggers/main.bicep | 52 +-- .../samples/service/main.bicep | 22 +- .../samples/service/namedvalues/main.bicep | 16 +- .../service/openidconnectproviders/main.bicep | 22 +- .../service/policyfragments/main.bicep | 36 +- .../samples/service/portalsettings/main.bicep | 28 +- .../samples/service/products/main.bicep | 16 +- .../service/products/policies/main.bicep | 22 +- .../samples/service/products/tags/main.bicep | 16 +- .../samples/service/schemas/main.bicep | 14 +- .../samples/service/subscriptions/main.bicep | 35 +- .../samples/service/tags/main.bicep | 16 +- .../samples/service/users/main.bicep | 40 +-- .../samples/containerapps/main.bicep | 46 ++- .../microsoft.app/samples/jobs/main.bicep | 10 +- .../certificates/main.bicep | 19 +- .../daprcomponents/main.bicep | 17 +- .../dotnetcomponents/main.bicep | 5 +- .../samples/managedenvironments/main.bicep | 39 ++- .../managedenvironments/storages/main.bicep | 65 ++-- .../samples/configurationstores/main.bicep | 6 +- .../spring/apiportals/domains/main.bicep | 20 +- .../samples/spring/apiportals/main.bicep | 18 +- .../customizedaccelerators/main.bicep | 14 +- .../spring/applicationaccelerators/main.bicep | 8 +- .../spring/applicationliveviews/main.bicep | 8 +- .../samples/spring/apps/bindings/main.bicep | 36 +- .../spring/apps/deployments/main.bicep | 20 +- .../samples/spring/apps/main.bicep | 8 +- .../builders/buildpackbindings/main.bicep | 38 +-- .../spring/buildservices/builders/main.bicep | 8 +- .../samples/spring/configservers/main.bicep | 8 +- .../spring/configurationservices/main.bicep | 8 +- .../samples/spring/devtoolportals/main.bicep | 14 +- .../spring/gateways/domains/main.bicep | 18 +- .../samples/spring/gateways/main.bicep | 16 +- .../spring/gateways/routeconfigs/main.bicep | 38 +-- .../samples/spring/main.bicep | 8 +- .../spring/monitoringsettings/main.bicep | 8 +- .../samples/spring/storages/main.bicep | 48 +-- .../samples/locks/main.bicep | 24 +- .../samples/policyassignments/main.bicep | 5 +- .../samples/policydefinitions/main.bicep | 3 +- .../samples/policyexemptions/main.bicep | 13 +- .../samples/policysetdefinitions/main.bicep | 15 +- .../samples/roledefinitions/main.bicep | 9 +- .../certificates/main.bicep | 8 +- .../configurations/main.bicep | 2 +- .../automationaccounts/connections/main.bicep | 22 +- .../connectiontypes/main.bicep | 2 +- .../automationaccounts/credentials/main.bicep | 4 +- .../hybridrunbookworkers/main.bicep | 61 ++-- .../hybridrunbookworkergroups/main.bicep | 11 +- .../automationaccounts/modules/main.bicep | 8 +- .../powershell72modules/main.bicep | 2 +- .../python3packages/main.bicep | 2 +- .../runbooks/draft/main.bicep | 8 +- .../automationaccounts/runbooks/main.bicep | 4 +- .../automationaccounts/schedules/main.bicep | 4 +- .../softwareupdateconfigurations/main.bicep | 14 +- .../sourcecontrols/main.bicep | 12 +- .../automationaccounts/variables/main.bicep | 4 +- .../privateclouds/authorizations/main.bicep | 8 +- .../samples/privateclouds/main.bicep | 8 +- .../samples/b2cdirectories/main.bicep | 11 +- .../batchaccounts/applications/main.bicep | 57 ++-- .../batchaccounts/certificates/main.bicep | 8 +- .../samples/batchaccounts/pools/main.bicep | 26 +- .../remarks/microsoft.billing/remarks.json | 27 +- .../billingprofiles/main.bicep | 39 +++ .../samples/botservices/channels/main.bicep | 18 +- .../samples/botservices/main.bicep | 17 +- settings/remarks/microsoft.cache/remarks.json | 10 + .../samples/redis/accesspolicies/main.bicep | 10 +- .../redis/accesspolicyassignments/main.bicep | 2 +- .../samples/redis/firewallrules/main.bicep | 4 +- .../redis/linkedservers/main-rg-module.bicep | 58 ++++ .../samples/redis/linkedservers/main.bicep | 23 ++ .../microsoft.cache/samples/redis/main.bicep | 4 +- .../redisenterprise/databases/main.bicep | 12 +- .../samples/redisenterprise/main.bicep | 8 +- .../samples/profiles/afdendpoints/main.bicep | 9 +- .../profiles/afdendpoints/routes/main.bicep | 31 +- .../samples/profiles/customdomains/main.bicep | 27 +- .../samples/profiles/endpoints/main.bicep | 6 +- .../microsoft.cdn/samples/profiles/main.bicep | 7 +- .../samples/profiles/origingroups/main.bicep | 9 +- .../profiles/origingroups/origins/main.bicep | 19 +- .../samples/profiles/rulesets/main.bicep | 9 +- .../profiles/rulesets/rules/main.bicep | 38 ++- .../profiles/securitypolicies/main.bicep | 117 +++---- .../samples/certificateorders/main.bicep | 5 +- .../samples/accounts/deployments/main.bicep | 12 +- .../samples/accounts/main.bicep | 8 +- .../samples/accounts/projects/main.bicep | 12 +- .../samples/accounts/raiblocklists/main.bicep | 14 +- .../samples/accounts/raipolicies/main.bicep | 8 +- .../samples/communicationservices/main.bicep | 1 + .../samples/emailservices/domains/main.bicep | 5 +- .../domains/senderusernames/main.bicep | 5 +- .../samples/emailservices/main.bicep | 1 + .../samples/availabilitysets/main.bicep | 6 +- .../capacityreservations/main.bicep | 4 +- .../samples/diskencryptionsets/main.bicep | 15 +- .../samples/disks/main.bicep | 10 +- .../samples/galleries/applications/main.bicep | 2 +- .../applications/versions/main.bicep | 65 ++-- .../samples/galleries/images/main.bicep | 12 +- .../samples/hostgroups/hosts/main.bicep | 8 +- .../restorepointcollections/main.bicep | 102 +++--- .../restorepoints/main.bicep | 52 ++- .../samples/snapshots/main.bicep | 36 +- .../virtualmachines/attachdatadisk/main.bicep | 100 +++--- .../virtualmachines/attachosdisk/main.bicep | 168 +++++---- .../samples/virtualmachines/basic/main.bicep | 36 +- .../virtualmachines/extensions/main.bicep | 80 +++-- .../virtualmachines/runcommands/main.bicep | 124 ++++--- .../extensions/main.bicep | 120 ++++--- .../virtualmachinescalesets/main.bicep | 56 ++- .../samples/ledgers/main.bicep | 4 +- .../samples/budgets/main.bicep | 20 +- .../samples/containergroups/main.bicep | 3 +- .../samples/registries/agentpools/main.bicep | 22 +- .../samples/registries/cacherules/main.bicep | 16 +- .../registries/connectedregistries/main.bicep | 23 +- .../registries/credentialsets/main.bicep | 48 +-- .../samples/registries/main.bicep | 10 +- .../samples/registries/scopemaps/main.bicep | 32 +- .../samples/registries/taskruns/main.bicep | 22 +- .../samples/registries/tasks/main.bicep | 16 +- .../samples/registries/tokens/main.bicep | 38 +-- .../samples/registries/webhooks/main.bicep | 16 +- .../samples/fleets/members/main.bicep | 36 +- .../managedclusters/agentpools/main.bicep | 4 +- .../samples/managedclusters/main.bicep | 2 +- .../trustedaccessrolebindings/main.bicep | 118 +++---- .../samples/scheduledactions/main.bicep | 26 +- .../samples/views/main.bicep | 5 +- .../samples/resourceproviders/main.bicep | 2 +- .../samples/grafana/main.bicep | 8 +- .../managedprivateendpoints/main.bicep | 12 +- .../samples/workspaces/main.bicep | 8 +- .../virtualnetworkpeerings/main.bicep | 48 +-- .../samples/factories/credentials/main.bicep | 13 +- .../samples/factories/dataflows/main.bicep | 30 +- .../samples/factories/datasets/main.bicep | 33 +- .../factories/integrationruntimes/main.bicep | 2 +- .../factories/linkedservices/main.bicep | 24 +- .../managedvirtualnetworks/main.bicep | 4 +- .../managedprivateendpoints/main.bicep | 24 +- .../samples/factories/pipelines/main.bicep | 2 +- .../samples/factories/triggers/main.bicep | 36 +- .../samples/services/main.bicep | 8 +- .../samples/services/projects/main.bicep | 14 +- .../backupvaults/backupinstances/main.bicep | 65 ++-- .../backupvaults/backuppolicies/main.bicep | 30 +- .../samples/resourceguards/main.bicep | 2 +- .../samples/accounts/shares/main.bicep | 2 +- .../samples/servers/configurations/main.bicep | 26 +- .../samples/servers/databases/main.bicep | 24 +- .../samples/servers/firewallrules/main.bicep | 24 +- .../samples/servers/main.bicep | 18 +- .../servers/virtualnetworkrules/main.bicep | 26 +- .../flexibleservers/administrators/main.bicep | 46 +-- .../flexibleservers/configurations/main.bicep | 22 +- .../flexibleservers/databases/main.bicep | 26 +- .../flexibleservers/firewallrules/main.bicep | 20 +- .../samples/flexibleservers/main.bicep | 20 +- .../samples/servers/administrators/main.bicep | 32 +- .../samples/servers/configurations/main.bicep | 26 +- .../samples/servers/databases/main.bicep | 24 +- .../samples/servers/firewallrules/main.bicep | 26 +- .../samples/servers/main.bicep | 18 +- .../servers/virtualnetworkrules/main.bicep | 38 +-- .../flexibleservers/administrators/main.bicep | 22 +- .../flexibleservers/configurations/main.bicep | 40 +-- .../flexibleservers/databases/main.bicep | 20 +- .../flexibleservers/firewallrules/main.bicep | 20 +- .../samples/flexibleservers/main.bicep | 22 +- .../virtualendpoints/main.bicep | 34 +- .../samples/servergroupsv2/main.bicep | 8 +- .../samples/servers/administrators/main.bicep | 38 ++- .../samples/servers/configurations/main.bicep | 28 +- .../samples/servers/databases/main.bicep | 30 +- .../samples/servers/firewallrules/main.bicep | 26 +- .../samples/servers/main.bicep | 20 +- .../servers/virtualnetworkrules/main.bicep | 48 +-- .../applicationgroups/applications/main.bicep | 3 +- .../samples/applicationgroups/main.bicep | 13 +- .../devcenters/attachednetworks/main.bicep | 8 +- .../samples/devcenters/catalogs/main.bicep | 2 +- .../devcenters/devboxdefinitions/main.bicep | 6 +- .../devcenters/environmenttypes/main.bicep | 2 +- .../samples/devcenters/main.bicep | 2 +- .../samples/networkconnections/main.bicep | 3 +- .../projects/environmenttypes/main.bicep | 28 +- .../samples/iothubs/certificates/main.bicep | 16 +- .../samples/iothubs/main.bicep | 14 +- .../certificates/main.bicep | 12 +- .../samples/provisioningservices/main.bicep | 12 +- .../samples/accounts/instances/main.bicep | 18 +- .../labs/policysets/policies/main.bicep | 13 +- .../samples/labs/schedules/main.bicep | 10 +- .../samples/labs/virtualmachines/main.bicep | 30 +- .../samples/labs/virtualnetworks/main.bicep | 13 +- .../samples/schedules/main.bicep | 95 +++--- .../endpoints/main.bicep | 36 +- .../cassandrakeyspaces/main.bicep | 20 +- .../cassandrakeyspaces/tables/main.bicep | 44 +-- .../gremlindatabases/graphs/main.bicep | 38 +-- .../gremlindatabases/main.bicep | 38 +-- .../samples/databaseaccounts/main.bicep | 22 +- .../mongodbdatabases/main.bicep | 28 +- .../mongodbroledefinitions/main.bicep | 68 ++-- .../mongodbuserdefinitions/main.bicep | 52 +-- .../databaseaccounts/services/main.bicep | 22 +- .../sqldatabases/containers/main.bicep | 38 +-- .../containers/storedprocedures/main.bicep | 42 +-- .../containers/triggers/main.bicep | 42 +-- .../userdefinedfunctions/main.bicep | 46 +-- .../databaseaccounts/sqldatabases/main.bicep | 30 +- .../sqlroleassignments/main.bicep | 44 +-- .../sqlroledefinitions/main.bicep | 36 +- .../databaseaccounts/tables/main.bicep | 28 +- .../mongoclusters/firewallrules/main.bicep | 12 +- .../samples/mongoclusters/users/main.bicep | 2 +- .../samples/elasticsans/main.bicep | 2 +- .../elasticsans/volumegroups/main.bicep | 4 +- .../volumegroups/volumes/main.bicep | 4 +- .../samples/domains/main.bicep | 6 +- .../samples/domains/topics/main.bicep | 4 +- .../samples/eventsubscriptions/main.bicep | 91 +++-- .../samples/namespaces/main.bicep | 8 +- .../eventsubscriptions/main.bicep | 111 +++--- .../samples/systemtopics/main.bicep | 1 + .../samples/topics/main.bicep | 4 +- .../samples/clusters/main.bicep | 2 +- .../namespaces/authorizationrules/main.bicep | 12 +- .../disasterrecoveryconfigs/main.bicep | 25 +- .../eventhubs/authorizationrules/main.bicep | 16 +- .../eventhubs/consumergroups/main.bicep | 16 +- .../samples/namespaces/eventhubs/main.bicep | 14 +- .../samples/namespaces/main.bicep | 10 +- .../namespaces/schemagroups/main.bicep | 14 +- .../guestconfigurationassignments/main.bicep | 110 +++--- .../samples/clusters/main.bicep | 48 ++- .../samples/services/main.bicep | 10 +- .../workspaces/dicomservices/main.bicep | 2 +- .../workspaces/fhirservices/main.bicep | 28 +- .../iotconnectors/fhirdestinations/main.bicep | 29 +- .../workspaces/iotconnectors/main.bicep | 27 +- .../remarks/microsoft.impact/remarks.json | 5 + .../samples/connectors/main.bicep | 1 + .../samples/workloadimpacts/main.bicep | 158 +++++++++ .../remarks/microsoft.insights/remarks.json | 15 + .../samples/actiongroups/main.bicep | 9 +- .../samples/activitylogalerts/main.bicep | 105 +++--- .../samples/autoscalesettings/main.bicep | 112 +++--- .../components/analyticsitems/main.bicep | 12 +- .../samples/components/main.bicep | 6 +- .../proactivedetectionconfigs/main.bicep | 23 ++ .../datacollectionendpoints/main.bicep | 2 +- .../datacollectionruleassociations/main.bicep | 114 +++---- .../samples/datacollectionrules/main.bicep | 12 +- .../samples/diagnosticsettings/main.bicep | 78 +++-- .../samples/logprofiles/main-rg-module.bicep | 38 +++ .../samples/logprofiles/main.bicep | 35 ++ .../samples/metricalerts/main.bicep | 88 +++-- .../samples/privatelinkscopes/main.bicep | 2 + .../scopedresources/main.bicep | 31 +- .../samples/scheduledqueryrules/main.bicep | 52 +-- .../samples/webtests/main.bicep | 28 +- .../samples/workbooks/main.bicep | 5 +- .../samples/workbooktemplates/main.bicep | 24 +- .../samples/iotapps/main.bicep | 10 +- .../samples/managedhsms/main.bicep | 11 +- .../samples/vaults/accesspolicies/main.bicep | 20 +- .../samples/vaults/keys/main.bicep | 24 +- .../samples/vaults/main.bicep | 16 +- .../samples/vaults/secrets/main.bicep | 10 +- .../samples/connectedclusters/main.bicep | 2 +- .../samples/extensions/main.bicep | 24 +- .../samples/fluxconfigurations/main.bicep | 54 +-- .../samples/clusters/databases/main.bicep | 16 +- .../databases/principalassignments/main.bicep | 30 +- .../clusters/databases/scripts/main.bicep | 20 +- .../samples/clusters/main.bicep | 20 +- .../managedprivateendpoints/main.bicep | 54 +-- .../clusters/principalassignments/main.bicep | 28 +- .../samples/labplans/main.bicep | 4 +- .../samples/labs/main.bicep | 36 +- .../samples/labs/schedules/main.bicep | 40 +-- .../samples/labs/users/main.bicep | 26 +- .../integrationaccounts/agreements/main.bicep | 120 ++++--- .../integrationaccounts/assemblies/main.bicep | 42 +-- .../batchconfigurations/main.bicep | 4 +- .../samples/integrationaccounts/main.bicep | 2 +- .../integrationaccounts/maps/main.bicep | 8 +- .../integrationaccounts/partners/main.bicep | 4 +- .../integrationaccounts/schemas/main.bicep | 6 +- .../integrationaccounts/sessions/main.bicep | 9 +- .../remarks.json | 5 + .../samples/workspaces/computes/main.bicep | 60 ++-- .../samples/workspaces/datastores/main.bicep | 116 ++++--- .../samples/workspaces/main.bicep | 58 ++-- .../workspaces/outboundrules/main.bicep | 119 +++++++ .../configurationassignments/main.bicep | 88 +++-- .../federatedidentitycredentials/main.bicep | 4 +- .../samples/accounts/creators/main.bicep | 2 +- .../samples/accounts/main.bicep | 1 + .../mediaservices/accountfilters/main.bicep | 51 ++- .../assets/assetfilters/main.bicep | 23 +- .../samples/mediaservices/assets/main.bicep | 39 ++- .../contentkeypolicies/main.bicep | 27 +- .../mediaservices/liveevents/main.bicep | 7 +- .../samples/mediaservices/main.bicep | 43 ++- .../streamingendpoints/main.bicep | 23 +- .../streaminglocators/main.bicep | 29 +- .../streamingpolicies/main.bicep | 41 ++- .../mediaservices/transforms/main.bicep | 19 +- .../samples/migrateprojects/main.bicep | 17 +- .../migrateprojects/solutions/main.bicep | 29 +- .../samples/spatialanchorsaccounts/main.bicep | 2 +- .../mobilenetworks/datanetworks/main.bicep | 2 +- .../mobilenetworks/services/main.bicep | 12 +- .../mobilenetworks/simpolicies/main.bicep | 38 +-- .../samples/mobilenetworks/sites/main.bicep | 2 +- .../samples/mobilenetworks/slices/main.bicep | 4 +- .../packetcorecontrolplanes/main.bicep | 52 ++- .../packetcoredataplanes/main.bicep | 8 +- .../privateendpointconnections/main.bicep | 66 ++-- .../netappaccounts/backuppolicies/main.bicep | 2 +- .../netappaccounts/backupvaults/main.bicep | 2 +- .../netappaccounts/capacitypools/main.bicep | 4 +- .../capacitypools/volumes/main.bicep | 49 ++- .../volumes/snapshots/main.bicep | 49 ++- .../volumes/volumequotarules/main.bicep | 66 ++-- .../snapshotpolicies/main.bicep | 2 +- .../remarks/microsoft.network/remarks.json | 10 + .../samples/applicationgateways/main.bicep | 87 ++--- .../main.bicep | 10 +- .../samples/azurefirewalls/main.bicep | 22 +- .../samples/bastionhosts/main.bicep | 42 ++- .../forwardingrules/main.bicep | 22 +- .../samples/dnsforwardingrulesets/main.bicep | 62 ++-- .../virtualnetworklinks/main.bicep | 20 +- .../dnsresolvers/inboundendpoints/main.bicep | 14 +- .../samples/dnsresolvers/main.bicep | 4 +- .../dnsresolvers/outboundendpoints/main.bicep | 14 +- .../samples/dnszones/a/main.bicep | 3 +- .../samples/dnszones/aaaa/main.bicep | 5 +- .../samples/dnszones/caa/main.bicep | 7 +- .../samples/dnszones/cname/main.bicep | 7 +- .../samples/dnszones/main.bicep | 1 + .../samples/dnszones/mx/main.bicep | 5 +- .../samples/dnszones/ns/main.bicep | 3 +- .../samples/dnszones/ptr/main.bicep | 9 +- .../samples/dnszones/srv/main.bicep | 5 +- .../samples/dnszones/txt/main.bicep | 7 +- .../authorizations/main.bicep | 14 +- .../samples/expressroutecircuits/main.bicep | 30 +- .../peerings/connections/main.bicep | 84 ++--- .../expressroutecircuits/peerings/main.bicep | 22 +- .../expressrouteconnections/main.bicep | 102 +++--- .../samples/expressroutegateways/main.bicep | 14 +- .../authorizations/main.bicep | 4 +- .../samples/expressrouteports/main.bicep | 2 +- .../rulecollectiongroups/main.bicep | 2 +- .../main.bicep | 21 +- .../backendaddresspools/main.bicep | 22 +- .../samples/loadbalancers/main.bicep | 26 +- .../samples/localnetworkgateways/main.bicep | 2 +- .../samples/natgateways/main.bicep | 6 +- .../samples/networkinterfaces/main.bicep | 16 +- .../main-rg-module.bicep | 22 ++ .../networkmanagerconnections/main.bicep | 25 ++ .../connectivityconfigurations/main.bicep | 53 ++- .../networkmanagers/ipampools/main.bicep | 4 +- .../ipampools/staticcidr/main.bicep | 6 +- .../samples/networkmanagers/main.bicep | 2 +- .../networkmanagers/networkgroups/main.bicep | 2 +- .../networkgroups/staticmembers/main.bicep | 46 +-- .../scopeconnections/main.bicep | 6 +- .../securityadminconfigurations/main.bicep | 4 +- .../rulecollections/main.bicep | 14 +- .../rulecollections/rules/main.bicep | 22 +- .../verifierworkspace/main.bicep | 4 +- .../reachabilityanalysisintent/main.bicep | 146 ++++---- .../reachabilityanalysisrun/main.bicep | 114 +++---- .../samples/networkprofiles/main.bicep | 50 ++- .../securityrules/main.bicep | 11 +- .../networkwatchers/flowlogs/main.bicep | 46 +-- .../networkwatchers/packetcaptures/main.bicep | 74 ++-- .../samples/p2svpngateways/main.bicep | 26 +- .../samples/privatednszones/a/main.bicep | 7 +- .../samples/privatednszones/aaaa/main.bicep | 9 +- .../samples/privatednszones/cname/main.bicep | 9 +- .../samples/privatednszones/main.bicep | 1 + .../samples/privatednszones/mx/main.bicep | 7 +- .../samples/privatednszones/ptr/main.bicep | 7 +- .../samples/privatednszones/srv/main.bicep | 11 +- .../samples/privatednszones/txt/main.bicep | 9 +- .../virtualnetworklinks/main.bicep | 34 +- .../samples/privateendpoints/main.bicep | 95 +++--- .../samples/privatelinkservices/main.bicep | 40 +-- .../samples/publicipaddresses/main.bicep | 14 +- .../samples/publicipprefixes/main.bicep | 9 +- .../samples/routefilters/main.bicep | 2 +- .../samples/routetables/main.bicep | 2 +- .../samples/routetables/routes/main.bicep | 2 +- .../azureendpoints/main.bicep | 48 +-- .../externalendpoints/main.bicep | 23 +- .../samples/trafficmanagerprofiles/main.bicep | 7 +- .../nestedendpoints/main.bicep | 17 +- .../hubvirtualnetworkconnections/main.bicep | 8 +- .../virtualhubs/ipconfigurations/main.bicep | 68 ++-- .../samples/virtualhubs/main.bicep | 8 +- .../samples/virtualnetworkgateways/main.bicep | 20 +- .../natrules/main.bicep | 26 +- .../samples/virtualnetworks/main.bicep | 8 +- .../virtualnetworks/subnets/main.bicep | 2 +- .../subnets/withipampool/main.bicep | 38 +-- .../virtualnetworkpeerings/main.bicep | 26 +- .../virtualnetworks/withipampool/main.bicep | 32 +- .../samples/vpngateways/main.bicep | 8 +- .../samples/vpngateways/natrules/main.bicep | 10 +- .../vpngateways/vpnconnections/main.bicep | 86 +++-- .../configurationpolicygroups/main.bicep | 24 +- .../vpnserverconfigurations/main.bicep | 12 +- .../samples/vpnsites/main.bicep | 4 +- .../samples/namespaces/main.bicep | 6 +- .../authorizationrules/main.bicep | 12 +- .../namespaces/notificationhubs/main.bicep | 8 +- .../samples/clusters/main.bicep | 2 +- .../samples/querypacks/main.bicep | 2 +- .../samples/querypacks/queries/main.bicep | 2 +- .../samples/workspaces/dataexports/main.bicep | 18 +- .../samples/workspaces/datasources/main.bicep | 6 +- .../workspaces/linkedservices/main.bicep | 40 +-- .../linkedstorageaccounts/main.bicep | 76 ++--- .../samples/workspaces/main.bicep | 12 +- .../workspaces/savedsearches/main.bicep | 10 +- .../storageinsightconfigs/main.bicep | 32 +- .../workspaces/tables/auditlog/main.bicep | 29 +- .../workspaces/tables/basic/main.bicep | 53 ++- .../tables/datacollectionlogs/main.bicep | 21 +- .../samples/solutions/main.bicep | 10 +- .../samples/spacecrafts/main.bicep | 4 +- .../samples/remediations/main.bicep | 7 +- .../samples/capacities/main.bicep | 6 +- .../microsoft.recoveryservices/remarks.json | 5 + .../samples/vaults/backupconfig/main.bicep | 8 +- .../protecteditems/main.bicep | 288 ++++++++++++++++ .../samples/vaults/backuppolicies/main.bicep | 8 +- .../backupresourceguardproxies/main.bicep | 9 +- .../vaults/backupstorageconfig/main.bicep | 8 +- .../samples/vaults/main.bicep | 6 +- .../vaults/replicationfabrics/main.bicep | 10 +- .../replicationnetworkmappings/main.bicep | 22 +- .../main.bicep | 12 +- .../main.bicep | 53 +-- .../vaults/replicationpolicies/main.bicep | 8 +- .../namespaces/authorizationrules/main.bicep | 4 +- .../authorizationrules/main.bicep | 6 +- .../namespaces/hybridconnections/main.bicep | 8 +- .../samples/namespaces/main.bicep | 4 +- .../samples/appliances/main.bicep | 2 +- .../remarks/microsoft.resources/remarks.json | 5 + .../samples/deployments/main.bicep | 58 ++++ .../samples/deploymentscripts/main.bicep | 2 +- .../samples/searchservices/main.bicep | 14 +- .../sharedprivatelinkresources/main.bicep | 40 +-- .../remarks/microsoft.security/remarks.json | 20 ++ .../main.bicep | 20 +- .../samples/assessmentmetadata/main.bicep | 3 + .../samples/assessments/main-rg-module.bicep | 143 ++++++++ .../samples/assessments/main.bicep | 41 +++ .../samples/automations/main.bicep | 31 +- .../defenderforstoragesettings/main.bicep | 22 +- .../samples/iotsecuritysolutions/main.bicep | 14 +- .../samples/securitycontacts/main.bicep | 3 +- .../workspacesettings/main-rg-module.bicep | 25 ++ .../samples/workspacesettings/main.bicep | 26 ++ .../samples/alertrules/main.bicep | 70 ++-- .../samples/automationrules/main.bicep | 76 ++--- .../samples/dataconnectors/main.bicep | 60 ++-- .../samples/metadata/main.bicep | 72 ++-- .../samples/onboardingstates/main.bicep | 16 +- .../samples/watchlists/main.bicep | 46 +-- .../watchlists/watchlistitems/main.bicep | 46 +-- .../remarks/microsoft.servicebus/remarks.json | 10 + .../namespaces/authorizationrules/main.bicep | 12 +- .../main-rg-module.bicep | 43 +++ .../disasterrecoveryconfigs/main.bicep | 25 ++ .../samples/namespaces/main.bicep | 10 +- .../queues/authorizationrules/main.bicep | 18 +- .../samples/namespaces/queues/main.bicep | 16 +- .../topics/authorizationrules/main.bicep | 18 +- .../samples/namespaces/topics/main.bicep | 18 +- .../topics/subscriptions/main.bicep | 22 +- .../topics/subscriptions/rules/main.bicep | 24 +- .../samples/clusters/main.bicep | 8 +- .../samples/managedclusters/main.bicep | 42 +-- .../managedclusters/nodetypes/main.bicep | 68 ++-- .../samples/linkers/main.bicep | 97 +++--- .../associations/main.bicep | 12 +- .../trafficcontrollers/frontends/main.bicep | 2 +- .../samples/signalr/main.bicep | 50 +-- .../sharedprivatelinkresources/main.bicep | 42 +-- .../samples/webpubsub/hubs/main.bicep | 10 +- .../samples/webpubsub/main.bicep | 10 +- .../sharedprivatelinkresources/main.bicep | 40 +-- .../samples/applications/main.bicep | 81 +---- settings/remarks/microsoft.sql/remarks.json | 5 + .../samples/instancepools/main.bicep | 87 ++--- .../samples/servers/administrators/main.bicep | 14 +- .../servers/auditingsettings/main.bicep | 6 +- .../servers/connectionpolicies/main.bicep | 10 +- .../samples/servers/databases/main.bicep | 12 +- .../securityalertpolicies/main.bicep | 10 +- .../transparentdataencryption/main.bicep | 16 +- .../samples/servers/dnsaliases/main.bicep | 6 +- .../samples/servers/elasticpools/main.bicep | 20 +- .../servers/encryptionprotector/main.bicep | 6 +- .../samples/servers/failovergroups/main.bicep | 43 +-- .../samples/servers/firewallrules/main.bicep | 6 +- .../servers/jobagents/credentials/main.bicep | 20 +- .../samples/servers/jobagents/jobs/main.bicep | 42 +-- .../servers/jobagents/jobs/steps/main.bicep | 99 ++++++ .../samples/servers/jobagents/main.bicep | 8 +- .../servers/jobagents/targetgroups/main.bicep | 68 ++-- .../microsoft.sql/samples/servers/main.bicep | 6 +- .../servers/outboundfirewallrules/main.bicep | 8 +- .../servers/securityalertpolicies/main.bicep | 6 +- .../sqlvulnerabilityassessments/main.bicep | 8 +- .../servers/virtualnetworkrules/main.bicep | 40 +-- .../microsoft.sqlvirtualmachine/remarks.json | 5 + .../sqlvirtualmachinegroups/main.bicep | 6 +- .../sqlvirtualmachines/basic/main.bicep | 212 ++++++------ .../sqlbestpracticesassessment/main.bicep | 320 ++++++++++++++++++ .../basic/main.bicep | 43 ++- .../remarks/microsoft.storage/remarks.json | 5 + .../samples/storageaccounts/basic/main.bicep | 18 +- .../immutabilitypolicies/main.bicep | 8 +- .../blobservices/containers/main.bicep | 6 +- .../storageaccounts/blobservices/main.bicep | 38 +-- .../encryptionscopes/main.bicep | 138 ++++++++ .../fileservices/shares/main.bicep | 6 +- .../localusers/basic/main.bicep | 32 +- .../managementpolicies/main.bicep | 42 +-- .../queueservices/queues/main.bicep | 8 +- .../tableservices/tables/main.bicep | 6 +- .../samples/amlfilesystems/main.bicep | 18 +- .../samples/caches/main.bicep | 15 +- .../storagemovers/endpoints/main.bicep | 6 +- .../samples/storagemovers/projects/main.bicep | 4 +- .../storagesyncservices/syncgroups/main.bicep | 2 +- .../streamingjobs/functions/main.bicep | 4 +- .../samples/streamingjobs/inputs/main.bicep | 22 +- .../samples/streamingjobs/main.bicep | 12 +- .../samples/streamingjobs/outputs/main.bicep | 26 +- .../azureadonlyauthentications/main.bicep | 31 +- .../workspaces/bigdatapools/main.bicep | 30 +- .../workspaces/firewallrules/main.bicep | 12 +- .../workspaces/integrationruntimes/main.bicep | 30 +- .../samples/workspaces/main.bicep | 29 +- .../main.bicep | 16 +- .../securityalertpolicies/main.bicep | 12 +- .../samples/workspaces/sqlpools/main.bicep | 20 +- .../vulnerabilityassessments/main.bicep | 25 +- .../sqlpools/workloadgroups/main.bicep | 45 ++- .../workloadclassifiers/main.bicep | 22 +- .../environments/accesspolicies/main.bicep | 10 +- .../environments/eventsources/main.bicep | 45 ++- .../samples/environments/main.bicep | 8 +- .../environments/referencedatasets/main.bicep | 16 +- .../samples/accounts/main.bicep | 23 +- .../samples/communicationsgateways/main.bicep | 18 +- .../testlines/main.bicep | 20 +- settings/remarks/microsoft.web/remarks.json | 5 + .../samples/serverfarms/main.bicep | 6 +- .../samples/sites/config/main.bicep | 44 +-- .../microsoft.web/samples/sites/main.bicep | 24 +- .../sites/publiccertificates/main.bicep | 10 +- .../samples/sites/siteextensions/main.bicep | 36 +- .../samples/sites/slots/config/main.bicep | 62 ++-- .../samples/sites/slots/main.bicep | 58 ++-- .../samples/sourcecontrols/main.bicep | 18 + .../staticsites/customdomains/main.bicep | 6 +- .../samples/staticsites/main.bicep | 2 +- .../configurations/main.bicep | 26 +- .../samples/nginxdeployments/main.bicep | 136 ++++---- .../samples/filesystems/main.bicep | 45 ++- .../2022-04-01/roledefinitions.md | 9 +- .../microsoft.compute/2024-03-02/disks.md | 10 +- .../2024-05-15/databaseaccounts.md | 22 +- .../microsoft.keyvault/2023-07-01/vaults.md | 16 +- 622 files changed, 9108 insertions(+), 7375 deletions(-) create mode 100644 settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep create mode 100644 settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep create mode 100644 settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep create mode 100644 settings/remarks/microsoft.cache/samples/redis/linkedservers/main-rg-module.bicep create mode 100644 settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep create mode 100644 settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep create mode 100644 settings/remarks/microsoft.insights/samples/components/proactivedetectionconfigs/main.bicep create mode 100644 settings/remarks/microsoft.insights/samples/logprofiles/main-rg-module.bicep create mode 100644 settings/remarks/microsoft.insights/samples/logprofiles/main.bicep create mode 100644 settings/remarks/microsoft.machinelearningservices/samples/workspaces/outboundrules/main.bicep create mode 100644 settings/remarks/microsoft.network/samples/networkmanagerconnections/main-rg-module.bicep create mode 100644 settings/remarks/microsoft.network/samples/networkmanagerconnections/main.bicep create mode 100644 settings/remarks/microsoft.recoveryservices/samples/vaults/backupfabrics/protectioncontainers/protecteditems/main.bicep create mode 100644 settings/remarks/microsoft.resources/samples/deployments/main.bicep create mode 100644 settings/remarks/microsoft.security/samples/assessments/main-rg-module.bicep create mode 100644 settings/remarks/microsoft.security/samples/assessments/main.bicep create mode 100644 settings/remarks/microsoft.security/samples/workspacesettings/main-rg-module.bicep create mode 100644 settings/remarks/microsoft.security/samples/workspacesettings/main.bicep create mode 100644 settings/remarks/microsoft.servicebus/samples/namespaces/disasterrecoveryconfigs/main-rg-module.bicep create mode 100644 settings/remarks/microsoft.servicebus/samples/namespaces/disasterrecoveryconfigs/main.bicep create mode 100644 settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep create mode 100644 settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep create mode 100644 settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep create mode 100644 settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep diff --git a/settings/remarks/microsoft.aadiam/remarks.json b/settings/remarks/microsoft.aadiam/remarks.json index bc501e82..caa4ff83 100644 --- a/settings/remarks/microsoft.aadiam/remarks.json +++ b/settings/remarks/microsoft.aadiam/remarks.json @@ -1,10 +1,17 @@ -{ - "$schema": "../../schemas/remarks.schema.json", - "TerraformSamples": [ - { - "ResourceType": "Microsoft.AADIAM/diagnosticSettings", - "Path": "samples/diagnosticsettings/main.tf", - "Description": "A basic example of deploying Azure Active Directory Diagnostic Setting for Azure Monitor." - } - ] -} +{ + "$schema": "../../schemas/remarks.schema.json", + "TerraformSamples": [ + { + "ResourceType": "Microsoft.AADIAM/diagnosticSettings", + "Path": "samples/diagnosticsettings/main.tf", + "Description": "A basic example of deploying Azure Active Directory Diagnostic Setting for Azure Monitor." + } + ], + "BicepSamples": [ + { + "ResourceType": "Microsoft.AADIAM/diagnosticSettings", + "Path": "samples/diagnosticsettings/main.bicep", + "Description": "A basic example of deploying Azure Active Directory Diagnostic Setting for Azure Monitor." + } + ] +} \ No newline at end of file diff --git a/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep b/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep new file mode 100644 index 00000000..a3e51bdc --- /dev/null +++ b/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep @@ -0,0 +1,40 @@ +targetScope = 'tenant' + +param location string = 'westus' +param resourceName string = 'acctest0001' + +resource diagnosticSetting 'Microsoft.AADIAM/diagnosticSettings@2017-04-01' = { + name: '${resourceName}-DS-unique' + properties: { + logs: [ + { + category: 'RiskyUsers' + enabled: true + } + { + category: 'ServicePrincipalSignInLogs' + enabled: true + } + { + category: 'SignInLogs' + enabled: true + } + { + category: 'B2CRequestLogs' + enabled: true + } + { + category: 'UserRiskEvents' + enabled: true + } + { + category: 'NonInteractiveUserSignInLogs' + enabled: true + } + { + category: 'AuditLogs' + enabled: true + } + ] + } +} diff --git a/settings/remarks/microsoft.advisor/remarks.json b/settings/remarks/microsoft.advisor/remarks.json index c0325475..19282e2f 100644 --- a/settings/remarks/microsoft.advisor/remarks.json +++ b/settings/remarks/microsoft.advisor/remarks.json @@ -1,10 +1,17 @@ -{ - "$schema": "../../schemas/remarks.schema.json", - "TerraformSamples": [ - { - "ResourceType": "Microsoft.Advisor/recommendations/suppressions", - "Path": "samples/recommendations/suppressions/main.tf", - "Description": "A basic example of deploying Specifies a suppression for an Azure Advisor recommendation." - } - ] -} +{ + "$schema": "../../schemas/remarks.schema.json", + "TerraformSamples": [ + { + "ResourceType": "Microsoft.Advisor/recommendations/suppressions", + "Path": "samples/recommendations/suppressions/main.tf", + "Description": "A basic example of deploying Specifies a suppression for an Azure Advisor recommendation." + } + ], + "BicepSamples": [ + { + "ResourceType": "Microsoft.Advisor/recommendations/suppressions", + "Path": "samples/recommendations/suppressions/main.bicep", + "Description": "A basic example of deploying Specifies a suppression for an Azure Advisor recommendation." + } + ] +} \ No newline at end of file diff --git a/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep b/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep new file mode 100644 index 00000000..90b2d350 --- /dev/null +++ b/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep @@ -0,0 +1,11 @@ +param recommendationId string +param resourceName string = 'acctest0001' +param location string = 'westus' + +resource suppression 'Microsoft.Advisor/recommendations/suppressions@2023-01-01' = { + name: resourceName + properties: { + suppressionId: '' + ttl: '00:30:00' + } +} diff --git a/settings/remarks/microsoft.alertsmanagement/samples/actionrules/main.bicep b/settings/remarks/microsoft.alertsmanagement/samples/actionrules/main.bicep index c6fba9b9..67f871e3 100644 --- a/settings/remarks/microsoft.alertsmanagement/samples/actionrules/main.bicep +++ b/settings/remarks/microsoft.alertsmanagement/samples/actionrules/main.bicep @@ -1,4 +1,5 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource actionRule 'Microsoft.AlertsManagement/actionRules@2021-08-08' = { name: resourceName @@ -11,8 +12,6 @@ resource actionRule 'Microsoft.AlertsManagement/actionRules@2021-08-08' = { ] description: '' enabled: true - scopes: [ - resourceGroup().id - ] + scopes: [] } } diff --git a/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep b/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep index 7c2efcf8..e5d50b82 100644 --- a/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep +++ b/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep @@ -5,19 +5,19 @@ resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { name: resourceName location: 'global' properties: { - armRoleReceivers: [] - automationRunbookReceivers: [] azureAppPushReceivers: [] azureFunctionReceivers: [] + logicAppReceivers: [] + smsReceivers: [] + webhookReceivers: [] + armRoleReceivers: [] + automationRunbookReceivers: [] emailReceivers: [] enabled: true eventHubReceivers: [] groupShortName: 'acctestag' itsmReceivers: [] - logicAppReceivers: [] - smsReceivers: [] voiceReceivers: [] - webhookReceivers: [] } } @@ -26,14 +26,14 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { + SamplingPercentage: 100 Application_Type: 'web' DisableIpMasking: false - DisableLocalAuth: false ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' + DisableLocalAuth: false + RetentionInDays: 90 } } @@ -41,13 +41,6 @@ resource smartDetectorAlertRule 'microsoft.alertsManagement/smartDetectorAlertRu name: resourceName location: 'global' properties: { - actionGroups: { - customEmailSubject: '' - customWebhookPayload: '' - groupIds: [ - actionGroup.id - ] - } description: '' detector: { id: 'FailureAnomaliesDetector' @@ -58,5 +51,12 @@ resource smartDetectorAlertRule 'microsoft.alertsManagement/smartDetectorAlertRu ] severity: 'Sev0' state: 'Enabled' + actionGroups: { + customEmailSubject: '' + customWebhookPayload: '' + groupIds: [ + actionGroup.id + ] + } } } 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..90673c72 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep @@ -1,26 +1,15 @@ 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: { + name: 'Consumption' + capacity: 0 + } properties: { + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -33,45 +22,56 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { + value: 'http://conferenceapi.azurewebsites.net/?format=json' apiType: 'http' apiVersion: '' format: 'swagger-link-json' path: 'test' type: 'http' - value: 'http://conferenceapi.azurewebsites.net/?format=json' + } +} + +resource diagnostic 'Microsoft.ApiManagement/service/apis/diagnostics@2021-08-01' = { + name: 'applicationinsights' + parent: api + properties: { + loggerId: logger.id + operationNameFormat: 'Name' + } +} + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + publicNetworkAccessForIngestion: 'Enabled' + Application_Type: 'web' + DisableLocalAuth: false + publicNetworkAccessForQuery: 'Enabled' + DisableIpMasking: false + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + SamplingPercentage: 100 } } resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { + loggerType: 'applicationInsights' credentials: { instrumentationKey: component.properties.InstrumentationKey } description: '' isBuffered: true - loggerType: 'applicationInsights' - } -} - -resource diagnostic 'Microsoft.ApiManagement/service/apis/diagnostics@2021-08-01' = { - parent: api - name: 'applicationinsights' - 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..ad8ae5c1 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep @@ -4,8 +4,11 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { - certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' @@ -18,30 +21,27 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' + certificates: [] } } resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { + path: 'api1' + protocols: [ + 'https' + ] + serviceUrl: '' apiRevisionDescription: '' apiType: 'http' apiVersion: '' apiVersionDescription: '' authenticationSettings: {} - description: '' displayName: 'api1' - path: 'api1' - protocols: [ - 'https' - ] - serviceUrl: '' subscriptionRequired: true type: 'http' + description: '' } } 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..d2790ca2 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep @@ -4,7 +4,12 @@ param location string = 'westus' resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-am' location: location + sku: { + name: 'Consumption' + capacity: 0 + } properties: { + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -17,48 +22,43 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { - parent: service name: '${resourceName}-api;rev=1' + parent: service properties: { + subscriptionRequired: true apiRevisionDescription: '' - apiType: 'http' apiVersionDescription: '' - authenticationSettings: {} - description: 'What is my purpose? You parse butter.' displayName: 'Butter Parser' - path: 'butter-parser' protocols: [ 'http' 'https' ] + type: 'http' + apiType: 'http' + authenticationSettings: {} + description: 'What is my purpose? You parse butter.' + path: 'butter-parser' serviceUrl: 'https://example.com/foo/bar' subscriptionKeyParameterNames: { header: 'X-Butter-Robot-API-Key' query: 'location' } - subscriptionRequired: true - type: 'http' } } resource operation 'Microsoft.ApiManagement/service/apis/operations@2022-08-01' = { - parent: api name: '${resourceName}-operation' + parent: api properties: { + urlTemplate: '/resource' description: '' displayName: 'DELETE Resource' method: 'DELETE' responses: [] templateParameters: [] - urlTemplate: '/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..f6c29bdc 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/policies/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/policies/main.bicep @@ -4,51 +4,51 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { - apiRevisionDescription: '' - apiType: 'http' - apiVersion: '' apiVersionDescription: '' authenticationSettings: {} - description: '' displayName: 'api1' + type: 'http' + apiType: 'http' + description: '' path: 'api1' protocols: [ 'https' ] serviceUrl: '' subscriptionRequired: true - type: 'http' + apiRevisionDescription: '' + apiVersion: '' } } 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..980f6386 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep @@ -4,7 +4,14 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -15,40 +22,33 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { } disableGateway: false publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { - parent: service name: '${resourceName};rev=1' + parent: service properties: { - apiRevisionDescription: '' - apiType: 'http' - apiVersion: '' - apiVersionDescription: '' - authenticationSettings: {} - description: '' displayName: 'api1' - path: 'api1' protocols: [ 'https' ] serviceUrl: '' - subscriptionRequired: true type: 'http' + apiRevisionDescription: '' + apiType: 'http' + apiVersionDescription: '' + description: '' + path: 'api1' + subscriptionRequired: true + apiVersion: '' + authenticationSettings: {} } } 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..e4050acc 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/tagdescriptions/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/tagdescriptions/main.bicep @@ -4,64 +4,64 @@ param location string = 'westus' resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-service' location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { - parent: service name: '${resourceName}-api;rev=1' + parent: service properties: { + subscriptionRequired: true + type: 'http' apiRevisionDescription: '' apiType: 'http' - apiVersionDescription: '' authenticationSettings: {} displayName: 'api1' - path: 'api1' protocols: [ 'https' ] - subscriptionRequired: true - type: 'http' + apiVersionDescription: '' + path: 'api1' } } +resource tag1 'Microsoft.ApiManagement/service/apis/tags@2022-08-01' = { + name: '${resourceName}-tag' + parent: api +} + resource tag 'Microsoft.ApiManagement/service/tags@2022-08-01' = { - parent: service name: '${resourceName}-tag' + parent: service properties: { - displayName: 'acctest0001-tag' + displayName: '${resourceName}-tag' } } resource tagDescription 'Microsoft.ApiManagement/service/apis/tagDescriptions@2022-08-01' = { - parent: api name: '${resourceName}-tag' + parent: api properties: { description: 'tag description' externalDocsDescription: 'external tag description' externalDocsUrl: 'https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs' } } - -resource tag1 'Microsoft.ApiManagement/service/apis/tags@2022-08-01' = { - parent: api - name: '${resourceName}-tag' -} 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..c7dff22c 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep @@ -4,7 +4,14 @@ param location string = 'westus' resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-service' location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -15,38 +22,31 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { } disableGateway: false publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { - parent: service name: '${resourceName}-api;rev=1' + parent: service properties: { - apiRevisionDescription: '' + type: 'http' apiType: 'http' apiVersionDescription: '' authenticationSettings: {} displayName: 'api1' path: 'api1' + subscriptionRequired: true + apiRevisionDescription: '' protocols: [ 'https' ] - subscriptionRequired: true - type: 'http' } } resource tag 'Microsoft.ApiManagement/service/tags@2022-08-01' = { - parent: service name: '${resourceName}-tag' + parent: service properties: { - displayName: 'acctest0001-tag' + displayName: '${resourceName}-tag' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep index 079e3fb3..0863f432 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep @@ -4,7 +4,14 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -15,19 +22,12 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { } disableGateway: false publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource 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..7c3a967c 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep @@ -1,15 +1,23 @@ +@secure() +@description('The OAuth client secret for the authorization server') +param oauthClientSecret string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The OAuth client ID for the authorization server') param oauthClientId string -@secure() -@description('The OAuth client secret for the authorization server') -param oauthClientSecret string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -19,38 +27,30 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource authorizationServer 'Microsoft.ApiManagement/service/authorizationServers@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { + tokenBodyParameters: [] authorizationEndpoint: 'https://azacceptance.hashicorptest.com/client/authorize' - authorizationMethods: [ - 'GET' - ] clientAuthenticationMethod: [] - clientId: null + clientId: '${oauthClientId}' clientRegistrationEndpoint: 'https://azacceptance.hashicorptest.com/client/register' - clientSecret: null - defaultScope: '' description: '' - displayName: 'Test Group' grantTypes: [ 'implicit' ] resourceOwnerPassword: '' - resourceOwnerUsername: '' supportState: false - tokenBodyParameters: [] + authorizationMethods: [ + 'GET' + ] + clientSecret: '${oauthClientSecret}' + defaultScope: '' + displayName: 'Test Group' + resourceOwnerUsername: '' } } 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..5ad5c875 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep @@ -1,23 +1,18 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource redis 'Microsoft.Cache/redis@2023-04-01' = { - name: resourceName - properties: { - enableNonSslPort: true - minimumTlsVersion: '1.2' - sku: { - capacity: 2 - family: 'C' - name: 'Standard' - } - } -} - resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -27,22 +22,28 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource 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' useFromLocation: 'default' + connectionString: '${redis.name}.redis.cache.windows.net:6380,password=${redis.listKeys().primaryKey},ssl=true,abortConnect=False' + } +} + +resource redis 'Microsoft.Cache/redis@2023-04-01' = { + name: resourceName + location: 'eastus' + properties: { + enableNonSslPort: true + minimumTlsVersion: '1.2' + sku: { + capacity: 2 + family: 'C' + name: 'Standard' + } } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep index 9fa37d0f..944a2e76 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep @@ -4,7 +4,12 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -17,17 +22,12 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource 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..8f079c22 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep @@ -1,26 +1,17 @@ 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: { + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -31,28 +22,20 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { } disableGateway: false publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource diagnostic 'Microsoft.ApiManagement/service/diagnostics@2021-08-01' = { - parent: service name: 'applicationinsights' + parent: service properties: { - loggerId: logger.id operationNameFormat: 'Name' } } resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { credentials: { instrumentationKey: component.properties.InstrumentationKey @@ -62,3 +45,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: { + publicNetworkAccessForIngestion: 'Enabled' + Application_Type: 'web' + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + publicNetworkAccessForQuery: 'Enabled' + RetentionInDays: 90 + SamplingPercentage: 100 + } +} 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..2031fd34 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep @@ -1,74 +1,74 @@ +@secure() +@description('The password for the certificate') +param certificatePassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The base64-encoded certificate data') param certificateData string -@secure() -@description('The password for the certificate') -param certificatePassword string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' } } resource certificate 'Microsoft.ApiManagement/service/certificates@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - data: null - password: null + data: '${certificateData}' + password: '${certificatePassword}' } } resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - description: '' locationData: { city: '' countryOrRegion: '' district: '' name: 'test' } + description: '' } } resource certificateAuthority 'Microsoft.ApiManagement/service/gateways/certificateAuthorities@2021-08-01' = { + name: 'azapi_resource.certificate.name' parent: gateway - name: 'certificate.name' properties: { isTrusted: false } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep index 30472942..d5aa98f2 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep @@ -4,42 +4,42 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { - certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' + certificates: [] } } 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..d835b244 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep @@ -4,26 +4,30 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -31,22 +35,18 @@ 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: { - city: '' - countryOrRegion: '' district: '' name: 'test' + city: '' + countryOrRegion: '' } } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep index dd41d7a0..b348228a 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep @@ -4,21 +4,24 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + name: 'Developer' + capacity: 1 + } properties: { - certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' @@ -30,20 +33,17 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' + certificates: [] } } resource group 'Microsoft.ApiManagement/service/groups@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - description: '' - displayName: 'Test Group' externalId: '' type: 'custom' + 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..9a2d1398 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep @@ -1,53 +1,53 @@ +@secure() +@description('The client secret for the Twitter identity provider') +param identityProviderClientSecret string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The client ID for the Twitter identity provider') param identityProviderClientId string -@secure() -@description('The client secret for the Twitter identity provider') -param identityProviderClientSecret string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - 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..380b879e 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep @@ -1,33 +1,21 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: resourceName - location: location - kind: 'web' - properties: { - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - } -} - resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -35,21 +23,33 @@ 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 - } description: '' isBuffered: true loggerType: 'applicationInsights' + credentials: { + instrumentationKey: component.properties.InstrumentationKey + } + } +} + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + RetentionInDays: 90 + publicNetworkAccessForIngestion: 'Enabled' + Application_Type: 'web' + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + SamplingPercentage: 100 + publicNetworkAccessForQuery: 'Enabled' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/main.bicep index 6d40bf73..9be3230f 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/main.bicep @@ -4,26 +4,30 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -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..6f01405d 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep @@ -4,30 +4,30 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource namedValue 'Microsoft.ApiManagement/service/namedValues@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { displayName: 'TestProperty230630032559683679' secret: false diff --git a/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep index 5ca9141b..ad7a728d 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep @@ -9,33 +9,33 @@ param openidClientSecret string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + name: 'Consumption' + capacity: 0 + } properties: { + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource 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..7112f70f 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep @@ -4,42 +4,42 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' } - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' } } resource policyFragment 'Microsoft.ApiManagement/service/policyFragments@2021-12-01-preview' = { - parent: service name: 'error-handler' + parent: service properties: { description: 'Fragment for Error Handling' format: 'xml' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep index 5b803d1a..828a3eae 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep @@ -4,26 +4,30 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + name: 'Developer' + capacity: 1 + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -31,21 +35,17 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource portalsetting 'Microsoft.ApiManagement/service/portalsettings@2021-08-01' = { - parent: service name: 'signup' + parent: service properties: { enabled: false termsOfService: { - consentRequired: false enabled: false text: '' + consentRequired: false } } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep index f85e8ff6..1816fa1e 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep @@ -4,35 +4,35 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { + terms: '' description: '' displayName: 'Test Product' state: 'notPublished' subscriptionRequired: false - terms: '' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep index 3fdf411f..7af73f08 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep @@ -1,47 +1,47 @@ -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: { + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - description: '' displayName: 'Test Product' state: 'notPublished' subscriptionRequired: false terms: '' + description: '' } } 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' + format: 'rawxml-link' } } 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..a2fedd52 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..98fc4fc4 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep @@ -4,14 +4,18 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -19,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..7dc0659b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep @@ -1,29 +1,33 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Developer' + } properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -31,15 +35,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publisherName: 'pub1' virtualNetworkType: 'None' } - sku: { - capacity: 1 - name: 'Developer' - } } resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { description: '' displayName: 'Test Product' @@ -50,20 +50,19 @@ 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' - ownerId: user.id scope: product.id state: 'submitted' } } resource user 'Microsoft.ApiManagement/service/users@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { email: 'azure-acctest230630032559695401@example.com' firstName: 'Acceptance' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep index bcdae209..e6de1034 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep @@ -4,7 +4,13 @@ param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location + sku: { + capacity: 0 + name: 'Consumption' + } properties: { + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -16,19 +22,13 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 0 - name: 'Consumption' } } resource 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..7564a195 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep @@ -1,48 +1,48 @@ -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: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - } - sku: { - capacity: 1 - name: 'Developer' } } resource user 'Microsoft.ApiManagement/service/users@2021-08-01' = { - parent: service name: resourceName + parent: service properties: { - email: 'azure-acctest230630032559695401@example.com' firstName: 'Acceptance' lastName: 'Test' + email: 'azure-acctest230630032559695401@example.com' } } diff --git a/settings/remarks/microsoft.app/samples/containerapps/main.bicep b/settings/remarks/microsoft.app/samples/containerapps/main.bicep index 91f538b1..fe9fa556 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: { + workspaceCapping: { + dailyQuotaGb: -1 + } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } + } +} + resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { name: resourceName location: location @@ -8,12 +28,9 @@ resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { configuration: { activeRevisionsMode: 'Single' } - managedEnvironmentId: managedEnvironment.id template: { containers: [ { - env: [] - image: 'jackofallops/azure-containerapps-python-acctest:v0.0.1' name: 'acctest-cont-230630032906865620' probes: [] resources: { @@ -22,6 +39,8 @@ resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { memory: '0.5Gi' } volumeMounts: [] + env: [] + image: 'jackofallops/azure-containerapps-python-acctest:v0.0.1' } ] scale: { @@ -39,30 +58,9 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } } vnetConfiguration: {} } } - -resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { - name: resourceName - location: location - properties: { - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - retentionInDays: 30 - sku: { - name: 'PerGB2018' - } - workspaceCapping: { - dailyQuotaGb: -1 - } - } -} diff --git a/settings/remarks/microsoft.app/samples/jobs/main.bicep b/settings/remarks/microsoft.app/samples/jobs/main.bicep index 890a500a..8595bc93 100644 --- a/settings/remarks/microsoft.app/samples/jobs/main.bicep +++ b/settings/remarks/microsoft.app/samples/jobs/main.bicep @@ -14,19 +14,18 @@ resource job 'Microsoft.App/jobs@2025-01-01' = { replicaTimeout: 10 triggerType: 'Manual' } - environmentId: managedEnvironment.id template: { containers: [ { - env: [] - image: 'jackofallops/azure-containerapps-python-acctest:v0.0.1' - name: 'testcontainerappsjob0' - probes: [] resources: { cpu: any('0.5') memory: '1Gi' } volumeMounts: [] + env: [] + image: 'jackofallops/azure-containerapps-python-acctest:v0.0.1' + name: 'testcontainerappsjob0' + probes: [] } ] initContainers: [] @@ -42,7 +41,6 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2025-01-01' = { appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } } diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep index eb160a33..ee81bb17 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep @@ -1,21 +1,20 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The password for the certificate used in the managed environment') param certificatePassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { name: resourceName location: location properties: { + vnetConfiguration: {} appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } } - vnetConfiguration: {} } } @@ -23,10 +22,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 @@ -36,15 +31,19 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { workspaceCapping: { dailyQuotaGb: -1 } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } } } 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..07b048ea 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { name: resourceName @@ -8,7 +8,6 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } } @@ -20,12 +19,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 sku: { name: 'PerGB2018' @@ -33,12 +26,18 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { workspaceCapping: { dailyQuotaGb: -1 } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' } } resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-03-01' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { componentType: 'state.azure.blobstorage' ignoreErrors: false diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep index 9e0a93f6..f23e8e7e 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep @@ -8,7 +8,6 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { - customerId: workspace.properties.customerId sharedKey: workspace.listKeys().primarySharedKey } } @@ -21,8 +20,8 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { location: location properties: { features: { - disableLocalAuth: false enableLogAccessUsingOnlyResourcePermissions: true + disableLocalAuth: false } publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' @@ -37,8 +36,8 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { } resource aspireDashboard 'Microsoft.App/managedEnvironments/dotNetComponents@2024-10-02-preview' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { componentType: 'AspireDashboard' configurations: [] diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep index 88753ea0..34a5334e 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep @@ -1,30 +1,10 @@ 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 properties: { - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 sku: { @@ -33,5 +13,24 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { workspaceCapping: { dailyQuotaGb: -1 } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' + } +} + +resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { + name: resourceName + location: location + properties: { + appLogsConfiguration: { + destination: 'log-analytics' + logAnalyticsConfiguration: { + 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..2bc102af 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep @@ -1,31 +1,23 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { - name: resourceName - location: location - properties: { - appLogsConfiguration: { - destination: 'log-analytics' - logAnalyticsConfiguration: { - customerId: workspace.properties.customerId - sharedKey: workspace.listKeys().primarySharedKey - } - } - vnetConfiguration: {} - } -} - resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + isNfsV3Enabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' accessTier: 'Hot' allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -38,17 +30,10 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false } tags: { environment: 'accTest' @@ -59,6 +44,9 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { + workspaceCapping: { + dailyQuotaGb: -1 + } features: { disableLocalAuth: false enableLogAccessUsingOnlyResourcePermissions: true @@ -69,21 +57,32 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { sku: { name: 'PerGB2018' } - workspaceCapping: { - dailyQuotaGb: -1 + } +} + +resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { + name: resourceName + location: location + properties: { + vnetConfiguration: {} + appLogsConfiguration: { + destination: 'log-analytics' + logAnalyticsConfiguration: { + sharedKey: workspace.listKeys().primarySharedKey + } } } } resource storage 'Microsoft.App/managedEnvironments/storages@2022-03-01' = { - parent: managedEnvironment name: resourceName + parent: managedEnvironment properties: { azureFile: { + accountName: storageAccount.name + shareName: 'testsharehkez7' accessMode: 'ReadWrite' accountKey: storageAccount.listKeys().keys[0].value - accountName: storageAccount.properties.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..c1d73b38 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: { + httpsOnly: false + public: false + gatewayIds: [] + } } resource domain 'Microsoft.AppPlatform/Spring/apiPortals/domains@2023-05-01-preview' = { - parent: apiPortal name: '${resourceName}.azuremicroservices.io' + parent: apiPortal properties: { thumbprint: '' } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep index 8397c83d..863457af 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apiportals/main.bicep @@ -4,25 +4,25 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource apiPortal 'Microsoft.AppPlatform/Spring/apiPortals@2023-05-01-preview' = { - parent: spring name: 'default' - properties: { - gatewayIds: [] - httpsOnly: false - public: false - } + parent: spring sku: { capacity: 1 name: 'E0' tier: 'Enterprise' } + properties: { + gatewayIds: [] + httpsOnly: false + public: false + } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep index cae0847c..e3a385a0 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep @@ -1,27 +1,26 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource applicationAccelerator 'Microsoft.AppPlatform/Spring/applicationAccelerators@2023-05-01-preview' = { - parent: spring name: 'default' + parent: spring } resource customizedAccelerator 'Microsoft.AppPlatform/Spring/applicationAccelerators/customizedAccelerators@2023-05-01-preview' = { - parent: applicationAccelerator name: resourceName + parent: applicationAccelerator properties: { - description: '' displayName: '' gitRepository: { authSetting: { @@ -33,5 +32,6 @@ resource customizedAccelerator 'Microsoft.AppPlatform/Spring/applicationAccelera url: 'https://github.com/Azure-Samples/piggymetrics' } iconUrl: '' + description: '' } } 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..aedc47b5 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep @@ -1,22 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' - -resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { - name: resourceName - location: location - properties: { - zoneRedundant: false - } - sku: { - name: 'E0' - } -} - -resource buildService 'Microsoft.AppPlatform/Spring/buildServices@2023-05-01-preview' = { - parent: spring - name: 'default' - properties: {} -} +param resourceName string = 'acctest0001' resource builder 'Microsoft.AppPlatform/Spring/buildServices/builders@2023-05-01-preview' = { name: resourceName @@ -39,9 +22,26 @@ 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' } } + +resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { + name: resourceName + location: location + sku: { + name: 'E0' + } + properties: { + zoneRedundant: false + } +} + +resource buildService 'Microsoft.AppPlatform/Spring/buildServices@2023-05-01-preview' = { + name: 'default' + parent: spring + properties: {} +} diff --git a/settings/remarks/microsoft.appplatform/samples/spring/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..80b5d0bd 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep @@ -1,21 +1,22 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } -resource devtoolportal 'Microsoft.AppPlatform/Spring/DevToolPortals@2023-05-01-preview' = { - parent: spring +resource devToolPortal 'Microsoft.AppPlatform/Spring/DevToolPortals@2023-05-01-preview' = { name: 'default' + parent: spring properties: { + public: false features: { applicationAccelerator: { state: 'Disabled' @@ -24,6 +25,5 @@ resource devtoolportal 'Microsoft.AppPlatform/Spring/DevToolPortals@2023-05-01-p state: 'Disabled' } } - public: false } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/gateways/domains/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/gateways/domains/main.bicep index e0e7e5ac..d3b511ce 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/gateways/domains/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/gateways/domains/main.bicep @@ -4,31 +4,31 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource gateway 'Microsoft.AppPlatform/Spring/gateways@2023-05-01-preview' = { - parent: spring name: 'default' - properties: { - httpsOnly: false - public: false - } + parent: spring sku: { capacity: 1 name: 'E0' tier: 'Enterprise' } + properties: { + httpsOnly: false + public: false + } } resource domain 'Microsoft.AppPlatform/Spring/gateways/domains@2023-05-01-preview' = { - parent: gateway name: '${resourceName}.azuremicroservices.io' + parent: gateway properties: { thumbprint: '' } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep index 4d3c60fa..f11837f6 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep @@ -4,24 +4,24 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'E0' } + properties: { + zoneRedundant: false + } } resource gateway 'Microsoft.AppPlatform/Spring/gateways@2023-05-01-preview' = { - parent: spring name: 'default' - properties: { - httpsOnly: false - public: false - } + parent: spring sku: { capacity: 1 name: 'E0' tier: 'Enterprise' } + properties: { + httpsOnly: false + public: false + } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep index dd36bcdb..06e0f2d6 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' + capacity: 1 + } + 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..208ccc1e 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/main.bicep @@ -1,13 +1,13 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location - properties: { - zoneRedundant: false - } sku: { name: 'S0' } + properties: { + zoneRedundant: false + } } 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..f4144c4a 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep @@ -4,26 +4,45 @@ param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName location: location + sku: { + name: 'S0' + } properties: { zoneRedundant: false } - sku: { - name: 'S0' +} + +resource storage 'Microsoft.AppPlatform/Spring/storages@2023-05-01-preview' = { + name: resourceName + parent: spring + properties: { + accountKey: storageAccount.listKeys().keys[0].value + accountName: storageAccount.name + storageType: 'StorageAccount' } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_GRS' + } kind: 'StorageV2' properties: { + supportsHttpsTrafficOnly: true accessTier: 'Hot' + allowSharedKeyAccess: true + isNfsV3Enabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } allowBlobPublicAccess: true allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { - keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -32,28 +51,9 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_GRS' - } -} - -resource storage 'Microsoft.AppPlatform/Spring/storages@2023-05-01-preview' = { - parent: spring - name: resourceName - properties: { - accountKey: storageAccount.listKeys().keys[0].value - accountName: storageAccount.name - storageType: 'StorageAccount' } } 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..face168a 100644 --- a/settings/remarks/microsoft.authorization/samples/policyassignments/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policyassignments/main.bicep @@ -1,9 +1,11 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' = { name: resourceName + scope: subscription() properties: { displayName: '' enforcementMode: 'Default' @@ -16,7 +18,6 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' ] } } - policyDefinitionId: policyDefinition.id scope: subscription().id } } @@ -41,7 +42,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..47df940a 100644 --- a/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep @@ -1,13 +1,15 @@ targetScope = 'subscription' param 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' - policyDefinitionId: policyDefinition.id scope: subscription().id } } @@ -15,15 +17,13 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { name: resourceName properties: { - description: '' - displayName: 'my-policy-definition' mode: 'All' parameters: { allowedLocations: { metadata: { + strongType: 'location' description: 'The list of allowed locations for resources.' displayName: 'Allowed locations' - strongType: 'location' } type: 'Array' } @@ -32,7 +32,7 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } then: { @@ -40,11 +40,14 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' } } policyType: 'Custom' + description: '' + displayName: 'my-policy-definition' } } 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..1b797080 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 @@ -19,15 +20,15 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' } } policyRule: { + then: { + effect: 'audit' + } if: { not: { field: 'location' - in: '[parameters(\'allowedLocations\')]' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } - then: { - effect: 'audit' - } } policyType: 'Custom' } @@ -37,7 +38,7 @@ resource policySetDefinition 'Microsoft.Authorization/policySetDefinitions@2025- name: 'acctestpolset-${resourceName}' properties: { description: '' - displayName: 'acctestpolset-acctest0001' + displayName: 'acctestpolset-${resourceName}' parameters: { allowedLocations: { metadata: { @@ -50,14 +51,14 @@ resource policySetDefinition 'Microsoft.Authorization/policySetDefinitions@2025- } policyDefinitions: [ { - groupNames: [] parameters: { listOfAllowedLocations: { - value: '[parameters(\'allowedLocations\')]' + value: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } policyDefinitionId: policyDefinition.id policyDefinitionReferenceId: '' + groupNames: [] } ] policyType: 'Custom' diff --git a/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep index 5f726a3e..4c98618c 100644 --- a/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep @@ -1,6 +1,7 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-preview' = { name: '6faae21a-0cd6-4536-8c23-a278823d12ed' @@ -11,15 +12,15 @@ resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-prev description: '' permissions: [ { - actions: [ - '*' - ] dataActions: [] notActions: [] notDataActions: [] + actions: [ + '*' + ] } ] - 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..72b9c195 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/certificates/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/certificates/main.bicep @@ -5,19 +5,19 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { + sku: { + name: 'Basic' + } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true - sku: { - name: 'Basic' - } } } resource 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..0b4cfb15 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep @@ -7,30 +7,30 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { - encryption: { - keySource: 'Microsoft.Automation' - } publicNetworkAccess: true sku: { name: 'Basic' } + encryption: { + keySource: 'Microsoft.Automation' + } } } resource 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 + SubscriptionId: subscription() + TenantId: tenant() } + connectionType: { + name: 'AzureServicePrincipal' + } + description: '' } } 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..b7e13255 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep @@ -19,11 +19,11 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { description: '' - password: null + password: '${automationCredentialPassword}' userName: 'test_user' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep index 7782f89a..e217ba69 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep @@ -34,20 +34,30 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] } } +resource hybridRunbookWorkerGroup 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups@2021-06-22' = { + name: resourceName + parent: automationAccount +} + +resource hybridRunbookWorker 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups/hybridRunbookWorkers@2021-06-22' = { + name: 'c7714056-5ba8-4bbe-920e-2993171164eb' + parent: hybridRunbookWorkerGroup + properties: { + vmResourceId: virtualMachine.id + } +} + resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - additionalCapabilities: {} applicationProfile: { galleryApplications: [] } @@ -58,9 +68,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } } extensionsTimeBudget: 'PT1H30M' - hardwareProfile: { - vmSize: 'Standard_D2s_v3' - } networkProfile: { networkInterfaces: [ { @@ -72,22 +79,22 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null - adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { + provisionVMAgent: true + ssh: { + publicKeys: [] + } disablePasswordAuthentication: false patchSettings: { assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' } - provisionVMAgent: true - ssh: { - publicKeys: [] - } } secrets: [] + adminPassword: vmAdminPassword + adminUsername: 'adminuser' } priority: 'Regular' storageProfile: { @@ -108,6 +115,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { writeAcceleratorEnabled: false } } + additionalCapabilities: {} + hardwareProfile: { + vmSize: 'Standard_D2s_v3' + } } } @@ -128,26 +139,18 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } 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' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' delegations: [] @@ -157,11 +160,3 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { 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..ae163f2a 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep @@ -1,8 +1,8 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The password for the automation account credential') param credentialPassword string +param resourceName string = 'acctest0001' resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = { name: resourceName @@ -19,19 +19,16 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { description: '' - password: null + password: '${credentialPassword}' userName: 'test_user' } } resource hybridRunbookWorkerGroup 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups@2021-06-22' = { - parent: automationAccount name: resourceName - credential: { - name: credential.name - } + parent: automationAccount } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep index d664d2d8..c5c6cd00 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/modules/main.bicep @@ -5,19 +5,19 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { + sku: { + name: 'Basic' + } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true - sku: { - name: 'Basic' - } } } resource module 'Microsoft.Automation/automationAccounts/modules@2020-01-13-preview' = { - parent: automationAccount name: 'xActiveDirectory' + parent: automationAccount properties: { contentLink: { uri: 'https://devopsgallerystorage.blob.core.windows.net/packages/xactivedirectory.2.19.0.nupkg' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/powershell72modules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/powershell72modules/main.bicep index 64a0d1b0..630c7bbb 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/powershell72modules/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/powershell72modules/main.bicep @@ -16,8 +16,8 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource powerShell72Module 'Microsoft.Automation/automationAccounts/powerShell72Modules@2020-01-13-preview' = { - parent: automationAccount name: 'xActiveDirectory' + parent: automationAccount properties: { contentLink: { uri: 'https://devopsgallerystorage.blob.core.windows.net/packages/xactivedirectory.2.19.0.nupkg' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/python3packages/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/python3packages/main.bicep index 656fe259..61334e3f 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/python3packages/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/python3packages/main.bicep @@ -17,8 +17,8 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2023-11-01' } resource python3Package 'Microsoft.Automation/automationAccounts/python3Packages@2023-11-01' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { contentLink: { uri: 'https://files.pythonhosted.org/packages/py3/r/requests/requests-2.31.0-py3-none-any.whl' diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep index 645c6422..791b556a 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep @@ -16,20 +16,20 @@ 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: { + logVerbose: true + runbookType: 'PowerShell' description: 'This is a test runbook for terraform acceptance test' draft: {} logActivityTrace: 0 logProgress: true - logVerbose: true - runbookType: 'PowerShell' } } resource draft 'Microsoft.Automation/automationAccounts/runbooks/draft@2018-06-30' = { - parent: runbook name: 'content' + parent: runbook } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep index 3e84d9ce..3456a2f3 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/main.bicep @@ -16,15 +16,15 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource runbook 'Microsoft.Automation/automationAccounts/runbooks@2019-06-01' = { - parent: automationAccount name: 'Get-AzureVMTutorial' location: location + parent: automationAccount properties: { - description: 'This is a test runbook for terraform acceptance test' draft: {} logActivityTrace: 0 logProgress: true logVerbose: true runbookType: 'PowerShell' + description: 'This is a test runbook for terraform acceptance test' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep index bf571ec0..c0d68a56 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = { name: resourceName @@ -16,8 +16,8 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource 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..9556d4ab 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep @@ -16,26 +16,26 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource softwareUpdateConfiguration 'Microsoft.Automation/automationAccounts/softwareUpdateConfigurations@2019-06-01' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { scheduleInfo: { - description: '' + nextRunOffsetMinutes: 0 + timeZone: 'Etc/UTC' expiryTimeOffsetMinutes: 0 - frequency: 'OneTime' - interval: 0 isEnabled: true - nextRunOffsetMinutes: 0 startTimeOffsetMinutes: 0 - timeZone: 'Etc/UTC' + description: '' + frequency: 'OneTime' + interval: 0 } updateConfiguration: { duration: 'PT2H' linux: { - excludedPackageNameMasks: [] includedPackageClassifications: 'Security' includedPackageNameMasks: [] rebootSetting: 'IfRequired' + excludedPackageNameMasks: [] } operatingSystem: 'Linux' targets: { diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep index 5a18a7a3..7e1394a9 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep @@ -8,29 +8,29 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2023-11-01' name: resourceName location: location properties: { - encryption: { - keySource: 'Microsoft.Automation' - } publicNetworkAccess: true sku: { name: 'Basic' } + encryption: { + keySource: 'Microsoft.Automation' + } } } resource sourceControl 'Microsoft.Automation/automationAccounts/sourceControls@2023-11-01' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { - autoSync: false branch: 'master' folderPath: '/' publishRunbook: false repoUrl: 'https://github.com/Azure-Samples/acr-build-helloworld-node.git' securityToken: { - accessToken: null + accessToken: '${pat}' tokenType: 'PersonalAccessToken' } sourceType: 'GitHub' + autoSync: false } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep index b64904b1..1a42425c 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep @@ -16,11 +16,11 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' } resource variable 'Microsoft.Automation/automationAccounts/variables@2020-01-13-preview' = { - parent: automationAccount name: resourceName + parent: automationAccount properties: { description: '' isEncrypted: false - value: '"Hello, Terraform Basic Test."' + value: 'Hello, Terraform Basic Test.' } } diff --git a/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep b/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep index afde51c0..878f8c7b 100644 --- a/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep +++ b/settings/remarks/microsoft.avs/samples/privateclouds/authorizations/main.bicep @@ -4,6 +4,9 @@ param location string = 'centralus' resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { name: resourceName location: location + sku: { + name: 'av36' + } properties: { internet: 'Disabled' managementCluster: { @@ -11,12 +14,9 @@ resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { } networkBlock: '192.168.48.0/22' } - sku: { - name: 'av36' - } } resource authorization 'Microsoft.AVS/privateClouds/authorizations@2022-05-01' = { - parent: privateCloud name: resourceName + parent: privateCloud } diff --git a/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep b/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep index 96933b18..e37ba12a 100644 --- a/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep +++ b/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep @@ -4,14 +4,14 @@ param location string = 'centralus' resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { name: resourceName location: location + sku: { + name: 'av36' + } properties: { + networkBlock: '192.168.48.0/22' internet: 'Disabled' managementCluster: { clusterSize: 3 } - networkBlock: '192.168.48.0/22' - } - sku: { - name: 'av36' } } diff --git a/settings/remarks/microsoft.azureactivedirectory/samples/b2cdirectories/main.bicep b/settings/remarks/microsoft.azureactivedirectory/samples/b2cdirectories/main.bicep index 5a6c877c..9745b7cf 100644 --- a/settings/remarks/microsoft.azureactivedirectory/samples/b2cdirectories/main.bicep +++ b/settings/remarks/microsoft.azureactivedirectory/samples/b2cdirectories/main.bicep @@ -10,15 +10,14 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { resource b2cDirectory 'Microsoft.AzureActiveDirectory/b2cDirectories@2021-04-01-preview' = { name: '${resourceName}.onmicrosoft.com' - location: 'United States' + sku: { + name: 'PremiumP1' + tier: 'A0' + } properties: { createTenantProperties: { countryCode: 'US' - displayName: 'acctest0003' + displayName: '${resourceName}' } } - sku: { - name: 'PremiumP1' - tier: 'A0' - } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep index 1ab86d68..0ce88aed 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep @@ -1,32 +1,18 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { - name: resourceName - location: location - properties: { - autoStorage: { - authenticationMode: 'StorageKeys' - storageAccountId: storageAccount.id - } - encryption: { - keySource: 'Microsoft.Batch' - } - poolAllocationMode: 'BatchService' - publicNetworkAccess: 'Enabled' - } -} - resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + networkAcls: { + defaultAction: 'Allow' + } accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -38,27 +24,40 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } + isSftpEnabled: false + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false isHnsEnabled: false isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' + } +} + +resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { + name: resourceName + location: location + properties: { + autoStorage: { + authenticationMode: 'StorageKeys' } + encryption: { + keySource: 'Microsoft.Batch' + } + poolAllocationMode: 'BatchService' publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } resource application 'Microsoft.Batch/batchAccounts/applications@2022-10-01' = { - parent: batchAccount name: resourceName + parent: batchAccount properties: { + displayName: '' allowUpdates: true defaultVersion: '' - displayName: '' } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep index 52dc66f5..1d8cded1 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep @@ -19,12 +19,12 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { } resource certificate 'Microsoft.Batch/batchAccounts/certificates@2022-10-01' = { - parent: batchAccount name: 'SHA1-${certificateThumbprint}' + parent: batchAccount properties: { - data: null - format: 'Cer' - thumbprint: null + thumbprint: '${certificateThumbprint}' thumbprintAlgorithm: 'sha1' + data: '${certificateData}' + format: 'Cer' } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep index f4661451..edc7e02c 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep @@ -5,18 +5,29 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' encryption: { keySource: 'Microsoft.Batch' } poolAllocationMode: 'BatchService' - publicNetworkAccess: 'Enabled' } } resource pool 'Microsoft.Batch/batchAccounts/pools@2022-10-01' = { - parent: batchAccount name: resourceName + parent: batchAccount properties: { + interNodeCommunication: 'Enabled' + scaleSettings: { + fixedScale: { + targetDedicatedNodes: 1 + targetLowPriorityNodes: 0 + nodeDeallocationOption: '' + resizeTimeout: 'PT15M' + } + } + taskSlotsPerNode: 1 + vmSize: 'STANDARD_A1' certificates: null deploymentConfiguration: { virtualMachineConfiguration: { @@ -35,17 +46,6 @@ resource pool 'Microsoft.Batch/batchAccounts/pools@2022-10-01' = { } } displayName: '' - interNodeCommunication: 'Enabled' metadata: [] - scaleSettings: { - fixedScale: { - nodeDeallocationOption: '' - resizeTimeout: 'PT15M' - targetDedicatedNodes: 1 - targetLowPriorityNodes: 0 - } - } - taskSlotsPerNode: 1 - vmSize: 'STANDARD_A1' } } diff --git a/settings/remarks/microsoft.billing/remarks.json b/settings/remarks/microsoft.billing/remarks.json index 58191af5..3071a2a7 100644 --- a/settings/remarks/microsoft.billing/remarks.json +++ b/settings/remarks/microsoft.billing/remarks.json @@ -1,10 +1,17 @@ -{ - "$schema": "../../schemas/remarks.schema.json", - "TerraformSamples": [ - { - "ResourceType": "Microsoft.Billing/billingAccounts/billingProfiles", - "Path": "samples/billingaccounts/billingprofiles/main.tf", - "Description": "A basic example of deploying Billing Accounts Billing Profiles." - } - ] -} +{ + "$schema": "../../schemas/remarks.schema.json", + "TerraformSamples": [ + { + "ResourceType": "Microsoft.Billing/billingAccounts/billingProfiles", + "Path": "samples/billingaccounts/billingprofiles/main.tf", + "Description": "A basic example of deploying Billing Accounts Billing Profiles." + } + ], + "BicepSamples": [ + { + "ResourceType": "Microsoft.Billing/billingAccounts/billingProfiles", + "Path": "samples/billingaccounts/billingprofiles/main.bicep", + "Description": "A basic example of deploying Billing Accounts Billing Profiles." + } + ] +} \ No newline at end of file diff --git a/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep b/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep new file mode 100644 index 00000000..870373eb --- /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: { + shipTo: { + country: 'US' + isValidAddress: true + postalCode: '12345-1234' + region: 'WA' + addressLine1: 'TestWay' + city: 'Redmond' + companyName: 'TestCompany' + } + billTo: { + country: 'US' + isValidAddress: true + postalCode: '12345-1234' + region: 'WA' + addressLine1: 'TestWay' + city: 'Redmond' + companyName: 'TestCompany' + } + displayName: '${resourceName}' + enabledAzurePlans: [ + { + skuId: '0001' + } + ] + } +} diff --git a/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep b/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep index 2b1fa1b6..b533bbd5 100644 --- a/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep +++ b/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep @@ -4,29 +4,29 @@ param location string = 'westus' resource botService 'Microsoft.BotService/botServices@2021-05-01-preview' = { name: resourceName location: location + sku: { + name: 'F0' + } kind: 'bot' properties: { cmekKeyVaultUrl: '' - description: '' developerAppInsightKey: '' - developerAppInsightsApiKey: '' developerAppInsightsApplicationId: '' - displayName: 'acctest0001' endpoint: '' - iconUrl: 'https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png' - isCmekEnabled: false isStreamingSupported: false msaAppId: '12345678-1234-1234-1234-123456789012' - } - sku: { - name: 'F0' + description: '' + developerAppInsightsApiKey: '' + displayName: '${resourceName}' + iconUrl: 'https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png' + isCmekEnabled: false } } 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..13321f8b 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' - endpoint: '' luisAppIds: [] + msaAppId: clientId + developerAppInsightsApiKey: '' + displayName: resourceName + endpoint: '' luisKey: '' - msaAppId: deployer().objectId - } - sku: { - name: 'F0' } tags: { environment: 'production' diff --git a/settings/remarks/microsoft.cache/remarks.json b/settings/remarks/microsoft.cache/remarks.json index fd40d222..cd140979 100644 --- a/settings/remarks/microsoft.cache/remarks.json +++ b/settings/remarks/microsoft.cache/remarks.json @@ -75,6 +75,16 @@ "ResourceType": "Microsoft.Cache/redisEnterprise/databases", "Path": "samples/redisenterprise/databases/main.bicep", "Description": "A basic example of deploying Redis Enterprise Database." + }, + { + "ResourceType": "Microsoft.Cache/redis/linkedServers", + "Path": "samples/redis/linkedservers/main.bicep", + "Description": "A basic example of deploying Redis Linked Server." + }, + { + "ResourceType": "Microsoft.Cache/redis/linkedServers", + "Path": "samples/redis/linkedservers/main-rg-module.bicep", + "Description": "A basic example of deploying Redis Linked Server." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep b/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep index 81125cb5..72a635ef 100644 --- a/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep @@ -5,10 +5,6 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { name: resourceName location: location properties: { - disableAccessKeyAuthentication: false - enableNonSslPort: true - minimumTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' redisConfiguration: { 'maxmemory-policy': 'volatile-lru' 'preferred-data-persistence-auth-method': '' @@ -19,12 +15,16 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { family: 'C' name: 'Basic' } + disableAccessKeyAuthentication: false + enableNonSslPort: true + minimumTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' } } 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..fc727c2d 100644 --- a/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep @@ -17,16 +17,16 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { } redisVersion: '6.0' sku: { - capacity: 1 family: 'P' name: 'Premium' + capacity: 1 } } } 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..28a95b89 --- /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: { + 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: { + name: 'Premium' + capacity: 1 + family: 'P' + } + disableAccessKeyAuthentication: false + } +} + +resource redisSecondary 'Microsoft.Cache/redis@2024-11-01' = { + name: '${resourceName}-secondary' + location: location + properties: { + enableNonSslPort: false + minimumTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' + redisConfiguration: { + 'maxmemory-policy': 'allkeys-lru' + 'maxmemory-reserved': '642' + 'preferred-data-persistence-auth-method': '' + 'maxmemory-delta': '642' + } + redisVersion: '6' + sku: { + capacity: 1 + family: 'P' + name: 'Premium' + } + disableAccessKeyAuthentication: false + } +} + +resource linkedServer 'Microsoft.Cache/redis/linkedServers@2024-11-01' = { + name: '${resourceName}-secondary' + parent: redisPrimary + properties: { + linkedRedisCacheId: redisSecondary.id + linkedRedisCacheLocation: location + serverRole: 'Secondary' + } +} diff --git a/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep b/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep new file mode 100644 index 00000000..ad12030e --- /dev/null +++ b/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep @@ -0,0 +1,23 @@ +targetScope = 'subscription' + +param resourceName string = 'acctest0001' +param location string = 'westus' + +resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: resourceName + location: location +} + +resource resourcegroupSecondary 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: '${resourceName}-secondary' + location: location +} + +module module1 'main-rg-module.bicep' = { + name: 'deploy-rg-resources' + scope: resourceGroup + params: { + resourceName: resourceName + location: location + } +} diff --git a/settings/remarks/microsoft.cache/samples/redis/main.bicep b/settings/remarks/microsoft.cache/samples/redis/main.bicep index b4171f1a..2f2a35dd 100644 --- a/settings/remarks/microsoft.cache/samples/redis/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/main.bicep @@ -1,16 +1,16 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' +param resourceName string = 'acctest0001' 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' } + enableNonSslPort: true } } diff --git a/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep b/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep index 332151c3..03202e56 100644 --- a/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep @@ -4,24 +4,24 @@ param location string = 'westus' resource redisEnterprise 'Microsoft.Cache/redisEnterprise@2025-04-01' = { name: resourceName location: location + sku: { + name: 'Balanced_B0' + } properties: { + minimumTlsVersion: '1.2' encryption: {} highAvailability: 'Enabled' - minimumTlsVersion: '1.2' - } - sku: { - name: 'Balanced_B0' } } resource defaultDatabase 'Microsoft.Cache/redisEnterprise/databases@2025-04-01' = { - parent: redisEnterprise name: 'default' + parent: redisEnterprise properties: { + port: 10000 clientProtocol: 'Encrypted' clusteringPolicy: 'OSSCluster' evictionPolicy: 'VolatileLRU' modules: [] - port: 10000 } } diff --git a/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep b/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep index 1e337bec..e4e3980a 100644 --- a/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep @@ -1,15 +1,15 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' +param resourceName string = 'acctest0001' 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..a27c94a4 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep @@ -1,62 +1,59 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Standard_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource afdEndpoint 'Microsoft.Cdn/profiles/afdEndpoints@2021-06-01' = { - parent: profile name: resourceName location: 'global' + parent: profile properties: { enabledState: 'Enabled' } } resource originGroup 'Microsoft.Cdn/profiles/originGroups@2021-06-01' = { - parent: profile name: resourceName + parent: profile properties: { + sessionAffinityState: 'Enabled' + trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 loadBalancingSettings: { - additionalLatencyInMilliseconds: 0 sampleSize: 16 successfulSamplesRequired: 3 + additionalLatencyInMilliseconds: 0 } - sessionAffinityState: 'Enabled' - trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 } } resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2021-06-01' = { - parent: originGroup name: resourceName + parent: originGroup properties: { - enabledState: 'Enabled' enforceCertificateNameCheck: false hostName: 'contoso.com' httpPort: 80 httpsPort: 443 originHostHeader: 'www.contoso.com' + enabledState: 'Enabled' priority: 1 weight: 1 } } resource route 'Microsoft.Cdn/profiles/afdEndpoints/routes@2021-06-01' = { - parent: afdEndpoint name: resourceName + parent: afdEndpoint properties: { - enabledState: 'Enabled' - forwardingProtocol: 'MatchRequest' - httpsRedirect: 'Enabled' - linkToDefaultDomain: 'Enabled' originGroup: { id: originGroup.id } @@ -67,5 +64,9 @@ resource route 'Microsoft.Cdn/profiles/afdEndpoints/routes@2021-06-01' = { 'Https' 'Http' ] + enabledState: 'Enabled' + forwardingProtocol: 'MatchRequest' + httpsRedirect: 'Enabled' + linkToDefaultDomain: 'Enabled' } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep index 96d9bbca..6c295351 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep @@ -1,32 +1,33 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' -resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { - name: '${resourceName}.com' - location: 'global' -} - resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Premium_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource customDomain 'Microsoft.Cdn/profiles/customDomains@2021-06-01' = { - parent: profile name: resourceName + parent: profile properties: { - azureDnsZone: { - id: dnsZone.id - } - hostName: 'fabrikam.acctest0001.com' tlsSettings: { certificateType: 'ManagedCertificate' minimumTlsVersion: 'TLS12' } + azureDnsZone: { + id: dnsZone.id + } + hostName: 'fabrikam.${resourceName}.com' } } + +resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { + name: '${resourceName}.com' + location: 'global' +} diff --git a/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep index 572ff490..3b7ac0c5 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep @@ -10,22 +10,22 @@ 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: { + queryStringCachingBehavior: 'IgnoreQueryString' isHttpAllowed: true isHttpsAllowed: true origins: [ { name: 'acceptanceTestCdnOrigin1' properties: { + httpsPort: 443 hostName: 'www.contoso.com' httpPort: 80 - httpsPort: 443 } } ] - queryStringCachingBehavior: 'IgnoreQueryString' } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/main.bicep index dbd2929d..7b279da8 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/main.bicep @@ -1,12 +1,13 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Premium_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep index 4294b4ed..aa32b1a2 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 location string = 'westeurope' param resourceName string = 'acctest0001' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Standard_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource 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..5627fac9 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/origins/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/origins/main.bicep @@ -1,24 +1,25 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Standard_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource originGroup 'Microsoft.Cdn/profiles/originGroups@2021-06-01' = { - parent: profile name: resourceName + parent: profile properties: { loadBalancingSettings: { - additionalLatencyInMilliseconds: 0 sampleSize: 16 successfulSamplesRequired: 3 + additionalLatencyInMilliseconds: 0 } sessionAffinityState: 'Enabled' trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 @@ -26,16 +27,16 @@ resource originGroup 'Microsoft.Cdn/profiles/originGroups@2021-06-01' = { } resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2021-06-01' = { - parent: originGroup name: resourceName + parent: originGroup properties: { - enabledState: 'Enabled' enforceCertificateNameCheck: false - hostName: 'contoso.com' httpPort: 80 + weight: 1 + enabledState: 'Enabled' + hostName: 'contoso.com' httpsPort: 443 originHostHeader: 'www.contoso.com' priority: 1 - weight: 1 } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/rulesets/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/rulesets/main.bicep index 2ee48591..ca746d21 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/rulesets/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/rulesets/main.bicep @@ -1,17 +1,18 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } sku: { name: 'Standard_AzureFrontDoor' } + properties: { + originResponseTimeoutSeconds: 120 + } } resource ruleSet 'Microsoft.Cdn/profiles/ruleSets@2021-06-01' = { - parent: profile name: resourceName + parent: profile } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep index 7908e707..827590b3 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep @@ -1,65 +1,60 @@ 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: { + trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 loadBalancingSettings: { additionalLatencyInMilliseconds: 0 sampleSize: 16 successfulSamplesRequired: 3 } sessionAffinityState: 'Enabled' - trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 } } resource ruleSet 'Microsoft.Cdn/profiles/ruleSets@2024-09-01' = { + name: 'ruleSet${substring(resourceName, (length(resourceName) - 4), 3)}' parent: profile - name: 'ruleSet${substring(resourceName, length(resourceName) - 4, 4)}' } resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2024-09-01' = { - parent: originGroup name: '${resourceName}-origin' + parent: originGroup properties: { - enabledState: 'Enabled' enforceCertificateNameCheck: false + httpsPort: 443 + weight: 1 + enabledState: 'Enabled' hostName: 'contoso.com' httpPort: 80 - httpsPort: 443 originHostHeader: 'www.contoso.com' priority: 1 - weight: 1 } } resource rule 'Microsoft.Cdn/profiles/ruleSets/rules@2024-09-01' = { + name: 'rule${substring(resourceName, (length(resourceName) - 4), 3)}' parent: ruleSet - name: 'rule${substring(resourceName, length(resourceName) - 4, 4)}' properties: { actions: [ { name: 'RouteConfigurationOverride' parameters: { - cacheConfiguration: { - cacheBehavior: 'OverrideIfOriginMissing' - cacheDuration: '23:59:59' - isCompressionEnabled: 'Disabled' - queryParameters: 'clientIp={client_ip}' - queryStringCachingBehavior: 'IgnoreSpecifiedQueryStrings' - } originGroupOverride: { forwardingProtocol: 'HttpsOnly' originGroup: { @@ -67,6 +62,13 @@ resource rule 'Microsoft.Cdn/profiles/ruleSets/rules@2024-09-01' = { } } typeName: 'DeliveryRuleRouteConfigurationOverrideActionParameters' + cacheConfiguration: { + queryStringCachingBehavior: 'IgnoreSpecifiedQueryStrings' + cacheBehavior: 'OverrideIfOriginMissing' + cacheDuration: '23:59:59' + isCompressionEnabled: 'Disabled' + queryParameters: 'clientIp={client_ip}' + } } } ] diff --git a/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep index 59c3d517..0a125258 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep @@ -1,14 +1,67 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' -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 customDomain 'Microsoft.Cdn/profiles/customDomains@2021-06-01' = { + name: resourceName + parent: profile + properties: { + azureDnsZone: { + id: dnsZone.id + } + hostName: 'fabrikam.${resourceName}.com' + tlsSettings: { + certificateType: 'ManagedCertificate' + minimumTlsVersion: 'TLS12' + } + } +} + +resource securityPolicy 'Microsoft.Cdn/profiles/securityPolicies@2021-06-01' = { + name: resourceName + parent: profile + properties: { + parameters: { + type: 'WebApplicationFirewall' + wafPolicy: { + id: frontDoorWebApplicationFirewallPolicy.id + } + associations: [ + { + patternsToMatch: [ + '/*' + ] + domains: [ + { + id: customDomain.id + } + ] + } + ] + } + } +} + +resource frontDoorWebApplicationFirewallPolicy 'Microsoft.Network/FrontDoorWebApplicationFirewallPolicies@2020-11-01' = { + name: resourceName + location: 'global' + sku: { + name: 'Premium_AzureFrontDoor' + } properties: { customRules: { rules: [ { - action: 'Block' - enabledState: 'Enabled' matchConditions: [ { matchValue: [ @@ -25,6 +78,8 @@ resource frontdoorwebapplicationfirewallpolicy 'Microsoft.Network/FrontDoorWebAp rateLimitDurationInMinutes: 1 rateLimitThreshold: 10 ruleType: 'MatchRule' + action: 'Block' + enabledState: 'Enabled' } ] } @@ -48,9 +103,9 @@ resource frontdoorwebapplicationfirewallpolicy 'Microsoft.Network/FrontDoorWebAp ruleSetVersion: 'preview-0.1' } { + ruleSetVersion: 'preview-0.1' ruleSetAction: 'Block' ruleSetType: 'BotProtection' - ruleSetVersion: 'preview-0.1' } ] } @@ -62,63 +117,9 @@ resource frontdoorwebapplicationfirewallpolicy 'Microsoft.Network/FrontDoorWebAp redirectUrl: 'https://www.fabrikam.com' } } - sku: { - name: 'Premium_AzureFrontDoor' - } } resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { name: '${resourceName}.com' location: 'global' } - -resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { - name: resourceName - location: 'global' - properties: { - originResponseTimeoutSeconds: 120 - } - sku: { - name: 'Premium_AzureFrontDoor' - } -} - -resource customDomain 'Microsoft.Cdn/profiles/customDomains@2021-06-01' = { - parent: profile - name: resourceName - properties: { - azureDnsZone: { - id: dnsZone.id - } - hostName: 'fabrikam.acctest0001.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..2ec30833 100644 --- a/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep +++ b/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep @@ -1,13 +1,14 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource certificateOrder 'Microsoft.CertificateRegistration/certificateOrders@2021-02-01' = { name: resourceName location: 'global' properties: { - autoRenew: true - distinguishedName: 'CN=example.com' keySize: 2048 productType: 'StandardDomainValidatedSsl' validityInYears: 1 + autoRenew: true + distinguishedName: 'CN=example.com' } } diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep index a8ce9a6c..76815b8a 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,15 @@ resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false } - sku: { - name: 'S0' + identity: { + type: 'None' + userAssignedIdentities: null } } resource deployment 'Microsoft.CognitiveServices/accounts/deployments@2023-05-01' = { - parent: account name: 'testdep' + parent: account properties: { model: { format: 'OpenAI' diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep index f5ae4140..c11e1855 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/main.bicep @@ -4,6 +4,10 @@ param location string = 'westus2' resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { name: resourceName location: location + sku: { + name: 'S0' + tier: 'Standard' + } kind: 'SpeechServices' properties: { allowedFqdnList: [] @@ -14,10 +18,6 @@ resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false } - sku: { - name: 'S0' - tier: 'Standard' - } } resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep index 9c0ebd8c..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..0e75bbf3 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep @@ -4,24 +4,24 @@ param location string = 'westus' resource account 'Microsoft.CognitiveServices/accounts@2024-10-01' = { name: '${resourceName}-ca' location: location + sku: { + name: 'S0' + } kind: 'OpenAI' properties: { - allowedFqdnList: [] - apiProperties: {} - customSubDomainName: '' disableLocalAuth: false dynamicThrottlingEnabled: false publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false - } - sku: { - name: 'S0' + allowedFqdnList: [] + apiProperties: {} + customSubDomainName: '' } } 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..4c934a77 100644 --- a/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep +++ b/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep @@ -1,3 +1,4 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource emailService 'Microsoft.Communication/emailServices@2023-04-01-preview' = { @@ -9,11 +10,11 @@ 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' + domainManagement: 'CustomerManaged' } } 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..a9e51ed4 100644 --- a/settings/remarks/microsoft.communication/samples/emailservices/main.bicep +++ b/settings/remarks/microsoft.communication/samples/emailservices/main.bicep @@ -1,3 +1,4 @@ +param location string = 'westeurope' param resourceName string = 'acctest0001' resource emailService 'Microsoft.Communication/emailServices@2023-03-31' = { 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..d619ae9c 100644 --- a/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep +++ b/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep @@ -7,11 +7,11 @@ 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' + capacity: 2 } } diff --git a/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep b/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep index bcc6162e..de90ab47 100644 --- a/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep @@ -5,14 +5,11 @@ resource diskEncryptionSet 'Microsoft.Compute/diskEncryptionSets@2022-03-02' = { name: resourceName location: location properties: { - activeKey: { - keyUrl: key.properties.keyUriWithVersion - sourceVault: { - id: vault.id - } - } encryptionType: 'EncryptionAtRestWithCustomerKey' rotationToLatestKeyVersionEnabled: false + activeKey: { + sourceVault: {} + } } } @@ -22,17 +19,17 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { properties: { accessPolicies: [] enableSoftDelete: true + tenantId: tenant() sku: { - family: 'A' name: 'standard' + family: 'A' } - tenantId: deployer().tenantId } } resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { - parent: vault name: resourceName + parent: vault properties: { keyOps: [ 'encrypt' diff --git a/settings/remarks/microsoft.compute/samples/disks/main.bicep b/settings/remarks/microsoft.compute/samples/disks/main.bicep index 9da32a6f..74776155 100644 --- a/settings/remarks/microsoft.compute/samples/disks/main.bicep +++ b/settings/remarks/microsoft.compute/samples/disks/main.bicep @@ -4,7 +4,12 @@ param location string = 'westeurope' resource disk 'Microsoft.Compute/disks@2022-03-02' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } properties: { + osType: '' + publicNetworkAccess: 'Enabled' creationData: { createOption: 'Empty' } @@ -13,10 +18,5 @@ resource disk 'Microsoft.Compute/disks@2022-03-02' = { type: 'EncryptionAtRestWithPlatformKey' } networkAccessPolicy: 'AllowAll' - osType: '' - publicNetworkAccess: 'Enabled' - } - sku: { - name: 'Standard_LRS' } } diff --git a/settings/remarks/microsoft.compute/samples/galleries/applications/main.bicep b/settings/remarks/microsoft.compute/samples/galleries/applications/main.bicep index 1f8ab269..d2e4de89 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/applications/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/applications/main.bicep @@ -10,9 +10,9 @@ resource gallery 'Microsoft.Compute/galleries@2022-03-03' = { } resource application 'Microsoft.Compute/galleries/applications@2022-03-03' = { - parent: gallery name: resourceName location: location + parent: gallery properties: { supportedOSType: 'Linux' } diff --git a/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep b/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep index cbc629ca..906f6b20 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep @@ -12,16 +12,24 @@ 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' - allowBlobPublicAccess: true - allowCrossTenantReplication: false - allowSharedKeyAccess: true + publicNetworkAccess: 'Enabled' defaultToOAuthAuthentication: false - dnsEndpointType: 'Standard' + isLocalUserEnabled: true + networkAcls: { + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + } + supportsHttpsTrafficOnly: true + accessTier: 'Hot' encryption: { - keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -30,61 +38,55 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } - isHnsEnabled: false - isLocalUserEnabled: true + allowBlobPublicAccess: true + allowCrossTenantReplication: false + dnsEndpointType: 'Standard' isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' - networkAcls: { - bypass: 'AzureServices' - defaultAction: 'Allow' - ipRules: [] - resourceAccessRules: [] - virtualNetworkRules: [] - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowSharedKeyAccess: true + isHnsEnabled: false + isSftpEnabled: false } } 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,9 +95,9 @@ resource version 'Microsoft.Compute/galleries/applications/versions@2022-03-03' } targetRegions: [ { - name: 'westus' regionalReplicaCount: 1 storageAccountType: 'Standard_LRS' + name: location } ] } @@ -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..5c4c791e 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep @@ -10,28 +10,28 @@ 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' + features: null + osState: 'Generalized' + osType: 'Linux' + privacyStatementUri: '' description: '' disallowed: { diskTypes: [] } - features: null hyperVGeneration: 'V1' identifier: { offer: 'AccTesOffer230630032848825313' publisher: 'AccTesPublisher230630032848825313' sku: 'AccTesSku230630032848825313' } - osState: 'Generalized' - osType: 'Linux' - privacyStatementUri: '' recommended: { - memory: {} vCPUs: {} + memory: {} } releaseNoteUri: '' } diff --git a/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep b/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep index 7d01a4fb..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..547bc308 100644 --- a/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep +++ b/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep @@ -1,35 +1,11 @@ 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 - } - } - } - ] - } -} - resource restorePointCollection 'Microsoft.Compute/restorePointCollections@2024-03-01' = { name: resourceName location: location properties: { - source: { - id: virtualMachine.id - } + source: {} } } @@ -37,20 +13,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: resourceName location: location properties: { - additionalCapabilities: {} - applicationProfile: { - galleryApplications: [] - } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - extensionsTimeBudget: 'PT1H30M' - hardwareProfile: { - vmSize: 'Standard_F2' - } networkProfile: { networkInterfaces: [ { @@ -62,9 +24,8 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { ] } osProfile: { - adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001' + computerName: resourceName linuxConfiguration: { disablePasswordAuthentication: true patchSettings: { @@ -82,9 +43,19 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } } secrets: [] + adminUsername: 'adminuser' } priority: 'Regular' storageProfile: { + osDisk: { + osType: 'Linux' + writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' + managedDisk: { + storageAccountType: 'Standard_LRS' + } + } dataDisks: [] imageReference: { offer: '0001-com-ubuntu-server-jammy' @@ -92,16 +63,21 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { sku: '22_04-lts' version: 'latest' } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - managedDisk: { - storageAccountType: 'Standard_LRS' - } - osType: 'Linux' - writeAcceleratorEnabled: false + } + applicationProfile: { + galleryApplications: [] + } + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' } } + extensionsTimeBudget: 'PT1H30M' + additionalCapabilities: {} + hardwareProfile: { + vmSize: 'Standard_F2' + } } } @@ -123,15 +99,35 @@ 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 - delegations: [] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.0.0/24' + defaultOutboundAccess: true + delegations: [] + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: resourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'internal' + properties: { + primary: false + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + } + } + ] } } diff --git a/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep b/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep index 79442794..fa169f49 100644 --- a/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep +++ b/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep @@ -14,9 +14,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { primary: false privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -27,9 +25,7 @@ resource restorePointCollection 'Microsoft.Compute/restorePointCollections@2024- name: '${resourceName}-rpc' location: location properties: { - source: { - id: virtualMachine.id - } + source: {} } } @@ -37,39 +33,25 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: '${resourceName}-vm' location: location properties: { + priority: 'Regular' additionalCapabilities: {} - applicationProfile: { - galleryApplications: [] - } diagnosticsProfile: { bootDiagnostics: { enabled: false storageUri: '' } } - extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_F2' } - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: true - } - } - ] - } osProfile: { adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001-vm' + computerName: '${resourceName}-vm' linuxConfiguration: { - disablePasswordAuthentication: true patchSettings: { - assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' + assessmentMode: 'ImageDefault' } provisionVMAgent: true ssh: { @@ -80,17 +62,17 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } ] } + disablePasswordAuthentication: true } secrets: [] } - priority: 'Regular' storageProfile: { dataDisks: [] imageReference: { - offer: '0001-com-ubuntu-server-jammy' publisher: 'Canonical' sku: '22_04-lts' version: 'latest' + offer: '0001-com-ubuntu-server-jammy' } osDisk: { caching: 'ReadWrite' @@ -102,6 +84,20 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { writeAcceleratorEnabled: false } } + applicationProfile: { + galleryApplications: [] + } + extensionsTimeBudget: 'PT1H30M' + networkProfile: { + networkInterfaces: [ + { + properties: { + primary: true + } + id: networkInterface.id + } + ] + } } } @@ -123,21 +119,21 @@ 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: { + serviceEndpoints: [] addressPrefix: '10.0.0.0/24' defaultOutboundAccess: true delegations: [] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] - serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.compute/samples/snapshots/main.bicep b/settings/remarks/microsoft.compute/samples/snapshots/main.bicep index a79e0b2c..198043ed 100644 --- a/settings/remarks/microsoft.compute/samples/snapshots/main.bicep +++ b/settings/remarks/microsoft.compute/samples/snapshots/main.bicep @@ -1,38 +1,38 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource disk 'Microsoft.Compute/disks@2023-04-02' = { - name: '${resourceName}disk' +resource snapshot 'Microsoft.Compute/snapshots@2022-03-02' = { + name: '${resourceName}snapshot' location: location properties: { creationData: { - createOption: 'Empty' - performancePlus: false - } - diskSizeGB: 10 - encryption: { - type: 'EncryptionAtRestWithPlatformKey' + createOption: 'Copy' + sourceUri: disk.id } + diskSizeGB: 20 + incremental: false networkAccessPolicy: 'AllowAll' - optimizedForFrequentAttach: false publicNetworkAccess: 'Enabled' } - sku: { - name: 'Standard_LRS' - } } -resource snapshot 'Microsoft.Compute/snapshots@2022-03-02' = { - name: '${resourceName}snapshot' +resource disk 'Microsoft.Compute/disks@2023-04-02' = { + name: '${resourceName}disk' location: location + sku: { + name: 'Standard_LRS' + } properties: { creationData: { - createOption: 'Copy' - sourceUri: disk.id + createOption: 'Empty' + performancePlus: false + } + diskSizeGB: 10 + encryption: { + type: 'EncryptionAtRestWithPlatformKey' } - diskSizeGB: 20 - incremental: false networkAccessPolicy: 'AllowAll' + optimizedForFrequentAttach: false publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep index f176ad72..e004890a 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep @@ -6,51 +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 - 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 @@ -70,12 +28,12 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: adminPassword - adminUsername: adminUsername - computerName: 'hostname230630032848831819' linuxConfiguration: { disablePasswordAuthentication: false } + adminPassword: adminPassword + adminUsername: adminUsername + computerName: 'hostname230630032848831819' } storageProfile: { imageReference: { @@ -92,14 +50,14 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } dataDisks: [ { - caching: 'ReadWrite' - createOption: 'Empty' - name: dataDiskName - diskSizeGB: 1 lun: 1 managedDisk: { storageAccountType: 'Standard_LRS' } + caching: 'ReadWrite' + createOption: 'Empty' + name: dataDiskName + diskSizeGB: 1 } { caching: 'ReadWrite' @@ -132,8 +90,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' delegations: [] @@ -143,3 +101,43 @@ 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: { + osType: 'Linux' + publicNetworkAccess: 'Enabled' + creationData: { + createOption: 'Empty' + } + diskSizeGB: 1 + encryption: { + type: 'EncryptionAtRestWithPlatformKey' + } + networkAccessPolicy: 'AllowAll' + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration1' + properties: { + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + primary: true + } + } + ] + } +} diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep index f066b25c..cc74a3c9 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep @@ -1,3 +1,4 @@ +param attachedResourceName string = 'acctest0002' param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator username for the virtual machine') @@ -5,7 +6,6 @@ param adminUsername string @secure() @description('The administrator password for the virtual machine') param adminPassword string -param attachedResourceName string = 'acctest0002' var osDiskName = 'myosdisk1' var attachedOsDiskName = 'myosdisk2' @@ -14,32 +14,96 @@ resource managedDisk 'Microsoft.Compute/disks@2023-10-02' existing = { name: osDiskName } -resource attachedManagedDisk 'Microsoft.Compute/disks@2023-10-02' = { - name: attachedOsDiskName +resource snapshot 'Microsoft.Compute/snapshots@2023-10-02' = { + name: resourceName location: location + sku: { + name: 'Standard_ZRS' + } properties: { creationData: { createOption: 'Copy' - sourceResourceId: snapshot.id + sourceResourceId: managedDisk.id } diskSizeGB: 30 + networkAccessPolicy: 'AllowAll' + hyperVGeneration: 'V1' + incremental: true encryption: { type: 'EncryptionAtRestWithPlatformKey' } - hyperVGeneration: 'V1' - networkAccessPolicy: 'AllowAll' osType: 'Linux' publicNetworkAccess: 'Enabled' supportedCapabilities: { architecture: 'x64' } } +} + +resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { + name: resourceName + location: location + properties: { + hardwareProfile: { + vmSize: 'Standard_F2' + } + networkProfile: { + networkInterfaces: [ + { + properties: { + primary: false + } + id: networkInterface.id + } + ] + } + osProfile: { + adminPassword: adminPassword + adminUsername: adminUsername + computerName: 'hostname230630032848831819' + linuxConfiguration: { + disablePasswordAuthentication: false + } + } + storageProfile: { + imageReference: { + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' + offer: 'UbuntuServer' + } + osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' + name: osDiskName + writeAcceleratorEnabled: false + } + } + } +} + +resource attachedManagedDisk 'Microsoft.Compute/disks@2023-10-02' = { + name: attachedOsDiskName + location: location sku: { name: 'Standard_LRS' } - zones: [ - '1' - ] + properties: { + networkAccessPolicy: 'AllowAll' + hyperVGeneration: 'V1' + publicNetworkAccess: 'Enabled' + supportedCapabilities: { + architecture: 'x64' + } + creationData: { + createOption: 'Copy' + } + osType: 'Linux' + diskSizeGB: 30 + encryption: { + type: 'EncryptionAtRestWithPlatformKey' + } + } } resource attachedNetworkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { @@ -55,9 +119,7 @@ resource attachedNetworkInterface 'Microsoft.Network/networkInterfaces@2022-07-0 primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -83,14 +145,14 @@ resource attachedVirtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = } storageProfile: { osDisk: { - caching: 'ReadWrite' - createOption: 'Attach' name: attachedOsDiskName osType: 'Linux' writeAcceleratorEnabled: false managedDisk: { id: attachedManagedDisk.id } + caching: 'ReadWrite' + createOption: 'Attach' } } } @@ -100,8 +162,6 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName location: location properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false ipConfigurations: [ { name: 'testconfiguration1' @@ -109,80 +169,12 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] - } -} - -resource snapshot 'Microsoft.Compute/snapshots@2023-10-02' = { - name: resourceName - location: location - properties: { - creationData: { - createOption: 'Copy' - sourceResourceId: managedDisk.id - } - diskSizeGB: 30 - encryption: { - type: 'EncryptionAtRestWithPlatformKey' - } - hyperVGeneration: 'V1' - incremental: true - networkAccessPolicy: 'AllowAll' - osType: 'Linux' - publicNetworkAccess: 'Enabled' - supportedCapabilities: { - architecture: 'x64' - } - } - sku: { - name: 'Standard_ZRS' - } -} - -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: adminUsername - computerName: 'hostname230630032848831819' - linuxConfiguration: { - disablePasswordAuthentication: false - } - } - storageProfile: { - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '16.04-LTS' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - name: osDiskName - writeAcceleratorEnabled: false - } - } + enableAcceleratedNetworking: false + enableIPForwarding: false } } @@ -203,8 +195,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/basic/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep index 93a31595..a66ef1a7 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep @@ -19,9 +19,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -32,22 +30,9 @@ 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: null - adminUsername: null + adminPassword: adminPassword + adminUsername: adminUsername computerName: 'hostname230630032848831819' linuxConfiguration: { disablePasswordAuthentication: false @@ -67,6 +52,19 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { writeAcceleratorEnabled: false } } + hardwareProfile: { + vmSize: 'Standard_F2' + } + networkProfile: { + networkInterfaces: [ + { + id: networkInterface.id + properties: { + primary: false + } + } + ] + } } } @@ -87,8 +85,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..f02ff22c 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep @@ -4,32 +4,24 @@ param location string = 'westeurope' @description('The administrator password for the virtual machine') param vmAdminPassword string -resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { - name: resourceName - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'testconfiguration1' - properties: { - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } - } - } - ] - } -} - resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { + storageProfile: { + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' + } + osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' + name: 'myosdisk1' + writeAcceleratorEnabled: false + } + } hardwareProfile: { vmSize: 'Standard_F2' } @@ -44,26 +36,12 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null - 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 - } + adminPassword: vmAdminPassword + adminUsername: 'testadmin' } } } @@ -85,9 +63,9 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource extension 'Microsoft.Compute/virtualMachines/extensions@2023-03-01' = { - parent: virtualMachine name: resourceName location: location + parent: virtualMachine properties: { autoUpgradeMinorVersion: false enableAutomaticUpgrade: false @@ -105,14 +83,34 @@ resource extension 'Microsoft.Compute/virtualMachines/extensions@2023-03-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration1' + properties: { + subnet: {} + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + } + } + ] } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep index 7a26f542..af6796c1 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep @@ -1,35 +1,8 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' @secure() @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 -} +param resourceName string = 'acctest0001' resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: '${resourceName}-vm' @@ -39,31 +12,23 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { applicationProfile: { galleryApplications: [] } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_B2s' } networkProfile: { networkInterfaces: [ { - id: networkInterface.id properties: { primary: true } + id: networkInterface.id } ] } osProfile: { - adminPassword: null adminUsername: 'adminuser' allowExtensionOperations: true - computerName: 'acctest0001-vm' + computerName: '${resourceName}-vm' linuxConfiguration: { disablePasswordAuthentication: false patchSettings: { @@ -76,26 +41,54 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } } secrets: [] + adminPassword: adminPassword } priority: 'Regular' storageProfile: { dataDisks: [] imageReference: { + version: 'latest' offer: '0001-com-ubuntu-server-jammy' publisher: 'Canonical' sku: '22_04-lts' - version: 'latest' } osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' managedDisk: { storageAccountType: 'Premium_LRS' } osType: 'Linux' writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' } } + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' + } + } + extensionsTimeBudget: 'PT1H30M' + } +} + +resource runCommand 'Microsoft.Compute/virtualMachines/runCommands@2023-03-01' = { + name: '${resourceName}-runcommand' + location: location + parent: virtualMachine + properties: { + errorBlobUri: '' + source: { + script: 'echo \'hello world\'' + } + asyncExecution: false + outputBlobUri: '' + parameters: [] + protectedParameters: [] + runAsPassword: '' + runAsUser: '' + timeoutInSeconds: 1200 + treatFailureAsDeploymentFailure: true } } @@ -116,36 +109,41 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } } -resource runCommand 'Microsoft.Compute/virtualMachines/runCommands@2023-03-01' = { - parent: virtualMachine - name: '${resourceName}-runcommand' - location: location - properties: { - asyncExecution: false - errorBlobUri: '' - outputBlobUri: '' - parameters: [] - protectedParameters: [] - runAsPassword: '' - runAsUser: '' - source: { - script: 'echo \'hello world\'' - } - timeoutInSeconds: 1200 - treatFailureAsDeploymentFailure: true - } -} - resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' defaultOutboundAccess: true delegations: [] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] - 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: {} + } + } + ] + } +} + +resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: '${resourceName}-uai' + location: location +} diff --git a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep index 7fd25e57..2325ab51 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep @@ -4,22 +4,56 @@ param location string = 'westeurope' resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023-03-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_F2' + tier: 'Standard' + } properties: { - additionalCapabilities: {} - doNotRunExtensionsOnOverprovisionedVMs: false orchestrationMode: 'Uniform' - overprovision: true scaleInPolicy: { forceDeletion: false rules: [ 'Default' ] } - singlePlacementGroup: true - upgradePolicy: { - mode: 'Manual' - } virtualMachineProfile: { + osProfile: { + adminUsername: 'adminuser' + computerNamePrefix: resourceName + linuxConfiguration: { + disablePasswordAuthentication: true + provisionVMAgent: true + ssh: { + publicKeys: [ + { + keyData: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+wWK73dCr+jgQOAxNsHAnNNNMEMWOHYEccp6wJm2gotpr9katuF/ZAdou5AaW1C61slRkHRkpRRX9FA9CYBiitZgvCCz+3nWNN7l/Up54Zps/pHWGZLHNJZRYyAB6j5yVLMVHIHriY49d/GZTZVNB8GoJv9Gakwc/fuEZYYl4YDFiGMBP///TzlI4jhiJzjKnEvqPFki5p2ZRJqcbCiF4pJrxUQR/RXqVFQdbRLZgYfJ8xGB878RENq3yQ39d8dVOkq4edbkzwcUmwwwkYVPIoDGsYLaRHnG+To7FvMeyO7xDVQkMKzopTQV8AuKpyvpqu0a9pWOMaiCyDytO7GGN you@me.com' + path: '/home/adminuser/.ssh/authorized_keys' + } + ] + } + } + secrets: [] + } + priority: 'Regular' + storageProfile: { + osDisk: { + managedDisk: { + storageAccountType: 'Standard_LRS' + } + osType: 'Linux' + writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' + } + dataDisks: [] + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' + } + } diagnosticsProfile: { bootDiagnostics: { enabled: false @@ -34,74 +68,38 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- { name: 'example' properties: { - dnsSettings: { - dnsServers: [] - } enableAcceleratedNetworking: false enableIPForwarding: false ipConfigurations: [ { - name: 'internal' properties: { - applicationGatewayBackendAddressPools: [] applicationSecurityGroups: [] loadBalancerBackendAddressPools: [] loadBalancerInboundNatPools: [] primary: true privateIPAddressVersion: 'IPv4' - subnet: { - id: subnet.id - } + subnet: {} + applicationGatewayBackendAddressPools: [] } + name: 'internal' } ] primary: true + dnsSettings: { + dnsServers: [] + } } } ] } - osProfile: { - adminUsername: 'adminuser' - computerNamePrefix: 'acctest0001' - linuxConfiguration: { - disablePasswordAuthentication: true - provisionVMAgent: true - ssh: { - publicKeys: [ - { - keyData: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+wWK73dCr+jgQOAxNsHAnNNNMEMWOHYEccp6wJm2gotpr9katuF/ZAdou5AaW1C61slRkHRkpRRX9FA9CYBiitZgvCCz+3nWNN7l/Up54Zps/pHWGZLHNJZRYyAB6j5yVLMVHIHriY49d/GZTZVNB8GoJv9Gakwc/fuEZYYl4YDFiGMBP///TzlI4jhiJzjKnEvqPFki5p2ZRJqcbCiF4pJrxUQR/RXqVFQdbRLZgYfJ8xGB878RENq3yQ39d8dVOkq4edbkzwcUmwwwkYVPIoDGsYLaRHnG+To7FvMeyO7xDVQkMKzopTQV8AuKpyvpqu0a9pWOMaiCyDytO7GGN you@me.com' - path: '/home/adminuser/.ssh/authorized_keys' - } - ] - } - } - secrets: [] - } - priority: 'Regular' - storageProfile: { - dataDisks: [] - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '16.04-LTS' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - managedDisk: { - storageAccountType: 'Standard_LRS' - } - osType: 'Linux' - writeAcceleratorEnabled: false - } - } } - } - sku: { - capacity: 1 - name: 'Standard_F2' - tier: 'Standard' + additionalCapabilities: {} + doNotRunExtensionsOnOverprovisionedVMs: false + overprovision: true + singlePlacementGroup: true + upgradePolicy: { + mode: 'Manual' + } } } @@ -122,13 +120,13 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource extension 'Microsoft.Compute/virtualMachineScaleSets/extensions@2023-03-01' = { - parent: virtualMachineScaleSet name: resourceName + parent: virtualMachineScaleSet properties: { autoUpgradeMinorVersion: true enableAutomaticUpgrade: false - provisionAfterExtensions: [] publisher: 'Microsoft.Azure.Extensions' + provisionAfterExtensions: [] settings: { commandToExecute: 'echo $HOSTNAME' } @@ -139,14 +137,14 @@ resource extension 'Microsoft.Compute/virtualMachineScaleSets/extensions@2023-03 } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { + serviceEndpointPolicies: [] + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep index 149cea35..2e1554f7 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep @@ -4,31 +4,27 @@ 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: {} + singlePlacementGroup: true + upgradePolicy: { + mode: 'Manual' + } doNotRunExtensionsOnOverprovisionedVMs: false orchestrationMode: 'Uniform' overprovision: true scaleInPolicy: { - forceDeletion: false rules: [ 'Default' ] - } - singlePlacementGroup: true - upgradePolicy: { - mode: 'Manual' + forceDeletion: false } virtualMachineProfile: { - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - extensionProfile: { - extensionsTimeBudget: 'PT1H30M' - } networkProfile: { networkInterfaceConfigurations: [ { @@ -41,18 +37,16 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- enableIPForwarding: false ipConfigurations: [ { - name: 'internal' properties: { + primary: true + privateIPAddressVersion: 'IPv4' + subnet: {} applicationGatewayBackendAddressPools: [] applicationSecurityGroups: [] loadBalancerBackendAddressPools: [] loadBalancerInboundNatPools: [] - primary: true - privateIPAddressVersion: 'IPv4' - subnet: { - id: subnet.id - } } + name: 'internal' } ] primary: true @@ -62,7 +56,7 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } osProfile: { adminUsername: 'adminuser' - computerNamePrefix: 'acctest0001' + computerNamePrefix: resourceName linuxConfiguration: { disablePasswordAuthentication: true provisionVMAgent: true @@ -96,13 +90,17 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- writeAcceleratorEnabled: false } } + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' + } + } + extensionProfile: { + extensionsTimeBudget: 'PT1H30M' + } } } - sku: { - capacity: 1 - name: 'Standard_F2' - tier: 'Standard' - } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -122,14 +120,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { + serviceEndpointPolicies: [] + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep b/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep index 248c723d..a72c5eb3 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() } ] 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..ae8dd712 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 @@ -7,25 +15,25 @@ resource budget 'Microsoft.Consumption/budgets@2019-10-01' = { category: 'Cost' filter: { tags: { - name: 'foo' - operator: 'In' values: [ 'bar' ] + name: 'foo' + operator: 'In' } } notifications: { 'Actual_EqualTo_90.000000_Percent': { + enabled: true + operator: 'EqualTo' + threshold: 90 + thresholdType: 'Actual' contactEmails: [ 'foo@example.com' 'bar@example.com' ] contactGroups: [] contactRoles: [] - enabled: true - operator: 'EqualTo' - threshold: 90 - thresholdType: 'Actual' } } timeGrain: 'Monthly' diff --git a/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep b/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep index cd16892d..163f7cfc 100644 --- a/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep +++ b/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep @@ -29,7 +29,6 @@ resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' ] initContainers: [] ipAddress: { - autoGeneratedDomainNameLabelScope: 'Unsecure' ports: [ { port: 80 @@ -37,6 +36,7 @@ resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' } ] type: 'Public' + autoGeneratedDomainNameLabelScope: 'Unsecure' } osType: 'Linux' restartPolicy: 'Always' @@ -45,5 +45,4 @@ resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' tags: { environment: 'Testing' } - zones: [] } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep index d5cfa193..d66b7b67 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep @@ -1,18 +1,23 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Premium' + tier: 'Premium' + } properties: { - adminUserEnabled: false - anonymousPullEnabled: false dataEndpointEnabled: false encryption: { status: 'disabled' } networkRuleBypassOptions: 'AzureServices' policies: { + trustPolicy: { + status: 'disabled' + } exportPolicy: { status: 'enabled' } @@ -22,23 +27,18 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = retentionPolicy: { status: 'disabled' } - trustPolicy: { - status: 'disabled' - } } publicNetworkAccess: 'Enabled' + adminUserEnabled: false zoneRedundancy: 'Disabled' - } - sku: { - name: 'Premium' - tier: 'Premium' + anonymousPullEnabled: false } } 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..0920a4c5 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep @@ -4,12 +4,13 @@ param location string = 'westus' resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = { name: '${resourceName}registry' location: location + sku: { + name: 'Basic' + } properties: { - adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false networkRuleBypassOptions: 'AzureServices' policies: { + trustPolicy: {} exportPolicy: { status: 'enabled' } @@ -17,19 +18,18 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = status: 'disabled' } retentionPolicy: {} - trustPolicy: {} } publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Basic' + adminUserEnabled: false + anonymousPullEnabled: false + dataEndpointEnabled: false } } 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..ae139d7d 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,14 +25,11 @@ 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: { @@ -39,18 +39,17 @@ resource connectedRegistry 'Microsoft.ContainerRegistry/registries/connectedRegi mode: 'ReadWrite' parent: { syncProperties: { + syncWindow: '' messageTtl: 'P1D' schedule: '* * * * *' - syncWindow: '' - tokenId: token.id } } } } resource scopeMap 'Microsoft.ContainerRegistry/registries/scopeMaps@2023-11-01-preview' = { - parent: registry name: '${resourceName}scopemap' + parent: registry properties: { actions: [ 'repositories/hello-world/content/delete' @@ -58,18 +57,18 @@ resource scopeMap 'Microsoft.ContainerRegistry/registries/scopeMaps@2023-11-01-p 'repositories/hello-world/content/write' 'repositories/hello-world/metadata/read' 'repositories/hello-world/metadata/write' - 'gateway/acctest0001connectedregistry/config/read' - 'gateway/acctest0001connectedregistry/config/write' - 'gateway/acctest0001connectedregistry/message/read' - 'gateway/acctest0001connectedregistry/message/write' + 'gateway/${resourceName}connectedregistry/config/read' + 'gateway/${resourceName}connectedregistry/config/write' + 'gateway/${resourceName}connectedregistry/message/read' + 'gateway/${resourceName}connectedregistry/message/write' ] description: '' } } resource token 'Microsoft.ContainerRegistry/registries/tokens@2023-11-01-preview' = { - parent: registry name: '${resourceName}token' + parent: registry properties: { scopeMapId: scopeMap.id status: 'enabled' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep index 83e8da41..8ba5fb14 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep @@ -10,9 +10,10 @@ param credentialPassword string 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: { @@ -27,9 +28,8 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = } publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Basic' + adminUserEnabled: false + anonymousPullEnabled: false } } @@ -37,9 +37,17 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: '${resourceName}vault' location: location properties: { + enableSoftDelete: true + enabledForDeployment: false + publicNetworkAccess: 'Enabled' + sku: { + family: 'A' + name: 'standard' + } + softDeleteRetentionInDays: 7 + tenantId: tenant() accessPolicies: [ { - objectId: deployer().objectId permissions: { certificates: [] keys: [] @@ -51,34 +59,26 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { ] storage: [] } - tenantId: deployer().tenantId + tenantId: tenant() + objectId: deployer().objectId } ] createMode: 'default' - enableRbacAuthorization: false - enableSoftDelete: true - enabledForDeployment: false enabledForDiskEncryption: false enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' - sku: { - family: 'A' - name: 'standard' - } - softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId + enableRbacAuthorization: false } } resource credentialSet 'Microsoft.ContainerRegistry/registries/credentialSets@2023-07-01' = { - parent: registry name: '${resourceName}-acr-credential-set' + parent: registry properties: { authCredentials: [ { + passwordSecretIdentifier: 'https://${resourceName}vault.vault.azure.net/secrets/password' + usernameSecretIdentifier: 'https://${resourceName}vault.vault.azure.net/secrets/username' name: 'Credential1' - passwordSecretIdentifier: 'https://acctest0001vault.vault.azure.net/secrets/password' - usernameSecretIdentifier: 'https://acctest0001vault.vault.azure.net/secrets/username' } ] 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..7d50b8c5 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep @@ -4,8 +4,11 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Standard' + tier: 'Standard' + } properties: { - adminUserEnabled: false anonymousPullEnabled: false dataEndpointEnabled: false encryption: { @@ -26,11 +29,8 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = status: 'disabled' } } + adminUserEnabled: false 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..a15eda06 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep @@ -4,40 +4,40 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Premium' + tier: 'Premium' + } properties: { + zoneRedundancy: 'Disabled' adminUserEnabled: false anonymousPullEnabled: false - dataEndpointEnabled: false - encryption: { - status: 'disabled' - } networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } - quarantinePolicy: { - status: 'disabled' - } retentionPolicy: { status: 'disabled' } trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } + quarantinePolicy: { + status: 'disabled' + } } publicNetworkAccess: 'Enabled' - zoneRedundancy: 'Disabled' - } - sku: { - name: 'Premium' - tier: 'Premium' + dataEndpointEnabled: false + encryption: { + status: 'disabled' + } } } 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..80d269d9 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep @@ -1,21 +1,20 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Standard' + tier: 'Standard' + } properties: { - adminUserEnabled: false anonymousPullEnabled: false dataEndpointEnabled: false encryption: { status: 'disabled' } - networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } quarantinePolicy: { status: 'disabled' } @@ -25,20 +24,21 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } } publicNetworkAccess: 'Enabled' + adminUserEnabled: false + networkRuleBypassOptions: 'AzureServices' 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..f50dde6e 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep @@ -4,10 +4,11 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Basic' + tier: 'Basic' + } properties: { - adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false encryption: { status: 'disabled' } @@ -28,17 +29,16 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = } publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Basic' - tier: 'Basic' + adminUserEnabled: false + anonymousPullEnabled: false + dataEndpointEnabled: false } } resource task 'Microsoft.ContainerRegistry/registries/tasks@2019-06-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { isSystemTask: true status: 'Enabled' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep index b4380ac1..a1a94518 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep @@ -1,43 +1,43 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + name: 'Premium' + tier: 'Premium' + } properties: { - adminUserEnabled: true - anonymousPullEnabled: false - dataEndpointEnabled: false - encryption: { - status: 'disabled' - } - networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } - quarantinePolicy: { - status: 'disabled' - } retentionPolicy: { status: 'disabled' } trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } + quarantinePolicy: { + status: 'disabled' + } } publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Premium' - tier: 'Premium' + adminUserEnabled: true + encryption: { + status: 'disabled' + } + anonymousPullEnabled: false + dataEndpointEnabled: false + networkRuleBypassOptions: 'AzureServices' } } 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..c990af70 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep @@ -4,10 +4,11 @@ param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName location: location + sku: { + tier: 'Standard' + name: 'Standard' + } properties: { - adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false encryption: { status: 'disabled' } @@ -28,17 +29,16 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = } publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Standard' - tier: 'Standard' + adminUserEnabled: false + anonymousPullEnabled: false + dataEndpointEnabled: false } } resource webHook 'Microsoft.ContainerRegistry/registries/webHooks@2021-08-01-preview' = { - parent: registry name: resourceName location: location + parent: registry properties: { actions: [ 'push' diff --git a/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep b/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep index 627308ea..7fa34adb 100644 --- a/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep @@ -10,31 +10,34 @@ resource fleet 'Microsoft.ContainerService/fleets@2024-04-01' = { resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' = { name: resourceName location: location + sku: { + tier: 'Free' + name: 'Base' + } properties: { - addonProfiles: {} agentPoolProfiles: [ { + kubeletDiskType: '' + osDiskType: 'Managed' + osType: 'Linux' count: 1 enableAutoScaling: false enableEncryptionAtHost: false - enableFIPS: false - enableNodePublicIP: false enableUltraSSD: false - kubeletDiskType: '' - mode: 'System' - name: 'default' - nodeLabels: {} - osDiskType: 'Managed' - osType: 'Linux' scaleDownMode: 'Delete' tags: {} - type: 'VirtualMachineScaleSets' upgradeSettings: { + nodeSoakDurationInMinutes: 0 drainTimeoutInMinutes: 0 maxSurge: '10%' - nodeSoakDurationInMinutes: 0 } + enableFIPS: false + nodeLabels: {} + type: 'VirtualMachineScaleSets' vmSize: 'Standard_B2s' + enableNodePublicIP: false + mode: 'System' + name: 'default' } ] apiServerAccessProfile: { @@ -52,30 +55,27 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' } } disableLocalAccounts: false - dnsPrefix: 'acctest0001' enableRBAC: true - kubernetesVersion: '' metricsProfile: { costAnalysis: { enabled: false } } nodeResourceGroup: '' + addonProfiles: {} + dnsPrefix: '${resourceName}' + kubernetesVersion: '' securityProfile: {} servicePrincipalProfile: { clientId: 'msi' } 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..661d26d2 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep @@ -5,6 +5,7 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p name: resourceName location: location properties: { + dnsPrefix: '${resourceName}' agentPoolProfiles: [ { count: 1 @@ -13,13 +14,12 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p vmSize: 'Standard_DS2_v2' } ] - dnsPrefix: 'acctest0001' } } 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..ec81acfc 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/main.bicep @@ -13,6 +13,6 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p vmSize: 'Standard_DS2_v2' } ] - dnsPrefix: 'acctest0001' + dnsPrefix: '${resourceName}' } } diff --git a/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep b/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep index 25a49290..6580c21c 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep @@ -1,41 +1,24 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: 'ai-${resourceName}' - location: location - kind: 'web' - properties: { - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - } -} - resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' = { name: 'aks-${resourceName}' location: location + sku: { + name: 'Base' + tier: 'Free' + } properties: { + securityProfile: {} + servicePrincipalProfile: { + clientId: 'msi' + } addonProfiles: {} agentPoolProfiles: [ { - count: 1 - enableAutoScaling: false - enableEncryptionAtHost: false enableFIPS: false - enableNodePublicIP: false enableUltraSSD: false - kubeletDiskType: '' mode: 'System' - name: 'default' - nodeLabels: {} - osDiskType: 'Managed' - osType: 'Linux' scaleDownMode: 'Delete' tags: {} type: 'VirtualMachineScaleSets' @@ -44,14 +27,18 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' maxSurge: '10%' nodeSoakDurationInMinutes: 0 } + name: 'default' vmSize: 'Standard_B2s' + enableEncryptionAtHost: false + enableNodePublicIP: false + osType: 'Linux' + count: 1 + enableAutoScaling: false + kubeletDiskType: '' + nodeLabels: {} + osDiskType: 'Managed' } ] - apiServerAccessProfile: { - disableRunCommand: false - enablePrivateCluster: false - enablePrivateClusterPublicFQDN: false - } autoUpgradeProfile: { nodeOSUpgradeChannel: 'NodeImage' upgradeChannel: 'none' @@ -61,39 +48,44 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' enabled: false } } - disableLocalAccounts: false - dnsPrefix: 'aks-acctest0001' - enableRBAC: true kubernetesVersion: '' metricsProfile: { costAnalysis: { enabled: false } } - nodeResourceGroup: '' - securityProfile: {} - servicePrincipalProfile: { - clientId: 'msi' - } supportPlan: 'KubernetesOfficial' - } - sku: { - name: 'Base' - tier: 'Free' + apiServerAccessProfile: { + enablePrivateClusterPublicFQDN: false + disableRunCommand: false + enablePrivateCluster: false + } + disableLocalAccounts: false + dnsPrefix: 'aks-${resourceName}' + enableRBAC: true + nodeResourceGroup: '' } } resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: 'st${resourceName}' location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' allowBlobPublicAccess: true + isSftpEnabled: false allowCrossTenantReplication: false + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true allowSharedKeyAccess: true defaultToOAuthAuthentication: false dnsEndpointType: 'Standard' + isHnsEnabled: false + isNfsV3Enabled: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -105,11 +97,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - isHnsEnabled: false isLocalUserEnabled: true - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { bypass: 'AzureServices' defaultAction: 'Allow' @@ -117,11 +105,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { resourceAccessRules: [] virtualNetworkRules: [] } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + accessTier: 'Hot' } } @@ -133,6 +117,8 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { createMode: 'default' enableRbacAuthorization: false enabledForDeployment: false + softDeleteRetentionInDays: 7 + tenantId: tenant() enabledForDiskEncryption: false enabledForTemplateDeployment: false publicNetworkAccess: 'Enabled' @@ -140,14 +126,16 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { family: 'A' name: 'standard' } - softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId } } resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-04-01' = { name: 'mlw-${resourceName}' location: location + sku: { + name: 'Basic' + tier: 'Basic' + } kind: 'Default' properties: { applicationInsights: component.id @@ -156,15 +144,11 @@ resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-04-01' = { storageAccount: storageAccount.id v1LegacyMode: false } - sku: { - name: 'Basic' - tier: 'Basic' - } } resource trustedAccessRoleBinding 'Microsoft.ContainerService/managedClusters/trustedAccessRoleBindings@2025-02-01' = { - parent: managedCluster name: 'tarb-${resourceName}' + parent: managedCluster properties: { roles: [ 'Microsoft.MachineLearningServices/workspaces/mlworkload' @@ -172,3 +156,19 @@ resource trustedAccessRoleBinding 'Microsoft.ContainerService/managedClusters/tr sourceResourceId: workspace.id } } + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: 'ai-${resourceName}' + location: location + kind: 'web' + properties: { + publicNetworkAccessForIngestion: 'Enabled' + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' + SamplingPercentage: 100 + } +} diff --git a/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep b/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep index 1eb2dc82..dbe54ec2 100644 --- a/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep +++ b/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep @@ -1,11 +1,25 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' resource scheduledAction 'Microsoft.CostManagement/scheduledActions@2022-10-01' = { name: resourceName + scope: subscription() kind: 'Email' properties: { + notificationEmail: 'test@test.com' + schedule: { + daysOfWeek: null + endDate: '2023-07-02T00:00:00Z' + frequency: 'Daily' + hourOfDay: 0 + startDate: '2023-07-01T00:00:00Z' + weeksOfMonth: null + dayOfMonth: 0 + } + status: 'Enabled' + viewId: resourceId('Microsoft.CostManagement/views', 'ms:CostByService') displayName: 'CostByServiceViewerz3k' fileDestination: { fileFormats: [] @@ -18,17 +32,5 @@ resource scheduledAction 'Microsoft.CostManagement/scheduledActions@2022-10-01' 'hashicorp@test.com' ] } - notificationEmail: 'test@test.com' - schedule: { - dayOfMonth: 0 - daysOfWeek: null - endDate: '2023-07-02T00:00:00Z' - frequency: 'Daily' - hourOfDay: 0 - startDate: '2023-07-01T00:00:00Z' - weeksOfMonth: null - } - status: 'Enabled' - viewId: resourceId('Microsoft.CostManagement/views', 'ms:CostByService') } } diff --git a/settings/remarks/microsoft.costmanagement/samples/views/main.bicep b/settings/remarks/microsoft.costmanagement/samples/views/main.bicep index be056d90..73d26d45 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 @@ -49,8 +48,8 @@ resource view 'Microsoft.CostManagement/views@2022-10-01' = { ] sorting: [ { - direction: 'Ascending' name: 'BillingMonth' + direction: 'Ascending' } ] } diff --git a/settings/remarks/microsoft.customproviders/samples/resourceproviders/main.bicep b/settings/remarks/microsoft.customproviders/samples/resourceproviders/main.bicep index 9cfb6695..8464410a 100644 --- a/settings/remarks/microsoft.customproviders/samples/resourceproviders/main.bicep +++ b/settings/remarks/microsoft.customproviders/samples/resourceproviders/main.bicep @@ -7,9 +7,9 @@ resource resourceProvider 'Microsoft.CustomProviders/resourceProviders@2018-09-0 properties: { resourceTypes: [ { - endpoint: 'https://example.com/' name: 'dEf1' routingType: 'Proxy' + endpoint: 'https://example.com/' } ] } diff --git a/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep b/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep index 042f70ca..9c6a6b79 100644 --- a/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep +++ b/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep @@ -4,14 +4,14 @@ param location string = 'westeurope' resource grafana 'Microsoft.Dashboard/grafana@2022-08-01' = { name: resourceName location: location + sku: { + name: 'Standard' + } properties: { - apiKey: 'Disabled' autoGeneratedDomainNameLabelScope: 'TenantReuse' deterministicOutboundIP: 'Disabled' publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - } - sku: { - name: 'Standard' + apiKey: 'Disabled' } } diff --git a/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep b/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep index 71e55b93..cc5099c2 100644 --- a/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep @@ -12,6 +12,9 @@ resource account 'Microsoft.Monitor/accounts@2023-04-03' = { resource grafana 'Microsoft.Dashboard/grafana@2023-09-01' = { name: '${resourceName}-graf' location: location + sku: { + name: 'Standard' + } properties: { apiKey: 'Disabled' autoGeneratedDomainNameLabelScope: 'TenantReuse' @@ -20,22 +23,19 @@ resource grafana 'Microsoft.Dashboard/grafana@2023-09-01' = { publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' } - sku: { - name: 'Standard' - } } resource managedPrivateEndpoint 'Microsoft.Dashboard/grafana/managedPrivateEndpoints@2023-09-01' = { - parent: grafana name: '${resourceName}-mpe' location: location + parent: grafana properties: { + requestMessage: '' groupIds: [ 'prometheusMetrics' ] privateLinkResourceId: account.id - privateLinkResourceRegion: 'eastus' + privateLinkResourceRegion: location privateLinkServiceUrl: '' - requestMessage: '' } } diff --git a/settings/remarks/microsoft.databricks/samples/workspaces/main.bicep b/settings/remarks/microsoft.databricks/samples/workspaces/main.bicep index 73fa901d..6892df12 100644 --- a/settings/remarks/microsoft.databricks/samples/workspaces/main.bicep +++ b/settings/remarks/microsoft.databricks/samples/workspaces/main.bicep @@ -4,8 +4,11 @@ param location string = 'eastus2' resource workspace 'Microsoft.Databricks/workspaces@2023-02-01' = { name: resourceName location: location + sku: { + name: 'premium' + } properties: { - managedResourceGroupId: resourceId('Microsoft.Resources/resourceGroups', 'databricks-rg-${resourceName}') + managedResourceGroupId: resourceGroup().id parameters: { prepareEncryption: { value: true @@ -16,7 +19,4 @@ resource workspace 'Microsoft.Databricks/workspaces@2023-02-01' = { } publicNetworkAccess: 'Enabled' } - sku: { - name: 'premium' - } } diff --git a/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep b/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep index a75f36b6..e46b581f 100644 --- a/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep +++ b/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep @@ -1,41 +1,22 @@ 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.1.0/24' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - resource workspace 'Microsoft.Databricks/workspaces@2023-02-01' = { name: resourceName location: location - properties: { - managedResourceGroupId: resourceId('Microsoft.Resources/resourceGroups', 'databricks-rg-${resourceName}') - publicNetworkAccess: 'Enabled' - } sku: { name: 'standard' } + properties: { + publicNetworkAccess: 'Enabled' + managedResourceGroupId: resourceGroup().id + } } resource virtualNetworkPeering 'Microsoft.Databricks/workspaces/virtualNetworkPeerings@2023-02-01' = { - parent: workspace name: resourceName + parent: workspace properties: { - allowForwardedTraffic: false - allowGatewayTransit: false - allowVirtualNetworkAccess: true databricksAddressSpace: { addressPrefixes: [ '10.139.0.0/16' @@ -50,5 +31,24 @@ resource virtualNetworkPeering 'Microsoft.Databricks/workspaces/virtualNetworkPe id: virtualNetwork.id } useRemoteGateways: false + allowForwardedTraffic: false + allowGatewayTransit: false + allowVirtualNetworkAccess: true + } +} + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.1.0/24' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] } } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep index 74ba3e81..0afb1869 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep @@ -10,21 +10,22 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } } -resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { - name: resourceName -} - resource credential 'Microsoft.DataFactory/factories/credentials@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { + type: 'ManagedIdentity' annotations: [ 'test' ] description: 'this is a test' - type: 'ManagedIdentity' typeProperties: { resourceId: userAssignedIdentity.id } } } + +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..688fa489 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep @@ -13,13 +13,13 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true + supportsHttpsTrafficOnly: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -31,24 +31,24 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + accessTier: 'Hot' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + defaultToOAuthAuthentication: false + isHnsEnabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' } } resource dataflow 'Microsoft.DataFactory/factories/dataflows@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'Flowlet' @@ -67,13 +67,12 @@ source1 sink( ''' sinks: [ { + name: 'sink1' description: '' linkedService: { parameters: {} - referenceName: linkedservice.name type: 'LinkedServiceReference' } - name: 'sink1' } ] sources: [ @@ -81,7 +80,6 @@ source1 sink( description: '' linkedService: { parameters: {} - referenceName: linkedservice.name type: 'LinkedServiceReference' } name: 'source1' @@ -92,8 +90,8 @@ source1 sink( } resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'AzureBlobStorage' diff --git a/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep index 8f874454..8f940739 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/datasets/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 @@ -13,46 +13,45 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } accessTier: 'Hot' allowBlobPublicAccess: true - allowCrossTenantReplication: true allowSharedKeyAccess: true defaultToOAuthAuthentication: false + isNfsV3Enabled: false + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + allowCrossTenantReplication: true encryption: { keySource: 'Microsoft.Storage' services: { - queue: { + table: { keyType: 'Service' } - table: { + queue: { keyType: 'Service' } } } isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } resource dataset 'Microsoft.DataFactory/factories/datasets@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' linkedServiceName: { - referenceName: linkedservice.name type: 'LinkedServiceReference' } type: 'Json' @@ -69,8 +68,8 @@ resource dataset 'Microsoft.DataFactory/factories/datasets@2018-06-01' = { } resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'AzureBlobStorage' diff --git a/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep index 0b9e810d..1147b531 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep @@ -11,8 +11,8 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } resource integrationRuntime 'Microsoft.DataFactory/factories/integrationRuntimes@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'SelfHosted' diff --git a/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep index 6eb10574..3d11a402 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep @@ -13,15 +13,17 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + supportsHttpsTrafficOnly: true + accessTier: 'Hot' encryption: { - keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -30,25 +32,23 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true } } resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' type: 'AzureBlobStorage' diff --git a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep index bf26c35b..1d550e51 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep @@ -5,14 +5,14 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { name: resourceName location: location properties: { + repoConfiguration: null globalParameters: {} publicNetworkAccess: 'Enabled' - repoConfiguration: null } } resource managedVirtualNetwork 'Microsoft.DataFactory/factories/managedVirtualNetworks@2018-06-01' = { - parent: factory name: 'default' + parent: factory properties: {} } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep index aecaf32e..ce1c53f8 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep @@ -14,9 +14,19 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'BlobStorage' properties: { + isSftpEnabled: false accessTier: 'Hot' + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true @@ -34,28 +44,18 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } isHnsEnabled: false isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } resource managedVirtualNetwork 'Microsoft.DataFactory/factories/managedVirtualNetworks@2018-06-01' = { - parent: factory name: 'default' + parent: factory properties: {} } resource managedPrivateEndpoint 'Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints@2018-06-01' = { - parent: managedVirtualNetwork name: resourceName + parent: managedVirtualNetwork properties: { groupId: 'blob' privateLinkResourceId: storageAccount.id diff --git a/settings/remarks/microsoft.datafactory/samples/factories/pipelines/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/pipelines/main.bicep index a17dd9d8..8d6c2e91 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/pipelines/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/pipelines/main.bicep @@ -11,8 +11,8 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } resource pipeline 'Microsoft.DataFactory/factories/pipelines@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { annotations: [] description: '' diff --git a/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep index 4921a197..693bc09b 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep @@ -5,30 +5,14 @@ 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 - properties: { - annotations: [] - description: '' - parameters: { - test: { - defaultValue: 'testparameter' - type: 'String' - } - } - variables: {} + publicNetworkAccess: 'Enabled' } } resource trigger 'Microsoft.DataFactory/factories/triggers@2018-06-01' = { - parent: factory name: resourceName + parent: factory properties: { description: '' pipeline: { @@ -47,3 +31,19 @@ resource trigger 'Microsoft.DataFactory/factories/triggers@2018-06-01' = { } } } + +resource pipeline 'Microsoft.DataFactory/factories/pipelines@2018-06-01' = { + name: resourceName + parent: factory + properties: { + parameters: { + test: { + type: 'String' + defaultValue: 'testparameter' + } + } + variables: {} + annotations: [] + description: '' + } +} diff --git a/settings/remarks/microsoft.datamigration/samples/services/main.bicep b/settings/remarks/microsoft.datamigration/samples/services/main.bicep index 655e65d7..86c80b14 100644 --- a/settings/remarks/microsoft.datamigration/samples/services/main.bicep +++ b/settings/remarks/microsoft.datamigration/samples/services/main.bicep @@ -4,13 +4,11 @@ param location string = 'westeurope' resource service 'Microsoft.DataMigration/services@2018-04-19' = { name: resourceName location: location - kind: 'Cloud' - properties: { - virtualSubnetId: subnet.id - } sku: { name: 'Standard_1vCores' } + kind: 'Cloud' + properties: {} } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -30,8 +28,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.1.0/24' delegations: [] diff --git a/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep b/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep index 097ee330..5677b9b0 100644 --- a/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep +++ b/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep @@ -4,13 +4,11 @@ param location string = 'westeurope' resource service 'Microsoft.DataMigration/services@2018-04-19' = { name: resourceName location: location - kind: 'Cloud' - properties: { - virtualSubnetId: subnet.id - } sku: { name: 'Standard_1vCores' } + kind: 'Cloud' + properties: {} } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { @@ -30,9 +28,9 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource project 'Microsoft.DataMigration/services/projects@2018-04-19' = { - parent: service name: resourceName location: location + parent: service properties: { sourcePlatform: 'SQL' targetPlatform: 'SQLDB' @@ -40,14 +38,14 @@ resource project 'Microsoft.DataMigration/services/projects@2018-04-19' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { + serviceEndpointPolicies: [] + serviceEndpoints: [] addressPrefix: '10.0.1.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep index 85769b4f..01c712c4 100644 --- a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep @@ -4,55 +4,52 @@ param location string = 'westeurope' @description('The administrator login password for the PostgreSQL server') param administratorLoginPassword string -resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { - name: resourceName - location: location - properties: { - storageSettings: [ - { - datastoreType: 'VaultStore' - type: 'LocallyRedundant' - } - ] - } -} - resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'B_Gen5_2' + tier: 'Basic' + } properties: { administratorLogin: 'psqladmin' - administratorLoginPassword: null createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 5120 } + administratorLoginPassword: '${administratorLoginPassword}' + infrastructureEncryption: 'Disabled' + minimalTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' version: '9.5' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'B_Gen5_2' - tier: 'Basic' +} + +resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { + name: resourceName + location: location + properties: { + storageSettings: [ + { + datastoreType: 'VaultStore' + type: 'LocallyRedundant' + } + ] } } resource backupInstance 'Microsoft.DataProtection/backupVaults/backupInstances@2022-04-01' = { - parent: backupVault name: resourceName + parent: backupVault properties: { dataSourceInfo: { datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' objectType: 'Datasource' - resourceID: database.id - resourceLocation: 'database.location' - resourceName: database.name resourceType: 'Microsoft.DBforPostgreSQL/servers/databases' resourceUri: '' } @@ -60,23 +57,21 @@ 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 - } + policyInfo: {} } } resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022-04-01' = { - parent: backupVault name: resourceName + parent: backupVault properties: { datasourceTypes: [ 'Microsoft.DBforPostgreSQL/servers/databases' @@ -103,17 +98,18 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 } taggingCriteria: [ { - isDefault: true tagInfo: { id: 'Default_' tagName: 'Default' } taggingPriority: 99 + isDefault: true } ] } } { + objectType: 'AzureRetentionRule' isDefault: true lifecycles: [ { @@ -129,15 +125,14 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 } ] name: 'Default' - objectType: 'AzureRetentionRule' } ] } } 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..722a5749 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 @@ -7,26 +7,22 @@ resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { properties: { storageSettings: [ { - datastoreType: 'VaultStore' type: 'LocallyRedundant' + datastoreType: 'VaultStore' } ] } } resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022-04-01' = { - parent: backupVault name: resourceName + parent: backupVault properties: { - datasourceTypes: [ - 'Microsoft.DBforPostgreSQL/servers/databases' - ] - objectType: 'BackupPolicy' policyRules: [ { backupParameters: { - backupType: 'Full' objectType: 'AzureBackupParams' + backupType: 'Full' } dataStore: { dataStoreType: 'VaultStore' @@ -35,22 +31,22 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 name: 'BackupIntervals' objectType: 'AzureBackupRule' trigger: { - objectType: 'ScheduleBasedTriggerContext' - schedule: { - repeatingTimeIntervals: [ - 'R/2021-05-23T02:30:00+00:00/P1W' - ] - } taggingCriteria: [ { - isDefault: true tagInfo: { id: 'Default_' tagName: 'Default' } taggingPriority: 99 + isDefault: true } ] + objectType: 'ScheduleBasedTriggerContext' + schedule: { + repeatingTimeIntervals: [ + 'R/2021-05-23T02:30:00+00:00/P1W' + ] + } } } { @@ -72,5 +68,9 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 objectType: 'AzureRetentionRule' } ] + datasourceTypes: [ + 'Microsoft.DBforPostgreSQL/servers/databases' + ] + objectType: 'BackupPolicy' } } diff --git a/settings/remarks/microsoft.dataprotection/samples/resourceguards/main.bicep b/settings/remarks/microsoft.dataprotection/samples/resourceguards/main.bicep index 388188e4..afec4f52 100644 --- a/settings/remarks/microsoft.dataprotection/samples/resourceguards/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/resourceguards/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource resourceGuard 'Microsoft.DataProtection/resourceGuards@2022-04-01' = { name: resourceName 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..204a4994 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep @@ -1,20 +1,25 @@ -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' +param location string = 'westeurope' resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 @@ -22,18 +27,13 @@ resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { storageMB: 51200 } version: '10.2' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + minimalTlsVersion: 'TLS1_2' } } resource configuration 'Microsoft.DBforMariaDB/servers/configurations@2018-06-01' = { - parent: server name: 'character_set_server' + parent: server properties: { value: 'LATIN1' } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep index deeb5349..e22ee0bc 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep @@ -1,39 +1,39 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the MariaDB server') param administratorLogin string @secure() @description('The administrator login password for the MariaDB server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'B_Gen5_2' + tier: 'Basic' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + version: '10.2' + createMode: 'Default' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } - 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..815d1915 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep @@ -1,39 +1,39 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the MariaDB server') param administratorLogin string @secure() @description('The administrator login password for the MariaDB server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' createMode: 'Default' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: 'TLS1_2' 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..5f216302 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep @@ -9,11 +9,16 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' minimalTlsVersion: 'TLS1_2' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { @@ -22,11 +27,6 @@ resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { storageMB: 51200 } version: '10.2' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + createMode: 'Default' } } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep index a29902eb..f064b127 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep @@ -1,34 +1,34 @@ -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' +param location string = 'westeurope' resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location + sku: { + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' createMode: 'Default' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { + storageMB: 51200 backupRetentionDays: 7 storageAutogrow: 'Enabled' - storageMB: 51200 } version: '10.2' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } 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..0432b97c 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep @@ -4,16 +4,19 @@ param location string = 'westus' @description('The administrator login password for the MySQL flexible server') param administratorLoginPassword string +resource userassignedidentity1 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: '${resourceName}-uai2' + location: location +} + resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { name: '${resourceName}-mysql' location: location + sku: { + tier: 'Burstable' + name: 'Standard_B1ms' + } properties: { - administratorLogin: 'tfadmin' - administratorLoginPassword: null - backup: { - backupRetentionDays: 7 - geoRedundantBackup: 'Disabled' - } dataEncryption: { type: 'SystemManaged' } @@ -21,31 +24,28 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { mode: 'Disabled' } version: '8.0.21' - } - sku: { - name: 'Standard_B1ms' - tier: 'Burstable' + administratorLogin: 'tfadmin' + administratorLoginPassword: '${administratorLoginPassword}' + backup: { + backupRetentionDays: 7 + geoRedundantBackup: 'Disabled' + } } } -resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { - name: '${resourceName}-uai1' - location: location -} - -resource userassignedidentity1 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { - name: '${resourceName}-uai2' - location: location -} - 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() + administratorType: 'ActiveDirectory' } } + +resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: '${resourceName}-uai1' + location: location +} diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep index f6ea8f5b..ffa46d43 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep @@ -7,13 +7,11 @@ 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 - backup: { - backupRetentionDays: 7 - geoRedundantBackup: 'Disabled' - } dataEncryption: { type: 'SystemManaged' } @@ -21,16 +19,18 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { mode: 'Disabled' } version: '8.0.21' - } - sku: { - name: 'Standard_B1ms' - tier: 'Burstable' + administratorLogin: 'tfadmin' + administratorLoginPassword: '${administratorLoginPassword}' + backup: { + backupRetentionDays: 7 + geoRedundantBackup: 'Disabled' + } } } 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..23eaee1b 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep @@ -9,32 +9,32 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { name: resourceName location: location + sku: { + name: 'Standard_B1s' + tier: 'Burstable' + } properties: { - administratorLogin: null - administratorLoginPassword: null + createMode: '' + highAvailability: { + mode: 'Disabled' + } + network: {} + version: '' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' } - createMode: '' dataEncryption: { type: 'SystemManaged' } - highAvailability: { - mode: 'Disabled' - } - network: {} - version: '' - } - sku: { - name: 'Standard_B1s' - tier: 'Burstable' } } resource database 'Microsoft.DBforMySQL/flexibleServers/databases@2021-05-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { charset: 'utf8' collation: 'utf8_unicode_ci' diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep index 01af1e66..75dbe674 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep @@ -7,32 +7,32 @@ param mysqlAdministratorPassword string resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { name: resourceName location: location + sku: { + name: 'Standard_B1s' + tier: 'Burstable' + } properties: { + createMode: '' + dataEncryption: { + type: 'SystemManaged' + } administratorLogin: 'adminTerraform' - administratorLoginPassword: null + administratorLoginPassword: '${mysqlAdministratorPassword}' backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' } - createMode: '' - dataEncryption: { - type: 'SystemManaged' - } highAvailability: { mode: 'Disabled' } network: {} version: '5.7' } - sku: { - name: 'Standard_B1s' - tier: 'Burstable' - } } resource firewallRule 'Microsoft.DBforMySQL/flexibleServers/firewallRules@2021-05-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { endIpAddress: '255.255.255.255' startIpAddress: '0.0.0.0' diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep index 93c05978..0bd0753a 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep @@ -9,13 +9,11 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { name: resourceName location: location + sku: { + name: 'Standard_B1s' + tier: 'Burstable' + } properties: { - administratorLogin: null - administratorLoginPassword: null - backup: { - backupRetentionDays: 7 - geoRedundantBackup: 'Disabled' - } createMode: '' dataEncryption: { type: 'SystemManaged' @@ -24,9 +22,11 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { mode: 'Disabled' } network: {} - } - sku: { - name: 'Standard_B1s' - tier: 'Burstable' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + backup: { + backupRetentionDays: 7 + geoRedundantBackup: 'Disabled' + } } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep index d06f8361..e4a4b26c 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep @@ -6,39 +6,41 @@ param administratorLogin string @description('The administrator login password for the MySQL server') param administratorLoginPassword string +param clientId string + resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + family: 'Gen5' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' + administratorLogin: '${administratorLogin}' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' + minimalTlsVersion: 'TLS1_2' } } 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() } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep index 28c38190..2fde956c 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep @@ -9,32 +9,32 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + } properties: { - administratorLogin: null - administratorLoginPassword: null + sslEnforcement: 'Enabled' + version: '5.7' createMode: 'Default' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } - version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + infrastructureEncryption: 'Disabled' + publicNetworkAccess: 'Enabled' } } 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..303ca953 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep @@ -1,39 +1,39 @@ -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 + administratorLoginPassword: '${administratorLoginPassword}' createMode: 'Default' infrastructureEncryption: 'Disabled' + sslEnforcement: 'Enabled' + version: '5.7' minimalTlsVersion: 'TLS1_1' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { storageAutogrow: 'Enabled' storageMB: 51200 } - version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' } } 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..d8fa2d8b 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep @@ -1,40 +1,40 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the MySQL server') param administratorLogin string @secure() @description('The administrator login password for the MySQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' + sslEnforcement: 'Enabled' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + createMode: 'Default' + minimalTlsVersion: 'TLS1_2' } } 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..c073d954 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep @@ -9,10 +9,13 @@ param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + tier: 'GeneralPurpose' + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_1' publicNetworkAccess: 'Enabled' @@ -21,12 +24,9 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { storageAutogrow: 'Enabled' storageMB: 51200 } + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' 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..24e28064 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep @@ -1,34 +1,34 @@ +@secure() +@description('The administrator login password for the MySQL server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the MySQL server') param administratorLogin string -@secure() -@description('The administrator login password for the MySQL server') -param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } + createMode: 'Default' + minimalTlsVersion: 'TLS1_2' + sslEnforcement: 'Enabled' version: '5.7' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' } } @@ -49,11 +49,9 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.7.29.0/29' - delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] @@ -62,14 +60,16 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { service: 'Microsoft.Sql' } ] + addressPrefix: '10.7.29.0/29' + delegations: [] } } resource virtualNetworkRule 'Microsoft.DBforMySQL/servers/virtualNetworkRules@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { - ignoreMissingVnetServiceEndpoint: false virtualNetworkSubnetId: subnet.id + ignoreMissingVnetServiceEndpoint: false } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep index a53943c6..7e5c33e1 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep @@ -1,21 +1,23 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @description('The administrator login for the PostgreSQL flexible server') param administratorLogin string @secure() @description('The administrator login password for the PostgreSQL flexible server') param administratorLoginPassword string +param resourceName string = 'acctest0001' +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: null - administratorLoginPassword: null authConfig: { activeDirectoryAuth: 'Enabled' passwordAuth: 'Enabled' - tenantId: deployer().tenantId + tenantId: tenant() } availabilityZone: '2' backup: { @@ -28,19 +30,17 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = storage: { storageSizeGB: 32 } + administratorLogin: administratorLogin + administratorLoginPassword: administratorLoginPassword 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() } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep index 29b9710c..d72c60e6 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep @@ -7,49 +7,49 @@ param postgresqlAdministratorPassword string resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-preview' = { name: resourceName location: location - identity: { - type: 'None' - userAssignedIdentities: null + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' } properties: { + highAvailability: { + mode: 'Disabled' + } + version: '12' administratorLogin: 'adminTerraform' - administratorLoginPassword: null + administratorLoginPassword: '${postgresqlAdministratorPassword}' availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' } - highAvailability: { - mode: 'Disabled' - } network: {} storage: { storageSizeGB: 32 } - version: '12' } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' + identity: { + type: 'None' + userAssignedIdentities: null } } -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..ec352c67 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep @@ -7,31 +7,31 @@ param postgresqlAdministratorPassword string resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = { name: resourceName location: location + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' + } properties: { administratorLogin: 'adminTerraform' - administratorLoginPassword: null + administratorLoginPassword: '${postgresqlAdministratorPassword}' availabilityZone: '2' + network: {} + storage: { + storageSizeGB: 32 + } backup: { geoRedundantBackup: 'Disabled' } highAvailability: { mode: 'Disabled' } - network: {} - storage: { - storageSizeGB: 32 - } version: '12' } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' - } } resource database 'Microsoft.DBforPostgreSQL/flexibleServers/databases@2022-12-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { charset: 'UTF8' collation: 'en_US.UTF8' diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep index 0f1d9126..c2315a37 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep @@ -1,37 +1,37 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator password for the PostgreSQL flexible server') param postgresqlAdministratorPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = { name: resourceName location: location + sku: { + tier: 'GeneralPurpose' + name: 'Standard_D2s_v3' + } properties: { administratorLogin: 'adminTerraform' - administratorLoginPassword: null + administratorLoginPassword: '${postgresqlAdministratorPassword}' availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' } + network: {} + version: '12' highAvailability: { mode: 'Disabled' } - network: {} storage: { storageSizeGB: 32 } - version: '12' - } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' } } resource firewallRule 'Microsoft.DBforPostgreSQL/flexibleServers/firewallRules@2022-12-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { endIpAddress: '122.122.0.0' startIpAddress: '122.122.0.0' diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep index bd677693..442f386f 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep @@ -9,17 +9,13 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-preview' = { name: resourceName location: location - identity: { - type: 'None' - userAssignedIdentities: null + sku: { + name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' availabilityZone: '2' - backup: { - geoRedundantBackup: 'Disabled' - } highAvailability: { mode: 'Disabled' } @@ -28,9 +24,13 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-pr storageSizeGB: 32 } version: '12' + administratorLoginPassword: '${administratorLoginPassword}' + backup: { + geoRedundantBackup: 'Disabled' + } } - sku: { - name: 'Standard_D2s_v3' - tier: 'GeneralPurpose' + identity: { + type: 'None' + userAssignedIdentities: null } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep index f32b3bc8..bd56adf0 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep @@ -7,16 +7,21 @@ param administratorLoginPassword string resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { name: '${resourceName}-primary' location: location + sku: { + name: 'Standard_D2ads_v5' + tier: 'GeneralPurpose' + } properties: { + highAvailability: { + mode: 'Disabled' + } + version: '16' administratorLogin: 'psqladmin' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' availabilityZone: '1' backup: { geoRedundantBackup: 'Disabled' } - highAvailability: { - mode: 'Disabled' - } network: { publicNetworkAccess: 'Disabled' } @@ -25,11 +30,6 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = storageSizeGB: 32 tier: 'P30' } - version: '16' - } - sku: { - name: 'Standard_D2ads_v5' - tier: 'GeneralPurpose' } } @@ -37,7 +37,12 @@ resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' name: '${resourceName}-replica' location: location properties: { - availabilityZone: '1' + sourceServerResourceId: flexibleServer.id + storage: { + autoGrow: 'Disabled' + storageSizeGB: 32 + tier: 'P30' + } backup: { geoRedundantBackup: 'Disabled' } @@ -48,19 +53,14 @@ resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' network: { publicNetworkAccess: 'Disabled' } - sourceServerResourceId: flexibleServer.id - storage: { - autoGrow: 'Disabled' - storageSizeGB: 32 - tier: 'P30' - } version: '16' + availabilityZone: '1' } } resource virtualEndpoint 'Microsoft.DBforPostgreSQL/flexibleServers/virtualEndpoints@2024-08-01' = { - parent: flexibleServer name: resourceName + parent: flexibleServer properties: { endpointType: 'ReadWrite' members: [ diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep index b4888c67..b1898976 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep @@ -8,14 +8,14 @@ resource serverGroupsv2 'Microsoft.DBforPostgreSQL/serverGroupsv2@2022-11-08' = name: resourceName location: location properties: { - administratorLoginPassword: null coordinatorEnablePublicIpAccess: true - coordinatorServerEdition: 'GeneralPurpose' - coordinatorStorageQuotaInMb: 131072 - coordinatorVCores: 2 enableHa: false nodeCount: 0 nodeEnablePublicIpAccess: false + administratorLoginPassword: '${administratorLoginPassword}' + coordinatorServerEdition: 'GeneralPurpose' + coordinatorStorageQuotaInMb: 131072 + coordinatorVCores: 2 nodeServerEdition: 'MemoryOptimized' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep index 042fc32c..3a9c2b2f 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep @@ -1,23 +1,28 @@ -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 @description('The administrator login name for the PostgreSQL server admin') param adminLogin string +param resourceName string = 'acctest0001' +param location string = 'westeurope' +@description('The administrator login name for the PostgreSQL server') +param administratorLogin string + +param clientId string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + family: 'Gen5' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' createMode: 'Default' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 @@ -25,22 +30,19 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { storageMB: 51200 } version: '9.6' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLoginPassword: '${administratorLoginPassword}' + infrastructureEncryption: 'Disabled' + publicNetworkAccess: 'Enabled' } } 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() } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep index e3a3be58..432a5870 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep @@ -1,40 +1,40 @@ +@secure() +@description('The administrator login password for the PostgreSQL server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the PostgreSQL server') param administratorLogin string -@secure() -@description('The administrator login password for the PostgreSQL server') -param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' createMode: 'Default' + sslEnforcement: 'Enabled' + version: '9.6' infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } - version: '9.6' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' } } resource 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..a47f0bb7 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep @@ -1,40 +1,40 @@ +@secure() +@description('The administrator login password for the PostgreSQL server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the PostgreSQL server') param administratorLogin string -@secure() -@description('The administrator login password for the PostgreSQL server') -param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + administratorLogin: '${administratorLogin}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' storageProfile: { + storageMB: 51200 backupRetentionDays: 7 storageAutogrow: 'Enabled' - storageMB: 51200 } version: '9.6' } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' - } } resource database 'Microsoft.DBforPostgreSQL/servers/databases@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { charset: 'UTF8' collation: 'English_United States.1252' diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep index 5d2022d7..10c2c39a 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep @@ -9,32 +9,32 @@ param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + capacity: 2 + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } version: '9.6' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + createMode: 'Default' + infrastructureEncryption: 'Disabled' + minimalTlsVersion: 'TLS1_2' + sslEnforcement: 'Enabled' } } resource firewallRule 'Microsoft.DBforPostgreSQL/servers/firewallRules@2017-12-01' = { - parent: server name: resourceName + parent: server properties: { endIpAddress: '255.255.255.255' startIpAddress: '0.0.0.0' diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep index 39559318..7ea6fb8e 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep @@ -9,25 +9,25 @@ 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' + sslEnforcement: 'Enabled' + version: '9.5' 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' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep index 471521bb..1271dca0 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep @@ -9,26 +9,26 @@ param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' + } properties: { - administratorLogin: null - administratorLoginPassword: null - createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' + sslEnforcement: 'Enabled' version: '9.5' - } - sku: { - capacity: 2 - family: 'Gen5' - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' + administratorLogin: '${administratorLogin}' + minimalTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' } } @@ -36,38 +36,38 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + dhcpOptions: { + dnsServers: [] + } + subnets: [] addressSpace: { addressPrefixes: [ '10.7.29.0/29' ] } - dhcpOptions: { - dnsServers: [] - } - subnets: [] } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.7.29.0/29' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] serviceEndpoints: [ { service: 'Microsoft.Sql' } ] + addressPrefix: '10.7.29.0/29' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] } } 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..bcf23d39 100644 --- a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep +++ b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep @@ -6,7 +6,6 @@ resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@202 location: location properties: { applicationGroupType: 'RemoteApp' - hostPoolArmPath: hostPool.id } } @@ -25,9 +24,9 @@ resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2023-09-05' = { } resource application 'Microsoft.DesktopVirtualization/applicationGroups/applications@2023-09-05' = { - parent: applicationGroup name: resourceName location: location + parent: applicationGroup properties: { commandLineSetting: 'DoNotAllow' filePath: 'C:\\Program Files\\Google\\Chrome\\Application\\chrome.exe' diff --git a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep index 75e4a4c3..9cff28c5 100644 --- a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep +++ b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep @@ -8,7 +8,6 @@ resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@202 applicationGroupType: 'Desktop' description: '' friendlyName: '' - hostPoolArmPath: hostPool.id } } @@ -16,17 +15,17 @@ resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-03' = { name: '${resourceName}-hp' location: location properties: { + publicNetworkAccess: 'Enabled' + startVMOnConnect: false + loadBalancerType: 'BreadthFirst' + personalDesktopAssignmentType: '' + validationEnvironment: false + vmTemplate: '' customRdpProperty: '' description: '' friendlyName: '' hostPoolType: 'Pooled' - loadBalancerType: 'BreadthFirst' maxSessionLimit: 999999 - personalDesktopAssignmentType: '' preferredAppGroupType: 'Desktop' - publicNetworkAccess: 'Enabled' - startVMOnConnect: false - validationEnvironment: false - vmTemplate: '' } } diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep index 7cb03984..1770ac2b 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/attachednetworks/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { name: resourceName @@ -12,10 +12,8 @@ resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { resource networkConnection 'Microsoft.DevCenter/networkConnections@2023-04-01' = { name: resourceName - location: 'westeurope' properties: { domainJoinType: 'AzureADJoin' - subnetId: subnet.id } } @@ -32,16 +30,16 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource attachNetwork 'Microsoft.DevCenter/devcenters/attachednetworks@2023-04-01' = { - parent: devCenter name: resourceName + parent: devCenter properties: { networkConnectionId: networkConnection.id } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' } diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep index a6a3809a..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..fa7c5c37 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep @@ -1,19 +1,19 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { name: resourceName location: location identity: { - type: 'SystemAssigned' userAssignedIdentities: null + type: 'SystemAssigned' } } 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..6fd54a6c 100644 --- a/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep @@ -6,7 +6,6 @@ resource networkConnection 'Microsoft.DevCenter/networkConnections@2023-04-01' = location: location properties: { domainJoinType: 'AzureADJoin' - subnetId: subnet.id } } @@ -23,8 +22,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' } diff --git a/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep b/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep index 85ced5c5..bb16b7f4 100644 --- a/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep @@ -1,32 +1,32 @@ 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 properties: { - description: '' devCenterId: devCenter.id maxDevBoxesPerUser: 0 + description: '' } } -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()}' 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..58191ef5 100644 --- a/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep +++ b/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep @@ -4,36 +4,36 @@ param location string = 'westeurope' @description('The Base64 encoded certificate content for the IoT Hub') param certificateContent string -resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { +resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'B1' + } properties: { cloudToDevice: {} enableFileUploadNotifications: false messagingEndpoints: {} routing: { fallbackRoute: { - condition: 'true' endpointNames: [ 'events' ] isEnabled: true source: 'DeviceMessages' + condition: 'true' } } storageEndpoints: {} } - sku: { - capacity: 1 - name: 'B1' - } } resource certificate 'Microsoft.Devices/IotHubs/certificates@2022-04-30-preview' = { - parent: iothub name: resourceName + parent: iotHub properties: { - certificate: null + certificate: '${certificateContent}' isVerified: false } } diff --git a/settings/remarks/microsoft.devices/samples/iothubs/main.bicep b/settings/remarks/microsoft.devices/samples/iothubs/main.bicep index 036e8dd0..ebf0e45c 100644 --- a/settings/remarks/microsoft.devices/samples/iothubs/main.bicep +++ b/settings/remarks/microsoft.devices/samples/iothubs/main.bicep @@ -1,11 +1,14 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' -resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { +resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'S1' + } properties: { - cloudToDevice: {} enableFileUploadNotifications: false messagingEndpoints: {} routing: { @@ -19,9 +22,6 @@ resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { } } storageEndpoints: {} - } - sku: { - capacity: 1 - name: 'S1' + cloudToDevice: {} } } diff --git a/settings/remarks/microsoft.devices/samples/provisioningservices/certificates/main.bicep b/settings/remarks/microsoft.devices/samples/provisioningservices/certificates/main.bicep index 0132ce72..92cf4ca1 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: { + publicNetworkAccess: 'Enabled' 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..f0b374e9 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 - properties: { - allocationPolicy: 'Hashed' - enableDataResidency: false - iotHubs: [] - publicNetworkAccess: 'Enabled' - } sku: { capacity: 1 name: 'S1' } + properties: { + iotHubs: [] + publicNetworkAccess: 'Enabled' + allocationPolicy: 'Hashed' + enableDataResidency: false + } } diff --git a/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep b/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep index 348c8fb1..ba733893 100644 --- a/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep +++ b/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep @@ -1,29 +1,29 @@ 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: { + name: 'S1' + capacity: 1 + } properties: { cloudToDevice: {} enableFileUploadNotifications: false messagingEndpoints: {} routing: { fallbackRoute: { + isEnabled: true + source: 'DeviceMessages' condition: 'true' endpointNames: [ 'events' ] - isEnabled: true - source: 'DeviceMessages' } } 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..37a24343 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/policysets/policies/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/policysets/policies/main.bicep @@ -6,20 +6,13 @@ resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { location: location } -// The policy set is a singleton named 'default' under the lab -resource policySet 'Microsoft.DevTestLab/labs/policySets@2018-09-15' existing = { - parent: lab - name: 'default' -} - resource policy 'Microsoft.DevTestLab/labs/policySets/policies@2018-09-15' = { - parent: policySet - name: 'LabVmCount' + name: 'policySets/default/LabVmCount' properties: { - description: '' - evaluatorType: 'MaxValuePolicy' factData: '' factName: 'LabVmCount' threshold: '999' + description: '' + evaluatorType: 'MaxValuePolicy' } } diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep index c4733acb..e42e1703 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { name: resourceName @@ -10,10 +10,13 @@ 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: { + status: 'Disabled' + taskType: 'LabVmsShutdownTask' + timeZoneId: 'India Standard Time' dailyRecurrence: { time: '0100' } @@ -22,9 +25,6 @@ resource schedule 'Microsoft.DevTestLab/labs/schedules@2018-09-15' = { timeInMinutes: 0 webhookUrl: '' } - status: 'Disabled' - taskType: 'LabVmsShutdownTask' - timeZoneId: 'India Standard Time' } tags: { environment: 'Production' diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep index ce588176..6826624e 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep @@ -1,8 +1,8 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The password for the DevTest Lab virtual machine') param vmPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { name: resourceName @@ -13,12 +13,13 @@ resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { } resource virtualMachine 'Microsoft.DevTestLab/labs/virtualMachines@2018-09-15' = { - parent: lab name: resourceName location: location + parent: lab properties: { + password: vmPassword + size: 'Standard_F2' allowClaim: true - disallowPublicIpAddress: false galleryImageReference: { offer: 'WindowsServer' osType: 'Windows' @@ -26,28 +27,31 @@ resource virtualMachine 'Microsoft.DevTestLab/labs/virtualMachines@2018-09-15' = sku: '2012-Datacenter' version: 'latest' } + labSubnetName: '${resourceName}Subnet' + storageType: 'Standard' + userName: 'acct5stU5er' + disallowPublicIpAddress: false isAuthenticationWithSshKey: false - labSubnetName: '\'${resourceName}Subnet\'' - labVirtualNetworkId: virtualNetwork.id networkInterface: {} notes: '' osType: 'Windows' - password: null - size: 'Standard_F2' - storageType: 'Standard' - userName: 'acct5stU5er' } } resource virtualNetwork 'Microsoft.DevTestLab/labs/virtualNetworks@2018-09-15' = { - parent: lab name: resourceName + parent: lab properties: { description: '' subnetOverrides: [ { - labSubnetName: '\'${resourceName}Subnet\'' - resourceId: resourceId('Microsoft.Network/virtualNetworks/subnets', resourceName, '${resourceName}Subnet') + labSubnetName: '${resourceName}Subnet' + resourceId: resourceId( + 'Microsoft.Network/virtualNetworks/subnets', + resourceGroup().name, + resourceName, + '${resourceName}Subnet' + ) useInVmCreationPermission: 'Allow' usePublicIpAddressPermission: 'Allow' } diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep index 68435e1e..f2aaaafe 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { name: resourceName @@ -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..77512219 100644 --- a/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep @@ -4,6 +4,35 @@ param location string = 'westeurope' @description('The administrator password for the virtual machine') param adminPassword string +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: 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: { + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + } +} + resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName location: location @@ -17,9 +46,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -30,19 +57,18 @@ resource schedule 'Microsoft.DevTestLab/schedules@2018-09-15' = { name: resourceName location: location properties: { + status: 'Enabled' + taskType: 'ComputeVmShutdownTask' + timeZoneId: 'Pacific Standard Time' dailyRecurrence: { time: '0100' } notificationSettings: { - emailRecipient: '' - status: 'Disabled' timeInMinutes: 30 webhookUrl: '' + emailRecipient: '' + status: 'Disabled' } - status: 'Enabled' - targetResourceId: virtualMachine.id - taskType: 'ComputeVmShutdownTask' - timeZoneId: 'Pacific Standard Time' } tags: { environment: 'Production' @@ -53,16 +79,9 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - additionalCapabilities: {} applicationProfile: { galleryApplications: [] } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_B2s' @@ -78,12 +97,11 @@ 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: { assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' @@ -92,10 +110,18 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ssh: { publicKeys: [] } + disablePasswordAuthentication: false } secrets: [] } priority: 'Regular' + additionalCapabilities: {} + diagnosticsProfile: { + bootDiagnostics: { + storageUri: '' + enabled: false + } + } storageProfile: { dataDisks: [] imageReference: { @@ -105,6 +131,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { version: 'latest' } osDisk: { + writeAcceleratorEnabled: false caching: 'ReadWrite' createOption: 'FromImage' managedDisk: { @@ -112,37 +139,7 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } name: 'myosdisk-230630033106863551' osType: 'Linux' - writeAcceleratorEnabled: false } } } } - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - -resource 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.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep b/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep index 7ed9bdf0..a98b82fb 100644 --- a/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep +++ b/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep @@ -6,50 +6,50 @@ resource digitalTwinsInstance 'Microsoft.DigitalTwins/digitalTwinsInstances@2020 location: location } -resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { +resource endpoint 'Microsoft.DigitalTwins/digitalTwinsInstances/endpoints@2020-12-01' = { name: resourceName - location: location + parent: digitalTwinsInstance properties: { - disableLocalAuth: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false + primaryConnectionString: authorizationRule.listKeys().primaryConnectionString + secondaryConnectionString: authorizationRule.listKeys().secondaryConnectionString + authenticationType: 'KeyBased' + deadLetterSecret: '' + endpointType: 'ServiceBus' } +} + +resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { + name: resourceName + location: location sku: { capacity: 0 name: 'Standard' tier: 'Standard' } -} - -resource endpoint 'Microsoft.DigitalTwins/digitalTwinsInstances/endpoints@2020-12-01' = { - parent: digitalTwinsInstance - name: resourceName properties: { - authenticationType: 'KeyBased' - deadLetterSecret: '' - endpointType: 'ServiceBus' - primaryConnectionString: 'authorizationRule.listKeys().primaryConnectionString' - secondaryConnectionString: 'authorizationRule.listKeys().secondaryConnectionString' + disableLocalAuth: false + publicNetworkAccess: 'Enabled' + zoneRedundant: false } } resource topic 'Microsoft.ServiceBus/namespaces/topics@2021-06-01-preview' = { - parent: namespace name: resourceName + parent: namespace properties: { - enableBatchedOperations: false enableExpress: false enablePartitioning: false maxSizeInMegabytes: 5120 requiresDuplicateDetection: false status: 'Active' supportOrdering: false + enableBatchedOperations: false } } resource authorizationRule 'Microsoft.ServiceBus/namespaces/topics/authorizationRules@2021-06-01-preview' = { - parent: topic name: resourceName + parent: topic properties: { rights: [ 'Send' diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep index 6c9cc2f6..5286d9bb 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep @@ -6,26 +6,27 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + isVirtualNetworkFilterEnabled: false + networkAclBypass: 'None' capabilities: [ { name: 'EnableCassandra' } ] + databaseAccountOfferType: 'Standard' + disableKeyBasedMetadataWriteAccess: false + virtualNetworkRules: [] consistencyPolicy: { + maxStalenessPrefix: 100 defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false enableAnalyticalStorage: false enableAutomaticFailover: false enableFreeTier: false - enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false + enableMultipleWriteLocations: false locations: [ { failoverPriority: 0 @@ -33,20 +34,19 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' } } 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..849aab69 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep @@ -1,72 +1,72 @@ param resourceName string = 'acctest0001' param location string = 'eastus' -var keyspaceName = '${toLower(resourceName)}ks' -var tableName = '${toLower(resourceName)}tbl' -var accountName = toLower(replace(resourceName, '-', '')) +var keyspaceName = 'resourcenameks' +var tableName = 'resourcenametbl' +var accountName = 'resourcename' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: accountName location: location kind: 'GlobalDocumentDB' properties: { - backupPolicy: null capabilities: [ { name: 'EnableCassandra' } ] - consistencyPolicy: { - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } + enableBurstCapacity: false + enableFreeTier: false + enablePartitionMerge: false + minimalTlsVersion: 'Tls12' + networkAclBypassResourceIds: [] databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false enableAnalyticalStorage: true enableAutomaticFailover: false - enableBurstCapacity: false - enableFreeTier: false + backupPolicy: null + disableKeyBasedMetadataWriteAccess: false enableMultipleWriteLocations: false - enablePartitionMerge: false ipRules: [] isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 isZoneRedundant: false - locationName: 'eastus' + locationName: '${location}' } ] - minimalTlsVersion: 'Tls12' networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' + consistencyPolicy: { + maxStalenessPrefix: 100 + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + } + defaultIdentity: 'FirstPartyIdentity' virtualNetworkRules: [] } } resource cassandraKeyspace 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces@2021-10-15' = { - parent: databaseAccount name: keyspaceName + parent: databaseAccount properties: { options: {} resource: { - id: keyspaceName + id: '${keyspaceName}' } } } resource table 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces/tables@2021-10-15' = { - parent: cassandraKeyspace name: tableName + parent: cassandraKeyspace properties: { options: {} resource: { analyticalStorageTtl: 1 - id: tableName + id: '${tableName}' schema: { clusterKeys: [] columns: [ @@ -75,8 +75,8 @@ resource table 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces/tables@ type: 'ascii' } { - name: 'test2' type: 'int' + name: 'test2' } ] partitionKeys: [ 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..723c8a18 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/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 @@ -11,21 +11,9 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: 'EnableGremlin' } ] - consistencyPolicy: { - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -33,39 +21,51 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' + virtualNetworkRules: [] + consistencyPolicy: { + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + defaultConsistencyLevel: 'Strong' + } + databaseAccountOfferType: 'Standard' + disableKeyBasedMetadataWriteAccess: false + enableAutomaticFailover: false + enableMultipleWriteLocations: false + ipRules: [] networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' + isVirtualNetworkFilterEnabled: false + networkAclBypass: 'None' } } 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' partitionKey: { kind: 'Hash' paths: [ '/test' ] } + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep index a620ab10..05aedff2 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep @@ -6,26 +6,17 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [ - { - name: 'EnableGremlin' - } - ] - consistencyPolicy: { - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false + isVirtualNetworkFilterEnabled: false + networkAclBypass: 'None' + networkAclBypassResourceIds: [] + defaultIdentity: 'FirstPartyIdentity' enableAutomaticFailover: false - enableFreeTier: false enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false + virtualNetworkRules: [] locations: [ { failoverPriority: 0 @@ -33,20 +24,29 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] + capabilities: [ + { + name: 'EnableGremlin' + } + ] + enableAnalyticalStorage: false + enableFreeTier: false publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + consistencyPolicy: { + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + defaultConsistencyLevel: 'Strong' + } } } resource gremlinDatabase 'Microsoft.DocumentDB/databaseAccounts/gremlinDatabases@2023-04-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep index 325a0359..810e1dda 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep @@ -6,32 +6,32 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 10 maxStalenessPrefix: 200 } databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { + locationName: 'West Europe' failoverPriority: 0 isZoneRedundant: false - locationName: 'West Europe' } ] + virtualNetworkRules: [] + disableLocalAuth: false + enableAnalyticalStorage: false + enableFreeTier: false + enableMultipleWriteLocations: false + isVirtualNetworkFilterEnabled: false networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' + disableKeyBasedMetadataWriteAccess: false + networkAclBypassResourceIds: [] + capabilities: [] } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep index 55714880..18337e30 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep @@ -6,26 +6,19 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'MongoDB' properties: { + enableAutomaticFailover: false + enableMultipleWriteLocations: false + networkAclBypass: 'None' capabilities: [ { name: 'EnableMongo' } ] - consistencyPolicy: { - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false enableFreeTier: false - enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -33,20 +26,27 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' + isVirtualNetworkFilterEnabled: false virtualNetworkRules: [] + disableLocalAuth: false + networkAclBypassResourceIds: [] + consistencyPolicy: { + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + disableKeyBasedMetadataWriteAccess: false } } resource mongodbDatabase 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep index c6bc4736..979242e9 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep @@ -1,76 +1,76 @@ param resourceName string = 'acctest0001' param location string = 'eastus' -var accountName = toLower(replace(resourceName, '-', '')) -var dbName = '${toLower(resourceName)}db' -var roleName = '${toLower(resourceName)}role' +var dbName = 'resourcenamedb' +var roleName = 'resourcenamerole' +var accountName = 'resourcename' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: accountName location: location kind: 'MongoDB' properties: { + minimalTlsVersion: 'Tls12' + virtualNetworkRules: [] backupPolicy: null - capabilities: [ - { - name: 'EnableMongoRoleBasedAccessControl' - } - { - name: 'EnableMongo' - } - ] + disableKeyBasedMetadataWriteAccess: false + enableAutomaticFailover: false + isVirtualNetworkFilterEnabled: false + networkAclBypassResourceIds: [] consistencyPolicy: { + maxStalenessPrefix: 100 defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false - enableBurstCapacity: false enableFreeTier: false - enableMultipleWriteLocations: false - enablePartitionMerge: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 isZoneRedundant: false - locationName: 'eastus' + locationName: '${location}' } ] - minimalTlsVersion: 'Tls12' - networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' + enableBurstCapacity: false + enablePartitionMerge: false + networkAclBypass: 'None' + capabilities: [ + { + name: 'EnableMongoRoleBasedAccessControl' + } + { + name: 'EnableMongo' + } + ] + databaseAccountOfferType: 'Standard' + enableMultipleWriteLocations: false + ipRules: [] } } resource mongodbDatabase 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2021-10-15' = { - parent: databaseAccount name: dbName + parent: databaseAccount properties: { options: {} resource: { - id: dbName + id: '${dbName}' } } } resource mongodbRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/mongodbRoleDefinitions@2022-11-15' = { - parent: databaseAccount name: '${dbName}.${roleName}' - properties: { - databaseName: dbName - roleName: roleName - type: 1 - } + parent: databaseAccount dependsOn: [ mongodbDatabase ] + properties: { + databaseName: '${dbName}' + roleName: '${roleName}' + type: 1 + } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep index 471dae66..edcc23ef 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep @@ -9,64 +9,64 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { location: location kind: 'MongoDB' properties: { - backupPolicy: null - capabilities: [ - { - name: 'EnableMongoRoleBasedAccessControl' - } - { - name: 'EnableMongo' - } - ] consistencyPolicy: { + maxStalenessPrefix: 100 defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableBurstCapacity: false - enableFreeTier: false - enableMultipleWriteLocations: false enablePartitionMerge: false ipRules: [] isVirtualNetworkFilterEnabled: false + publicNetworkAccess: 'Enabled' + disableLocalAuth: false + enableAutomaticFailover: false + databaseAccountOfferType: 'Standard' + enableAnalyticalStorage: false locations: [ { failoverPriority: 0 isZoneRedundant: false - locationName: 'westus' + locationName: '${location}' } ] - minimalTlsVersion: 'Tls12' networkAclBypass: 'None' networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' virtualNetworkRules: [] + capabilities: [ + { + name: 'EnableMongoRoleBasedAccessControl' + } + { + name: 'EnableMongo' + } + ] + disableKeyBasedMetadataWriteAccess: false + enableBurstCapacity: false + enableFreeTier: false + enableMultipleWriteLocations: false + minimalTlsVersion: 'Tls12' + backupPolicy: null } } resource mongodbDatabas 'Microsoft.DocumentDB/databaseAccounts/mongodbDatabases@2021-10-15' = { - parent: databaseAccount name: '${resourceName}-mongodb' + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001-mongodb' + id: '${resourceName}-mongodb' } } } resource mongodbUserDefinition 'Microsoft.DocumentDB/databaseAccounts/mongodbUserDefinitions@2022-11-15' = { - parent: databaseAccount name: '${mongodbDatabas.name}.myUserName' + parent: databaseAccount properties: { + userName: 'myUserName' databaseName: mongodbDatabas.name mechanisms: 'SCRAM-SHA-256' - password: null - userName: 'myUserName' + password: mongodbUserPassword } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep index fe8b85c7..0f669d02 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep @@ -6,22 +6,23 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + enableFreeTier: false + enableMultipleWriteLocations: false + isVirtualNetworkFilterEnabled: false capabilities: [] + defaultIdentity: 'FirstPartyIdentity' + enableAnalyticalStorage: false + networkAclBypass: 'None' + virtualNetworkRules: [] + databaseAccountOfferType: 'Standard' + enableAutomaticFailover: false consistencyPolicy: { defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -29,16 +30,15 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + disableKeyBasedMetadataWriteAccess: false } } resource service 'Microsoft.DocumentDB/databaseAccounts/services@2022-05-15' = { - parent: databaseAccount name: 'SqlDedicatedGateway' + parent: databaseAccount properties: { instanceCount: 1 instanceSize: 'Cosmos.D4s' diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep index 145232df..20612393 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep @@ -6,22 +6,18 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] + disableKeyBasedMetadataWriteAccess: false + enableAutomaticFailover: false + enableFreeTier: false + virtualNetworkRules: [] consistencyPolicy: { defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 10 maxStalenessPrefix: 200 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false + networkAclBypass: 'None' + publicNetworkAccess: 'Enabled' locations: [ { failoverPriority: 0 @@ -29,31 +25,34 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' + capabilities: [] + defaultIdentity: 'FirstPartyIdentity' + disableLocalAuth: false + enableAnalyticalStorage: false + isVirtualNetworkFilterEnabled: false networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + databaseAccountOfferType: 'Standard' + enableMultipleWriteLocations: false } } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { + resource: { + id: '${resourceName}' + } options: { throughput: 400 } - resource: { - id: 'acctest0001' - } } } resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = { - parent: sqlDatabase name: resourceName + parent: sqlDatabase properties: { - options: {} resource: { id: 'test-containerWest Europe' partitionKey: { @@ -63,5 +62,6 @@ resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/container ] } } + options: {} } } 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..a1a506dd 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/storedprocedures/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/storedprocedures/main.bicep @@ -6,67 +6,67 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + ipRules: [] + networkAclBypass: 'None' + publicNetworkAccess: 'Enabled' + virtualNetworkRules: [] capabilities: [] + disableKeyBasedMetadataWriteAccess: false + locations: [ + { + failoverPriority: 0 + isZoneRedundant: false + locationName: 'West Europe' + } + ] + networkAclBypassResourceIds: [] consistencyPolicy: { defaultConsistencyLevel: 'Session' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAnalyticalStorage: false enableAutomaticFailover: false + defaultIdentity: 'FirstPartyIdentity' + enableAnalyticalStorage: false enableFreeTier: false enableMultipleWriteLocations: false - ipRules: [] isVirtualNetworkFilterEnabled: false - locations: [ - { - failoverPriority: 0 - isZoneRedundant: false - locationName: 'West Europe' - } - ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] } } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = { - parent: sqlDatabase name: resourceName + parent: sqlDatabase properties: { options: {} resource: { - id: 'acctest0001' partitionKey: { kind: 'Hash' paths: [ '/definition/id' ] } + id: '${resourceName}' } } } 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..bb877b86 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/triggers/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/triggers/main.bicep @@ -6,54 +6,54 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] - consistencyPolicy: { - defaultConsistencyLevel: 'Session' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } - databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false enableFreeTier: false enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { + locationName: 'West Europe' failoverPriority: 0 isZoneRedundant: false - locationName: 'West Europe' } ] - networkAclBypass: 'None' + virtualNetworkRules: [] + capabilities: [] + consistencyPolicy: { + defaultConsistencyLevel: 'Session' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + disableKeyBasedMetadataWriteAccess: false networkAclBypassResourceIds: [] + networkAclBypass: 'None' + databaseAccountOfferType: 'Standard' + disableLocalAuth: false + enableAutomaticFailover: false + isVirtualNetworkFilterEnabled: false publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] } } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { - options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } + options: {} } } resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers@2023-04-15' = { - parent: sqlDatabase name: resourceName + parent: sqlDatabase properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' partitionKey: { kind: 'Hash' paths: [ @@ -65,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..bae70b37 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep @@ -6,22 +6,6 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] - consistencyPolicy: { - defaultConsistencyLevel: 'Session' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -30,30 +14,46 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } ] networkAclBypass: 'None' + disableKeyBasedMetadataWriteAccess: false + enableAnalyticalStorage: false + enableAutomaticFailover: false networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' virtualNetworkRules: [] + enableFreeTier: false + enableMultipleWriteLocations: false + isVirtualNetworkFilterEnabled: false + publicNetworkAccess: 'Enabled' + capabilities: [] + databaseAccountOfferType: 'Standard' + consistencyPolicy: { + defaultConsistencyLevel: 'Session' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + defaultIdentity: 'FirstPartyIdentity' + disableLocalAuth: false + ipRules: [] } } 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..035e7042 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep @@ -6,22 +6,22 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] + defaultIdentity: 'FirstPartyIdentity' + enableMultipleWriteLocations: false + networkAclBypass: 'None' consistencyPolicy: { + maxStalenessPrefix: 200 defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 10 - maxStalenessPrefix: 200 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false ipRules: [] isVirtualNetworkFilterEnabled: false + publicNetworkAccess: 'Enabled' + virtualNetworkRules: [] + disableLocalAuth: false + enableAnalyticalStorage: false + networkAclBypassResourceIds: [] locations: [ { failoverPriority: 0 @@ -29,22 +29,22 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + capabilities: [] + databaseAccountOfferType: 'Standard' + enableAutomaticFailover: false + enableFreeTier: false } } resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: { throughput: 400 } resource: { - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep index f2ac0313..46d373aa 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep @@ -2,30 +2,30 @@ 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' + parent: databaseAccount } 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 + enablePurge: false + engineType: 'V2' + restrictOutboundNetworkAccess: 'Disabled' enableDiskEncryption: false enableDoubleEncryption: false - enablePurge: false enableStreamingIngest: false - engineType: 'V2' publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' - } } resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { @@ -33,22 +33,17 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + databaseAccountOfferType: 'Standard' + disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false + enableAnalyticalStorage: false capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'Session' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -58,24 +53,29 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { ] networkAclBypass: 'None' networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' + enableFreeTier: false + enableMultipleWriteLocations: false virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' + ipRules: [] + isVirtualNetworkFilterEnabled: false + publicNetworkAccess: 'Enabled' } } resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { - parent: cluster name: resourceName location: location + parent: cluster 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 } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep index d27400e8..a3bdf7e7 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep @@ -1,27 +1,27 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: resourceName location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] + defaultIdentity: 'FirstPartyIdentity' + disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false + enableAutomaticFailover: false + isVirtualNetworkFilterEnabled: false + networkAclBypass: 'None' + publicNetworkAccess: 'Enabled' + virtualNetworkRules: [] consistencyPolicy: { - defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 + defaultConsistencyLevel: 'Strong' } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false enableFreeTier: false enableMultipleWriteLocations: false - ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -29,20 +29,17 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' + capabilities: [] + databaseAccountOfferType: 'Standard' + ipRules: [] networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] } } resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinitions@2021-10-15' = { - parent: databaseAccount name: 'c3ce1661-d0b9-3476-0a7c-2654ce2f3055' + parent: databaseAccount properties: { - assignableScopes: [ - databaseAccount.id - ] permissions: [ { dataActions: [ @@ -50,7 +47,10 @@ resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinit ] } ] - roleName: 'acctest0001' + roleName: resourceName type: 'CustomRole' + assignableScopes: [ + databaseAccount.id + ] } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep index 210b7112..dc400124 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep @@ -6,25 +6,27 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [ - { - name: 'EnableTable' - } - ] + publicNetworkAccess: 'Enabled' consistencyPolicy: { defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false enableAnalyticalStorage: false enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false + databaseAccountOfferType: 'Standard' ipRules: [] + networkAclBypass: 'None' + virtualNetworkRules: [] + capabilities: [ + { + name: 'EnableTable' + } + ] + disableKeyBasedMetadataWriteAccess: false + enableMultipleWriteLocations: false isVirtualNetworkFilterEnabled: false locations: [ { @@ -33,20 +35,18 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypass: 'None' networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + enableFreeTier: false } } resource table 'Microsoft.DocumentDB/databaseAccounts/tables@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: {} resource: { - id: 'acctest0001' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep b/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep index 69e3ef43..190aede4 100644 --- a/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep @@ -13,26 +13,26 @@ resource mongoCluster 'Microsoft.DocumentDB/mongoClusters@2025-09-01' = { compute: { tier: 'M40' } - highAvailability: { - targetMode: 'Disabled' - } previewFeatures: [ 'ShardRebalancer' ] - publicNetworkAccess: 'Enabled' - serverVersion: '5.0' sharding: { shardCount: 1 } storage: { sizeGb: 32 } + highAvailability: { + targetMode: 'Disabled' + } + publicNetworkAccess: 'Enabled' + serverVersion: '5.0' } } 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/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep index 9e0b659a..b5a4b9c9 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/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 diff --git a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep index c9205983..1998fa20 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/main.bicep @@ -8,15 +8,15 @@ resource elasticSan 'Microsoft.ElasticSan/elasticSans@2023-01-01' = { baseSizeTiB: 1 extendedCapacitySizeTiB: 0 sku: { - name: 'Premium_LRS' tier: 'Premium' + name: 'Premium_LRS' } } } resource volumeGroup 'Microsoft.ElasticSan/elasticSans/volumeGroups@2023-01-01' = { - parent: elasticSan name: '${resourceName}-vg' + parent: elasticSan properties: { encryption: 'EncryptionAtRestWithPlatformKey' networkAcls: { diff --git a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep index ab0d9770..c38dac16 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/volumegroups/volumes/main.bicep @@ -15,8 +15,8 @@ resource elasticSan 'Microsoft.ElasticSan/elasticSans@2023-01-01' = { } resource volumeGroup 'Microsoft.ElasticSan/elasticSans/volumeGroups@2023-01-01' = { - parent: elasticSan name: '${resourceName}-vg' + parent: elasticSan properties: { encryption: 'EncryptionAtRestWithPlatformKey' networkAcls: { @@ -27,8 +27,8 @@ resource volumeGroup 'Microsoft.ElasticSan/elasticSans/volumeGroups@2023-01-01' } resource volume 'Microsoft.ElasticSan/elasticSans/volumeGroups/volumes@2023-01-01' = { - parent: volumeGroup name: '${resourceName}-v' + parent: volumeGroup properties: { sizeGiB: 1 } diff --git a/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep b/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep index a9c9a9ec..14bc5da2 100644 --- a/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep @@ -5,11 +5,11 @@ resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { name: resourceName location: location properties: { - autoCreateTopicWithFirstSubscription: true - autoDeleteTopicWithLastSubscription: true - disableLocalAuth: false inputSchema: 'EventGridSchema' inputSchemaMapping: null publicNetworkAccess: 'Enabled' + autoCreateTopicWithFirstSubscription: true + autoDeleteTopicWithLastSubscription: true + disableLocalAuth: false } } diff --git a/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep index 200dc074..6e14062c 100644 --- a/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { name: resourceName @@ -15,6 +15,6 @@ resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { } resource topic 'Microsoft.EventGrid/domains/topics@2021-12-01' = { - parent: domain name: resourceName + parent: domain } diff --git a/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep b/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep index cb0ed3cd..5f5caeee 100644 --- a/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep @@ -1,58 +1,42 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = { - scope: storageAccount - name: resourceName - properties: { - deadLetterDestination: null - destination: { - endpointType: 'EventHub' - properties: { - deliveryAttributeMappings: null - resourceId: eventhub.id - } - } - eventDeliverySchema: 'EventGridSchema' - filter: { - includedEventTypes: [ - 'Microsoft.Storage.BlobCreated' - 'Microsoft.Storage.BlobRenamed' - ] - } - labels: [] - retryPolicy: { - eventTimeToLiveInMinutes: 144 - maxDeliveryAttempts: 10 - } - } -} - resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location - properties: { - disableLocalAuth: false - isAutoInflateEnabled: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false - } sku: { capacity: 1 name: 'Standard' tier: 'Standard' } + properties: { + publicNetworkAccess: 'Enabled' + zoneRedundant: false + disableLocalAuth: false + isAutoInflateEnabled: false + } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + isNfsV3Enabled: false + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } accessTier: 'Hot' - allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + allowBlobPublicAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -66,26 +50,41 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { messageRetentionInDays: 1 partitionCount: 1 status: 'Active' } } + +resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = { + name: resourceName + scope: storageAccount + properties: { + destination: { + endpointType: 'EventHub' + properties: { + deliveryAttributeMappings: null + } + } + eventDeliverySchema: 'EventGridSchema' + filter: { + includedEventTypes: [ + 'Microsoft.Storage.BlobCreated' + 'Microsoft.Storage.BlobRenamed' + ] + } + labels: [] + retryPolicy: { + eventTimeToLiveInMinutes: 144 + maxDeliveryAttempts: 10 + } + deadLetterDestination: null + } +} diff --git a/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep b/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep index cac8743f..75baaa3b 100644 --- a/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep @@ -1,14 +1,14 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' 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..14c26c72 100644 --- a/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep @@ -1,22 +1,48 @@ param resourceName string = 'acctest0001' param location string = 'westus' -var storageAccountName = '${resourceName}sa01' -var queueName = '${resourceName}queue' -var eventSubscription1Name = '${resourceName}-es1' -var eventSubscription2Name = '${resourceName}-es2' -var systemTopicName = '${resourceName}-st' +var eventSubscription2Name = 'resourceName-es2' +var systemTopicName = 'resourceName-st' +var storageAccountName = 'resourceNamesa01' +var queueName = 'resourceNamequeue' +var queueServiceId = '${storageAccount.id}/queueServices/default' +var eventSubscription1Name = 'resourceName-es1' + +resource systemTopic 'Microsoft.EventGrid/systemTopics@2022-06-15' = { + name: systemTopicName + location: 'global' + properties: { + source: resourceGroup().id + topicType: 'Microsoft.Resources.ResourceGroups' + } +} resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: storageAccountName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' + isLocalUserEnabled: true + minimumTlsVersion: 'TLS1_2' + allowSharedKeyAccess: true + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true allowBlobPublicAccess: true allowCrossTenantReplication: false - allowSharedKeyAccess: true defaultToOAuthAuthentication: false + isHnsEnabled: false + isNfsV3Enabled: false + networkAcls: { + resourceAccessRules: [] + virtualNetworkRules: [] + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + } + accessTier: 'Hot' dnsEndpointType: 'Standard' encryption: { keySource: 'Microsoft.Storage' @@ -29,38 +55,23 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - isHnsEnabled: false - isLocalUserEnabled: true - isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - bypass: 'AzureServices' - defaultAction: 'Allow' - ipRules: [] - resourceAccessRules: [] - virtualNetworkRules: [] - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } -resource systemTopic 'Microsoft.EventGrid/systemTopics@2022-06-15' = { - name: systemTopicName - location: 'global' - properties: { - source: resourceGroup().id - topicType: 'Microsoft.Resources.ResourceGroups' - } +resource queue 'Microsoft.Storage/storageAccounts/queueServices/queues@2023-05-01' = { + name: queueName + dependsOn: [ + storageAccount + ] } resource eventSubscription 'Microsoft.EventGrid/systemTopics/eventSubscriptions@2022-06-15' = { - parent: systemTopic name: eventSubscription1Name + parent: systemTopic + dependsOn: [ + queue + ] properties: { deadLetterDestination: null destination: { @@ -74,24 +85,25 @@ resource eventSubscription 'Microsoft.EventGrid/systemTopics/eventSubscriptions@ filter: { advancedFilters: [ { - key: 'subject' operatorType: 'StringBeginsWith' - values: ['foo'] + values: [ + 'foo' + ] + key: 'subject' } ] } labels: [] } - dependsOn: [ - queue - ] } resource eventsubscription1 'Microsoft.EventGrid/systemTopics/eventSubscriptions@2022-06-15' = { - parent: systemTopic name: eventSubscription2Name + parent: systemTopic + dependsOn: [ + queue + ] properties: { - deadLetterDestination: null destination: { endpointType: 'StorageQueue' properties: { @@ -105,28 +117,13 @@ resource eventsubscription1 'Microsoft.EventGrid/systemTopics/eventSubscriptions { key: 'subject' operatorType: 'StringEndsWith' - values: ['bar'] + values: [ + 'bar' + ] } ] } labels: [] + deadLetterDestination: null } - dependsOn: [ - queue - ] -} - -// The queue service is a singleton named 'default' under the storage account -resource queueService 'Microsoft.Storage/storageAccounts/queueServices@2023-05-01' existing = { - parent: storageAccount - name: 'default' -} - -resource queue 'Microsoft.Storage/storageAccounts/queueServices/queues@2023-05-01' = { - parent: queueService - name: queueName - - dependsOn: [ - storageAccount - ] } diff --git a/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep index 02267b1a..db3c1e98 100644 --- a/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/systemtopics/main.bicep @@ -1,4 +1,5 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource systemTopic 'Microsoft.EventGrid/systemTopics@2021-12-01' = { name: resourceName diff --git a/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep index 7d52cb0d..7036e6b5 100644 --- a/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep @@ -5,9 +5,9 @@ resource topic 'Microsoft.EventGrid/topics@2021-12-01' = { name: resourceName location: location properties: { - disableLocalAuth: false - inputSchema: 'EventGridSchema' inputSchemaMapping: null publicNetworkAccess: 'Enabled' + disableLocalAuth: false + inputSchema: 'EventGridSchema' } } diff --git a/settings/remarks/microsoft.eventhub/samples/clusters/main.bicep b/settings/remarks/microsoft.eventhub/samples/clusters/main.bicep index 0f1ada93..6bab59e7 100644 --- a/settings/remarks/microsoft.eventhub/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/clusters/main.bicep @@ -5,7 +5,7 @@ resource cluster 'Microsoft.EventHub/clusters@2021-11-01' = { name: resourceName location: location sku: { - capacity: 1 name: 'Dedicated' + capacity: 1 } } 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..f963d6ca 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep @@ -4,32 +4,32 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Basic' + tier: 'Basic' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Basic' - tier: 'Basic' - } } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { - messageRetentionInDays: 1 partitionCount: 2 status: 'Active' + messageRetentionInDays: 1 } } 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..ec3a8a37 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep @@ -4,22 +4,22 @@ param location string = 'westeurope' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location - properties: { - disableLocalAuth: false - isAutoInflateEnabled: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false - } sku: { capacity: 1 name: 'Standard' tier: 'Standard' } + properties: { + publicNetworkAccess: 'Enabled' + zoneRedundant: false + disableLocalAuth: false + isAutoInflateEnabled: false + } } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { messageRetentionInDays: 1 partitionCount: 2 @@ -28,8 +28,8 @@ resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { } resource consumerGroup 'Microsoft.EventHub/namespaces/eventhubs/consumerGroups@2021-11-01' = { - parent: eventhub name: resourceName + parent: eventhub properties: { userMetadata: '' } diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep index 423bc654..bd59a83e 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep @@ -4,25 +4,25 @@ 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: { + status: 'Active' messageRetentionInDays: 1 partitionCount: 2 - status: 'Active' } } diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep index e41aea1f..5187e28c 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: { + tier: 'Standard' + capacity: 1 + name: '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..739eb2be 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 - properties: { - disableLocalAuth: false - isAutoInflateEnabled: false - publicNetworkAccess: 'Enabled' - zoneRedundant: false - } sku: { capacity: 1 name: 'Standard' tier: 'Standard' } + properties: { + isAutoInflateEnabled: false + publicNetworkAccess: 'Enabled' + zoneRedundant: false + disableLocalAuth: false + } } resource 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..b01d7ff8 100644 --- a/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep +++ b/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep @@ -1,29 +1,8 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator password for the virtual machine') param adminPassword string - -resource guestConfigurationAssignment 'Microsoft.GuestConfiguration/guestConfigurationAssignments@2020-06-25' = { - scope: virtualMachine - name: 'WhitelistedApplication' - location: location - properties: { - guestConfiguration: { - assignmentType: '' - configurationParameter: [ - { - name: '[InstalledApplication]bwhitelistedapp;Name' - value: 'NotePad,sql' - } - ] - contentHash: '' - contentUri: '' - name: 'WhitelistedApplication' - version: '1.*' - } - } -} +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName @@ -35,12 +14,10 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { { name: 'internal' properties: { + subnet: {} primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } } } ] @@ -51,7 +28,25 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - additionalCapabilities: {} + priority: 'Regular' + storageProfile: { + osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' + managedDisk: { + storageAccountType: 'Standard_LRS' + } + osType: 'Windows' + writeAcceleratorEnabled: false + } + dataDisks: [] + imageReference: { + offer: 'WindowsServer' + publisher: 'MicrosoftWindowsServer' + sku: '2016-Datacenter' + version: 'latest' + } + } applicationProfile: { galleryApplications: [] } @@ -61,10 +56,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { storageUri: '' } } - extensionsTimeBudget: 'PT1H30M' - hardwareProfile: { - vmSize: 'Standard_F2' - } networkProfile: { networkInterfaces: [ { @@ -76,9 +67,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - adminPassword: null - adminUsername: 'adminuser' - allowExtensionOperations: true computerName: 'acctestvmdro23' secrets: [] windowsConfiguration: { @@ -93,25 +81,14 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { listeners: [] } } + adminPassword: adminPassword + adminUsername: 'adminuser' + allowExtensionOperations: true } - priority: 'Regular' - storageProfile: { - dataDisks: [] - imageReference: { - offer: 'WindowsServer' - publisher: 'MicrosoftWindowsServer' - sku: '2016-Datacenter' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - managedDisk: { - storageAccountType: 'Standard_LRS' - } - osType: 'Windows' - writeAcceleratorEnabled: false - } + additionalCapabilities: {} + extensionsTimeBudget: 'PT1H30M' + hardwareProfile: { + vmSize: 'Standard_F2' } } } @@ -133,14 +110,35 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'internal' + parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + } +} + +resource guestConfigurationAssignment 'Microsoft.GuestConfiguration/guestConfigurationAssignments@2020-06-25' = { + name: 'WhitelistedApplication' + location: location + scope: virtualMachine + properties: { + guestConfiguration: { + assignmentType: '' + configurationParameter: [ + { + name: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + value: 'NotePad,sql' + } + ] + contentHash: '' + contentUri: '' + name: 'WhitelistedApplication' + version: '1.*' + } } } diff --git a/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep b/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep index ce8260ec..c084b991 100644 --- a/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep @@ -10,8 +10,8 @@ param vmPassword string param restCredentialPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { @@ -19,25 +19,22 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { location: location properties: { clusterDefinition: { - componentVersion: { - Spark: '2.4' - } configurations: { gateway: { - 'restAuthCredential.isEnabled': true 'restAuthCredential.password': restCredentialPassword 'restAuthCredential.username': 'acctestusrgw' + 'restAuthCredential.isEnabled': true } } kind: 'Spark' + componentVersion: { + Spark: '2.4' + } } clusterVersion: '4.0.3000.1' computeProfile: { roles: [ { - hardwareProfile: { - vmSize: 'standard_a4_v2' - } name: 'headnode' osProfile: { linuxOperatingSystemProfile: { @@ -46,6 +43,9 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { } } targetInstanceCount: 2 + hardwareProfile: { + vmSize: 'standard_a4_v2' + } } { hardwareProfile: { @@ -83,11 +83,9 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { storageProfile: { storageaccounts: [ { - container: container.name isDefault: true key: storageAccount.listKeys().keys[0].value - name: '${storageAccount.name}.blob.core.windows.net' - resourceId: storageAccount.id + name: '.blob.core.windows.net' } ] } @@ -98,8 +96,19 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + minimumTlsVersion: 'TLS1_2' + isHnsEnabled: false + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: true @@ -108,32 +117,21 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { encryption: { keySource: 'Microsoft.Storage' services: { - queue: { + table: { keyType: 'Service' } - table: { + queue: { keyType: 'Service' } } } - isHnsEnabled: false isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep index 47827fb8..0debdcea 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep @@ -6,16 +6,16 @@ resource service 'Microsoft.HealthcareApis/services@2022-12-01' = { location: location kind: 'fhir' properties: { - accessPolicies: [ - { - objectId: deployer().objectId - } - ] authenticationConfiguration: {} corsConfiguration: {} cosmosDbConfiguration: { offerThroughput: 1000 } publicNetworkAccess: 'Enabled' + accessPolicies: [ + { + objectId: deployer().objectId + } + ] } } 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..67b32716 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep @@ -6,16 +6,16 @@ resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { location: location } -resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { - parent: workspace +resource fhirService2 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { name: resourceName location: location + parent: workspace kind: 'fhir-R4' properties: { acrConfiguration: {} authenticationConfiguration: { - audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' - authority: 'https://login.microsoftonline.com/deployer().tenantId' + audience: fhirService.properties.authenticationConfiguration.audience + authority: fhirService.properties.authenticationConfiguration.authority smartProxyEnabled: false } corsConfiguration: { @@ -27,23 +27,23 @@ resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-0 } } -resource fhirService2 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { - parent: workspace +resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { name: resourceName location: location + parent: workspace kind: 'fhir-R4' properties: { - acrConfiguration: {} - authenticationConfiguration: { - audience: fhirService.properties.authenticationConfiguration.audience - authority: fhirService.properties.authenticationConfiguration.authority - smartProxyEnabled: false - } corsConfiguration: { - allowCredentials: false - headers: [] methods: [] origins: [] + allowCredentials: false + headers: [] + } + acrConfiguration: {} + authenticationConfiguration: { + authority: 'https://login.microsoftonline.com/${tenant()}' + smartProxyEnabled: false + audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' } } } 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..eb94e1c0 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep @@ -4,16 +4,16 @@ 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' + capacity: 1 + } + properties: { + publicNetworkAccess: 'Enabled' + zoneRedundant: false + disableLocalAuth: false + isAutoInflateEnabled: false } } @@ -23,8 +23,8 @@ resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { messageRetentionInDays: 1 partitionCount: 2 @@ -33,16 +33,16 @@ 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' smartProxyEnabled: false + audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' + authority: 'https://login.microsoftonline.com/${tenant()}' } corsConfiguration: { allowCredentials: false @@ -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: { @@ -65,7 +65,6 @@ resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12 } } ingestionEndpointConfiguration: { - consumerGroup: consumerGroup.id eventHubName: eventhub.name fullyQualifiedEventHubNamespace: '${namespace.name}.servicebus.windows.net' } @@ -73,17 +72,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..1dae1bd7 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/main.bicep @@ -1,30 +1,30 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { + name: resourceName + location: location +} + resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard' + tier: 'Standard' + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Standard' - tier: 'Standard' - } -} - -resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { - name: resourceName - location: location } resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - parent: namespace name: resourceName + parent: namespace properties: { messageRetentionInDays: 1 partitionCount: 2 @@ -33,9 +33,9 @@ resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { } resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12-01' = { - parent: workspace name: resourceName location: location + parent: workspace properties: { deviceMapping: { content: { @@ -44,7 +44,6 @@ resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12 } } ingestionEndpointConfiguration: { - consumerGroup: consumerGroup.id eventHubName: eventhub.name fullyQualifiedEventHubNamespace: '${namespace.name}.servicebus.windows.net' } @@ -52,8 +51,8 @@ resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12 } resource consumerGroup 'Microsoft.EventHub/namespaces/eventhubs/consumerGroups@2021-11-01' = { - parent: eventhub name: resourceName + parent: eventhub properties: { userMetadata: '' } diff --git a/settings/remarks/microsoft.impact/remarks.json b/settings/remarks/microsoft.impact/remarks.json index 74e3d285..ad4b99ea 100644 --- a/settings/remarks/microsoft.impact/remarks.json +++ b/settings/remarks/microsoft.impact/remarks.json @@ -17,6 +17,11 @@ "ResourceType": "Microsoft.Impact/connectors", "Path": "samples/connectors/main.bicep", "Description": "A basic example of deploying Impact Connectors." + }, + { + "ResourceType": "Microsoft.Impact/workloadImpacts", + "Path": "samples/workloadimpacts/main.bicep", + "Description": "A basic example of deploying Impact Workload Impacts." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.impact/samples/connectors/main.bicep b/settings/remarks/microsoft.impact/samples/connectors/main.bicep index 39b2c82d..e70a791f 100644 --- a/settings/remarks/microsoft.impact/samples/connectors/main.bicep +++ b/settings/remarks/microsoft.impact/samples/connectors/main.bicep @@ -1,6 +1,7 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource connector 'Microsoft.Impact/connectors@2024-05-01-preview' = { name: resourceName diff --git a/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep b/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep new file mode 100644 index 00000000..79234bee --- /dev/null +++ b/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep @@ -0,0 +1,158 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' +@secure() +@description('The administrator password for the virtual machine') +param adminPassword string + +resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { + name: resourceName + location: location + properties: { + hardwareProfile: { + vmSize: 'Standard_F2' + } + networkProfile: { + networkInterfaces: [ + { + id: networkInterface.id + properties: { + primary: false + } + } + ] + } + osProfile: { + adminPassword: adminPassword + adminUsername: 'testadmin' + computerName: 'hostname230630032848831819' + linuxConfiguration: { + disablePasswordAuthentication: false + } + } + storageProfile: { + osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' + name: 'myosdisk1' + writeAcceleratorEnabled: false + } + imageReference: { + version: 'latest' + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + } + } + } +} + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + dhcpOptions: { + dnsServers: [] + } + subnets: [] + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + } +} + +resource workloadImpact 'Microsoft.Impact/workloadImpacts@2023-12-01-preview' = { + name: resourceName + properties: { + errorDetails: { + errorCode: 'code' + errorMessage: 'errorMessage' + } + impactCategory: 'Resource.Availability' + impactedResourceId: virtualMachine.id + performance: [ + { + expectedValueRange: { + max: 5 + min: 1 + } + metricName: 'example' + unit: 'ByteSeconds' + actual: 2 + expected: 2 + } + ] + startDateTime: '2024-12-03T01:15:00Z' + workload: { + context: 'context' + toolset: 'Ansible' + } + additionalProperties: { + NodeId: 'node-123' + Manufacturer: 'ManufacturerName' + ModelNumber: 'Model123' + PhysicalHostName: 'host123' + SerialNumber: 'SN123456' + VmUniqueId: 'vm-unique-id' + CollectTelemetry: true + Location: 'DataCenter1' + LogUrl: 'http://example.com/log' + } + 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' + impactDescription: 'impact description' + impactGroupId: 'impact groupid' + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: resourceName + parent: virtualNetwork + properties: { + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration1' + properties: { + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + } + } + ] + enableAcceleratedNetworking: 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..e15d1e15 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' = { @@ -7,15 +8,15 @@ resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { armRoleReceivers: [] automationRunbookReceivers: [] azureAppPushReceivers: [] - azureFunctionReceivers: [] - emailReceivers: [] - enabled: true eventHubReceivers: [] groupShortName: 'acctestag' itsmReceivers: [] logicAppReceivers: [] + webhookReceivers: [] + azureFunctionReceivers: [] + emailReceivers: [] + enabled: true smsReceivers: [] voiceReceivers: [] - webhookReceivers: [] } } diff --git a/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep b/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep index fe95dfcf..f350148a 100644 --- a/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep +++ b/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep @@ -1,50 +1,11 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { - name: resourceName - location: 'global' - properties: { - armRoleReceivers: [] - automationRunbookReceivers: [] - azureAppPushReceivers: [] - azureFunctionReceivers: [] - emailReceivers: [] - enabled: true - eventHubReceivers: [] - groupShortName: 'acctestag1' - itsmReceivers: [] - logicAppReceivers: [] - smsReceivers: [] - voiceReceivers: [] - webhookReceivers: [] - } -} - -resource actionGroup2 'Microsoft.Insights/actionGroups@2023-01-01' = { - name: resourceName - location: 'global' - properties: { - armRoleReceivers: [] - automationRunbookReceivers: [] - azureAppPushReceivers: [] - azureFunctionReceivers: [] - emailReceivers: [] - enabled: true - eventHubReceivers: [] - groupShortName: 'acctestag2' - itsmReceivers: [] - logicAppReceivers: [] - smsReceivers: [] - voiceReceivers: [] - webhookReceivers: [] - } -} - resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { name: resourceName location: 'global' properties: { + scopes: [] actions: { actionGroups: [ { @@ -73,8 +34,8 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { field: 'properties.currentHealthStatus' } { - equals: 'Degraded' field: 'properties.currentHealthStatus' + equals: 'Degraded' } ] } @@ -97,8 +58,8 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { field: 'properties.cause' } { - equals: 'UserInitiated' field: 'properties.cause' + equals: 'UserInitiated' } ] } @@ -106,25 +67,24 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { } description: 'This is just a test acceptance.' enabled: true - scopes: [ - resourceGroup().id - storageAccount.id - ] } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { - keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -133,18 +93,55 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } - isHnsEnabled: false isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true + defaultToOAuthAuthentication: false + isHnsEnabled: false + minimumTlsVersion: 'TLS1_2' } - sku: { - name: 'Standard_LRS' +} + +resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { + name: resourceName + location: 'global' + properties: { + azureAppPushReceivers: [] + emailReceivers: [] + eventHubReceivers: [] + groupShortName: 'acctestag1' + itsmReceivers: [] + logicAppReceivers: [] + smsReceivers: [] + voiceReceivers: [] + armRoleReceivers: [] + automationRunbookReceivers: [] + azureFunctionReceivers: [] + enabled: true + webhookReceivers: [] + } +} + +resource actionGroup2 'Microsoft.Insights/actionGroups@2023-01-01' = { + name: resourceName + location: 'global' + properties: { + armRoleReceivers: [] + automationRunbookReceivers: [] + azureAppPushReceivers: [] + azureFunctionReceivers: [] + emailReceivers: [] + eventHubReceivers: [] + smsReceivers: [] + voiceReceivers: [] + enabled: true + groupShortName: 'acctestag2' + itsmReceivers: [] + logicAppReceivers: [] + webhookReceivers: [] } } diff --git a/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep b/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep index a1ef6631..f145024c 100644 --- a/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep +++ b/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep @@ -1,10 +1,39 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator username for the virtual machine scale set') param adminUsername string @secure() @description('The administrator password for the virtual machine scale set') param adminPassword string +param resourceName string = 'acctest0001' + +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: { + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + } +} resource autoScaleSetting 'Microsoft.Insights/autoScaleSettings@2022-10-01' = { name: resourceName @@ -22,40 +51,42 @@ resource autoScaleSetting 'Microsoft.Insights/autoScaleSettings@2022-10-01' = { name: 'metricRules' rules: [ { + scaleAction: { + direction: 'Increase' + type: 'ChangeCount' + value: '1' + cooldown: 'PT1M' + } metricTrigger: { dimensions: [] + statistic: 'Average' + timeAggregation: 'Last' + timeWindow: 'PT5M' 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 - orchestrationMode: 'Uniform' overprovision: true scaleInPolicy: { forceDeletion: false @@ -67,6 +98,7 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- upgradePolicy: { mode: 'Manual' } + orchestrationMode: 'Uniform' virtualMachineProfile: { diagnosticsProfile: { bootDiagnostics: { @@ -82,35 +114,31 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- { name: 'TestNetworkProfile-230630033559396108' properties: { - dnsSettings: { - dnsServers: [] - } - enableAcceleratedNetworking: false enableIPForwarding: false ipConfigurations: [ { - name: 'TestIPConfiguration' properties: { + privateIPAddressVersion: 'IPv4' + subnet: {} applicationGatewayBackendAddressPools: [] applicationSecurityGroups: [] loadBalancerBackendAddressPools: [] loadBalancerInboundNatPools: [] primary: true - privateIPAddressVersion: 'IPv4' - subnet: { - id: subnet.id - } } + name: 'TestIPConfiguration' } ] primary: true + dnsSettings: { + dnsServers: [] + } + enableAcceleratedNetworking: false } } ] } osProfile: { - adminPassword: null - adminUsername: null computerNamePrefix: 'testvm-230630033559396108' linuxConfiguration: { disablePasswordAuthentication: false @@ -125,6 +153,8 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } } secrets: [] + adminPassword: adminPassword + adminUsername: adminUsername } priority: 'Regular' storageProfile: { @@ -147,38 +177,4 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } } } - sku: { - capacity: 2 - name: 'Standard_F2' - tier: 'Standard' - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork - name: 'internal' - properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - } } diff --git a/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep b/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep index c22f4fd2..e3c73143 100644 --- a/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep +++ b/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep @@ -6,22 +6,18 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - Application_Type: 'web' - DisableIpMasking: false + publicNetworkAccessForIngestion: 'Enabled' DisableLocalAuth: false ForceCustomerStorageForProfiler: false RetentionInDays: 90 SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' + DisableIpMasking: false } } resource analyticsItem 'microsoft.insights/components/analyticsItems@2015-05-01' = { - parent: component name: 'item' - Content: 'requests #test' - Name: 'testquery' - Scope: 'shared' - Type: 'query' + parent: component } diff --git a/settings/remarks/microsoft.insights/samples/components/main.bicep b/settings/remarks/microsoft.insights/samples/components/main.bicep index e36d6913..f373c726 100644 --- a/settings/remarks/microsoft.insights/samples/components/main.bicep +++ b/settings/remarks/microsoft.insights/samples/components/main.bicep @@ -6,13 +6,13 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - Application_Type: 'web' DisableIpMasking: false DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 } } 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..33fe787f --- /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 + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + RetentionInDays: 90 + SamplingPercentage: 100 + } +} + +resource proactiveDetectionConfig 'Microsoft.Insights/components/ProactiveDetectionConfigs@2015-05-01' = { + name: 'slowpageloadtime' + parent: component +} diff --git a/settings/remarks/microsoft.insights/samples/datacollectionendpoints/main.bicep b/settings/remarks/microsoft.insights/samples/datacollectionendpoints/main.bicep index 3f0bf9f1..a5e2f8e0 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionendpoints/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionendpoints/main.bicep @@ -5,9 +5,9 @@ resource dataCollectionEndpoint 'Microsoft.Insights/dataCollectionEndpoints@2022 name: resourceName location: location properties: { - description: '' networkAcls: { publicNetworkAccess: 'Enabled' } + description: '' } } diff --git a/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep b/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep index 72d5147a..bc1dbdee 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep @@ -4,38 +4,6 @@ param location string = 'westeurope' @description('The administrator password for the virtual machine') param adminPassword string -resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { - name: resourceName - location: location - properties: { - dataFlows: [ - { - destinations: [ - 'test-destination-metrics' - ] - streams: [ - 'Microsoft-InsightsMetrics' - ] - } - ] - description: '' - destinations: { - azureMonitorMetrics: { - name: 'test-destination-metrics' - } - } - } -} - -resource dataCollectionRuleAssociation 'Microsoft.Insights/dataCollectionRuleAssociations@2022-06-01' = { - scope: virtualMachine - name: resourceName - properties: { - dataCollectionRuleId: dataCollectionRule.id - description: '' - } -} - resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: 'nic-230630033559397415' location: location @@ -49,9 +17,7 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: { - id: subnet.id - } + subnet: {} } } ] @@ -62,6 +28,18 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: 'machine-230630033559397415' location: location properties: { + extensionsTimeBudget: 'PT1H30M' + networkProfile: { + networkInterfaces: [ + { + id: networkInterface.id + properties: { + primary: true + } + } + ] + } + priority: 'Regular' additionalCapabilities: {} applicationProfile: { galleryApplications: [] @@ -72,27 +50,12 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { storageUri: '' } } - extensionsTimeBudget: 'PT1H30M' hardwareProfile: { vmSize: 'Standard_B1ls' } - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: true - } - } - ] - } osProfile: { - adminPassword: null - adminUsername: 'adminuser' - allowExtensionOperations: true computerName: 'machine-230630033559397415' linuxConfiguration: { - disablePasswordAuthentication: false patchSettings: { assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' @@ -101,10 +64,13 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ssh: { publicKeys: [] } + disablePasswordAuthentication: false } secrets: [] + adminPassword: adminPassword + adminUsername: 'adminuser' + allowExtensionOperations: true } - priority: 'Regular' storageProfile: { dataDisks: [] imageReference: { @@ -114,13 +80,13 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { version: 'latest' } osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' managedDisk: { storageAccountType: 'Standard_LRS' } osType: 'Linux' writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' } } } @@ -130,21 +96,21 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: 'network-230630033559397415' location: location properties: { + dhcpOptions: { + dnsServers: [] + } + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' ] } - dhcpOptions: { - dnsServers: [] - } - subnets: [] } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: 'subnet-230630033559397415' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' delegations: [] @@ -154,3 +120,35 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { serviceEndpoints: [] } } + +resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { + name: resourceName + location: location + properties: { + destinations: { + azureMonitorMetrics: { + name: 'test-destination-metrics' + } + } + dataFlows: [ + { + destinations: [ + 'test-destination-metrics' + ] + streams: [ + 'Microsoft-InsightsMetrics' + ] + } + ] + description: '' + } +} + +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..4be39973 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep @@ -1,10 +1,15 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { name: resourceName location: location properties: { + destinations: { + azureMonitorMetrics: { + name: 'test-destination-metrics' + } + } dataFlows: [ { destinations: [ @@ -16,10 +21,5 @@ resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' } ] description: '' - destinations: { - azureMonitorMetrics: { - name: 'test-destination-metrics' - } - } } } diff --git a/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep b/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep index 0b673c3a..16c6457f 100644 --- a/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep +++ b/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep @@ -1,59 +1,26 @@ 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: { + name: 'Basic' + tier: 'Basic' + capacity: 1 + } properties: { disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false } - sku: { - capacity: 1 - name: 'Basic' - tier: 'Basic' - } } resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { - accessPolicies: [] - createMode: 'default' - enableRbacAuthorization: false - enableSoftDelete: true enabledForDeployment: false enabledForDiskEncryption: false enabledForTemplateDeployment: false @@ -62,13 +29,17 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { family: 'A' name: 'standard' } - tenantId: deployer().tenantId + tenantId: tenant() + accessPolicies: [] + createMode: 'default' + enableRbacAuthorization: false + enableSoftDelete: true } } resource authorizationRule 'Microsoft.EventHub/namespaces/authorizationRules@2021-11-01' = { - parent: namespace name: 'example' + parent: namespace properties: { rights: [ 'Listen' @@ -77,3 +48,30 @@ resource authorizationRule 'Microsoft.EventHub/namespaces/authorizationRules@202 ] } } + +resource diagnosticSetting 'Microsoft.Insights/diagnosticSettings@2021-05-01-preview' = { + name: resourceName + scope: vault + properties: { + metrics: [ + { + retentionPolicy: { + days: 0 + enabled: false + } + category: 'AllMetrics' + enabled: true + } + ] + logs: [ + { + categoryGroup: 'Audit' + enabled: true + retentionPolicy: { + enabled: false + days: 0 + } + } + ] + } +} 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..556e7af8 --- /dev/null +++ b/settings/remarks/microsoft.insights/samples/logprofiles/main-rg-module.bicep @@ -0,0 +1,38 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_GRS' + } + kind: 'StorageV2' + properties: { + minimumTlsVersion: 'TLS1_2' + accessTier: 'Hot' + isHnsEnabled: false + isNfsV3Enabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false + encryption: { + keySource: 'Microsoft.Storage' + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + } + isSftpEnabled: false + } +} diff --git a/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep b/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep new file mode 100644 index 00000000..5898f17e --- /dev/null +++ b/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep @@ -0,0 +1,35 @@ +targetScope = 'subscription' + +param location string = 'westeurope' +param resourceName string = 'acctest0001' + +resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: resourceName + location: location +} + +resource logProfile 'Microsoft.Insights/logProfiles@2016-03-01' = { + name: resourceName + properties: { + categories: [ + 'Action' + ] + locations: [ + 'westeurope' + 'westeurope' + ] + retentionPolicy: { + days: 7 + enabled: true + } + } +} + +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..d9ad0060 100644 --- a/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep +++ b/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep @@ -1,38 +1,72 @@ 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' + allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + allowBlobPublicAccess: true + encryption: { + keySource: 'Microsoft.Storage' + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + } + isHnsEnabled: false + isSftpEnabled: false + supportsHttpsTrafficOnly: true + } +} + resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = { name: resourceName location: 'global' properties: { - actions: [] - autoMitigate: true + severity: 3 criteria: { allOf: [ { - criterionType: 'StaticThresholdCriterion' dimensions: [] metricName: 'UsedCapacity' - metricNamespace: 'Microsoft.Storage/storageAccounts' name: 'Metric1' operator: 'GreaterThan' skipMetricValidation: false threshold: any('55.5') timeAggregation: 'Average' + criterionType: 'StaticThresholdCriterion' + metricNamespace: 'Microsoft.Storage/storageAccounts' } ] 'odata.type': 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria' } description: '' enabled: true - evaluationFrequency: 'PT1M' - scopes: [ - storageAccount.id - ] - severity: 3 targetResourceRegion: '' targetResourceType: '' windowSize: 'PT1H' + actions: [] + autoMitigate: true + evaluationFrequency: 'PT1M' + scopes: [] } tags: { CUSTOMER: 'CUSTOMERx' @@ -41,39 +75,3 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = { test: '123' } } - -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' - } -} 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..5a78e5b1 100644 --- a/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep +++ b/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep @@ -1,31 +1,32 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-preview' = { + name: resourceName + location: 'Global' + properties: {} +} + +resource scopedResource 'Microsoft.Insights/privateLinkScopes/scopedResources@2019-10-17-preview' = { + name: resourceName + parent: privateLinkScope + properties: { + linkedResourceId: component.id + } +} + resource component 'Microsoft.Insights/components@2020-02-02' = { name: resourceName location: location kind: 'web' properties: { + publicNetworkAccessForIngestion: 'Enabled' Application_Type: 'web' DisableIpMasking: false DisableLocalAuth: false ForceCustomerStorageForProfiler: false - RetentionInDays: 90 SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' - } -} - -resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-preview' = { - name: resourceName - properties: {} -} - -resource scopedResource 'Microsoft.Insights/privateLinkScopes/scopedResources@2019-10-17-preview' = { - parent: privateLinkScope - name: resourceName - properties: { - linkedResourceId: component.id + RetentionInDays: 90 } } diff --git a/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep b/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep index fae18770..33a957b2 100644 --- a/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep +++ b/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep @@ -1,50 +1,50 @@ 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 scheduledQueryRule 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = { name: resourceName location: location kind: 'LogAlert' properties: { + enabled: true + evaluationFrequency: 'PT5M' + targetResourceTypes: null + scopes: [ + component.id + ] + severity: 3 + skipQueryValidation: false + windowSize: 'PT5M' autoMitigate: false checkWorkspaceAlertsStorageConfigured: false criteria: { allOf: [ { - dimensions: null operator: 'Equal' query: ''' requests | summarize CountByCountry=count() by client_CountryOrRegion ''' threshold: 5 timeAggregation: 'Count' + dimensions: null } ] } - enabled: true - evaluationFrequency: 'PT5M' - scopes: [ - component.id - ] - severity: 3 - skipQueryValidation: false - targetResourceTypes: null - windowSize: 'PT5M' + } +} + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + SamplingPercentage: 100 + Application_Type: 'web' + DisableIpMasking: false } } diff --git a/settings/remarks/microsoft.insights/samples/webtests/main.bicep b/settings/remarks/microsoft.insights/samples/webtests/main.bicep index 072fc674..4e376302 100644 --- a/settings/remarks/microsoft.insights/samples/webtests/main.bicep +++ b/settings/remarks/microsoft.insights/samples/webtests/main.bicep @@ -1,17 +1,17 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource component 'Microsoft.Insights/components@2020-02-02' = { name: resourceName location: location kind: 'web' properties: { + SamplingPercentage: 100 Application_Type: 'web' DisableIpMasking: false DisableLocalAuth: false ForceCustomerStorageForProfiler: false RetentionInDays: 90 - SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' } @@ -22,16 +22,8 @@ resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { location: location kind: 'standard' properties: { - Description: '' Enabled: false - Frequency: 300 Kind: 'standard' - Locations: [ - { - Id: 'us-tx-sn1-azr' - } - ] - Name: 'acctest0001' Request: { FollowRedirects: false Headers: [ @@ -49,14 +41,22 @@ resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { RequestUrl: 'http://microsoft.com' } RetryEnabled: false - SyntheticMonitorId: 'acctest0001' - Timeout: 30 + SyntheticMonitorId: resourceName ValidationRules: { - ExpectedHttpStatusCode: 200 SSLCheck: false + ExpectedHttpStatusCode: 200 } + Description: '' + Frequency: 300 + Locations: [ + { + Id: 'us-tx-sn1-azr' + } + ] + Name: resourceName + Timeout: 30 } 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..01dea22a 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' = { @@ -5,9 +6,9 @@ resource workbook 'Microsoft.Insights/workbooks@2022-04-01' = { location: location kind: 'shared' properties: { + serializedData: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + sourceId: 'azure monitor' 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"}' - sourceId: 'azure monitor' } } diff --git a/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep b/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep index 5538419d..435efbb2 100644 --- a/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep +++ b/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep @@ -5,17 +5,9 @@ resource workbookTemplate 'Microsoft.Insights/workbookTemplates@2020-11-20' = { name: resourceName location: location properties: { - galleries: [ - { - category: 'workbook' - name: 'test' - order: 0 - resourceType: 'Azure Monitor' - type: 'workbook' - } - ] - priority: 0 templateData: { + styleSettings: {} + version: 'Notebook/1.0' '$schema': 'https://github.com/Microsoft/Application-Insights-Workbooks/blob/master/schema/workbook.json' items: [ { @@ -29,8 +21,16 @@ Welcome to your new workbook.''' type: 1 } ] - styleSettings: {} - version: 'Notebook/1.0' } + galleries: [ + { + category: 'workbook' + name: 'test' + order: 0 + resourceType: 'Azure Monitor' + type: 'workbook' + } + ] + priority: 0 } } diff --git a/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep b/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep index 464310e5..1b37fd4d 100644 --- a/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep +++ b/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep @@ -4,13 +4,13 @@ param location string = 'westeurope' resource iotApp 'Microsoft.IoTCentral/iotApps@2021-11-01-preview' = { name: resourceName location: location + sku: { + name: 'ST1' + } properties: { - displayName: 'acctest0001' - publicNetworkAccess: 'Enabled' subdomain: 'subdomain-2306300333537' template: 'iotc-pnp-preview@1.0.0' - } - sku: { - name: 'ST1' + displayName: '${resourceName}' + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep b/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep index bed18d28..1efa10d3 100644 --- a/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep @@ -1,8 +1,13 @@ +param resourceName string = 'acctest0001' param location string = 'westeurope' resource managedHSM 'Microsoft.KeyVault/managedHSMs@2021-10-01' = { name: 'kvHsm230630033342437496' location: location + sku: { + name: 'Standard_B1' + family: 'B' + } properties: { createMode: 'default' enablePurgeProtection: false @@ -12,10 +17,6 @@ resource managedHSM 'Microsoft.KeyVault/managedHSMs@2021-10-01' = { ] publicNetworkAccess: 'Enabled' softDeleteRetentionInDays: 90 - tenantId: deployer().tenantId - } - sku: { - family: 'B' - name: 'Standard_B1' + tenantId: tenant() } } diff --git a/settings/remarks/microsoft.keyvault/samples/vaults/accesspolicies/main.bicep b/settings/remarks/microsoft.keyvault/samples/vaults/accesspolicies/main.bicep index 439d976c..b2ae1aa3 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/accesspolicies/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/accesspolicies/main.bicep @@ -1,40 +1,40 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' 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() } } resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = { - parent: vault name: 'add' + parent: vault properties: { accessPolicies: [ { objectId: deployer().objectId permissions: { + secrets: [ + 'Set' + ] + storage: [] certificates: [ 'ManageContacts' ] keys: [ 'Create' ] - secrets: [ - 'Set' - ] - storage: [] } - tenantId: deployer().tenantId + tenantId: tenant() } ] } diff --git a/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep b/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep index 01dbf532..55951e76 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep @@ -5,28 +5,25 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName location: location properties: { - accessPolicies: [] - enablePurgeProtection: true enableSoftDelete: true + enablePurgeProtection: true + tenantId: tenant() sku: { family: 'A' name: 'standard' } - tenantId: deployer().tenantId + accessPolicies: [] } } resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = { - parent: vault name: 'add' + parent: vault properties: { accessPolicies: [ { objectId: deployer().objectId permissions: { - certificates: [ - 'ManageContacts' - ] keys: [ 'Get' 'Create' @@ -46,16 +43,22 @@ resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = 'Get' ] storage: [] + certificates: [ + 'ManageContacts' + ] } - tenantId: deployer().tenantId + tenantId: tenant() } ] } } 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..87f9df77 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep @@ -9,22 +9,20 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { { objectId: deployer().objectId permissions: { + secrets: [ + 'Set' + ] + storage: [] certificates: [ 'ManageContacts' ] keys: [ 'Create' ] - secrets: [ - 'Set' - ] - storage: [] } - tenantId: deployer().tenantId + tenantId: tenant() } ] - createMode: 'default' - enableRbacAuthorization: false enableSoftDelete: true enabledForDeployment: false enabledForDiskEncryption: false @@ -34,7 +32,9 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { family: 'A' name: 'standard' } + tenantId: tenant() + createMode: 'default' + enableRbacAuthorization: false softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId } } diff --git a/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep b/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep index a761e6f5..179adcb8 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep @@ -1,23 +1,23 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' 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() } } resource putSecret 'Microsoft.KeyVault/vaults/secrets@2023-02-01' = { - parent: vault name: resourceName + parent: vault properties: { value: 'szechuan' } diff --git a/settings/remarks/microsoft.kubernetes/samples/connectedclusters/main.bicep b/settings/remarks/microsoft.kubernetes/samples/connectedclusters/main.bicep index c92ee190..f6d1ddef 100644 --- a/settings/remarks/microsoft.kubernetes/samples/connectedclusters/main.bicep +++ b/settings/remarks/microsoft.kubernetes/samples/connectedclusters/main.bicep @@ -6,9 +6,9 @@ resource connectedCluster 'Microsoft.Kubernetes/connectedClusters@2024-01-01' = location: location kind: 'ProvisionedCluster' properties: { - agentPublicKeyCertificate: '' arcAgentProfile: { agentAutoUpgrade: 'Enabled' } + agentPublicKeyCertificate: '' } } diff --git a/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep b/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep index f3c96a80..83b500c3 100644 --- a/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep +++ b/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep @@ -1,27 +1,27 @@ 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 properties: { agentPoolProfiles: [ { - count: 1 - mode: 'System' name: 'default' vmSize: 'Standard_DS2_v2' + count: 1 + mode: 'System' } ] - dnsPrefix: 'acctest0001' + dnsPrefix: '${resourceName}' + } +} + +resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = { + name: resourceName + scope: managedCluster + properties: { + extensionType: 'microsoft.flux' + autoUpgradeMinorVersion: true } } diff --git a/settings/remarks/microsoft.kubernetesconfiguration/samples/fluxconfigurations/main.bicep b/settings/remarks/microsoft.kubernetesconfiguration/samples/fluxconfigurations/main.bicep index 342721d7..76ae70fb 100644 --- a/settings/remarks/microsoft.kubernetesconfiguration/samples/fluxconfigurations/main.bicep +++ b/settings/remarks/microsoft.kubernetesconfiguration/samples/fluxconfigurations/main.bicep @@ -1,26 +1,47 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-preview' = { + name: resourceName + location: location + properties: { + agentPoolProfiles: [ + { + vmSize: 'Standard_DS2_v2' + count: 1 + mode: 'System' + name: 'default' + } + ] + dnsPrefix: '${resourceName}' + } +} + resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = { - scope: managedCluster name: resourceName + scope: managedCluster properties: { - autoUpgradeMinorVersion: true extensionType: 'microsoft.flux' + autoUpgradeMinorVersion: true } } resource fluxConfiguration 'Microsoft.KubernetesConfiguration/fluxConfigurations@2022-03-01' = { - scope: managedCluster name: resourceName + scope: managedCluster + dependsOn: [ + extension + ] properties: { + sourceKind: 'GitRepository' + suspend: false gitRepository: { - repositoryRef: { - branch: 'branch' - } syncIntervalInSeconds: 120 timeoutInSeconds: 120 url: 'https://github.com/Azure/arc-k8s-demo' + repositoryRef: { + branch: 'branch' + } } kustomizations: { applications: { @@ -45,26 +66,5 @@ resource fluxConfiguration 'Microsoft.KubernetesConfiguration/fluxConfigurations } namespace: 'flux-system' scope: 'cluster' - sourceKind: 'GitRepository' - suspend: false - } - dependsOn: [ - extension - ] -} - -resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-preview' = { - name: resourceName - location: location - properties: { - agentPoolProfiles: [ - { - count: 1 - mode: 'System' - name: 'default' - vmSize: 'Standard_DS2_v2' - } - ] - dnsPrefix: 'acctest0001' } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep index e7f447c8..201b8ce8 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep @@ -4,29 +4,29 @@ param location string = 'westeurope' resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { enableAutoStop: true enableDiskEncryption: false - enableDoubleEncryption: false enablePurge: false enableStreamingIngest: false - engineType: 'V2' publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' + enableDoubleEncryption: false + engineType: 'V2' 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..e199efef 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep @@ -1,43 +1,45 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +param clientId string + resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { - enableAutoStop: true - enableDiskEncryption: false enableDoubleEncryption: false + publicIPType: 'IPv4' + publicNetworkAccess: 'Enabled' + trustedExternalTenants: [] + enableAutoStop: true 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' + enableDiskEncryption: false } } 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() } } 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..cd2b20da 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep @@ -4,36 +4,36 @@ param location string = 'westeurope' resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { enableAutoStop: true - enableDiskEncryption: false enableDoubleEncryption: false enablePurge: false + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: 'Disabled' + enableDiskEncryption: false enableStreamingIngest: false engineType: 'V2' publicIPType: 'IPv4' - publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' - } } resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { - parent: cluster name: resourceName location: location + parent: cluster kind: 'ReadWrite' properties: {} } resource 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..bc8b6577 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/main.bicep @@ -4,21 +4,21 @@ param location string = 'westeurope' resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + capacity: 1 + } properties: { - enableAutoStop: true - enableDiskEncryption: false enableDoubleEncryption: false + publicIPType: 'IPv4' + publicNetworkAccess: 'Enabled' + trustedExternalTenants: [] enablePurge: false enableStreamingIngest: false engineType: 'V2' - publicIPType: 'IPv4' - publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' - trustedExternalTenants: [] - } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' + enableAutoStop: true + enableDiskEncryption: false } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep index d595fe4c..f8ee9875 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep @@ -4,34 +4,47 @@ param location string = 'westeurope' resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { - enableAutoStop: true enableDiskEncryption: false - enableDoubleEncryption: false enablePurge: false - enableStreamingIngest: false engineType: 'V2' publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] + enableDoubleEncryption: false + enableStreamingIngest: false + restrictOutboundNetworkAccess: 'Disabled' + enableAutoStop: true } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' +} + +resource managedPrivateEndpoint 'Microsoft.Kusto/clusters/managedPrivateEndpoints@2023-05-02' = { + name: resourceName + parent: cluster + properties: { + groupId: 'blob' + privateLinkResourceId: storageAccount.id } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true allowBlobPublicAccess: true allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -44,26 +57,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' - } -} - -resource managedPrivateEndpoint 'Microsoft.Kusto/clusters/managedPrivateEndpoints@2023-05-02' = { - parent: cluster - name: resourceName - properties: { - groupId: 'blob' - privateLinkResourceId: storageAccount.id + accessTier: 'Hot' + allowSharedKeyAccess: true + isHnsEnabled: false + isNfsV3Enabled: false } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep index bfe0741d..1bd346c4 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep @@ -1,35 +1,37 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +param clientId string + resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' + } properties: { - enableAutoStop: true - enableDiskEncryption: false + publicIPType: 'IPv4' + restrictOutboundNetworkAccess: 'Disabled' enableDoubleEncryption: false - enablePurge: false enableStreamingIngest: false engineType: 'V2' - publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' trustedExternalTenants: [] - } - sku: { - capacity: 1 - name: 'Dev(No SLA)_Standard_D11_v2' - tier: 'Basic' + enableAutoStop: true + enableDiskEncryption: false + enablePurge: false } } resource principalAssignment 'Microsoft.Kusto/clusters/principalAssignments@2023-05-02' = { - parent: cluster name: resourceName + parent: cluster properties: { - principalId: deployer().objectId + tenantId: tenant() + principalId: clientId principalType: 'App' role: 'AllDatabasesViewer' - tenantId: deployer().tenantId } } diff --git a/settings/remarks/microsoft.labservices/samples/labplans/main.bicep b/settings/remarks/microsoft.labservices/samples/labplans/main.bicep index 8b9e5b62..23bceec0 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..8e5ad51e 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/main.bicep @@ -8,42 +8,42 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { name: resourceName location: location properties: { - autoShutdownProfile: { - shutdownOnDisconnect: 'Disabled' - shutdownOnIdle: 'None' - shutdownWhenNotConnected: 'Disabled' - } - connectionProfile: { - clientRdpAccess: 'None' - clientSshAccess: 'None' - webRdpAccess: 'None' - webSshAccess: 'None' - } - securityProfile: { - openAccess: 'Disabled' - } title: 'Test Title' virtualMachineProfile: { + usageQuota: 'PT0S' + useSharedPassword: 'Disabled' additionalCapabilities: { installGpuDrivers: 'Disabled' } adminUser: { - password: null + password: '${adminPassword}' username: 'testadmin' } createOption: 'Image' imageReference: { - offer: '0001-com-ubuntu-server-focal' publisher: 'canonical' sku: '20_04-lts' version: 'latest' + offer: '0001-com-ubuntu-server-focal' } sku: { capacity: 1 name: 'Classic_Fsv2_2_4GB_128_S_SSD' } - usageQuota: 'PT0S' - useSharedPassword: 'Disabled' + } + autoShutdownProfile: { + shutdownOnIdle: 'None' + shutdownWhenNotConnected: 'Disabled' + shutdownOnDisconnect: 'Disabled' + } + connectionProfile: { + clientRdpAccess: 'None' + clientSshAccess: 'None' + webRdpAccess: 'None' + webSshAccess: 'None' + } + securityProfile: { + openAccess: 'Disabled' } } } diff --git a/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep b/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep index 2794d8e2..9521fa7e 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep @@ -1,34 +1,21 @@ -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 location: location properties: { - autoShutdownProfile: { - shutdownOnDisconnect: 'Disabled' - shutdownOnIdle: 'None' - shutdownWhenNotConnected: 'Disabled' - } - connectionProfile: { - clientRdpAccess: 'None' - clientSshAccess: 'None' - webRdpAccess: 'None' - webSshAccess: 'None' - } - securityProfile: { - openAccess: 'Disabled' - } title: 'Test Title' virtualMachineProfile: { + useSharedPassword: 'Disabled' additionalCapabilities: { installGpuDrivers: 'Disabled' } adminUser: { - password: null + password: '${adminPassword}' username: 'testadmin' } createOption: 'Image' @@ -43,16 +30,29 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { name: 'Classic_Fsv2_2_4GB_128_S_SSD' } usageQuota: 'PT0S' - useSharedPassword: 'Disabled' + } + autoShutdownProfile: { + shutdownOnDisconnect: 'Disabled' + shutdownOnIdle: 'None' + shutdownWhenNotConnected: 'Disabled' + } + connectionProfile: { + clientRdpAccess: 'None' + clientSshAccess: 'None' + webRdpAccess: 'None' + webSshAccess: 'None' + } + securityProfile: { + openAccess: 'Disabled' } } } 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' + stopAt: '2023-06-30T04:33:55Z' } } diff --git a/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep b/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep index 9453127f..88286c3d 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep @@ -8,11 +8,6 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { name: resourceName location: location properties: { - autoShutdownProfile: { - shutdownOnDisconnect: 'Disabled' - shutdownOnIdle: 'None' - shutdownWhenNotConnected: 'Disabled' - } connectionProfile: { clientRdpAccess: 'None' clientSshAccess: 'None' @@ -24,11 +19,17 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { } title: 'Test Title' virtualMachineProfile: { + sku: { + name: 'Classic_Fsv2_2_4GB_128_S_SSD' + capacity: 1 + } + usageQuota: 'PT0S' + useSharedPassword: 'Disabled' additionalCapabilities: { installGpuDrivers: 'Disabled' } adminUser: { - password: null + password: '${adminPassword}' username: 'testadmin' } createOption: 'Image' @@ -38,19 +39,18 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { sku: '20_04-lts' version: 'latest' } - sku: { - capacity: 1 - name: 'Classic_Fsv2_2_4GB_128_S_SSD' - } - usageQuota: 'PT0S' - useSharedPassword: 'Disabled' + } + autoShutdownProfile: { + shutdownWhenNotConnected: 'Disabled' + shutdownOnDisconnect: 'Disabled' + shutdownOnIdle: 'None' } } } 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..0bad4cfb 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep @@ -4,46 +4,29 @@ param location string = 'westeurope' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard' } + properties: {} } resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { agreementType: 'AS2' content: { aS2: { receiveAgreement: { protocolSettings: { - acknowledgementConnectionSettings: { - ignoreCertificateNameMismatch: false - keepHttpConnectionAlive: false - supportHttpStatusCodeContinue: false - unfoldHttpHeaders: false - } - envelopeSettings: { - autogenerateFileName: false - fileNameTemplate: '%FILE().ReceivedFileName%' - messageContentType: 'text/plain' - suspendMessageOnFileNameGenerationError: true - transmitFileNameInMimeHeader: false - } - errorSettings: { - resendIfMDNNotReceived: false - suspendDuplicateMessage: false - } mdnSettings: { - dispositionNotificationTo: 'http://localhost' - micHashingAlgorithm: 'SHA1' - needMDN: false sendInboundMDNToMessageBox: true sendMDNAsynchronously: false signMDN: false signOutboundMDNIfOptional: false + dispositionNotificationTo: 'http://localhost' + micHashingAlgorithm: 'SHA1' + needMDN: false } messageConnectionSettings: { ignoreCertificateNameMismatch: false @@ -52,43 +35,31 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = unfoldHttpHeaders: true } securitySettings: { - enableNRRForInboundDecodedMessages: false enableNRRForInboundEncodedMessages: false enableNRRForInboundMDN: false enableNRRForOutboundDecodedMessages: false enableNRRForOutboundEncodedMessages: false enableNRRForOutboundMDN: false overrideGroupSigningCertificate: false + enableNRRForInboundDecodedMessages: false } validationSettings: { + interchangeDuplicatesValidityDays: 5 + overrideMessageProperties: false + signingAlgorithm: 'Default' checkCertificateRevocationListOnReceive: false checkCertificateRevocationListOnSend: false checkDuplicateMessage: false compressMessage: false - encryptMessage: false encryptionAlgorithm: 'DES3' - interchangeDuplicatesValidityDays: 5 - overrideMessageProperties: false signMessage: false - signingAlgorithm: 'Default' + encryptMessage: false } - } - receiverBusinessIdentity: { - qualifier: 'AS2Identity' - value: 'FabrikamNY' - } - senderBusinessIdentity: { - qualifier: 'AS2Identity' - value: 'FabrikamDC' - } - } - sendAgreement: { - protocolSettings: { acknowledgementConnectionSettings: { + unfoldHttpHeaders: false ignoreCertificateNameMismatch: false keepHttpConnectionAlive: false supportHttpStatusCodeContinue: false - unfoldHttpHeaders: false } envelopeSettings: { autogenerateFileName: false @@ -101,14 +72,38 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = resendIfMDNNotReceived: false suspendDuplicateMessage: false } + } + receiverBusinessIdentity: { + qualifier: 'AS2Identity' + value: 'FabrikamNY' + } + senderBusinessIdentity: { + qualifier: 'AS2Identity' + value: 'FabrikamDC' + } + } + sendAgreement: { + receiverBusinessIdentity: { + qualifier: 'AS2Identity' + value: 'FabrikamDC' + } + senderBusinessIdentity: { + qualifier: 'AS2Identity' + value: 'FabrikamNY' + } + protocolSettings: { + errorSettings: { + suspendDuplicateMessage: false + resendIfMDNNotReceived: false + } mdnSettings: { - dispositionNotificationTo: 'http://localhost' micHashingAlgorithm: 'SHA1' needMDN: false sendInboundMDNToMessageBox: true sendMDNAsynchronously: false signMDN: false signOutboundMDNIfOptional: false + dispositionNotificationTo: 'http://localhost' } messageConnectionSettings: { ignoreCertificateNameMismatch: false @@ -126,63 +121,66 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = overrideGroupSigningCertificate: false } validationSettings: { - checkCertificateRevocationListOnReceive: false - checkCertificateRevocationListOnSend: false checkDuplicateMessage: false compressMessage: false - encryptMessage: false - encryptionAlgorithm: 'DES3' - interchangeDuplicatesValidityDays: 5 overrideMessageProperties: false signMessage: false signingAlgorithm: 'Default' + checkCertificateRevocationListOnReceive: false + checkCertificateRevocationListOnSend: false + encryptMessage: false + encryptionAlgorithm: 'DES3' + interchangeDuplicatesValidityDays: 5 + } + acknowledgementConnectionSettings: { + ignoreCertificateNameMismatch: false + keepHttpConnectionAlive: false + supportHttpStatusCodeContinue: false + unfoldHttpHeaders: false + } + envelopeSettings: { + autogenerateFileName: false + fileNameTemplate: '%FILE().ReceivedFileName%' + messageContentType: 'text/plain' + suspendMessageOnFileNameGenerationError: true + transmitFileNameInMimeHeader: false } - } - receiverBusinessIdentity: { - qualifier: 'AS2Identity' - value: 'FabrikamDC' - } - senderBusinessIdentity: { - qualifier: 'AS2Identity' - value: 'FabrikamNY' } } } } guestIdentity: { - qualifier: 'AS2Identity' value: 'FabrikamDC' + qualifier: 'AS2Identity' } - guestPartner: partner2.name hostIdentity: { qualifier: 'AS2Identity' value: 'FabrikamNY' } - hostPartner: partner.name } } resource partner 'Microsoft.Logic/integrationAccounts/partners@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { + partnerType: 'B2B' content: { b2b: { businessIdentities: [ { - qualifier: 'AS2Identity' value: 'FabrikamNY' + qualifier: 'AS2Identity' } ] } } - partnerType: 'B2B' } } 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..6daead8e 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep @@ -4,20 +4,36 @@ 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' allowBlobPublicAccess: true + isHnsEnabled: false + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + bypass: 'AzureServices' + defaultAction: 'Allow' + } allowCrossTenantReplication: false + isLocalUserEnabled: true + accessTier: 'Hot' allowSharedKeyAccess: true defaultToOAuthAuthentication: false dnsEndpointType: 'Standard' @@ -32,36 +48,20 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - isHnsEnabled: false - isLocalUserEnabled: true - isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - bypass: 'AzureServices' - defaultAction: 'Allow' - ipRules: [] - resourceAccessRules: [] - virtualNetworkRules: [] - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } resource assembly 'Microsoft.Logic/integrationAccounts/assemblies@2019-05-01' = { - parent: integrationAccount name: '${resourceName}-assembly' + parent: integrationAccount properties: { - assemblyName: 'TestAssembly2' - assemblyVersion: '2.2.2.2' content: 'dGVzdA==' contentType: 'application/octet-stream' metadata: { foo: 'bar2' } + assemblyName: 'TestAssembly2' + assemblyVersion: '2.2.2.2' } } diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep index ffb5d1cd..032a54e7 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/batchconfigurations/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard' } + properties: {} } resource batchConfiguration 'Microsoft.Logic/integrationAccounts/batchConfigurations@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { batchGroupName: 'TestBatchGroup' releaseCriteria: { diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep index 8f755960..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..b954fa13 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep @@ -4,16 +4,18 @@ 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: { + contentType: 'application/xml' + mapType: 'Xslt' content: ''' ''' - contentType: 'application/xml' - mapType: 'Xslt' } } diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/partners/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/partners/main.bicep index b61925a7..70c8e269 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/partners/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/partners/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 partner 'Microsoft.Logic/integrationAccounts/partners@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { content: { b2b: { diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/schemas/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/schemas/main.bicep index fa4c7780..27dcecde 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/schemas/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/schemas/main.bicep @@ -1,18 +1,18 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName location: location - properties: {} sku: { name: 'Basic' } + properties: {} } resource schema 'Microsoft.Logic/integrationAccounts/schemas@2019-05-01' = { - parent: integrationAccount name: resourceName + parent: integrationAccount properties: { content: '''' + runtimeVersion: 'Java_8' + type: 'Jar' + } } } @@ -17,21 +53,12 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 10 maxStalenessPrefix: 200 } - databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] isVirtualNetworkFilterEnabled: false locations: [ { @@ -40,74 +67,46 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] + defaultIdentity: 'FirstPartyIdentity' + disableKeyBasedMetadataWriteAccess: false + enableAutomaticFailover: false + enableFreeTier: false + ipRules: [] networkAclBypass: 'None' networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' + capabilities: [] + enableMultipleWriteLocations: false + databaseAccountOfferType: 'Standard' + disableLocalAuth: false virtualNetworkRules: [] } } resource linker 'Microsoft.ServiceLinker/linkers@2022-05-01' = { - scope: deployment name: resourceName + scope: deployment properties: { authInfo: { authType: 'systemAssignedIdentity' } clientType: 'none' targetService: { - id: sqlDatabase.id resourceProperties: null type: 'AzureResource' } } } -resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { - parent: spring - name: resourceName - location: location - properties: { - customPersistentDisks: [] - enableEndToEndTLS: false - public: false - } -} - resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10-15' = { - parent: databaseAccount name: resourceName + parent: databaseAccount properties: { options: { throughput: 400 } resource: { - id: 'acctest0001' + id: '${resourceName}' } } } - -resource deployment 'Microsoft.AppPlatform/Spring/apps/deployments@2023-05-01-preview' = { - parent: app - name: 'deploy-q4uff' - properties: { - deploymentSettings: { - environmentVariables: {} - resourceRequests: { - cpu: '1' - memory: '1Gi' - } - } - source: { - jvmOptions: '' - relativePath: '' - runtimeVersion: 'Java_8' - type: 'Jar' - } - } - sku: { - capacity: 1 - name: 'S0' - tier: 'Standard' - } -} diff --git a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep index 1b9932b2..8e75d4bd 100644 --- a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep +++ b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep @@ -24,34 +24,32 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } resource association 'Microsoft.ServiceNetworking/trafficControllers/associations@2023-11-01' = { - parent: trafficController name: '${resourceName}-assoc' location: location + parent: trafficController properties: { associationType: 'subnets' - subnet: { - id: subnet.id - } + subnet: {} } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: '${resourceName}-subnet' + parent: virtualNetwork properties: { - addressPrefix: '10.0.1.0/24' defaultOutboundAccess: true delegations: [ { - name: 'delegation' properties: { serviceName: 'Microsoft.ServiceNetworking/trafficControllers' } + name: 'delegation' } ] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.1.0/24' } } diff --git a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep index 1d959084..af33f2f6 100644 --- a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep +++ b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep @@ -7,8 +7,8 @@ resource trafficController 'Microsoft.ServiceNetworking/trafficControllers@2023- } resource frontend 'Microsoft.ServiceNetworking/trafficControllers/frontends@2023-11-01' = { - parent: trafficController name: '${resourceName}-frontend' location: location + parent: trafficController properties: {} } diff --git a/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep b/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep index cf280b4f..c12288a2 100644 --- a/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep @@ -4,10 +4,31 @@ param location string = 'westeurope' resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_S1' + } properties: { + resourceLogConfiguration: { + categories: [ + { + enabled: 'false' + name: 'MessagingLogs' + } + { + name: 'ConnectivityLogs' + enabled: 'false' + } + { + name: 'HttpRequestLogs' + enabled: 'false' + } + ] + } + upstream: { + templates: [] + } cors: {} - disableAadAuth: false - disableLocalAuth: false features: [ { flag: 'ServiceMode' @@ -27,34 +48,13 @@ resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { } ] publicNetworkAccess: 'Enabled' - resourceLogConfiguration: { - categories: [ - { - enabled: 'false' - name: 'MessagingLogs' - } - { - enabled: 'false' - name: 'ConnectivityLogs' - } - { - enabled: 'false' - name: 'HttpRequestLogs' - } - ] - } serverless: { connectionTimeoutInSeconds: 30 } tls: { clientCertEnabled: false } - upstream: { - templates: [] - } - } - sku: { - capacity: 1 - name: 'Standard_S1' + disableAadAuth: false + disableLocalAuth: false } } diff --git a/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep b/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep index 8e2ebab2..e1f1840d 100644 --- a/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep @@ -4,9 +4,12 @@ param location string = 'westeurope' resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_S1' + } properties: { cors: {} - disableAadAuth: false disableLocalAuth: false features: [ { @@ -27,35 +30,32 @@ resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { } ] publicNetworkAccess: 'Enabled' + serverless: { + connectionTimeoutInSeconds: 30 + } + upstream: { + templates: [] + } + disableAadAuth: false resourceLogConfiguration: { categories: [ { - enabled: 'false' name: 'MessagingLogs' + enabled: 'false' } { enabled: 'false' name: 'ConnectivityLogs' } { - enabled: 'false' name: 'HttpRequestLogs' + enabled: 'false' } ] } - serverless: { - connectionTimeoutInSeconds: 30 - } tls: { clientCertEnabled: false } - upstream: { - templates: [] - } - } - sku: { - capacity: 1 - name: 'Standard_S1' } } @@ -63,6 +63,11 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { + tenantId: tenant() + createMode: 'default' + enabledForDeployment: false + enabledForDiskEncryption: false + softDeleteRetentionInDays: 7 accessPolicies: [ { objectId: deployer().objectId @@ -78,31 +83,26 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { ] storage: [] } - tenantId: deployer().tenantId + tenantId: tenant() } ] - createMode: 'default' enableRbacAuthorization: false enableSoftDelete: true - enabledForDeployment: false - enabledForDiskEncryption: false enabledForTemplateDeployment: false publicNetworkAccess: 'Enabled' sku: { family: 'A' name: 'standard' } - softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId } } resource sharedPrivateLinkResource 'Microsoft.SignalRService/signalR/sharedPrivateLinkResources@2023-02-01' = { - parent: signalR name: resourceName + parent: signalR properties: { + requestMessage: 'please approve' groupId: 'vault' privateLinkResourceId: vault.id - requestMessage: 'please approve' } } diff --git a/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep b/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep index fe288f3f..377ec535 100644 --- a/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep @@ -4,6 +4,10 @@ param location string = 'westeurope' resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_S1' + } properties: { disableAadAuth: false disableLocalAuth: false @@ -12,15 +16,11 @@ resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { clientCertEnabled: false } } - sku: { - capacity: 1 - name: 'Standard_S1' - } } resource hub 'Microsoft.SignalRService/webPubSub/hubs@2023-02-01' = { - parent: webPubSub name: resourceName + parent: webPubSub properties: { anonymousConnectPolicy: 'Deny' eventListeners: [] diff --git a/settings/remarks/microsoft.signalrservice/samples/webpubsub/main.bicep b/settings/remarks/microsoft.signalrservice/samples/webpubsub/main.bicep index 9e647d23..2d53b883 100644 --- a/settings/remarks/microsoft.signalrservice/samples/webpubsub/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/webpubsub/main.bicep @@ -4,16 +4,16 @@ param location string = 'westeurope' resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_S1' + } properties: { - disableAadAuth: false disableLocalAuth: false publicNetworkAccess: 'Enabled' tls: { clientCertEnabled: false } - } - sku: { - capacity: 1 - name: 'Standard_S1' + disableAadAuth: false } } diff --git a/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep b/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep index 054ee992..1a663682 100644 --- a/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep @@ -5,6 +5,18 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { + enabledForDeployment: false + enabledForDiskEncryption: false + enabledForTemplateDeployment: false + publicNetworkAccess: 'Enabled' + sku: { + family: 'A' + name: 'standard' + } + tenantId: tenant() + createMode: 'default' + enableRbacAuthorization: false + softDeleteRetentionInDays: 7 accessPolicies: [ { objectId: deployer().objectId @@ -20,45 +32,33 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { ] storage: [] } - tenantId: deployer().tenantId + tenantId: tenant() } ] - createMode: 'default' - enableRbacAuthorization: false enableSoftDelete: true - enabledForDeployment: false - enabledForDiskEncryption: false - enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' - sku: { - family: 'A' - name: 'standard' - } - softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId } } resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'Standard_S1' + } properties: { - disableAadAuth: false - disableLocalAuth: false publicNetworkAccess: 'Enabled' tls: { clientCertEnabled: false } - } - sku: { - capacity: 1 - name: 'Standard_S1' + disableAadAuth: false + disableLocalAuth: false } } resource sharedPrivateLinkResource 'Microsoft.SignalRService/webPubSub/sharedPrivateLinkResources@2023-02-01' = { - parent: webPubSub name: resourceName + parent: webPubSub properties: { groupId: 'vault' privateLinkResourceId: vault.id diff --git a/settings/remarks/microsoft.solutions/samples/applications/main.bicep b/settings/remarks/microsoft.solutions/samples/applications/main.bicep index 70a405e6..1d45ce54 100644 --- a/settings/remarks/microsoft.solutions/samples/applications/main.bicep +++ b/settings/remarks/microsoft.solutions/samples/applications/main.bicep @@ -6,8 +6,7 @@ resource application 'Microsoft.Solutions/applications@2021-07-01' = { location: location kind: 'ServiceCatalog' properties: { - applicationDefinitionId: applicationDefinition.id - managedResourceGroupId: '/subscriptions/subscription().subscriptionId/resourceGroups/acctest0001-infragroup' + managedResourceGroupId: '/subscriptions/${subscription()}/resourceGroups/${resourceName}-infragroup' parameters: { arrayParameter: { value: [ @@ -23,14 +22,14 @@ resource application 'Microsoft.Solutions/applications@2021-07-01' = { } objectParameter: { value: { - nested_array: [ - 'value_1' - 'value_2' - ] nested_bool: true nested_object: { key_0: 0 } + nested_array: [ + 'value_1' + 'value_2' + ] } } secureStringParameter: { @@ -53,77 +52,11 @@ resource applicationDefinition 'Microsoft.Solutions/applicationDefinitions@2021- roleDefinitionId: 'b24988ac-6180-42a0-ab88-20f7382dd24c' } ] - createUiDefinition: ''' { - "$schema": "https://schema.management.azure.com/schemas/0.1.2-preview/CreateUIDefinition.MultiVm.json#", - "handler": "Microsoft.Azure.CreateUIDef", - "version": "0.1.2-preview", - "parameters": { - "basics": [], - "steps": [], - "outputs": {} - } - } -''' + createUiDefinition: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} description: 'Test Managed App Definition' displayName: 'TestManagedAppDefinition' isEnabled: true lockLevel: 'ReadOnly' - mainTemplate: ''' { - "$schema": "https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#", - "contentVersion": "1.0.0.0", - "parameters": { - - "boolParameter": { - "type": "bool" - }, - "intParameter": { - "type": "int" - }, - "stringParameter": { - "type": "string" - }, - "secureStringParameter": { - "type": "secureString" - }, - "objectParameter": { - "type": "object" - }, - "arrayParameter": { - "type": "array" - } - - }, - "variables": {}, - "resources": [], - "outputs": { - "boolOutput": { - "type": "bool", - "value": true - }, - "intOutput": { - "type": "int", - "value": 100 - }, - "stringOutput": { - "type": "string", - "value": "stringOutputValue" - }, - "objectOutput": { - "type": "object", - "value": { - "nested_bool": true, - "nested_array": ["value_1", "value_2"], - "nested_object": { - "key_0": 0 - } - } - }, - "arrayOutput": { - "type": "array", - "value": ["value_1", "value_2"] - } - } - } -''' + mainTemplate: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } diff --git a/settings/remarks/microsoft.sql/remarks.json b/settings/remarks/microsoft.sql/remarks.json index 4435dec1..7c2e5798 100644 --- a/settings/remarks/microsoft.sql/remarks.json +++ b/settings/remarks/microsoft.sql/remarks.json @@ -257,6 +257,11 @@ "ResourceType": "Microsoft.Sql/servers/virtualNetworkRules", "Path": "samples/servers/virtualnetworkrules/main.bicep", "Description": "A basic example of deploying Azure SQL Virtual Network Rule." + }, + { + "ResourceType": "Microsoft.Sql/servers/jobAgents/jobs/steps", + "Path": "samples/servers/jobagents/jobs/steps/main.bicep", + "Description": "A basic example of deploying Elastic Job Step." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.sql/samples/instancepools/main.bicep b/settings/remarks/microsoft.sql/samples/instancepools/main.bicep index b18f9384..fc4b7939 100644 --- a/settings/remarks/microsoft.sql/samples/instancepools/main.bicep +++ b/settings/remarks/microsoft.sql/samples/instancepools/main.bicep @@ -1,90 +1,93 @@ param resourceName string = 'acctest0001' +param location string = 'westeurope' resource subnet 'Microsoft.Network/virtualNetworks/subnets@2023-04-01' existing = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork } resource instancePool 'Microsoft.Sql/instancePools@2022-05-01-preview' = { name: resourceName - properties: { - licenseType: 'LicenseIncluded' - subnetId: subnet.id - vCores: 8 - } + location: 'azapi_resource.resourceGroup.location' sku: { family: 'Gen5' name: 'GP_Gen5' tier: 'GeneralPurpose' } + properties: { + licenseType: 'LicenseIncluded' + subnetId: subnet.id + vCores: 8 + } } resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2023-04-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' properties: { securityRules: [ { - name: 'allow_tds_inbound' properties: { + sourcePortRange: '*' access: 'Allow' description: 'Allow access to data' destinationAddressPrefix: '*' destinationPortRange: '1433' - direction: 'Inbound' priority: 1000 + direction: 'Inbound' protocol: 'TCP' sourceAddressPrefix: 'VirtualNetwork' - sourcePortRange: '*' } + name: 'allow_tds_inbound' } { name: 'allow_redirect_inbound' properties: { - access: 'Allow' description: 'Allow inbound redirect traffic to Managed Instance inside the virtual network' destinationAddressPrefix: '*' destinationPortRange: '11000-11999' - direction: 'Inbound' - priority: 1100 protocol: 'Tcp' sourceAddressPrefix: 'VirtualNetwork' sourcePortRange: '*' + access: 'Allow' + direction: 'Inbound' + priority: 1100 } } { name: 'allow_geodr_inbound' properties: { - access: 'Allow' description: 'Allow inbound geodr traffic inside the virtual network' + priority: 1200 + sourceAddressPrefix: 'VirtualNetwork' + sourcePortRange: '*' destinationAddressPrefix: '*' destinationPortRange: '5022' direction: 'Inbound' - priority: 1200 protocol: 'Tcp' - sourceAddressPrefix: 'VirtualNetwork' - sourcePortRange: '*' + access: 'Allow' } } { name: 'deny_all_inbound' properties: { + protocol: '*' + sourcePortRange: '*' + destinationPortRange: '*' + direction: 'Inbound' + sourceAddressPrefix: '*' access: 'Deny' description: 'Deny all other inbound traffic' destinationAddressPrefix: '*' - destinationPortRange: '*' - direction: 'Inbound' priority: 4096 - protocol: '*' - sourceAddressPrefix: '*' - sourcePortRange: '*' } } { name: 'allow_linkedserver_outbound' properties: { + destinationAddressPrefix: 'VirtualNetwork' access: 'Allow' description: 'Allow outbound linkedserver traffic inside the virtual network' - destinationAddressPrefix: 'VirtualNetwork' destinationPortRange: '1433' direction: 'Outbound' priority: 1000 @@ -96,44 +99,44 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2023-04-0 { name: 'allow_redirect_outbound' properties: { - access: 'Allow' - description: 'Allow outbound redirect traffic to Managed Instance inside the virtual network' - destinationAddressPrefix: 'VirtualNetwork' destinationPortRange: '11000-11999' direction: 'Outbound' - priority: 1100 protocol: 'Tcp' - sourceAddressPrefix: '*' sourcePortRange: '*' + access: 'Allow' + destinationAddressPrefix: 'VirtualNetwork' + priority: 1100 + sourceAddressPrefix: '*' + description: 'Allow outbound redirect traffic to Managed Instance inside the virtual network' } } { name: 'allow_geodr_outbound' properties: { + destinationAddressPrefix: 'VirtualNetwork' + protocol: 'Tcp' access: 'Allow' description: 'Allow outbound geodr traffic inside the virtual network' - destinationAddressPrefix: 'VirtualNetwork' destinationPortRange: '5022' direction: 'Outbound' priority: 1200 - protocol: 'Tcp' sourceAddressPrefix: '*' sourcePortRange: '*' } } { - name: 'deny_all_outbound' properties: { + destinationPortRange: '*' + protocol: '*' access: 'Deny' description: 'Deny all other outbound traffic' - destinationAddressPrefix: '*' - destinationPortRange: '*' direction: 'Outbound' priority: 4096 - protocol: '*' sourceAddressPrefix: '*' sourcePortRange: '*' + destinationAddressPrefix: '*' } + name: 'deny_all_outbound' } ] } @@ -141,6 +144,7 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2023-04-0 resource routeTable 'Microsoft.Network/routeTables@2023-04-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' properties: { disableBgpRoutePropagation: false } @@ -148,6 +152,7 @@ resource routeTable 'Microsoft.Network/routeTables@2023-04-01' = { resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' properties: { addressSpace: { addressPrefixes: [ @@ -156,15 +161,21 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = { } subnets: [ { - name: 'Default' properties: { addressPrefix: '10.0.0.0/24' } + name: 'Default' } { - name: 'acctest0001' + name: resourceName properties: { addressPrefix: '10.0.1.0/24' + networkSecurityGroup: { + id: networkSecurityGroup.id + } + routeTable: { + id: routeTable.id + } delegations: [ { name: 'miDelegation' @@ -173,12 +184,6 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = { } } ] - networkSecurityGroup: { - id: networkSecurityGroup.id - } - routeTable: { - id: routeTable.id - } } } ] diff --git a/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep index ebcec94e..3a65b0a4 100644 --- a/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep @@ -1,26 +1,28 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' + +param clientId string resource server 'Microsoft.Sql/servers@2015-05-01-preview' = { name: resourceName location: location properties: { administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' version: '12.0' } } resource administrator 'Microsoft.Sql/servers/administrators@2020-11-01-preview' = { - parent: server name: 'ActiveDirectory' + parent: server properties: { administratorType: 'ActiveDirectory' login: 'sqladmin' - sid: deployer().objectId - tenantId: deployer().tenantId + sid: clientId + tenantId: tenant() } } diff --git a/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep b/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep index b8a48ccd..d729f15e 100644 --- a/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep @@ -8,18 +8,18 @@ resource server 'Microsoft.Sql/servers@2022-05-01-preview' = { name: resourceName location: location properties: { + version: '12.0' administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' - version: '12.0' } } resource auditingSettings 'Microsoft.Sql/servers/auditingSettings@2022-05-01-preview' = { - parent: server name: 'default' + parent: server properties: { auditActionsAndGroups: [ 'FAILED_DATABASE_AUTHENTICATION_GROUP' diff --git a/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep b/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep index 80a772ec..6fd7f0ce 100644 --- a/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep @@ -10,18 +10,18 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: null - administratorLoginPassword: null - minimalTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' } } resource connectionPolicy 'Microsoft.Sql/servers/connectionPolicies@2014-04-01' = { - parent: server name: 'default' + parent: server properties: { connectionType: 'Default' } diff --git a/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep b/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep index b6fb2f83..8da3fc3d 100644 --- a/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep @@ -9,7 +9,7 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { location: location properties: { administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' @@ -18,20 +18,20 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { } resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { + readScale: 'Disabled' + zoneRedundant: false autoPauseDelay: 0 createMode: 'Default' - elasticPoolId: '' highAvailabilityReplicaCount: 0 isLedgerOn: false + requestedBackupStorageRedundancy: 'Geo' + elasticPoolId: '' licenseType: 'LicenseIncluded' maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') minCapacity: 0 - readScale: 'Disabled' - requestedBackupStorageRedundancy: 'Geo' - zoneRedundant: false } } diff --git a/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep b/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep index 3250298c..ff2ff6a9 100644 --- a/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep @@ -9,7 +9,7 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { location: location properties: { administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' @@ -18,27 +18,27 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { } resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { - autoPauseDelay: 0 createMode: 'Default' elasticPoolId: '' highAvailabilityReplicaCount: 0 isLedgerOn: false + requestedBackupStorageRedundancy: 'Geo' + autoPauseDelay: 0 licenseType: 'LicenseIncluded' maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') minCapacity: 0 readScale: 'Disabled' - requestedBackupStorageRedundancy: 'Geo' zoneRedundant: false } } resource securityAlertPolicy 'Microsoft.Sql/servers/databases/securityAlertPolicies@2020-11-01-preview' = { - parent: database name: 'default' + parent: database properties: { state: 'Disabled' } diff --git a/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep b/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep index a2dfb33b..a24675da 100644 --- a/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep @@ -8,37 +8,37 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' } } resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { + zoneRedundant: false autoPauseDelay: 0 createMode: 'Default' - elasticPoolId: '' highAvailabilityReplicaCount: 0 - isLedgerOn: false licenseType: 'LicenseIncluded' + readScale: 'Disabled' + elasticPoolId: '' + isLedgerOn: false maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') minCapacity: 0 - readScale: 'Disabled' requestedBackupStorageRedundancy: 'Geo' - zoneRedundant: false } } resource transparentDataEncryption 'Microsoft.Sql/servers/databases/transparentDataEncryption@2014-04-01' = { - parent: database name: 'current' + parent: database properties: { status: 'Enabled' } diff --git a/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep b/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep index 6401087e..3921fb87 100644 --- a/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep @@ -10,8 +10,8 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' @@ -20,6 +20,6 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { } resource dnsAlias 'Microsoft.Sql/servers/dnsAliases@2020-11-01-preview' = { - parent: server name: resourceName + parent: server } diff --git a/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep b/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep index 9051a2ab..d4f3fb04 100644 --- a/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep @@ -8,19 +8,25 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { + restrictOutboundNetworkAccess: 'Disabled' + version: '12.0' administratorLogin: '4dm1n157r470r' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' - version: '12.0' } } resource elasticPool 'Microsoft.Sql/servers/elasticPools@2020-11-01-preview' = { - parent: server name: resourceName location: location + parent: server + sku: { + tier: 'Basic' + capacity: 50 + family: '' + name: 'BasicPool' + } properties: { maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') maxSizeBytes: 5242880000 @@ -30,10 +36,4 @@ resource elasticPool 'Microsoft.Sql/servers/elasticPools@2020-11-01-preview' = { } zoneRedundant: false } - sku: { - capacity: 50 - family: '' - name: 'BasicPool' - tier: 'Basic' - } } diff --git a/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep b/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep index 15f96329..eb36c23c 100644 --- a/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep @@ -8,18 +8,18 @@ resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' } } resource encryptionProtector 'Microsoft.Sql/servers/encryptionProtector@2023-08-01-preview' = { - parent: server name: 'current' + parent: server properties: { autoRotationEnabled: false serverKeyName: '' diff --git a/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep b/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep index c7a6ba1c..d5d0a05b 100644 --- a/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep @@ -1,64 +1,65 @@ -param resourceName string = 'acctest0001' -param location string = 'westus' -param secondaryLocation string = 'eastus' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westus' +param secondaryLocation string = 'eastus' resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-primary' location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' } } resource server1 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-secondary' + location: secondaryLocation properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' } } resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { - parent: server name: '${resourceName}-db' location: location + parent: server + sku: { + name: 'S1' + } properties: { - autoPauseDelay: 0 - collation: 'SQL_Latin1_General_CP1_CI_AS' createMode: 'Default' + minCapacity: 0 + readScale: 'Disabled' + zoneRedundant: false + autoPauseDelay: 0 elasticPoolId: '' encryptionProtectorAutoRotation: false - highAvailabilityReplicaCount: 0 isLedgerOn: false - licenseType: '' - maxSizeBytes: 214748364800 - minCapacity: 0 - readScale: 'Disabled' + secondaryType: '' + highAvailabilityReplicaCount: 0 requestedBackupStorageRedundancy: 'Geo' sampleName: '' - secondaryType: '' - zoneRedundant: false - } - sku: { - name: 'S1' + collation: 'SQL_Latin1_General_CP1_CI_AS' + licenseType: '' + maxSizeBytes: 214748364800 } } resource failoverGroup 'Microsoft.Sql/servers/failoverGroups@2023-08-01-preview' = { - parent: server name: '${resourceName}-fg' + parent: server properties: { databases: [ database.id diff --git a/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep b/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep index aa411a36..57f42db0 100644 --- a/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep @@ -8,18 +8,18 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'msincredible' - administratorLoginPassword: null minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'msincredible' + administratorLoginPassword: '${administratorLoginPassword}' } } resource firewallRule 'Microsoft.Sql/servers/firewallRules@2020-11-01-preview' = { - parent: server name: resourceName + parent: server properties: { endIpAddress: '255.255.255.255' startIpAddress: '0.0.0.0' diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep index 1520d8b1..0eb78bc6 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep @@ -13,47 +13,47 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { + version: '12.0' administratorLogin: '4dministr4t0r' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' - version: '12.0' } } resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { - autoPauseDelay: 0 collation: 'SQL_Latin1_General_CP1_CI_AS' createMode: 'Default' elasticPoolId: '' highAvailabilityReplicaCount: 0 isLedgerOn: false - minCapacity: 0 - readScale: 'Disabled' requestedBackupStorageRedundancy: 'Geo' zoneRedundant: false + autoPauseDelay: 0 + minCapacity: 0 + readScale: 'Disabled' } } resource jobAgent 'Microsoft.Sql/servers/jobAgents@2020-11-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { databaseId: database.id } } resource credential 'Microsoft.Sql/servers/jobAgents/credentials@2020-11-01-preview' = { - parent: jobAgent name: resourceName + parent: jobAgent properties: { - password: null - username: null + password: '${sqlAdminPassword}' + username: '${sqlAdminUsername}' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep index 67bbb970..13d16f9a 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep @@ -1,63 +1,63 @@ -param resourceName string = 'acctest0001' param location string = 'westus' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-server' location: location properties: { - administratorLogin: '4dm1n157r470r' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: '4dm1n157r470r' } } resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { - parent: server name: '${resourceName}-db' location: location + parent: server + sku: { + name: 'S1' + } properties: { - autoPauseDelay: 0 - collation: 'SQL_Latin1_General_CP1_CI_AS' - createMode: 'Default' - elasticPoolId: '' - encryptionProtectorAutoRotation: false - highAvailabilityReplicaCount: 0 isLedgerOn: false + sampleName: '' licenseType: '' - maintenanceConfigurationId: '/subscriptions/subscription().subscriptionId/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' + maintenanceConfigurationId: '/subscriptions/${subscription()}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' minCapacity: 0 readScale: 'Disabled' - requestedBackupStorageRedundancy: 'Geo' - sampleName: '' secondaryType: '' zoneRedundant: false - } - sku: { - name: 'S1' + collation: 'SQL_Latin1_General_CP1_CI_AS' + elasticPoolId: '' + encryptionProtectorAutoRotation: false + highAvailabilityReplicaCount: 0 + requestedBackupStorageRedundancy: 'Geo' + autoPauseDelay: 0 + createMode: 'Default' } } resource jobAgent 'Microsoft.Sql/servers/jobAgents@2023-08-01-preview' = { - parent: server name: '${resourceName}-job-agent' location: location - properties: { - databaseId: database.id - } + parent: server sku: { name: 'JA100' } + properties: { + databaseId: database.id + } } resource job 'Microsoft.Sql/servers/jobAgents/jobs@2023-08-01-preview' = { - parent: jobAgent name: '${resourceName}-job' + parent: jobAgent properties: { description: '' } diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep new file mode 100644 index 00000000..6d8e9b67 --- /dev/null +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep @@ -0,0 +1,99 @@ +param resourceName string = 'acctest0001' +param location string = 'westus' +@secure() +@description('The administrator login password for the SQL server') +param administratorLoginPassword string +@secure() +@description('The password for the SQL job credential') +param jobCredentialPassword string + +var maintenanceConfigId = '/subscriptions/${subscription().subscriptionId}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' + +resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { + name: '${resourceName}-server' + location: location + properties: { + version: '12.0' + administratorLogin: '4dm1n157r470r' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: 'Disabled' + } +} + +resource jobAgent 'Microsoft.Sql/servers/jobAgents@2023-08-01-preview' = { + name: '${resourceName}-job-agent' + location: location + parent: server + sku: { + name: 'JA100' + } + properties: { + databaseId: database.id + } +} + +resource targetGroup 'Microsoft.Sql/servers/jobAgents/targetGroups@2023-08-01-preview' = { + name: '${resourceName}-target-group' + parent: jobAgent + properties: { + members: [] + } +} + +resource job 'Microsoft.Sql/servers/jobAgents/jobs@2023-08-01-preview' = { + name: '${resourceName}-job' + parent: jobAgent + properties: { + description: '' + } +} + +resource step 'Microsoft.Sql/servers/jobAgents/jobs/steps@2023-08-01-preview' = { + name: '${resourceName}-job-step' + parent: job + properties: { + credential: credential.id + executionOptions: { + retryAttempts: 10 + retryIntervalBackoffMultiplier: 2 + timeoutSeconds: 43200 + initialRetryIntervalSeconds: 1 + maximumRetryIntervalSeconds: 120 + } + stepId: 1 + targetGroup: targetGroup.id + action: { + value: '''IF NOT EXISTS (SELECT * FROM sys.objects WHERE [name] = N''Person'') + CREATE TABLE Person ( + FirstName NVARCHAR(50), + LastName NVARCHAR(50), + ); +''' + } + } +} + +resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { + name: '${resourceName}-db' + location: location + parent: server + sku: { + name: 'S1' + } + properties: { + maintenanceConfigurationId: '${maintenanceConfigId}' + collation: 'SQL_Latin1_General_CP1_CI_AS' + createMode: 'Default' + } +} + +resource credential 'Microsoft.Sql/servers/jobAgents/credentials@2023-08-01-preview' = { + name: '${resourceName}-job-credential' + parent: jobAgent + properties: { + password: '${jobCredentialPassword}' + username: 'testusername' + } +} diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep index a30fcdd9..718b5886 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep @@ -9,7 +9,7 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { location: location properties: { administratorLogin: '4dministr4t0r' - administratorLoginPassword: null + administratorLoginPassword: '${sqlAdministratorPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' @@ -18,9 +18,9 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { } resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { autoPauseDelay: 0 collation: 'SQL_Latin1_General_CP1_CI_AS' @@ -28,8 +28,8 @@ resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { elasticPoolId: '' highAvailabilityReplicaCount: 0 isLedgerOn: false - maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') minCapacity: 0 + maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') readScale: 'Disabled' requestedBackupStorageRedundancy: 'Geo' zoneRedundant: false @@ -37,9 +37,9 @@ resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { } resource jobAgent 'Microsoft.Sql/servers/jobAgents@2020-11-01-preview' = { - parent: server name: resourceName location: location + parent: server properties: { databaseId: database.id } diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep index 008aa16c..4839a3bf 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep @@ -12,7 +12,7 @@ resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { location: location properties: { administratorLogin: '4dm1n157r470r' - administratorLoginPassword: null + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' @@ -20,57 +20,57 @@ resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { } } -resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { - parent: server - name: '${resourceName}-db' - location: location - properties: { - autoPauseDelay: 0 - collation: 'SQL_Latin1_General_CP1_CI_AS' - createMode: 'Default' - elasticPoolId: '' - encryptionProtectorAutoRotation: false - highAvailabilityReplicaCount: 0 - isLedgerOn: false - licenseType: '' - maintenanceConfigurationId: '/subscriptions/subscription().subscriptionId/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' - minCapacity: 0 - readScale: 'Disabled' - requestedBackupStorageRedundancy: 'Geo' - sampleName: '' - secondaryType: '' - zoneRedundant: false - } - sku: { - name: 'S1' - } -} - resource jobAgent 'Microsoft.Sql/servers/jobAgents@2023-08-01-preview' = { - parent: server name: '${resourceName}-job-agent' location: location - properties: { - databaseId: database.id - } + parent: server sku: { name: 'JA100' } + properties: { + databaseId: database.id + } } resource credential 'Microsoft.Sql/servers/jobAgents/credentials@2023-08-01-preview' = { - parent: jobAgent name: '${resourceName}-job-credential' + parent: jobAgent properties: { - password: null + password: '${jobCredentialPassword}' username: 'testusername' } } resource targetGroup 'Microsoft.Sql/servers/jobAgents/targetGroups@2023-08-01-preview' = { - parent: jobAgent name: '${resourceName}-target-group' + parent: jobAgent properties: { members: [] } } + +resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { + name: '${resourceName}-db' + location: location + parent: server + sku: { + name: 'S1' + } + properties: { + licenseType: '' + requestedBackupStorageRedundancy: 'Geo' + highAvailabilityReplicaCount: 0 + readScale: 'Disabled' + sampleName: '' + zoneRedundant: false + createMode: 'Default' + minCapacity: 0 + secondaryType: '' + collation: 'SQL_Latin1_General_CP1_CI_AS' + elasticPoolId: '' + encryptionProtectorAutoRotation: false + maintenanceConfigurationId: '/subscriptions/${subscription()}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' + autoPauseDelay: 0 + isLedgerOn: false + } +} diff --git a/settings/remarks/microsoft.sql/samples/servers/main.bicep b/settings/remarks/microsoft.sql/samples/servers/main.bicep index 2df7ea10..b8357cbc 100644 --- a/settings/remarks/microsoft.sql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/main.bicep @@ -8,11 +8,11 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { + restrictOutboundNetworkAccess: 'Disabled' + version: '12.0' administratorLogin: 'mradministrator' - administratorLoginPassword: null + administratorLoginPassword: '${sqlAdministratorPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' - version: '12.0' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep b/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep index 9e3d5381..4eaa7723 100644 --- a/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep @@ -8,17 +8,17 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'msincredible' - administratorLoginPassword: null - minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Enabled' version: '12.0' + administratorLogin: 'msincredible' + administratorLoginPassword: '${adminPassword}' + minimalTlsVersion: '1.2' } } resource outboundFirewallRule 'Microsoft.Sql/servers/outboundFirewallRules@2021-02-01-preview' = { - parent: server name: 'sql230630033612934212.database.windows.net' + parent: server properties: {} } diff --git a/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep b/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep index e63e42f1..415f5d94 100644 --- a/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep @@ -10,15 +10,15 @@ resource server 'Microsoft.Sql/servers@2015-05-01-preview' = { name: resourceName location: location properties: { - administratorLogin: null - administratorLoginPassword: null + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' version: '12.0' } } resource securityAlertPolicy 'Microsoft.Sql/servers/securityAlertPolicies@2017-03-01-preview' = { - parent: server name: 'Default' + parent: server properties: { state: 'Disabled' } diff --git a/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep b/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep index ba2ba40a..212fdf60 100644 --- a/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep @@ -1,25 +1,25 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.Sql/servers@2022-05-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: null minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' } } resource sqlVulnerabilityAssessments 'Microsoft.Sql/servers/sqlVulnerabilityAssessments@2022-05-01-preview' = { - parent: server name: 'default' + parent: server properties: { state: 'Enabled' } diff --git a/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep index 9cab05b5..7482a201 100644 --- a/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep @@ -4,19 +4,6 @@ param location string = 'westeurope' @description('The administrator password for the SQL server') param sqlAdministratorPassword string -resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { - name: resourceName - location: location - properties: { - administratorLogin: 'missadmin' - administratorLoginPassword: null - minimalTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' - version: '12.0' - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location @@ -34,27 +21,40 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.7.28.0/25' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [ { service: 'Microsoft.Sql' } ] + addressPrefix: '10.7.28.0/25' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + } +} + +resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { + name: resourceName + location: location + properties: { + administratorLoginPassword: '${sqlAdministratorPassword}' + minimalTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: 'Disabled' + version: '12.0' + administratorLogin: 'missadmin' } } resource virtualNetworkRule 'Microsoft.Sql/servers/virtualNetworkRules@2020-11-01-preview' = { - parent: server name: resourceName + parent: server properties: { - ignoreMissingVnetServiceEndpoint: false virtualNetworkSubnetId: subnet.id + ignoreMissingVnetServiceEndpoint: false } } diff --git a/settings/remarks/microsoft.sqlvirtualmachine/remarks.json b/settings/remarks/microsoft.sqlvirtualmachine/remarks.json index 806f1091..49519a97 100644 --- a/settings/remarks/microsoft.sqlvirtualmachine/remarks.json +++ b/settings/remarks/microsoft.sqlvirtualmachine/remarks.json @@ -27,6 +27,11 @@ "ResourceType": "Microsoft.SqlVirtualMachine/sqlVirtualMachines", "Path": "samples/sqlvirtualmachines/basic/main.bicep", "Description": "A basic example of deploying Microsoft SQL Virtual Machine." + }, + { + "ResourceType": "Microsoft.SqlVirtualMachine/sqlVirtualMachines", + "Path": "samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep", + "Description": "A sqlbestpracticesassessment example of deploying Microsoft SQL Virtual Machine." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep index 386b1a28..aa709e80 100644 --- a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep +++ b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep @@ -9,13 +9,13 @@ resource sqlVirtualMachineGroup 'Microsoft.SqlVirtualMachine/sqlVirtualMachineGr sqlImageSku: 'Developer' wsfcDomainProfile: { clusterBootstrapAccount: '' - clusterOperatorAccount: '' clusterSubnetType: 'SingleSubnet' - domainFqdn: 'testdomain.com' ouPath: '' + storageAccountUrl: '' + clusterOperatorAccount: '' + domainFqdn: 'testdomain.com' sqlServiceAccount: '' storageAccountPrimaryKey: '' - storageAccountUrl: '' } } } diff --git a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep index dc0fcf1d..26e123cf 100644 --- a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep +++ b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep @@ -4,138 +4,47 @@ param location string = 'westeurope' @description('The administrator password for the SQL virtual machine') param vmAdminPassword string -resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { - name: resourceName - properties: { - auxiliaryMode: 'None' - auxiliarySku: 'None' - disableTcpStateTracking: false - dnsSettings: { - dnsServers: [] - } - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'testconfiguration1' - properties: { - primary: true - privateIPAddress: '10.0.0.4' - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - publicIPAddress: { - id: publicIPAddress.id - } - subnet: { - id: subnet.id - } - } - type: 'Microsoft.Network/networkInterfaces/ipConfigurations' - } - ] - nicType: 'Standard' - } -} - -resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2024-05-01' = { - name: resourceName - properties: { - securityRules: [ - { - name: 'MSSQLRule' - properties: { - access: 'Allow' - destinationAddressPrefix: '*' - destinationAddressPrefixes: [] - destinationPortRange: '1433' - destinationPortRanges: [] - direction: 'Inbound' - priority: 1001 - protocol: 'Tcp' - sourceAddressPrefix: '167.220.255.0/25' - sourceAddressPrefixes: [] - sourcePortRange: '*' - sourcePortRanges: [] - } - } - ] - } -} - -resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { - name: resourceName - properties: { - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' - } - idleTimeoutInMinutes: 4 - ipTags: [] - publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Dynamic' - } - sku: { - name: 'Basic' - tier: 'Regional' - } -} - resource sqlvirtualMachine 'Microsoft.SqlVirtualMachine/sqlVirtualMachines@2023-10-01' = { - name: 'virtualMachine.name' + name: 'azapi_resource.virtualMachine.name' + location: 'azapi_resource.virtualMachine.location' properties: { - enableAutomaticUpgrade: true - leastPrivilegeMode: 'Enabled' - sqlImageOffer: 'SQL2017-WS2016' sqlImageSku: 'Developer' sqlManagement: 'Full' sqlServerLicenseType: 'PAYG' - virtualMachineResourceId: virtualMachine.id + enableAutomaticUpgrade: true + leastPrivilegeMode: 'Enabled' + sqlImageOffer: 'SQL2017-WS2016' } } resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-07-01' = { name: resourceName + location: 'azapi_resource.resourceGroup.location' properties: { - hardwareProfile: { - vmSize: 'Standard_F2s' - } - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: false - } - } - ] - } osProfile: { - adminPassword: null - adminUsername: 'testadmin' - allowExtensionOperations: true - computerName: 'winhost01' secrets: [] windowsConfiguration: { + timeZone: 'Pacific Standard Time' enableAutomaticUpdates: true patchSettings: { - assessmentMode: 'ImageDefault' patchMode: 'AutomaticByOS' + assessmentMode: 'ImageDefault' } provisionVMAgent: true - timeZone: 'Pacific Standard Time' } + adminUsername: 'testadmin' + adminPassword: vmAdminPassword + allowExtensionOperations: true + computerName: 'winhost01' } storageProfile: { - dataDisks: [] imageReference: { + version: 'latest' offer: 'SQL2017-WS2016' publisher: 'MicrosoftSQLServer' sku: 'SQLDEV' - version: 'latest' } osDisk: { - caching: 'ReadOnly' - createOption: 'FromImage' - deleteOption: 'Detach' diskSizeGB: 127 managedDisk: { storageAccountType: 'Premium_LRS' @@ -143,7 +52,24 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-07-01' = { name: 'acctvm-250116171212663925OSDisk' osType: 'Windows' writeAcceleratorEnabled: false + caching: 'ReadOnly' + deleteOption: 'Detach' + createOption: 'FromImage' } + dataDisks: [] + } + hardwareProfile: { + vmSize: 'Standard_F2s' + } + networkProfile: { + networkInterfaces: [ + { + properties: { + primary: false + } + id: networkInterface.id + } + ] } } } @@ -161,12 +87,86 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.0.0.0/24' networkSecurityGroup: { id: networkSecurityGroup.id } + addressPrefix: '10.0.0.0/24' + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + enableAcceleratedNetworking: false + nicType: 'Standard' + auxiliaryMode: 'None' + auxiliarySku: 'None' + disableTcpStateTracking: false + enableIPForwarding: false + ipConfigurations: [ + { + properties: { + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + publicIPAddress: {} + subnet: {} + primary: true + privateIPAddress: '10.0.0.4' + } + type: 'Microsoft.Network/networkInterfaces/ipConfigurations' + name: 'testconfiguration1' + } + ] + dnsSettings: { + dnsServers: [] + } + } +} + +resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + securityRules: [ + { + name: 'MSSQLRule' + properties: { + access: 'Allow' + destinationAddressPrefix: '*' + destinationAddressPrefixes: [] + destinationPortRange: '1433' + destinationPortRanges: [] + priority: 1001 + sourceAddressPrefixes: [] + sourcePortRange: '*' + direction: 'Inbound' + protocol: 'Tcp' + sourceAddressPrefix: '167.220.255.0/25' + sourcePortRanges: [] + } + } + ] + } +} + +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + sku: { + name: 'Basic' + tier: 'Regional' + } + properties: { + publicIPAllocationMethod: 'Dynamic' + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + idleTimeoutInMinutes: 4 + ipTags: [] + publicIPAddressVersion: 'IPv4' } } diff --git a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep new file mode 100644 index 00000000..d6df0ae2 --- /dev/null +++ b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep @@ -0,0 +1,320 @@ +@secure() +@description('The administrator password for the virtual machine') +param adminPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' + +resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + securityRules: [ + { + name: 'MSSQLRule' + properties: { + protocol: 'Tcp' + sourceAddressPrefix: '167.220.255.0/25' + sourcePortRange: '*' + sourcePortRanges: [] + access: 'Allow' + destinationAddressPrefixes: [] + direction: 'Inbound' + sourceAddressPrefixes: [] + destinationAddressPrefix: '*' + destinationPortRange: '1433' + destinationPortRanges: [] + priority: 1001 + } + } + ] + } +} + +resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-07-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + networkProfile: { + networkInterfaces: [ + { + properties: { + primary: false + } + id: networkInterface.id + } + ] + } + osProfile: { + adminUsername: 'testadmin' + adminPassword: adminPassword + allowExtensionOperations: true + computerName: 'winhost01' + secrets: [] + windowsConfiguration: { + timeZone: 'Pacific Standard Time' + enableAutomaticUpdates: true + patchSettings: { + patchMode: 'AutomaticByOS' + assessmentMode: 'ImageDefault' + } + provisionVMAgent: true + } + } + storageProfile: { + dataDisks: [] + imageReference: { + publisher: 'MicrosoftSQLServer' + sku: 'SQLDEV' + version: 'latest' + offer: 'SQL2017-WS2016' + } + osDisk: { + diskSizeGB: 127 + managedDisk: { + storageAccountType: 'Premium_LRS' + } + name: 'acctvm-250116171212663925OSDisk' + osType: 'Windows' + deleteOption: 'Detach' + writeAcceleratorEnabled: false + caching: 'ReadOnly' + createOption: 'FromImage' + } + } + hardwareProfile: { + vmSize: 'Standard_F2s' + } + } +} + +resource dataCollectionRuleAssociation 'Microsoft.Insights/dataCollectionRuleAssociations@2022-06-01' = { + name: 'azapi_resource.workspace.output.properties.customerId_azapi_resource.resourceGroup.location_DCRA_1' + scope: virtualMachine + properties: { + dataCollectionRuleId: dataCollectionRule.id + } +} + +resource extension 'Microsoft.Compute/virtualMachines/extensions@2024-07-01' = { + name: 'AzureMonitorWindowsAgent' + location: 'westeurope' + parent: virtualMachine + properties: { + publisher: 'Microsoft.Azure.Monitor' + suppressFailures: false + type: 'AzureMonitorWindowsAgent' + typeHandlerVersion: '1.0' + autoUpgradeMinorVersion: true + enableAutomaticUpgrade: true + } +} + +resource sqlvirtualMachine 'Microsoft.SqlVirtualMachine/sqlVirtualMachines@2023-10-01' = { + name: 'azapi_resource.virtualMachine.name' + location: 'azapi_resource.virtualMachine.location' + dependsOn: [ + dataCollectionRuleAssociation + extension + ] + properties: { + sqlImageSku: 'Developer' + sqlManagement: 'Full' + assessmentSettings: { + runImmediately: false + schedule: { + dayOfWeek: 'Monday' + enable: true + startTime: '00:00' + weeklyInterval: 1 + } + enable: true + } + sqlServerLicenseType: 'PAYG' + enableAutomaticUpgrade: true + leastPrivilegeMode: 'Enabled' + sqlImageOffer: 'SQL2017-WS2016' + } +} + +resource workspace 'Microsoft.OperationalInsights/workspaces@2020-08-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + legacy: 0 + searchVersion: 1 + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } + workspaceCapping: { + dailyQuotaGb: -1 + } + } +} + +resource table 'Microsoft.OperationalInsights/workspaces/tables@2023-09-01' = { + name: 'SqlAssessment_CL' + parent: workspace + properties: { + schema: { + columns: [ + { + name: 'TimeGenerated' + type: 'datetime' + } + { + name: 'RawData' + type: 'string' + } + ] + name: 'SqlAssessment_CL' + } + } +} + +resource dataCollectionEndpoint 'Microsoft.Insights/dataCollectionEndpoints@2022-06-01' = { + name: '${location}-DCE-1' + location: 'azapi_resource.resourceGroup.location' + properties: { + networkAcls: { + publicNetworkAccess: 'Enabled' + } + } +} + +resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { + name: 'azapi_resource.workspace.output.properties.customerId_azapi_resource.resourceGroup.location_DCR_1' + location: 'azapi_resource.resourceGroup.location' + dependsOn: [ + table + ] + properties: { + destinations: { + logAnalytics: [ + {} + ] + } + streamDeclarations: { + 'Custom-SqlAssessment_CL': { + columns: [ + { + name: 'TimeGenerated' + type: 'datetime' + } + { + type: 'string' + name: 'RawData' + } + ] + } + } + dataCollectionEndpointId: dataCollectionEndpoint.id + dataFlows: [ + { + outputStream: 'Custom-SqlAssessment_CL' + streams: [ + 'Custom-SqlAssessment_CL' + ] + transformKql: 'source' + destinations: [] + } + ] + dataSources: { + logFiles: [ + { + filePatterns: [ + 'C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\Microsoft SQL Server IaaS Agent\\Assessment\\*.csv' + ] + format: 'text' + name: 'Custom-SqlAssessment_CL' + settings: { + text: { + recordStartTimestampFormat: 'ISO 8601' + } + } + streams: [ + 'Custom-SqlAssessment_CL' + ] + } + ] + } + description: '' + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + enableIPForwarding: false + nicType: 'Standard' + auxiliaryMode: 'None' + ipConfigurations: [ + { + name: 'testconfiguration1' + properties: { + publicIPAddress: {} + subnet: {} + primary: true + privateIPAddress: '10.0.0.4' + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + } + type: 'Microsoft.Network/networkInterfaces/ipConfigurations' + } + ] + auxiliarySku: 'None' + disableTcpStateTracking: false + dnsSettings: { + dnsServers: [] + } + enableAcceleratedNetworking: false + } +} + +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + sku: { + name: 'Basic' + tier: 'Regional' + } + properties: { + ipTags: [] + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Dynamic' + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + idleTimeoutInMinutes: 4 + } +} + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: resourceName + parent: virtualNetwork + properties: { + addressPrefix: '10.0.0.0/24' + networkSecurityGroup: { + id: networkSecurityGroup.id + } + } +} diff --git a/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep b/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep index 05908b4d..38d639a8 100644 --- a/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep +++ b/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep @@ -5,9 +5,20 @@ resource containerGroupProfile 'Microsoft.ContainerInstance/containerGroupProfil name: '${resourceName}-contianerGroup' location: location properties: { + imageRegistryCredentials: [] + ipAddress: { + ports: [ + { + port: 8000 + protocol: 'TCP' + } + ] + type: 'Public' + } + osType: 'Linux' + sku: 'Standard' containers: [ { - name: 'mycontainergroupprofile' properties: { command: [] environmentVariables: [] @@ -24,37 +35,23 @@ resource containerGroupProfile 'Microsoft.ContainerInstance/containerGroupProfil } } } + name: 'mycontainergroupprofile' } ] - imageRegistryCredentials: [] - ipAddress: { - ports: [ - { - port: 8000 - protocol: 'TCP' - } - ] - type: 'Public' - } - osType: 'Linux' - sku: 'Standard' } } resource standbyContainerGroupPool 'Microsoft.StandbyPool/standbyContainerGroupPools@2025-03-01' = { name: '${resourceName}-CGPool' - location: 'eastus' properties: { containerGroupProperties: { + subnetIds: [ + {} + ] containerGroupProfile: { id: containerGroupProfile.id revision: 1 } - subnetIds: [ - { - id: subnet.id - } - ] } elasticityProfile: { maxReadyCapacity: 5 @@ -85,14 +82,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: '${resourceName}-subnet' + parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' } } diff --git a/settings/remarks/microsoft.storage/remarks.json b/settings/remarks/microsoft.storage/remarks.json index 52ce7558..7c107a8e 100644 --- a/settings/remarks/microsoft.storage/remarks.json +++ b/settings/remarks/microsoft.storage/remarks.json @@ -107,6 +107,11 @@ "ResourceType": "Microsoft.Storage/storageAccounts/tableServices/tables", "Path": "samples/storageaccounts/tableservices/tables/main.bicep", "Description": "A basic example of deploying Table within Azure Storage." + }, + { + "ResourceType": "Microsoft.Storage/storageAccounts/encryptionScopes", + "Path": "samples/storageaccounts/encryptionscopes/main.bicep", + "Description": "A basic example of deploying Storage Encryption Scope." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep index 5c7e206f..1d7a7d15 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep @@ -1,15 +1,16 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -22,17 +23,16 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + accessTier: 'Hot' + allowSharedKeyAccess: true + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false } } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep index c7c59b53..d6a97bd0 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep @@ -2,22 +2,22 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard_LRS' } + properties: {} } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' @@ -26,8 +26,8 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } resource immutabilityPolicy 'Microsoft.Storage/storageAccounts/blobServices/containers/immutabilityPolicies@2023-05-01' = { - parent: container name: 'default' + parent: container properties: { allowProtectedAppendWrites: false immutabilityPeriodSinceCreationInDays: 4 diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/main.bicep index 4efc6c29..efb64a7a 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/main.bicep @@ -2,22 +2,22 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard_LRS' } + properties: {} } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep index e53e1805..ff84cf09 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep @@ -1,52 +1,46 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false + publicNetworkAccess: 'Enabled' defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { - queue: { + table: { keyType: 'Service' } - table: { + queue: { keyType: 'Service' } } } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + accessTier: 'Hot' + allowBlobPublicAccess: true } } resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2021-09-01' = { - parent: storageAccount name: 'default' + parent: storageAccount properties: { - changeFeed: { - enabled: true - } - containerDeleteRetentionPolicy: { - enabled: false - } cors: {} deleteRetentionPolicy: { enabled: false @@ -58,5 +52,11 @@ resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2021-09-01' restorePolicy: { enabled: false } + changeFeed: { + enabled: true + } + containerDeleteRetentionPolicy: { + enabled: false + } } } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep new file mode 100644 index 00000000..877d45b7 --- /dev/null +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep @@ -0,0 +1,138 @@ +param resourceName string = 'acctest0001' +param location string = 'westus' + +resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { + name: '${resourceName}sa' + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: { + defaultToOAuthAuthentication: false + dnsEndpointType: 'Standard' + encryption: { + keySource: 'Microsoft.Storage' + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + } + allowSharedKeyAccess: true + networkAcls: { + resourceAccessRules: [] + virtualNetworkRules: [] + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + } + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + allowBlobPublicAccess: true + allowCrossTenantReplication: false + isHnsEnabled: false + isLocalUserEnabled: true + isNfsV3Enabled: false + accessTier: 'Hot' + isSftpEnabled: false + supportsHttpsTrafficOnly: true + } +} + +resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { + name: '${resourceName}-kv' + location: location + dependsOn: [ + storageAccount + ] + properties: { + enablePurgeProtection: true + enabledForDiskEncryption: false + enabledForTemplateDeployment: false + sku: { + family: 'A' + name: 'standard' + } + tenantId: tenant() + createMode: 'default' + enableRbacAuthorization: false + enableSoftDelete: true + enabledForDeployment: false + publicNetworkAccess: 'Enabled' + accessPolicies: [ + { + tenantId: tenant() + objectId: deployer().objectId + permissions: { + certificates: [] + keys: [ + 'Get' + 'Create' + 'Delete' + 'List' + 'Restore' + 'Recover' + 'UnwrapKey' + 'WrapKey' + 'Purge' + 'Encrypt' + 'Decrypt' + 'Sign' + 'Verify' + 'GetRotationPolicy' + ] + secrets: [] + storage: [] + } + } + { + objectId: storageAccount.identity.principalId + permissions: { + certificates: [] + keys: [ + 'Get' + 'UnwrapKey' + 'WrapKey' + ] + secrets: [] + storage: [] + } + tenantId: tenant() + } + ] + } +} + +resource encryptionScope 'Microsoft.Storage/storageAccounts/encryptionScopes@2023-05-01' = { + name: '${resourceName}-scope' + parent: storageAccount + dependsOn: [ + vault + ] + properties: { + keyVaultProperties: {} + source: 'Microsoft.KeyVault' + state: 'Enabled' + } +} + +resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { + name: '${resourceName}-key' + parent: vault + properties: { + keySize: 2048 + kty: 'RSA' + keyOps: [ + 'encrypt' + 'decrypt' + 'sign' + 'verify' + 'wrapKey' + 'unwrapKey' + ] + } +} diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/fileservices/shares/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/fileservices/shares/main.bicep index 0ba2cdcb..78323224 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/fileservices/shares/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/fileservices/shares/main.bicep @@ -2,22 +2,22 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' resource fileService 'Microsoft.Storage/storageAccounts/fileServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard_LRS' } + properties: {} } resource share 'Microsoft.Storage/storageAccounts/fileServices/shares@2022-09-01' = { - parent: fileService name: resourceName + parent: fileService properties: { accessTier: 'Cool' } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep index 3575fd63..477c7d7f 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep @@ -4,13 +4,23 @@ 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 + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + accessTier: 'Hot' + allowBlobPublicAccess: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -22,28 +32,15 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } } resource localUser 'Microsoft.Storage/storageAccounts/localUsers@2021-09-01' = { - parent: storageAccount name: resourceName + parent: storageAccount properties: { - hasSharedKey: true - hasSshKey: false - hasSshPassword: false homeDirectory: 'containername/' permissionScopes: [ { @@ -52,5 +49,8 @@ resource localUser 'Microsoft.Storage/storageAccounts/localUsers@2021-09-01' = { service: 'blob' } ] + hasSharedKey: true + hasSshKey: false + hasSshPassword: false } } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep index 7464c6f1..370418ed 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep @@ -4,12 +4,12 @@ param location string = 'westeurope' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'BlobStorage' properties: { accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -23,53 +23,53 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + isNfsV3Enabled: false + isSftpEnabled: false + publicNetworkAccess: 'Enabled' } } resource managementPolicy 'Microsoft.Storage/storageAccounts/managementPolicies@2021-09-01' = { - parent: storageAccount name: 'default' + parent: storageAccount properties: { policy: { rules: [ { definition: { actions: { - baseBlob: { + snapshot: { delete: { - daysAfterModificationGreaterThan: 100 - } - tierToArchive: { - daysAfterModificationGreaterThan: 50 + daysAfterCreationGreaterThan: 30 } + } + baseBlob: { tierToCool: { daysAfterModificationGreaterThan: 10 } - } - snapshot: { delete: { - daysAfterCreationGreaterThan: 30 + daysAfterModificationGreaterThan: 100 + } + tierToArchive: { + daysAfterModificationGreaterThan: 50 } } } filters: { - blobTypes: [ - 'blockBlob' - ] prefixMatch: [ 'container1/prefix1' ] + blobTypes: [ + 'blockBlob' + ] } } enabled: true diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep index 4a063a33..cbe8a4e8 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep @@ -1,23 +1,23 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource queueService 'Microsoft.Storage/storageAccounts/queueServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard_LRS' } + properties: {} } resource queue 'Microsoft.Storage/storageAccounts/queueServices/queues@2022-09-01' = { - parent: queueService name: resourceName + parent: queueService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/tableservices/tables/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/tableservices/tables/main.bicep index a5e05ede..0dd9805a 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/tableservices/tables/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/tableservices/tables/main.bicep @@ -2,22 +2,22 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' resource tableService 'Microsoft.Storage/storageAccounts/tableServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - properties: {} sku: { name: 'Standard_LRS' } + properties: {} } resource table 'Microsoft.Storage/storageAccounts/tableServices/tables@2022-09-01' = { - parent: tableService name: resourceName + parent: tableService properties: { signedIdentifiers: [] } diff --git a/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep b/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep index 6eb0dde6..48df250c 100644 --- a/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep +++ b/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep @@ -4,20 +4,16 @@ param location string = 'westus' resource amlFilesystem 'Microsoft.StorageCache/amlFilesystems@2024-07-01' = { name: '${resourceName}-amlfs' location: location + sku: { + name: 'AMLFS-Durable-Premium-250' + } properties: { - filesystemSubnet: subnet.id maintenanceWindow: { - dayOfWeek: 'Friday' timeOfDayUTC: '22:00' + dayOfWeek: 'Friday' } storageCapacityTiB: 8 } - sku: { - name: 'AMLFS-Durable-Premium-250' - } - zones: [ - '1' - ] } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { @@ -38,15 +34,15 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: '${resourceName}-subnet' + parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' - defaultOutboundAccess: true delegations: [] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + defaultOutboundAccess: true } } diff --git a/settings/remarks/microsoft.storagecache/samples/caches/main.bicep b/settings/remarks/microsoft.storagecache/samples/caches/main.bicep index 459e9c0d..d2298ea9 100644 --- a/settings/remarks/microsoft.storagecache/samples/caches/main.bicep +++ b/settings/remarks/microsoft.storagecache/samples/caches/main.bicep @@ -4,16 +4,15 @@ param location string = 'westeurope' resource cach 'Microsoft.StorageCache/caches@2023-01-01' = { name: resourceName location: location + sku: { + name: 'Standard_2G' + } properties: { cacheSizeGB: 3072 networkSettings: { mtu: 1500 ntpServer: 'time.windows.com' } - subnet: subnet.id - } - sku: { - name: 'Standard_2G' } } @@ -34,14 +33,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - parent: virtualNetwork name: resourceName + parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' } } diff --git a/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep b/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep index 7163200e..6e20b39e 100644 --- a/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep +++ b/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep @@ -8,12 +8,12 @@ resource storageMover 'Microsoft.StorageMover/storageMovers@2023-03-01' = { } resource endpoint 'Microsoft.StorageMover/storageMovers/endpoints@2023-03-01' = { - parent: storageMover name: resourceName + parent: storageMover properties: { - endpointType: 'NfsMount' - export: '' host: '192.168.0.1' nfsVersion: 'NFSauto' + endpointType: 'NfsMount' + export: '' } } diff --git a/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep b/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep index f621af83..58772540 100644 --- a/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep +++ b/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'eastus' +param resourceName string = 'acctest0001' resource storageMover 'Microsoft.StorageMover/storageMovers@2023-03-01' = { name: resourceName @@ -8,7 +8,7 @@ resource storageMover 'Microsoft.StorageMover/storageMovers@2023-03-01' = { } resource project 'Microsoft.StorageMover/storageMovers/projects@2023-03-01' = { - parent: storageMover name: resourceName + parent: storageMover properties: {} } diff --git a/settings/remarks/microsoft.storagesync/samples/storagesyncservices/syncgroups/main.bicep b/settings/remarks/microsoft.storagesync/samples/storagesyncservices/syncgroups/main.bicep index cc582be8..58353ad4 100644 --- a/settings/remarks/microsoft.storagesync/samples/storagesyncservices/syncgroups/main.bicep +++ b/settings/remarks/microsoft.storagesync/samples/storagesyncservices/syncgroups/main.bicep @@ -10,6 +10,6 @@ resource storageSyncService 'Microsoft.StorageSync/storageSyncServices@2020-03-0 } resource syncGroup 'Microsoft.StorageSync/storageSyncServices/syncGroups@2020-03-01' = { - parent: storageSyncService name: resourceName + parent: storageSyncService } diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep index 1e464e7a..3bd60809 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep @@ -12,8 +12,8 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { eventsLateArrivalMaxDelayInSeconds: 60 eventsOutOfOrderMaxDelayInSeconds: 50 eventsOutOfOrderPolicy: 'Adjust' - jobType: 'Cloud' outputErrorPolicy: 'Drop' + jobType: 'Cloud' sku: { name: 'Standard' } @@ -31,8 +31,8 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { } resource function 'Microsoft.StreamAnalytics/streamingJobs/functions@2020-03-01' = { - parent: streamingJob name: resourceName + parent: streamingJob properties: { properties: { binding: { diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep index 444d70e6..7fe9571a 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep @@ -1,11 +1,14 @@ 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: { + name: 'S1' + capacity: 1 + } properties: { - cloudToDevice: {} enableFileUploadNotifications: false messagingEndpoints: {} routing: { @@ -19,10 +22,7 @@ resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { } } storageEndpoints: {} - } - sku: { - capacity: 1 - name: 'S1' + cloudToDevice: {} } } @@ -31,14 +31,14 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { location: location properties: { cluster: {} + eventsOutOfOrderPolicy: 'Adjust' + outputErrorPolicy: 'Drop' compatibilityLevel: '1.0' contentStoragePolicy: 'SystemAccount' dataLocale: 'en-GB' eventsLateArrivalMaxDelayInSeconds: 60 eventsOutOfOrderMaxDelayInSeconds: 50 - eventsOutOfOrderPolicy: 'Adjust' jobType: 'Cloud' - outputErrorPolicy: 'Drop' sku: { name: 'Standard' } @@ -56,15 +56,15 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { } resource input 'Microsoft.StreamAnalytics/streamingJobs/inputs@2020-03-01' = { - parent: streamingJob name: resourceName + parent: streamingJob properties: { datasource: { properties: { consumerGroupName: '$Default' endpoint: 'messages/events' - iotHubNamespace: iothub.name - sharedAccessPolicyKey: iothub.listkeys().value[0].primaryKey + iotHubNamespace: iotHub.name + sharedAccessPolicyKey: iotHub.listKeys().value[0].primaryKey sharedAccessPolicyName: 'iothubowner' } type: 'Microsoft.Devices/IotHubs' diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep index d84d889c..d360808c 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep @@ -8,12 +8,6 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { cluster: {} compatibilityLevel: '1.0' contentStoragePolicy: 'SystemAccount' - dataLocale: 'en-GB' - eventsLateArrivalMaxDelayInSeconds: 60 - eventsOutOfOrderMaxDelayInSeconds: 50 - eventsOutOfOrderPolicy: 'Adjust' - jobType: 'Cloud' - outputErrorPolicy: 'Drop' sku: { name: 'Standard' } @@ -27,5 +21,11 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { streamingUnits: 3 } } + dataLocale: 'en-GB' + eventsLateArrivalMaxDelayInSeconds: 60 + eventsOutOfOrderMaxDelayInSeconds: 50 + eventsOutOfOrderPolicy: 'Adjust' + jobType: 'Cloud' + outputErrorPolicy: 'Drop' } } diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep index a164e7d9..62b44850 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep @@ -4,13 +4,18 @@ 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 + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + allowBlobPublicAccess: true + allowCrossTenantReplication: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -29,11 +34,6 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { networkAcls: { defaultAction: 'Allow' } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' } } @@ -42,14 +42,9 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { location: location properties: { cluster: {} - compatibilityLevel: '1.0' contentStoragePolicy: 'SystemAccount' - dataLocale: 'en-GB' - eventsLateArrivalMaxDelayInSeconds: 60 eventsOutOfOrderMaxDelayInSeconds: 50 - eventsOutOfOrderPolicy: 'Adjust' jobType: 'Cloud' - outputErrorPolicy: 'Drop' sku: { name: 'Standard' } @@ -63,12 +58,17 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { streamingUnits: 3 } } + compatibilityLevel: '1.0' + dataLocale: 'en-GB' + eventsLateArrivalMaxDelayInSeconds: 60 + eventsOutOfOrderPolicy: 'Adjust' + outputErrorPolicy: 'Drop' } } resource output 'Microsoft.StreamAnalytics/streamingJobs/outputs@2021-10-01-preview' = { - parent: streamingJob name: resourceName + parent: streamingJob properties: { datasource: { properties: { diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep index 9c13441c..c16843d0 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep @@ -7,49 +7,48 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' - properties: {} - sku: { - name: 'Standard_LRS' - } + parent: storageAccount } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource synapseAzureadOnlyAuthentication 'Microsoft.Synapse/workspaces/azureADOnlyAuthentications@2021-06-01-preview' = { - parent: workspace name: 'default' + parent: workspace properties: { azureADOnlyAuthentication: true } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' } } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep index 8414c368..b89c15b0 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep @@ -7,18 +7,18 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { @@ -27,9 +27,7 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { properties: { defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin @@ -38,17 +36,10 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { } resource bigDataPool 'Microsoft.Synapse/workspaces/bigDataPools@2021-06-01-preview' = { - parent: workspace name: resourceName location: location + parent: workspace properties: { - autoPause: { - enabled: false - } - autoScale: { - enabled: false - } - cacheSize: 0 defaultSparkLogFolder: '/logs' dynamicExecutorAllocation: { enabled: false @@ -57,17 +48,24 @@ resource bigDataPool 'Microsoft.Synapse/workspaces/bigDataPools@2021-06-01-previ } isComputeIsolationEnabled: false nodeCount: 3 - nodeSize: 'Small' nodeSizeFamily: 'MemoryOptimized' + sparkVersion: '2.4' + autoPause: { + enabled: false + } + autoScale: { + enabled: false + } + nodeSize: 'Small' sessionLevelPackagesEnabled: false sparkEventsFolder: '/events' - sparkVersion: '2.4' + cacheSize: 0 } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/firewallrules/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/firewallrules/main.bicep index b556f446..a08c6293 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/firewallrules/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/firewallrules/main.bicep @@ -7,18 +7,18 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { @@ -27,9 +27,7 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { properties: { defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin @@ -38,8 +36,8 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { } resource firewallRule 'Microsoft.Synapse/workspaces/firewallRules@2021-06-01' = { - parent: workspace name: 'AllowAll' + parent: workspace properties: { endIpAddress: '255.255.255.255' startIpAddress: '0.0.0.0' @@ -47,8 +45,8 @@ resource firewallRule 'Microsoft.Synapse/workspaces/firewallRules@2021-06-01' = } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep index 32629f13..a1ab0845 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep @@ -7,18 +7,8 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' - properties: {} - sku: { - name: 'Standard_LRS' - } + parent: storageAccount } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { @@ -27,9 +17,7 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { properties: { defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: 'default' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin @@ -38,20 +26,30 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { } resource integrationRuntime 'Microsoft.Synapse/workspaces/integrationRuntimes@2021-06-01-preview' = { - parent: workspace name: resourceName + parent: workspace properties: { - description: 'test' type: 'SelfHosted' + description: 'test' } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' } } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep index 63bdfeb2..1d8af93e 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep @@ -7,41 +7,40 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' - properties: {} - sku: { - name: 'Standard_LRS' - } + parent: storageAccount } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' } } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep index 2b54ab6d..f6f9875f 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep @@ -7,39 +7,37 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource managedIdentitySqlControlSetting 'Microsoft.Synapse/workspaces/managedIdentitySqlControlSettings@2021-06-01' = { - parent: workspace name: 'default' + parent: workspace properties: { grantSqlControlToManagedIdentity: { desiredState: 'Disabled' @@ -48,8 +46,8 @@ resource managedIdentitySqlControlSetting 'Microsoft.Synapse/workspaces/managedI } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep index 2a327d4b..3d00c458 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep @@ -7,18 +7,18 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { @@ -27,9 +27,7 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { properties: { defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin @@ -38,8 +36,8 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { } resource securityAlertPolicy 'Microsoft.Synapse/workspaces/securityAlertPolicies@2021-06-01' = { - parent: workspace name: 'Default' + parent: workspace properties: { state: 'Enabled' storageAccountAccessKey: storageAccount.listKeys().keys[0].value @@ -48,8 +46,8 @@ resource securityAlertPolicy 'Microsoft.Synapse/workspaces/securityAlertPolicies } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep index b6f07408..bfb38ac5 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep @@ -7,51 +7,49 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource sqlPool 'Microsoft.Synapse/workspaces/sqlPools@2021-06-01' = { - parent: workspace name: resourceName location: location - properties: { - createMode: 'Default' - } + parent: workspace sku: { name: 'DW100c' } + properties: { + createMode: 'Default' + } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep index efbceb15..2adcbb1e 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep @@ -7,50 +7,49 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { - defaultDataLakeStorage: { - accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name - } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin sqlAdministratorLoginPassword: sqlAdministratorLoginPassword + defaultDataLakeStorage: { + accountUrl: storageAccount.properties.primaryEndpoints.dfs + } } } resource sqlPool 'Microsoft.Synapse/workspaces/sqlPools@2021-06-01' = { - parent: workspace name: resourceName location: location - properties: { - createMode: 'Default' - } + parent: workspace sku: { name: 'DW100c' } + properties: { + createMode: 'Default' + } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' @@ -59,8 +58,8 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } resource vulnerabilityAssessment 'Microsoft.Synapse/workspaces/sqlPools/vulnerabilityAssessments@2021-06-01' = { - parent: sqlPool name: 'default' + parent: sqlPool properties: { storageAccountAccessKey: storageAccount.listKeys().keys[0].value storageContainerPath: 'https://${storageAccount.name}.blob.core.windows.net/${container.name}/' diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep index b92ed4a2..e49b01e0 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep @@ -1,56 +1,45 @@ +@secure() +@description('The SQL administrator login password for the Synapse workspace') +param sqlAdministratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The SQL administrator login for the Synapse workspace') param sqlAdministratorLogin string -@secure() -@description('The SQL administrator login password for the Synapse workspace') -param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' -} - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - kind: 'StorageV2' - properties: {} - sku: { - name: 'Standard_LRS' - } + parent: storageAccount } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } resource sqlPool 'Microsoft.Synapse/workspaces/sqlPools@2021-06-01' = { - parent: workspace name: resourceName location: location - properties: { - createMode: 'Default' - } + parent: workspace sku: { name: 'DW100c' } + properties: { + createMode: 'Default' + } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' @@ -59,8 +48,8 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } resource workloadGroup 'Microsoft.Synapse/workspaces/sqlPools/workloadGroups@2021-06-01' = { - parent: sqlPool name: resourceName + parent: sqlPool properties: { importance: 'normal' maxResourcePercent: 100 @@ -69,3 +58,13 @@ resource workloadGroup 'Microsoft.Synapse/workspaces/sqlPools/workloadGroups@202 minResourcePercentPerRequest: 3 } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep index 54aadcb8..ba681e3b 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep @@ -7,18 +7,18 @@ param sqlAdministratorLogin string param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { - parent: storageAccount name: 'default' + parent: storageAccount } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location - kind: 'StorageV2' - properties: {} sku: { name: 'Standard_LRS' } + kind: 'StorageV2' + properties: {} } resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { @@ -27,9 +27,7 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { properties: { defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs - filesystem: container.name } - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin @@ -38,20 +36,20 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { } resource sqlPool 'Microsoft.Synapse/workspaces/sqlPools@2021-06-01' = { - parent: workspace name: resourceName location: location - properties: { - createMode: 'Default' - } + parent: workspace sku: { name: 'DW100c' } + properties: { + createMode: 'Default' + } } resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - parent: blobService name: resourceName + parent: blobService properties: { metadata: { key: 'value' @@ -60,8 +58,8 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } resource workloadGroup 'Microsoft.Synapse/workspaces/sqlPools/workloadGroups@2021-06-01' = { - parent: sqlPool name: resourceName + parent: sqlPool properties: { importance: 'normal' maxResourcePercent: 100 @@ -72,8 +70,8 @@ resource workloadGroup 'Microsoft.Synapse/workspaces/sqlPools/workloadGroups@202 } resource workloadClassifier 'Microsoft.Synapse/workspaces/sqlPools/workloadGroups/workloadClassifiers@2021-06-01' = { - parent: workloadGroup name: resourceName + parent: workloadGroup properties: { memberName: 'dbo' } diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep index da33ae18..0fd1e511 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep @@ -4,20 +4,20 @@ param location string = 'westeurope' resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'S1' + } kind: 'Gen1' properties: { dataRetentionTime: 'P30D' storageLimitExceededBehavior: 'PurgeOldData' } - sku: { - capacity: 1 - name: 'S1' - } } resource accessPolicy 'Microsoft.TimeSeriesInsights/environments/accessPolicies@2020-05-15' = { - parent: environment name: resourceName + parent: environment properties: { description: '' principalObjectId: 'aGUID' diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep index 9d649fbb..83fc0453 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep @@ -1,9 +1,13 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' -resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { +resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'B1' + } properties: { cloudToDevice: {} enableFileUploadNotifications: false @@ -20,10 +24,6 @@ resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { } storageEndpoints: {} } - sku: { - capacity: 1 - name: 'B1' - } tags: { purpose: 'testing' } @@ -32,10 +32,13 @@ resource iothub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'L1' + } kind: 'Gen2' properties: { storageConfiguration: { - accountName: storageAccount.name managementKey: storageAccount.listKeys().keys[0].value } timeSeriesIdProperties: [ @@ -45,22 +48,19 @@ resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { } ] } - sku: { - capacity: 1 - name: 'L1' - } } resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { accessTier: 'Hot' - allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -73,31 +73,30 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + allowBlobPublicAccess: true + defaultToOAuthAuthentication: false + isNfsV3Enabled: false networkAcls: { defaultAction: 'Allow' } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } - sku: { - name: 'Standard_LRS' - } } resource eventSource 'Microsoft.TimeSeriesInsights/environments/eventSources@2020-05-15' = { - parent: environment name: resourceName location: location + parent: environment kind: 'Microsoft.IoTHub' properties: { - consumerGroupName: 'test' - eventSourceResourceId: iothub.id - iotHubName: iothub.name + eventSourceResourceId: iotHub.id + iotHubName: iotHub.name keyName: 'iothubowner' - sharedAccessKey: iothub.listkeys().value[0].primaryKey + sharedAccessKey: iotHub.listKeys().value[0].primaryKey timestampPropertyName: '' + consumerGroupName: 'test' } } diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/main.bicep index 773185ef..6f362691 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/main.bicep @@ -4,13 +4,13 @@ param location string = 'westeurope' resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { name: resourceName location: location + sku: { + capacity: 1 + name: 'S1' + } kind: 'Gen1' properties: { dataRetentionTime: 'P30D' storageLimitExceededBehavior: 'PurgeOldData' } - sku: { - capacity: 1 - name: 'S1' - } } diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep index f7bf257f..f26ed8e5 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep @@ -1,30 +1,30 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { name: resourceName location: location - kind: 'Gen1' - properties: { - dataRetentionTime: 'P30D' - storageLimitExceededBehavior: 'PurgeOldData' - } sku: { capacity: 1 name: 'S1' } + kind: 'Gen1' + properties: { + storageLimitExceededBehavior: 'PurgeOldData' + dataRetentionTime: 'P30D' + } } resource referenceDataSet 'Microsoft.TimeSeriesInsights/environments/referenceDataSets@2020-05-15' = { - parent: environment name: resourceName location: location + parent: environment properties: { dataStringComparisonBehavior: 'Ordinal' keyProperties: [ { - name: 'keyProperty1' type: 'String' + name: 'keyProperty1' } ] } diff --git a/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep b/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep index 305a02af..b1d530c1 100644 --- a/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep +++ b/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep @@ -6,7 +6,6 @@ resource account 'Microsoft.VideoIndexer/accounts@2025-04-01' = { location: location properties: { storageServices: { - resourceId: storageAccount.id userAssignedIdentity: '' } } @@ -15,13 +14,21 @@ resource account 'Microsoft.VideoIndexer/accounts@2025-04-01' = { resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: '${replace(resourceName, '-', '')}sa' location: location + sku: { + name: 'Standard_LRS' + } kind: 'StorageV2' properties: { + publicNetworkAccess: 'Enabled' + defaultToOAuthAuthentication: false + isSftpEnabled: false + supportsHttpsTrafficOnly: true accessTier: 'Hot' + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' allowBlobPublicAccess: true allowCrossTenantReplication: false allowSharedKeyAccess: true - defaultToOAuthAuthentication: false dnsEndpointType: 'Standard' encryption: { keySource: 'Microsoft.Storage' @@ -34,11 +41,6 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - isHnsEnabled: false - isLocalUserEnabled: true - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { bypass: 'AzureServices' defaultAction: 'Allow' @@ -46,11 +48,8 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { resourceAccessRules: [] virtualNetworkRules: [] } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - } - sku: { - name: 'Standard_LRS' + isHnsEnabled: false + isLocalUserEnabled: true } } diff --git a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep index 259c0806..4ba3bdca 100644 --- a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep +++ b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep @@ -5,12 +5,6 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 name: resourceName location: location properties: { - autoGeneratedDomainNameLabelScope: 'NoReuse' - codecs: [ - 'PCMA' - ] - connectivity: 'PublicAddress' - e911Type: 'Standard' platforms: [ 'OperatorConnect' ] @@ -32,18 +26,24 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 { name: 'useast2' primaryRegionProperties: { - allowedMediaSourceAddressPrefixes: [ - '10.2.2.0/24' - ] allowedSignalingSourceAddressPrefixes: [ '10.2.1.0/24' ] operatorAddresses: [ '198.51.100.2' ] + allowedMediaSourceAddressPrefixes: [ + '10.2.2.0/24' + ] } } ] teamsVoicemailPilotNumber: '1234567890' + autoGeneratedDomainNameLabelScope: 'NoReuse' + codecs: [ + 'PCMA' + ] + connectivity: 'PublicAddress' + e911Type: 'Standard' } } diff --git a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep index 66d475f3..634c672f 100644 --- a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep +++ b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep @@ -5,11 +5,6 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 name: resourceName location: location properties: { - autoGeneratedDomainNameLabelScope: 'NoReuse' - codecs: [ - 'PCMA' - ] - connectivity: 'PublicAddress' e911Type: 'Standard' platforms: [ 'OperatorConnect' @@ -32,26 +27,31 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 { name: 'useast2' primaryRegionProperties: { + operatorAddresses: [ + '198.51.100.2' + ] allowedMediaSourceAddressPrefixes: [ '10.2.2.0/24' ] allowedSignalingSourceAddressPrefixes: [ '10.2.1.0/24' ] - operatorAddresses: [ - '198.51.100.2' - ] } } ] teamsVoicemailPilotNumber: '1234567890' + autoGeneratedDomainNameLabelScope: 'NoReuse' + codecs: [ + 'PCMA' + ] + connectivity: 'PublicAddress' } } -resource testline 'Microsoft.VoiceServices/communicationsGateways/testLines@2023-01-31' = { - parent: communicationsGateway +resource testLine 'Microsoft.VoiceServices/communicationsGateways/testLines@2023-01-31' = { name: resourceName location: location + parent: communicationsGateway properties: { phoneNumber: '123456789' purpose: 'Automated' diff --git a/settings/remarks/microsoft.web/remarks.json b/settings/remarks/microsoft.web/remarks.json index 893c9a34..00e9d0d9 100644 --- a/settings/remarks/microsoft.web/remarks.json +++ b/settings/remarks/microsoft.web/remarks.json @@ -121,6 +121,11 @@ "ResourceType": "Microsoft.Web/staticSites/customDomains", "Path": "samples/staticsites/customdomains/main.bicep", "Description": "A basic example of deploying Static Web App Custom Domain." + }, + { + "ResourceType": "Microsoft.Web/sourcecontrols", + "Path": "samples/sourcecontrols/main.bicep", + "Description": "A basic example of deploying App Service GitHub Token." } ] } \ No newline at end of file diff --git a/settings/remarks/microsoft.web/samples/serverfarms/main.bicep b/settings/remarks/microsoft.web/samples/serverfarms/main.bicep index ac77f6af..1e1d261f 100644 --- a/settings/remarks/microsoft.web/samples/serverfarms/main.bicep +++ b/settings/remarks/microsoft.web/samples/serverfarms/main.bicep @@ -4,13 +4,13 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { hyperV: false perSiteScaling: false reserved: false zoneRedundant: false } - sku: { - name: 'S1' - } } diff --git a/settings/remarks/microsoft.web/samples/sites/config/main.bicep b/settings/remarks/microsoft.web/samples/sites/config/main.bicep index bdfaa837..686e0702 100644 --- a/settings/remarks/microsoft.web/samples/sites/config/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/config/main.bicep @@ -4,53 +4,53 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { hyperV: false perSiteScaling: false reserved: false zoneRedundant: false } - sku: { - name: 'S1' - } } resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceName location: location properties: { - clientAffinityEnabled: false - clientCertEnabled: false - clientCertMode: 'Required' - enabled: true + vnetRouteAllEnabled: false httpsOnly: false - publicNetworkAccess: 'Enabled' - serverFarmId: serverfarm.id siteConfig: { - acrUseManagedIdentityCreds: false - alwaysOn: true - autoHealEnabled: false - ftpsState: 'Disabled' - http20Enabled: false + remoteDebuggingEnabled: false + use32BitWorkerProcess: true + windowsFxVersion: '' loadBalancing: 'LeastRequests' + vnetRouteAllEnabled: false + webSocketsEnabled: false localMySqlEnabled: false + ftpsState: 'Disabled' managedPipelineMode: 'Integrated' minTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' - remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false scmMinTlsVersion: '1.2' - use32BitWorkerProcess: true - vnetRouteAllEnabled: false - webSocketsEnabled: false - windowsFxVersion: '' + acrUseManagedIdentityCreds: false + alwaysOn: true + autoHealEnabled: false + http20Enabled: false + publicNetworkAccess: 'Enabled' } - vnetRouteAllEnabled: false + clientAffinityEnabled: false + clientCertEnabled: false + clientCertMode: 'Required' + enabled: true + publicNetworkAccess: 'Enabled' + serverFarmId: serverfarm.id } } resource config 'Microsoft.Web/sites/config@2022-09-01' = { - parent: site name: 'azurestorageaccounts' + parent: site properties: {} } diff --git a/settings/remarks/microsoft.web/samples/sites/main.bicep b/settings/remarks/microsoft.web/samples/sites/main.bicep index 84754e11..6108cb98 100644 --- a/settings/remarks/microsoft.web/samples/sites/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { hyperV: false perSiteScaling: false reserved: false zoneRedundant: false } - sku: { - name: 'S1' - } } resource site 'Microsoft.Web/sites@2022-09-01' = { @@ -20,31 +20,31 @@ resource site 'Microsoft.Web/sites@2022-09-01' = { location: location properties: { clientAffinityEnabled: false - clientCertEnabled: false - clientCertMode: 'Required' enabled: true httpsOnly: false + vnetRouteAllEnabled: false + clientCertEnabled: false + clientCertMode: 'Required' publicNetworkAccess: 'Enabled' serverFarmId: serverfarm.id siteConfig: { acrUseManagedIdentityCreds: false alwaysOn: true + use32BitWorkerProcess: true + remoteDebuggingEnabled: false + scmMinTlsVersion: '1.2' autoHealEnabled: false ftpsState: 'Disabled' http20Enabled: false loadBalancing: 'LeastRequests' localMySqlEnabled: false + publicNetworkAccess: 'Enabled' + webSocketsEnabled: false + windowsFxVersion: '' managedPipelineMode: 'Integrated' minTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' - remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false - scmMinTlsVersion: '1.2' - use32BitWorkerProcess: true vnetRouteAllEnabled: false - webSocketsEnabled: false - windowsFxVersion: '' } - vnetRouteAllEnabled: false } } diff --git a/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep b/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep index b98d9d7a..c1bd1e0b 100644 --- a/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep @@ -4,16 +4,16 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = { name: resourceName location: location - kind: 'Windows' - properties: { - isXenon: false - } sku: { capacity: 1 name: 'S1' size: 'S1' tier: 'Standard' } + kind: 'Windows' + properties: { + isXenon: false + } } resource site 'Microsoft.Web/sites@2021-02-01' = { @@ -30,8 +30,8 @@ resource site 'Microsoft.Web/sites@2021-02-01' = { } resource publicCertificate 'Microsoft.Web/sites/publicCertificates@2022-09-01' = { - parent: site name: resourceName + parent: site properties: { blob: 'LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUNzakNDQVpvQ0NRQ01kdDdEdnlnUHREQU5CZ2txaGtpRzl3MEJBUXNGQURBYk1Sa3dGd1lEVlFRRERCQmgKY0drdWRHVnljbUZtYjNKdExtbHZNQjRYRFRFNE1EY3dOVEV3TXpNek1Gb1hEVEk0TURjd01qRXdNek16TUZvdwpHekVaTUJjR0ExVUVBd3dRWVhCcExuUmxjbkpoWm05eWJTNXBiekNDQVNJd0RRWUpLb1pJaHZjTkFRRUJCUUFECmdnRVBBRENDQVFvQ2dnRUJBS1FXMzMyT2wyOENzaWRBaGVEMWFMOVVsOEpXbktMZGFWeEtaM3NzbDVDWGpQRE8KbU03SVhrMFNnYlFuVUM4bElsUEZaaURHYlExc0I2T1RNdW42Wlo0aXBMcDgwZHRsMHJvQ0x0Q25EUU9CR3pDTgpBckNZQW9YUnVyamtYRVk3dHBEMHd3dFU3MiszN2gzSFE0ZzBWUzZWSXRKQ3FKOVFBRFYrSE8yWld1WlRlejcwCk1ob0w2T0xmWlA3SEdZZEpES2dmRVZORjVYbGJWek5BR2tESUpGZGhqTnh5R0d1NU5mc20xcGZRaEF5dW5razcKSlZhbWpVZzVJb2pSZG82M0lTOXd3ek1PZGVHU0FiQmNzSmZZZUNmVmcya3VwUjhxMFRtWit4OTNSbW1PbGJTaQo2NmtFWXhSelo5WUNRZUhKbW4xWWZKOTJCcENVaXk5QTZaMWlhS1VDQXdFQUFUQU5CZ2txaGtpRzl3MEJBUXNGCkFBT0NBUUVBSjdKaGxlY1A3SjQ4d0kyUUhUTWJBTWtrV0J2L2lXcTEvUUlGNHVnSDNaYjVQb3JPditOZmhRMEwKbFdpdy9Tek44QWU5NXZVaXhBR1lITVNhMjhvdW1NNUsxT3NxS0VrVklvMUFvQkg4bkJ6K1ZjVHBSRC9tSFhvdApBSFBBWnQ5ajVMcWVIWCtlblI2UmJJTkFmM2puK1lVM01kVmUwTXNBRGRGQVNWRGZqbVFQMlI3bzlhSmIvUXFPCmczYlpCV3NpQkRFSVNmeWFIMitwZ1VNN3d0d0VvRldtRU1sZ2pMSzFNUkJzMWNEWlhxbkhhQ2QvcnMrTm1XVjkKbmFFdTd4NWZ5UU9rNEhvemtwd2VSK0p4MXNCbFRSc2E0OS9xU0h0LzZVTEtmTzAxL2NUczRpRjcxeWtYUGJoMwpLajljSTJ1bzlhWXRYa3hraEtyR3lVcEE3RkpxV3c9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==' publicCertificateLocation: 'Unknown' diff --git a/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep b/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep index 94f2c216..442f7110 100644 --- a/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep @@ -5,53 +5,53 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { hyperV: false perSiteScaling: false reserved: false zoneRedundant: false } - sku: { - name: 'S1' - } } resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceSiteName location: location properties: { - clientAffinityEnabled: false - clientCertEnabled: false clientCertMode: 'Required' - enabled: true httpsOnly: false publicNetworkAccess: 'Enabled' - serverFarmId: serverfarm.id siteConfig: { + managedPipelineMode: 'Integrated' + minTlsVersion: '1.2' + scmMinTlsVersion: '1.2' acrUseManagedIdentityCreds: false - alwaysOn: true - autoHealEnabled: false - ftpsState: 'Disabled' http20Enabled: false - loadBalancing: 'LeastRequests' localMySqlEnabled: false - managedPipelineMode: 'Integrated' - minTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' remoteDebuggingEnabled: false - scmIpSecurityRestrictionsUseMain: false - scmMinTlsVersion: '1.2' use32BitWorkerProcess: true + alwaysOn: true + ftpsState: 'Disabled' + scmIpSecurityRestrictionsUseMain: false vnetRouteAllEnabled: false - webSocketsEnabled: false windowsFxVersion: '' + autoHealEnabled: false + loadBalancing: 'LeastRequests' + publicNetworkAccess: 'Enabled' + webSocketsEnabled: false } vnetRouteAllEnabled: false + clientAffinityEnabled: false + clientCertEnabled: false + enabled: true + serverFarmId: serverfarm.id } } resource dynatraceSiteExtension 'Microsoft.Web/sites/siteextensions@2022-09-01' = { - parent: site name: 'Dynatrace' location: location + parent: site } diff --git a/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep b/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep index a261a10d..f1fd862a 100644 --- a/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep @@ -4,15 +4,15 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { hyperV: false perSiteScaling: false reserved: false zoneRedundant: false } - sku: { - name: 'S1' - } } resource site 'Microsoft.Web/sites@2022-09-01' = { @@ -21,72 +21,72 @@ resource site 'Microsoft.Web/sites@2022-09-01' = { properties: { clientAffinityEnabled: false clientCertEnabled: false - clientCertMode: 'Required' enabled: true - httpsOnly: false publicNetworkAccess: 'Enabled' serverFarmId: serverfarm.id + vnetRouteAllEnabled: false + clientCertMode: 'Required' + httpsOnly: false siteConfig: { - acrUseManagedIdentityCreds: false - alwaysOn: true - autoHealEnabled: false - ftpsState: 'Disabled' - http20Enabled: false - loadBalancing: 'LeastRequests' - localMySqlEnabled: false - managedPipelineMode: 'Integrated' - minTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false - scmMinTlsVersion: '1.2' use32BitWorkerProcess: true vnetRouteAllEnabled: false + http20Enabled: false + scmMinTlsVersion: '1.2' webSocketsEnabled: false + acrUseManagedIdentityCreds: false + alwaysOn: true + ftpsState: 'Disabled' + managedPipelineMode: 'Integrated' + publicNetworkAccess: 'Enabled' windowsFxVersion: '' + autoHealEnabled: false + loadBalancing: 'LeastRequests' + localMySqlEnabled: false + minTlsVersion: '1.2' } - vnetRouteAllEnabled: false } } resource slot 'Microsoft.Web/sites/slots@2022-09-01' = { - parent: site name: resourceName location: location + parent: site properties: { clientAffinityEnabled: false clientCertEnabled: false - clientCertExclusionPaths: '' - clientCertMode: 'Required' - enabled: true httpsOnly: false - publicNetworkAccess: 'Enabled' - serverFarmId: serverfarm.id siteConfig: { + remoteDebuggingEnabled: false + webSocketsEnabled: false acrUseManagedIdentityCreds: false - alwaysOn: true - autoHealEnabled: false ftpsState: 'Disabled' - http20Enabled: false loadBalancing: 'LeastRequests' localMySqlEnabled: false - managedPipelineMode: 'Integrated' - minTlsVersion: '1.2' publicNetworkAccess: 'Enabled' - remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false + autoHealEnabled: false + managedPipelineMode: 'Integrated' scmMinTlsVersion: '1.2' use32BitWorkerProcess: false + alwaysOn: true + http20Enabled: false + minTlsVersion: '1.2' vnetRouteAllEnabled: false - webSocketsEnabled: false windowsFxVersion: '' } vnetRouteAllEnabled: false + clientCertExclusionPaths: '' + clientCertMode: 'Required' + enabled: true + publicNetworkAccess: 'Enabled' + serverFarmId: serverfarm.id } } resource config 'Microsoft.Web/sites/slots/config@2022-09-01' = { - parent: slot name: 'azurestorageaccounts' + parent: slot properties: {} } diff --git a/settings/remarks/microsoft.web/samples/sites/slots/main.bicep b/settings/remarks/microsoft.web/samples/sites/slots/main.bicep index a38c7b91..7425c65b 100644 --- a/settings/remarks/microsoft.web/samples/sites/slots/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/slots/main.bicep @@ -4,83 +4,83 @@ param location string = 'westeurope' resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { name: resourceName location: location + sku: { + name: 'S1' + } properties: { hyperV: false perSiteScaling: false reserved: false zoneRedundant: false } - sku: { - name: 'S1' - } } resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceName location: location properties: { - clientAffinityEnabled: false - clientCertEnabled: false clientCertMode: 'Required' enabled: true httpsOnly: false - publicNetworkAccess: 'Enabled' - serverFarmId: serverfarm.id siteConfig: { + use32BitWorkerProcess: true acrUseManagedIdentityCreds: false - alwaysOn: true - autoHealEnabled: false - ftpsState: 'Disabled' http20Enabled: false - loadBalancing: 'LeastRequests' localMySqlEnabled: false - managedPipelineMode: 'Integrated' - minTlsVersion: '1.2' + scmMinTlsVersion: '1.2' + vnetRouteAllEnabled: false + ftpsState: 'Disabled' publicNetworkAccess: 'Enabled' remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false - scmMinTlsVersion: '1.2' - use32BitWorkerProcess: true - vnetRouteAllEnabled: false + alwaysOn: true + autoHealEnabled: false webSocketsEnabled: false windowsFxVersion: '' + loadBalancing: 'LeastRequests' + managedPipelineMode: 'Integrated' + minTlsVersion: '1.2' } + clientCertEnabled: false + publicNetworkAccess: 'Enabled' + serverFarmId: serverfarm.id vnetRouteAllEnabled: false + clientAffinityEnabled: false } } resource slot 'Microsoft.Web/sites/slots@2022-09-01' = { - parent: site name: resourceName location: location + parent: site properties: { clientAffinityEnabled: false - clientCertEnabled: false clientCertExclusionPaths: '' - clientCertMode: 'Required' - enabled: true - httpsOnly: false publicNetworkAccess: 'Enabled' - serverFarmId: serverfarm.id siteConfig: { - acrUseManagedIdentityCreds: false - alwaysOn: true autoHealEnabled: false ftpsState: 'Disabled' + managedPipelineMode: 'Integrated' + scmMinTlsVersion: '1.2' + use32BitWorkerProcess: false + alwaysOn: true http20Enabled: false loadBalancing: 'LeastRequests' localMySqlEnabled: false - managedPipelineMode: 'Integrated' - minTlsVersion: '1.2' publicNetworkAccess: 'Enabled' remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false - scmMinTlsVersion: '1.2' - use32BitWorkerProcess: false - vnetRouteAllEnabled: false webSocketsEnabled: false + acrUseManagedIdentityCreds: false + minTlsVersion: '1.2' + vnetRouteAllEnabled: false windowsFxVersion: '' } vnetRouteAllEnabled: false + clientCertEnabled: false + clientCertMode: 'Required' + enabled: true + httpsOnly: false + serverFarmId: serverfarm.id } } diff --git a/settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep b/settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep new file mode 100644 index 00000000..95ad1e16 --- /dev/null +++ b/settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep @@ -0,0 +1,18 @@ +targetScope = 'tenant' + +@secure() +@description('The GitHub token secret for source control integration') +param githubTokenSecret string +param resourceName string = 'acctest0001' +param location string = 'eastus' +@secure() +@description('The GitHub access token for source control integration') +param githubToken string + +resource sourcecontrol 'Microsoft.Web/sourcecontrols@2021-02-01' = { + name: 'GitHub' + properties: { + tokenSecret: '${githubTokenSecret}' + token: '${githubToken}' + } +} diff --git a/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep b/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep index a9b765ba..e30ea138 100644 --- a/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep +++ b/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep @@ -1,18 +1,18 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource staticSite 'Microsoft.Web/staticSites@2021-02-01' = { name: resourceName location: location - properties: {} sku: { name: 'Free' } + properties: {} } resource customDomain 'Microsoft.Web/staticSites/customDomains@2021-02-01' = { - parent: staticSite name: '${resourceName}.contoso.com' + parent: staticSite properties: { validationMethod: 'dns-txt-token' } diff --git a/settings/remarks/microsoft.web/samples/staticsites/main.bicep b/settings/remarks/microsoft.web/samples/staticsites/main.bicep index 722c6511..4d747091 100644 --- a/settings/remarks/microsoft.web/samples/staticsites/main.bicep +++ b/settings/remarks/microsoft.web/samples/staticsites/main.bicep @@ -4,9 +4,9 @@ param location string = 'westeurope' resource staticSite 'Microsoft.Web/staticSites@2021-02-01' = { name: resourceName location: location - properties: {} sku: { name: 'Free' tier: 'Free' } + properties: {} } diff --git a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep index ea30bb24..7c593069 100644 --- a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep +++ b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep @@ -4,6 +4,9 @@ param location string = 'westus' resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = { name: '${resourceName}-nginx' location: location + sku: { + name: 'standardv2_Monthly' + } properties: { autoUpgradeProfile: { upgradeChannel: 'stable' @@ -12,27 +15,23 @@ resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = networkProfile: { frontEndIPConfiguration: { publicIPAddresses: [ - { - id: publicIPAddress.id - } + {} ] } - networkInterfaceConfiguration: { - subnetId: subnet.id - } + networkInterfaceConfiguration: {} } scalingProperties: { capacity: 10 } } - sku: { - name: 'standardv2_Monthly' - } } resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { name: '${resourceName}-pip' location: location + sku: { + name: 'Standard' + } properties: { ddosSettings: { protectionMode: 'VirtualNetworkInherited' @@ -41,9 +40,6 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { publicIPAddressVersion: 'IPv4' publicIPAllocationMethod: 'Static' } - sku: { - name: 'Standard' - } } resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { @@ -64,9 +60,10 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } resource configuration 'Nginx.NginxPlus/nginxDeployments/configurations@2024-11-01-preview' = { - parent: nginxDeployment name: 'default' + parent: nginxDeployment properties: { + rootFile: '/etc/nginx/nginx.conf' files: [ { content: 'aHR0cCB7CiAgICBzZXJ2ZXIgewogICAgICAgIGxpc3RlbiA4MDsKICAgICAgICBsb2NhdGlvbiAvIHsKICAgICAgICAgICAgYXV0aF9iYXNpYyAiUHJvdGVjdGVkIEFyZWEiOwogICAgICAgICAgICBhdXRoX2Jhc2ljX3VzZXJfZmlsZSAvb3B0Ly5odHBhc3N3ZDsKICAgICAgICAgICAgZGVmYXVsdF90eXBlIHRleHQvaHRtbDsKICAgICAgICAgICAgcmV0dXJuIDIwMCAnPCFkb2N0eXBlIGh0bWw+PGh0bWwgbGFuZz0iZW4iPjxoZWFkPjwvaGVhZD48Ym9keT4KICAgICAgICAgICAgICAgIDxkaXY+dGhpcyBvbmUgd2lsbCBiZSB1cGRhdGVkPC9kaXY+CiAgICAgICAgICAgICAgICA8ZGl2PmF0IDEwOjM4IGFtPC9kaXY+CiAgICAgICAgICAgIDwvYm9keT48L2h0bWw+JzsKICAgICAgICB9CiAgICAgICAgaW5jbHVkZSBzaXRlLyouY29uZjsKICAgIH0KfQo=' @@ -79,13 +76,12 @@ resource configuration 'Nginx.NginxPlus/nginxDeployments/configurations@2024-11- virtualPath: '/opt/.htpasswd' } ] - rootFile: '/etc/nginx/nginx.conf' } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: '${resourceName}-subnet' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' defaultOutboundAccess: true diff --git a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep index 21aa7c31..2e854149 100644 --- a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep +++ b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep @@ -1,79 +1,20 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = { - name: '${resourceName}-nginx' +resource publicipaddress1 'Microsoft.Network/publicIPAddresses@2024-05-01' = { + name: '${resourceName}-pip2' location: location - properties: { - autoUpgradeProfile: { - upgradeChannel: 'stable' - } - enableDiagnosticsSupport: false - networkProfile: { - frontEndIPConfiguration: { - publicIPAddresses: [ - { - id: publicIPAddress.id - } - ] - } - networkInterfaceConfiguration: { - subnetId: subnet.id - } - } - scalingProperties: { - autoScaleSettings: { - profiles: [ - { - capacity: { - max: 30 - min: 10 - } - name: 'test' - } - ] - } - } - userProfile: { - preferredEmail: 'test@test.com' - } - } sku: { - name: 'standardv2_Monthly' + name: 'Standard' + tier: 'Regional' } -} - -resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { - name: '${resourceName}-pip' - location: location properties: { - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' - } idleTimeoutInMinutes: 4 publicIPAddressVersion: 'IPv4' publicIPAllocationMethod: 'Static' - } - sku: { - name: 'Standard' - tier: 'Regional' - } -} - -resource publicipaddress1 'Microsoft.Network/publicIPAddresses@2024-05-01' = { - name: '${resourceName}-pip2' - location: location - properties: { ddosSettings: { protectionMode: 'VirtualNetworkInherited' } - idleTimeoutInMinutes: 4 - publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Static' - } - sku: { - name: 'Standard' - tier: 'Regional' } } @@ -81,6 +22,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: '${resourceName}-vnet' location: location properties: { + privateEndpointVNetPolicies: 'Disabled' + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -89,14 +32,12 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { dhcpOptions: { dnsServers: [] } - privateEndpointVNetPolicies: 'Disabled' - subnets: [] } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: '${resourceName}-subnet' + parent: virtualNetwork properties: { addressPrefix: '10.0.2.0/24' defaultOutboundAccess: true @@ -116,9 +57,12 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { } resource subnet1 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: virtualNetwork name: '${resourceName}-subnet2' + parent: virtualNetwork properties: { + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] addressPrefix: '10.0.3.0/24' defaultOutboundAccess: true delegations: [ @@ -130,8 +74,60 @@ resource subnet1 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { } ] privateEndpointNetworkPolicies: 'Disabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] + } +} + +resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = { + name: '${resourceName}-nginx' + location: location + sku: { + name: 'standardv2_Monthly' + } + properties: { + autoUpgradeProfile: { + upgradeChannel: 'stable' + } + enableDiagnosticsSupport: false + networkProfile: { + frontEndIPConfiguration: { + publicIPAddresses: [ + {} + ] + } + networkInterfaceConfiguration: {} + } + scalingProperties: { + autoScaleSettings: { + profiles: [ + { + capacity: { + max: 30 + min: 10 + } + name: 'test' + } + ] + } + } + userProfile: { + preferredEmail: 'test@test.com' + } + } +} + +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { + name: '${resourceName}-pip' + location: location + sku: { + name: 'Standard' + tier: 'Regional' + } + properties: { + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + idleTimeoutInMinutes: 4 + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Static' } } diff --git a/settings/remarks/qumulo.storage/samples/filesystems/main.bicep b/settings/remarks/qumulo.storage/samples/filesystems/main.bicep index 526a60f7..98f9aff0 100644 --- a/settings/remarks/qumulo.storage/samples/filesystems/main.bicep +++ b/settings/remarks/qumulo.storage/samples/filesystems/main.bicep @@ -1,27 +1,8 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrative password for the Qumulo file system') param qumuloPassword string - -resource qumuloFileSystem 'Qumulo.Storage/fileSystems@2024-06-19' = { - name: resourceName - location: location - properties: { - adminPassword: null - availabilityZone: '1' - delegatedSubnetId: subnet.id - marketplaceDetails: { - offerId: 'qumulo-saas-mpp' - planId: 'azure-native-qumulo-v3' - publisherId: 'qumulo1584033880660' - } - storageSku: 'Cold_LRS' - userDetails: { - email: 'test@test.com' - } - } -} +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource vnet 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: resourceName @@ -38,9 +19,9 @@ resource vnet 'Microsoft.Network/virtualNetworks@2024-05-01' = { } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - parent: vnet name: resourceName location: location + parent: vnet properties: { addressPrefix: '10.0.1.0/24' defaultOutboundAccess: true @@ -48,10 +29,10 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { { name: 'delegation' properties: { + serviceName: 'Qumulo.Storage/fileSystems' actions: [ 'Microsoft.Network/virtualNetworks/subnets/join/action' ] - serviceName: 'Qumulo.Storage/fileSystems' } } ] @@ -59,3 +40,21 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { privateLinkServiceNetworkPolicies: 'Enabled' } } + +resource qumuloFileSystem 'Qumulo.Storage/fileSystems@2024-06-19' = { + name: resourceName + location: location + properties: { + adminPassword: qumuloPassword + availabilityZone: '1' + marketplaceDetails: { + offerId: 'qumulo-saas-mpp' + planId: 'azure-native-qumulo-v3' + publisherId: 'qumulo1584033880660' + } + storageSku: 'Cold_LRS' + userDetails: { + email: 'test@test.com' + } + } +} diff --git a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.authorization/2022-04-01/roledefinitions.md b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.authorization/2022-04-01/roledefinitions.md index 1007121e..9d2f87d3 100644 --- a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.authorization/2022-04-01/roledefinitions.md +++ b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.authorization/2022-04-01/roledefinitions.md @@ -100,6 +100,7 @@ A basic example of deploying custom Role Definition. targetScope = 'subscription' param resourceName string = 'acctest0001' +param location string = 'eastus' resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-preview' = { name: '6faae21a-0cd6-4536-8c23-a278823d12ed' @@ -110,15 +111,15 @@ resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-prev description: '' permissions: [ { - actions: [ - '*' - ] dataActions: [] notActions: [] notDataActions: [] + actions: [ + '*' + ] } ] - roleName: 'acctest0001' + roleName: resourceName type: 'CustomRole' } } diff --git a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.compute/2024-03-02/disks.md b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.compute/2024-03-02/disks.md index b5950790..9f6d8018 100644 --- a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.compute/2024-03-02/disks.md +++ b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.compute/2024-03-02/disks.md @@ -311,7 +311,12 @@ param location string = 'westeurope' resource disk 'Microsoft.Compute/disks@2022-03-02' = { name: resourceName location: location + sku: { + name: 'Standard_LRS' + } properties: { + osType: '' + publicNetworkAccess: 'Enabled' creationData: { createOption: 'Empty' } @@ -320,11 +325,6 @@ resource disk 'Microsoft.Compute/disks@2022-03-02' = { type: 'EncryptionAtRestWithPlatformKey' } networkAccessPolicy: 'AllowAll' - osType: '' - publicNetworkAccess: 'Enabled' - } - sku: { - name: 'Standard_LRS' } } ``` diff --git a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.documentdb/2024-05-15/databaseaccounts.md b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.documentdb/2024-05-15/databaseaccounts.md index 4642b1fb..40a2dbe1 100644 --- a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.documentdb/2024-05-15/databaseaccounts.md +++ b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.documentdb/2024-05-15/databaseaccounts.md @@ -435,33 +435,33 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 10 maxStalenessPrefix: 200 } databaseAccountOfferType: 'Standard' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false - enableAnalyticalStorage: false enableAutomaticFailover: false - enableFreeTier: false - enableMultipleWriteLocations: false ipRules: [] - isVirtualNetworkFilterEnabled: false locations: [ { + locationName: 'West Europe' failoverPriority: 0 isZoneRedundant: false - locationName: 'West Europe' } ] + virtualNetworkRules: [] + disableLocalAuth: false + enableAnalyticalStorage: false + enableFreeTier: false + enableMultipleWriteLocations: false + isVirtualNetworkFilterEnabled: false networkAclBypass: 'None' - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' + disableKeyBasedMetadataWriteAccess: false + networkAclBypassResourceIds: [] + capabilities: [] } } ``` diff --git a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.keyvault/2023-07-01/vaults.md b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.keyvault/2023-07-01/vaults.md index a9035a7e..d43afadc 100644 --- a/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.keyvault/2023-07-01/vaults.md +++ b/src/TemplateRefGenerator.Tests/Files/markdown/microsoft.keyvault/2023-07-01/vaults.md @@ -214,22 +214,20 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { { objectId: deployer().objectId permissions: { + secrets: [ + 'Set' + ] + storage: [] certificates: [ 'ManageContacts' ] keys: [ 'Create' ] - secrets: [ - 'Set' - ] - storage: [] } - tenantId: deployer().tenantId + tenantId: tenant() } ] - createMode: 'default' - enableRbacAuthorization: false enableSoftDelete: true enabledForDeployment: false enabledForDiskEncryption: false @@ -239,8 +237,10 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { family: 'A' name: 'standard' } + tenantId: tenant() + createMode: 'default' + enableRbacAuthorization: false softDeleteRetentionInDays: 7 - tenantId: deployer().tenantId } } ``` From e841a62a6b721eb7270e2bdd4119e1d657033239 Mon Sep 17 00:00:00 2001 From: Mingzhe Jiang Date: Mon, 9 Feb 2026 20:22:20 -0800 Subject: [PATCH 2/2] Re-factor the format --- .../samples/diagnosticsettings/main.bicep | 2 +- .../recommendations/suppressions/main.bicep | 2 +- .../smartdetectoralertrules/main.bicep | 26 +- .../samples/servers/main.bicep | 6 +- .../service/apis/diagnostics/main.bicep | 42 +-- .../samples/service/apis/main.bicep | 18 +- .../service/apis/operations/main.bicep | 28 +- .../samples/service/apis/policies/main.bicep | 14 +- .../samples/service/apis/schemas/main.bicep | 22 +- .../service/apis/tagdescriptions/main.bicep | 32 +- .../samples/service/apis/tags/main.bicep | 18 +- .../samples/service/apiversionsets/main.bicep | 6 +- .../service/authorizationservers/main.bicep | 18 +- .../samples/service/caches/main.bicep | 4 +- .../samples/service/certificates/main.bicep | 10 +- .../samples/service/diagnostics/main.bicep | 36 +-- .../certificateauthorities/main.bicep | 30 +- .../hostnameconfigurations/main.bicep | 36 +-- .../samples/service/gateways/main.bicep | 28 +- .../samples/service/groups/main.bicep | 30 +- .../service/identityproviders/main.bicep | 36 +-- .../samples/service/loggers/main.bicep | 40 +-- .../samples/service/main.bicep | 26 +- .../samples/service/namedvalues/main.bicep | 2 +- .../service/openidconnectproviders/main.bicep | 20 +- .../service/policyfragments/main.bicep | 26 +- .../samples/service/portalsettings/main.bicep | 20 +- .../samples/service/products/main.bicep | 2 +- .../service/products/policies/main.bicep | 8 +- .../samples/service/products/tags/main.bicep | 4 +- .../samples/service/schemas/main.bicep | 12 +- .../samples/service/subscriptions/main.bicep | 44 +-- .../samples/service/tags/main.bicep | 10 +- .../samples/service/users/main.bicep | 30 +- .../samples/containerapps/main.bicep | 44 +-- .../microsoft.app/samples/jobs/main.bicep | 10 +- .../certificates/main.bicep | 14 +- .../daprcomponents/main.bicep | 12 +- .../dotnetcomponents/main.bicep | 14 +- .../samples/managedenvironments/main.bicep | 12 +- .../managedenvironments/storages/main.bicep | 62 ++-- .../spring/apiportals/domains/main.bicep | 2 +- .../customizedaccelerators/main.bicep | 8 +- .../samples/spring/apps/bindings/main.bicep | 30 +- .../builders/buildpackbindings/main.bicep | 34 +-- .../samples/spring/devtoolportals/main.bicep | 4 +- .../samples/spring/gateways/main.bicep | 2 +- .../spring/gateways/routeconfigs/main.bicep | 28 +- .../samples/spring/main.bicep | 2 +- .../samples/spring/storages/main.bicep | 36 +-- .../samples/attestationproviders/main.bicep | 2 +- .../samples/policyassignments/main.bicep | 2 +- .../samples/policydefinitions/main.bicep | 2 +- .../samples/policyexemptions/main.bicep | 26 +- .../samples/policysetdefinitions/main.bicep | 32 +- .../samples/roledefinitions/main.bicep | 4 +- .../samples/configurationprofiles/main.bicep | 2 +- .../certificates/main.bicep | 6 +- .../configurations/main.bicep | 6 +- .../automationaccounts/connections/main.bicep | 18 +- .../connectiontypes/main.bicep | 2 +- .../automationaccounts/credentials/main.bicep | 8 +- .../hybridrunbookworkers/main.bicep | 112 +++---- .../hybridrunbookworkergroups/main.bicep | 4 +- .../samples/automationaccounts/main.bicep | 6 +- .../runbooks/draft/main.bicep | 4 +- .../automationaccounts/schedules/main.bicep | 6 +- .../softwareupdateconfigurations/main.bicep | 20 +- .../sourcecontrols/main.bicep | 10 +- .../automationaccounts/variables/main.bicep | 8 +- .../samples/privateclouds/main.bicep | 4 +- .../batchaccounts/applications/main.bicep | 52 ++-- .../batchaccounts/certificates/main.bicep | 4 +- .../samples/batchaccounts/main.bicep | 2 +- .../samples/batchaccounts/pools/main.bicep | 20 +- .../billingprofiles/main.bicep | 20 +- .../samples/botservices/channels/main.bicep | 8 +- .../samples/botservices/main.bicep | 10 +- .../samples/redis/accesspolicies/main.bicep | 8 +- .../redis/accesspolicyassignments/main.bicep | 2 +- .../samples/redis/firewallrules/main.bicep | 8 +- .../redis/linkedservers/main-rg-module.bicep | 30 +- .../samples/redis/linkedservers/main.bicep | 2 +- .../microsoft.cache/samples/redis/main.bicep | 2 +- .../redisenterprise/databases/main.bicep | 4 +- .../samples/redisenterprise/main.bicep | 2 +- .../profiles/afdendpoints/routes/main.bicep | 12 +- .../samples/profiles/customdomains/main.bicep | 10 +- .../samples/profiles/endpoints/main.bicep | 8 +- .../samples/profiles/origingroups/main.bicep | 2 +- .../profiles/origingroups/origins/main.bicep | 8 +- .../profiles/rulesets/rules/main.bicep | 24 +- .../profiles/securitypolicies/main.bicep | 152 +++++----- .../samples/certificateorders/main.bicep | 2 +- .../samples/codesigningaccounts/main.bicep | 2 +- .../samples/accounts/deployments/main.bicep | 6 +- .../samples/accounts/projects/main.bicep | 4 +- .../samples/accounts/raiblocklists/main.bicep | 4 +- .../samples/emailservices/domains/main.bicep | 4 +- .../samples/emailservices/main.bicep | 2 +- .../samples/availabilitysets/main.bicep | 2 +- .../capacityreservations/main.bicep | 2 +- .../samples/diskencryptionsets/main.bicep | 12 +- .../samples/disks/main.bicep | 2 +- .../applications/versions/main.bicep | 40 +-- .../samples/galleries/images/main.bicep | 24 +- .../samples/hostgroups/hosts/main.bicep | 2 +- .../restorepointcollections/main.bicep | 110 +++---- .../restorepoints/main.bicep | 82 +++--- .../samples/snapshots/main.bicep | 32 +- .../virtualmachines/attachdatadisk/main.bicep | 100 +++---- .../virtualmachines/attachosdisk/main.bicep | 130 ++++----- .../samples/virtualmachines/basic/main.bicep | 26 +- .../virtualmachines/extensions/main.bicep | 46 +-- .../virtualmachines/runcommands/main.bicep | 140 ++++----- .../extensions/main.bicep | 98 +++---- .../virtualmachinescalesets/main.bicep | 102 +++---- .../samples/ledgers/main.bicep | 4 +- .../samples/budgets/main.bicep | 4 +- .../samples/containergroups/main.bicep | 8 +- .../samples/registries/agentpools/main.bicep | 18 +- .../samples/registries/cacherules/main.bicep | 4 +- .../registries/connectedregistries/main.bicep | 4 +- .../registries/credentialsets/main.bicep | 40 +-- .../samples/registries/main.bicep | 14 +- .../samples/registries/scopemaps/main.bicep | 18 +- .../samples/registries/taskruns/main.bicep | 26 +- .../samples/registries/tasks/main.bicep | 22 +- .../samples/registries/tokens/main.bicep | 16 +- .../samples/registries/webhooks/main.bicep | 14 +- .../samples/fleets/members/main.bicep | 38 +-- .../managedclusters/agentpools/main.bicep | 6 +- .../trustedaccessrolebindings/main.bicep | 184 ++++++------ .../samples/scheduledactions/main.bicep | 26 +- .../samples/views/main.bicep | 24 +- .../samples/grafana/main.bicep | 2 +- .../managedprivateendpoints/main.bicep | 8 +- .../virtualnetworkpeerings/main.bicep | 40 +-- .../samples/factories/credentials/main.bicep | 12 +- .../samples/factories/dataflows/main.bicep | 74 ++--- .../samples/factories/datasets/main.bicep | 48 +-- .../factories/integrationruntimes/main.bicep | 2 +- .../factories/linkedservices/main.bicep | 28 +- .../managedvirtualnetworks/main.bicep | 2 +- .../managedprivateendpoints/main.bicep | 18 +- .../samples/factories/triggers/main.bicep | 46 +-- .../samples/services/main.bicep | 4 +- .../samples/services/projects/main.bicep | 24 +- .../backupvaults/backupinstances/main.bicep | 128 ++++---- .../backupvaults/backuppolicies/main.bicep | 48 +-- .../samples/backupvaults/main.bicep | 2 +- .../samples/resourceguards/main.bicep | 2 +- .../samples/servers/configurations/main.bicep | 16 +- .../samples/servers/databases/main.bicep | 8 +- .../samples/servers/firewallrules/main.bicep | 16 +- .../samples/servers/main.bicep | 10 +- .../servers/virtualnetworkrules/main.bicep | 16 +- .../flexibleservers/administrators/main.bicep | 30 +- .../flexibleservers/configurations/main.bicep | 12 +- .../flexibleservers/databases/main.bicep | 12 +- .../flexibleservers/firewallrules/main.bicep | 10 +- .../samples/flexibleservers/main.bicep | 14 +- .../samples/servers/administrators/main.bicep | 18 +- .../samples/servers/configurations/main.bicep | 12 +- .../samples/servers/databases/main.bicep | 14 +- .../samples/servers/firewallrules/main.bicep | 14 +- .../samples/servers/main.bicep | 16 +- .../servers/virtualnetworkrules/main.bicep | 22 +- .../flexibleservers/administrators/main.bicep | 12 +- .../flexibleservers/configurations/main.bicep | 18 +- .../flexibleservers/databases/main.bicep | 10 +- .../flexibleservers/firewallrules/main.bicep | 16 +- .../samples/flexibleservers/main.bicep | 12 +- .../virtualendpoints/main.bicep | 50 ++-- .../samples/servergroupsv2/main.bicep | 4 +- .../samples/servers/administrators/main.bicep | 20 +- .../samples/servers/configurations/main.bicep | 18 +- .../samples/servers/databases/main.bicep | 12 +- .../samples/servers/firewallrules/main.bicep | 14 +- .../samples/servers/main.bicep | 16 +- .../servers/virtualnetworkrules/main.bicep | 28 +- .../applicationgroups/applications/main.bicep | 2 +- .../samples/applicationgroups/main.bicep | 14 +- .../samples/devcenters/catalogs/main.bicep | 2 +- .../devcenters/devboxdefinitions/main.bicep | 4 +- .../samples/devcenters/main.bicep | 2 +- .../samples/networkconnections/main.bicep | 2 +- .../projects/environmenttypes/main.bicep | 26 +- .../samples/iothubs/certificates/main.bicep | 2 +- .../samples/iothubs/main.bicep | 4 +- .../certificates/main.bicep | 2 +- .../samples/provisioningservices/main.bicep | 4 +- .../samples/accounts/instances/main.bicep | 50 ++-- .../samples/labs/schedules/main.bicep | 8 +- .../samples/labs/virtualmachines/main.bicep | 20 +- .../samples/labs/virtualnetworks/main.bicep | 2 +- .../samples/schedules/main.bicep | 158 +++++----- .../endpoints/main.bicep | 36 +-- .../cassandrakeyspaces/main.bicep | 30 +- .../cassandrakeyspaces/tables/main.bicep | 64 ++-- .../gremlindatabases/graphs/main.bicep | 26 +- .../gremlindatabases/main.bicep | 40 +-- .../samples/databaseaccounts/main.bicep | 34 +-- .../mongodbdatabases/main.bicep | 26 +- .../mongodbroledefinitions/main.bicep | 36 +-- .../mongodbuserdefinitions/main.bicep | 50 ++-- .../databaseaccounts/services/main.bicep | 30 +- .../sqldatabases/containers/main.bicep | 30 +- .../containers/storedprocedures/main.bicep | 36 +-- .../containers/triggers/main.bicep | 30 +- .../userdefinedfunctions/main.bicep | 36 +-- .../databaseaccounts/sqldatabases/main.bicep | 30 +- .../sqlroleassignments/main.bicep | 78 ++--- .../sqlroledefinitions/main.bicep | 32 +- .../databaseaccounts/tables/main.bicep | 30 +- .../mongoclusters/firewallrules/main.bicep | 16 +- .../samples/mongoclusters/users/main.bicep | 10 +- .../samples/elasticsans/main.bicep | 6 +- .../samples/domains/main.bicep | 4 +- .../samples/domains/topics/main.bicep | 4 +- .../samples/eventsubscriptions/main.bicep | 90 +++--- .../samples/namespaces/main.bicep | 2 +- .../eventsubscriptions/main.bicep | 72 ++--- .../samples/topics/main.bicep | 4 +- .../samples/clusters/main.bicep | 2 +- .../disasterrecoveryconfigs/main.bicep | 24 +- .../eventhubs/authorizationrules/main.bicep | 2 +- .../eventhubs/consumergroups/main.bicep | 6 +- .../samples/namespaces/eventhubs/main.bicep | 4 +- .../samples/namespaces/main.bicep | 2 +- .../namespaces/schemagroups/main.bicep | 4 +- .../guestconfigurationassignments/main.bicep | 144 ++++----- .../samples/clusters/main.bicep | 78 ++--- .../samples/services/main.bicep | 4 +- .../workspaces/fhirservices/main.bicep | 36 +-- .../iotconnectors/fhirdestinations/main.bicep | 64 ++-- .../samples/workloadimpacts/main.bicep | 76 ++--- .../samples/actiongroups/main.bicep | 16 +- .../samples/activitylogalerts/main.bicep | 104 +++---- .../samples/autoscalesettings/main.bicep | 74 ++--- .../components/analyticsitems/main.bicep | 6 +- .../samples/components/main.bicep | 8 +- .../proactivedetectionconfigs/main.bicep | 6 +- .../datacollectionendpoints/main.bicep | 2 +- .../datacollectionruleassociations/main.bicep | 64 ++-- .../samples/datacollectionrules/main.bicep | 4 +- .../samples/diagnosticsettings/main.bicep | 24 +- .../samples/logprofiles/main-rg-module.bicep | 22 +- .../samples/logprofiles/main.bicep | 8 +- .../samples/metricalerts/main.bicep | 94 +++--- .../samples/privatelinkscopes/main.bicep | 2 +- .../scopedresources/main.bicep | 32 +- .../samples/scheduledqueryrules/main.bicep | 52 ++-- .../samples/webtests/main.bicep | 54 ++-- .../samples/workbooks/main.bicep | 4 +- .../samples/workbooktemplates/main.bicep | 24 +- .../samples/iotapps/main.bicep | 2 +- .../samples/managedhsms/main.bicep | 2 +- .../samples/vaults/accesspolicies/main.bicep | 16 +- .../samples/vaults/keys/main.bicep | 22 +- .../samples/vaults/main.bicep | 26 +- .../samples/vaults/secrets/main.bicep | 4 +- .../samples/connectedclusters/main.bicep | 2 +- .../samples/extensions/main.bicep | 6 +- .../samples/fluxconfigurations/main.bicep | 6 +- .../samples/clusters/databases/main.bicep | 6 +- .../databases/principalassignments/main.bicep | 10 +- .../clusters/databases/scripts/main.bicep | 12 +- .../samples/clusters/main.bicep | 14 +- .../managedprivateendpoints/main.bicep | 44 +-- .../clusters/principalassignments/main.bicep | 12 +- .../samples/labplans/main.bicep | 2 +- .../samples/labs/main.bicep | 38 +-- .../samples/labs/schedules/main.bicep | 34 +-- .../samples/labs/users/main.bicep | 26 +- .../integrationaccounts/agreements/main.bicep | 108 +++---- .../integrationaccounts/assemblies/main.bicep | 20 +- .../samples/integrationaccounts/main.bicep | 2 +- .../integrationaccounts/maps/main.bicep | 4 +- .../integrationaccounts/schemas/main.bicep | 2 +- .../samples/workflows/main.bicep | 2 +- .../samples/workspaces/computes/main.bicep | 28 +- .../samples/workspaces/datastores/main.bicep | 108 +++---- .../samples/workspaces/main.bicep | 50 ++-- .../workspaces/outboundrules/main.bicep | 46 +-- .../configurationassignments/main.bicep | 50 ++-- .../maintenanceconfigurations/main.bicep | 4 +- .../federatedidentitycredentials/main.bicep | 2 +- .../samples/accounts/main.bicep | 2 +- .../mediaservices/accountfilters/main.bicep | 44 +-- .../assets/assetfilters/main.bicep | 50 ++-- .../samples/mediaservices/assets/main.bicep | 42 +-- .../contentkeypolicies/main.bicep | 46 +-- .../mediaservices/liveevents/main.bicep | 4 +- .../samples/mediaservices/main.bicep | 44 +-- .../streamingendpoints/main.bicep | 14 +- .../streaminglocators/main.bicep | 26 +- .../streamingpolicies/main.bicep | 50 ++-- .../mediaservices/transforms/main.bicep | 20 +- .../samples/migrateprojects/main.bicep | 22 +- .../migrateprojects/solutions/main.bicep | 20 +- .../samples/spatialanchorsaccounts/main.bicep | 2 +- .../mobilenetworks/datanetworks/main.bicep | 2 +- .../mobilenetworks/services/main.bicep | 2 +- .../mobilenetworks/simpolicies/main.bicep | 26 +- .../packetcorecontrolplanes/main.bicep | 40 +-- .../privateendpointconnections/main.bicep | 10 +- .../netappaccounts/backuppolicies/main.bicep | 4 +- .../netappaccounts/capacitypools/main.bicep | 2 +- .../capacitypools/volumes/main.bicep | 62 ++-- .../volumes/snapshots/main.bicep | 64 ++-- .../volumes/volumequotarules/main.bicep | 48 +-- .../samples/applicationgateways/main.bicep | 98 +++---- .../main.bicep | 6 +- .../samples/azurefirewalls/main.bicep | 12 +- .../samples/bastionhosts/main.bicep | 66 ++--- .../forwardingrules/main.bicep | 24 +- .../samples/dnsforwardingrulesets/main.bicep | 38 +-- .../virtualnetworklinks/main.bicep | 4 +- .../dnsresolvers/inboundendpoints/main.bicep | 38 +-- .../samples/dnsresolvers/main.bicep | 18 +- .../samples/dnszones/aaaa/main.bicep | 2 +- .../samples/dnszones/caa/main.bicep | 4 +- .../samples/dnszones/main.bicep | 2 +- .../samples/dnszones/ptr/main.bicep | 2 +- .../samples/dnszones/srv/main.bicep | 2 +- .../samples/dnszones/txt/main.bicep | 4 +- .../authorizations/main.bicep | 4 +- .../samples/expressroutecircuits/main.bicep | 28 +- .../peerings/connections/main.bicep | 34 +-- .../expressroutecircuits/peerings/main.bicep | 8 +- .../expressrouteconnections/main.bicep | 88 +++--- .../samples/expressroutegateways/main.bicep | 34 +-- .../main.bicep | 14 +- .../backendaddresspools/main.bicep | 6 +- .../samples/loadbalancers/main.bicep | 6 +- .../samples/localnetworkgateways/main.bicep | 2 +- .../samples/networkinterfaces/main.bicep | 12 +- .../connectivityconfigurations/main.bicep | 12 +- .../networkmanagers/ipampools/main.bicep | 2 +- .../ipampools/staticcidr/main.bicep | 10 +- .../networkgroups/staticmembers/main.bicep | 8 +- .../scopeconnections/main.bicep | 2 +- .../securityadminconfigurations/main.bicep | 2 +- .../rulecollections/main.bicep | 10 +- .../rulecollections/rules/main.bicep | 16 +- .../verifierworkspace/main.bicep | 4 +- .../reachabilityanalysisintent/main.bicep | 166 +++++------ .../reachabilityanalysisrun/main.bicep | 88 +++--- .../samples/networkprofiles/main.bicep | 2 +- .../securityrules/main.bicep | 6 +- .../networkwatchers/flowlogs/main.bicep | 42 +-- .../networkwatchers/packetcaptures/main.bicep | 50 ++-- .../samples/p2svpngateways/main.bicep | 54 ++-- .../samples/privatednszones/a/main.bicep | 4 +- .../samples/privatednszones/aaaa/main.bicep | 4 +- .../samples/privatednszones/cname/main.bicep | 4 +- .../samples/privatednszones/main.bicep | 2 +- .../samples/privatednszones/mx/main.bicep | 2 +- .../samples/privatednszones/ptr/main.bicep | 2 +- .../samples/privatednszones/srv/main.bicep | 6 +- .../samples/privatednszones/txt/main.bicep | 4 +- .../virtualnetworklinks/main.bicep | 34 +-- .../samples/privateendpoints/main.bicep | 66 ++--- .../samples/privatelinkservices/main.bicep | 66 ++--- .../samples/publicipaddresses/main.bicep | 4 +- .../samples/routefilters/main.bicep | 2 +- .../samples/routetables/main.bicep | 2 +- .../azureendpoints/main.bicep | 8 +- .../externalendpoints/main.bicep | 14 +- .../samples/trafficmanagerprofiles/main.bicep | 2 +- .../nestedendpoints/main.bicep | 24 +- .../hubvirtualnetworkconnections/main.bicep | 46 +-- .../virtualhubs/ipconfigurations/main.bicep | 50 ++-- .../samples/virtualhubs/main.bicep | 26 +- .../samples/virtualnetworkgateways/main.bicep | 68 ++--- .../natrules/main.bicep | 74 ++--- .../samples/virtualnetworks/main.bicep | 8 +- .../subnets/withipampool/main.bicep | 60 ++-- .../virtualnetworks/withipampool/main.bicep | 34 +-- .../samples/virtualwans/main.bicep | 2 +- .../samples/vpngateways/main.bicep | 10 +- .../samples/vpngateways/natrules/main.bicep | 6 +- .../vpngateways/vpnconnections/main.bicep | 58 ++-- .../configurationpolicygroups/main.bicep | 28 +- .../vpnserverconfigurations/main.bicep | 16 +- .../samples/vpnsites/main.bicep | 6 +- .../authorizationrules/main.bicep | 4 +- .../namespaces/notificationhubs/main.bicep | 2 +- .../samples/clusters/main.bicep | 2 +- .../samples/querypacks/main.bicep | 2 +- .../samples/workspaces/dataexports/main.bicep | 14 +- .../samples/workspaces/datasources/main.bicep | 2 +- .../workspaces/linkedservices/main.bicep | 16 +- .../linkedstorageaccounts/main.bicep | 86 +++--- .../samples/workspaces/main.bicep | 10 +- .../workspaces/savedsearches/main.bicep | 14 +- .../storageinsightconfigs/main.bicep | 38 +-- .../workspaces/tables/auditlog/main.bicep | 10 +- .../workspaces/tables/basic/main.bicep | 18 +- .../tables/datacollectionlogs/main.bicep | 16 +- .../samples/spacecrafts/main.bicep | 2 +- .../samples/remediations/main.bicep | 12 +- .../samples/capacities/main.bicep | 2 +- .../samples/accounts/main.bicep | 2 +- .../samples/vaults/backupconfig/main.bicep | 2 +- .../protecteditems/main.bicep | 276 +++++++++--------- .../samples/vaults/backuppolicies/main.bicep | 4 +- .../vaults/replicationfabrics/main.bicep | 4 +- .../replicationnetworkmappings/main.bicep | 6 +- .../main.bicep | 2 +- .../main.bicep | 40 +-- .../vaults/replicationpolicies/main.bicep | 2 +- .../namespaces/authorizationrules/main.bicep | 2 +- .../namespaces/hybridconnections/main.bicep | 4 +- .../samples/appliances/main.bicep | 4 +- .../remarks/microsoft.resources/remarks.json | 4 +- .../samples/deployments/main.bicep | 42 +-- .../samples/deploymentscripts/main.bicep | 4 +- .../samples/resourceGroups/main.bicep | 2 +- .../samples/searchservices/main.bicep | 8 +- .../sharedprivatelinkresources/main.bicep | 40 +-- .../main.bicep | 14 +- .../samples/assessments/main-rg-module.bicep | 56 ++-- .../samples/assessments/main.bicep | 20 +- .../samples/automations/main.bicep | 28 +- .../samples/securitycontacts/main.bicep | 4 +- .../workspacesettings/main-rg-module.bicep | 12 +- .../samples/workspacesettings/main.bicep | 2 +- .../samples/alertrules/main.bicep | 12 +- .../samples/automationrules/main.bicep | 14 +- .../samples/dataconnectors/main.bicep | 6 +- .../samples/metadata/main.bicep | 24 +- .../samples/onboardingstates/main.bicep | 12 +- .../samples/watchlists/main.bicep | 2 +- .../watchlists/watchlistitems/main.bicep | 2 +- .../main-rg-module.bicep | 28 +- .../disasterrecoveryconfigs/main.bicep | 12 +- .../samples/namespaces/main.bicep | 2 +- .../queues/authorizationrules/main.bicep | 12 +- .../samples/namespaces/queues/main.bicep | 14 +- .../topics/authorizationrules/main.bicep | 4 +- .../samples/namespaces/topics/main.bicep | 2 +- .../topics/subscriptions/main.bicep | 8 +- .../topics/subscriptions/rules/main.bicep | 16 +- .../samples/clusters/main.bicep | 10 +- .../samples/managedclusters/main.bicep | 40 +-- .../managedclusters/nodetypes/main.bicep | 50 ++-- .../samples/linkers/main.bicep | 74 ++--- .../associations/main.bicep | 40 +-- .../trafficcontrollers/frontends/main.bicep | 2 +- .../samples/signalr/main.bicep | 46 +-- .../sharedprivatelinkresources/main.bicep | 66 ++--- .../samples/webpubsub/hubs/main.bicep | 6 +- .../sharedprivatelinkresources/main.bicep | 72 ++--- .../samples/applications/main.bicep | 34 +-- .../samples/instancepools/main.bicep | 144 ++++----- .../samples/servers/administrators/main.bicep | 8 +- .../servers/auditingsettings/main.bicep | 6 +- .../servers/connectionpolicies/main.bicep | 2 +- .../samples/servers/databases/main.bicep | 12 +- .../securityalertpolicies/main.bicep | 18 +- .../transparentdataencryption/main.bicep | 14 +- .../samples/servers/dnsaliases/main.bicep | 6 +- .../samples/servers/elasticpools/main.bicep | 8 +- .../servers/encryptionprotector/main.bicep | 8 +- .../samples/servers/failovergroups/main.bicep | 32 +- .../samples/servers/firewallrules/main.bicep | 2 +- .../servers/jobagents/credentials/main.bicep | 42 +-- .../samples/servers/jobagents/jobs/main.bicep | 22 +- .../servers/jobagents/jobs/steps/main.bicep | 46 +-- .../samples/servers/jobagents/main.bicep | 22 +- .../servers/jobagents/targetgroups/main.bicep | 56 ++-- .../microsoft.sql/samples/servers/main.bicep | 2 +- .../servers/outboundfirewallrules/main.bicep | 6 +- .../servers/securityalertpolicies/main.bicep | 6 +- .../sqlvulnerabilityassessments/main.bicep | 2 +- .../servers/virtualnetworkrules/main.bicep | 8 +- .../sqlvirtualmachinegroups/main.bicep | 8 +- .../sqlvirtualmachines/basic/main.bicep | 92 +++--- .../sqlbestpracticesassessment/main.bicep | 272 ++++++++--------- .../basic/main.bicep | 48 +-- .../samples/storageaccounts/basic/main.bicep | 14 +- .../immutabilitypolicies/main.bicep | 18 +- .../storageaccounts/blobservices/main.bicep | 28 +- .../encryptionscopes/main.bicep | 52 ++-- .../localusers/basic/main.bicep | 12 +- .../managementpolicies/main.bicep | 36 +-- .../queueservices/queues/main.bicep | 2 +- .../samples/amlfilesystems/main.bicep | 6 +- .../samples/caches/main.bicep | 32 +- .../storagemovers/endpoints/main.bicep | 4 +- .../samples/storagemovers/projects/main.bicep | 2 +- .../streamingjobs/functions/main.bicep | 14 +- .../samples/streamingjobs/inputs/main.bicep | 24 +- .../samples/streamingjobs/main.bicep | 14 +- .../samples/streamingjobs/outputs/main.bicep | 30 +- .../samples/privatelinkhubs/main.bicep | 2 +- .../azureadonlyauthentications/main.bicep | 30 +- .../workspaces/bigdatapools/main.bicep | 48 +-- .../workspaces/integrationruntimes/main.bicep | 8 +- .../samples/workspaces/main.bicep | 24 +- .../main.bicep | 30 +- .../securityalertpolicies/main.bicep | 8 +- .../samples/workspaces/sqlpools/main.bicep | 2 +- .../vulnerabilityassessments/main.bicep | 8 +- .../sqlpools/workloadgroups/main.bicep | 10 +- .../workloadclassifiers/main.bicep | 30 +- .../environments/accesspolicies/main.bicep | 4 +- .../environments/eventsources/main.bicep | 92 +++--- .../environments/referencedatasets/main.bicep | 8 +- .../samples/accounts/main.bicep | 30 +- .../samples/communicationsgateways/main.bicep | 22 +- .../testlines/main.bicep | 16 +- .../samples/sites/config/main.bicep | 30 +- .../microsoft.web/samples/sites/main.bicep | 52 ++-- .../sites/publiccertificates/main.bicep | 32 +- .../samples/sites/siteextensions/main.bicep | 56 ++-- .../samples/sites/slots/config/main.bicep | 82 +++--- .../samples/sites/slots/main.bicep | 60 ++-- .../samples/sourcecontrols/main.bicep | 8 +- .../staticsites/customdomains/main.bicep | 2 +- .../configurations/main.bicep | 72 ++--- .../samples/nginxdeployments/main.bicep | 58 ++-- .../samples/filesystems/main.bicep | 8 +- 525 files changed, 6446 insertions(+), 6446 deletions(-) diff --git a/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep b/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep index a3e51bdc..a75b3d86 100644 --- a/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep +++ b/settings/remarks/microsoft.aadiam/samples/diagnosticsettings/main.bicep @@ -1,7 +1,7 @@ targetScope = 'tenant' -param location string = 'westus' param resourceName string = 'acctest0001' +param location string = 'westus' resource diagnosticSetting 'Microsoft.AADIAM/diagnosticSettings@2017-04-01' = { name: '${resourceName}-DS-unique' diff --git a/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep b/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep index 90b2d350..a36a9683 100644 --- a/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep +++ b/settings/remarks/microsoft.advisor/samples/recommendations/suppressions/main.bicep @@ -1,6 +1,6 @@ +param location string = 'westus' param recommendationId string param resourceName string = 'acctest0001' -param location string = 'westus' resource suppression 'Microsoft.Advisor/recommendations/suppressions@2023-01-01' = { name: resourceName diff --git a/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep b/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep index e5d50b82..8342ea46 100644 --- a/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep +++ b/settings/remarks/microsoft.alertsmanagement/samples/smartdetectoralertrules/main.bicep @@ -5,19 +5,19 @@ resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { name: resourceName location: 'global' properties: { - azureAppPushReceivers: [] - azureFunctionReceivers: [] - logicAppReceivers: [] - smsReceivers: [] - webhookReceivers: [] - armRoleReceivers: [] - automationRunbookReceivers: [] emailReceivers: [] enabled: true - eventHubReceivers: [] groupShortName: 'acctestag' itsmReceivers: [] + logicAppReceivers: [] voiceReceivers: [] + webhookReceivers: [] + armRoleReceivers: [] + automationRunbookReceivers: [] + azureAppPushReceivers: [] + azureFunctionReceivers: [] + eventHubReceivers: [] + smsReceivers: [] } } @@ -26,14 +26,14 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - SamplingPercentage: 100 - Application_Type: 'web' DisableIpMasking: false ForceCustomerStorageForProfiler: false + RetentionInDays: 90 publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' DisableLocalAuth: false - RetentionInDays: 90 + SamplingPercentage: 100 + publicNetworkAccessForQuery: 'Enabled' } } @@ -52,11 +52,11 @@ resource smartDetectorAlertRule 'microsoft.alertsManagement/smartDetectorAlertRu severity: 'Sev0' state: 'Enabled' actionGroups: { - customEmailSubject: '' customWebhookPayload: '' groupIds: [ actionGroup.id ] + customEmailSubject: '' } } } diff --git a/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep b/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep index ecfb3f0f..1a5e246e 100644 --- a/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep +++ b/settings/remarks/microsoft.analysisservices/samples/servers/main.bicep @@ -8,12 +8,12 @@ resource server 'Microsoft.AnalysisServices/servers@2017-08-01' = { name: 'B1' } properties: { - asAdministrators: { - members: [] - } ipV4FirewallSettings: { enablePowerBIService: false firewallRules: [] } + asAdministrators: { + members: [] + } } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep index 90673c72..ef3f4b22 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/diagnostics/main.bicep @@ -5,23 +5,23 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location sku: { - name: 'Consumption' capacity: 0 + name: 'Consumption' } properties: { - virtualNetworkType: 'None' - certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' + virtualNetworkType: 'None' + certificates: [] } } @@ -29,12 +29,25 @@ resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { name: '${resourceName};rev=1' parent: service properties: { - value: 'http://conferenceapi.azurewebsites.net/?format=json' apiType: 'http' apiVersion: '' format: 'swagger-link-json' path: 'test' type: 'http' + value: 'http://conferenceapi.azurewebsites.net/?format=json' + } +} + +resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { + name: resourceName + parent: service + properties: { + credentials: { + instrumentationKey: component.properties.InstrumentationKey + } + description: '' + isBuffered: true + loggerType: 'applicationInsights' } } @@ -52,26 +65,13 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - publicNetworkAccessForIngestion: 'Enabled' Application_Type: 'web' DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + SamplingPercentage: 100 publicNetworkAccessForQuery: 'Enabled' DisableIpMasking: false - ForceCustomerStorageForProfiler: false RetentionInDays: 90 - SamplingPercentage: 100 - } -} - -resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { - name: resourceName - parent: service - properties: { - loggerType: 'applicationInsights' - credentials: { - instrumentationKey: component.properties.InstrumentationKey - } - description: '' - isBuffered: true + publicNetworkAccessForIngestion: 'Enabled' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep index ad8ae5c1..f4b5ff99 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/main.bicep @@ -9,19 +9,19 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Consumption' } properties: { + certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' - certificates: [] } } @@ -29,19 +29,19 @@ resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { name: '${resourceName};rev=1' parent: service properties: { + apiType: 'http' + authenticationSettings: {} + description: '' + displayName: 'api1' + apiRevisionDescription: '' + apiVersion: '' + apiVersionDescription: '' path: 'api1' protocols: [ 'https' ] serviceUrl: '' - apiRevisionDescription: '' - apiType: 'http' - apiVersion: '' - apiVersionDescription: '' - authenticationSettings: {} - displayName: 'api1' subscriptionRequired: true type: 'http' - description: '' } } 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 d2790ca2..44b75dbd 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/operations/main.bicep @@ -5,23 +5,23 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-am' location: location sku: { - name: 'Consumption' capacity: 0 + name: 'Consumption' } properties: { + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' } } @@ -29,24 +29,24 @@ resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { name: '${resourceName}-api;rev=1' parent: service properties: { - subscriptionRequired: true - apiRevisionDescription: '' - apiVersionDescription: '' + description: 'What is my purpose? You parse butter.' displayName: 'Butter Parser' + path: 'butter-parser' protocols: [ 'http' 'https' ] + subscriptionRequired: true type: 'http' + apiRevisionDescription: '' apiType: 'http' - authenticationSettings: {} - description: 'What is my purpose? You parse butter.' - path: 'butter-parser' serviceUrl: 'https://example.com/foo/bar' subscriptionKeyParameterNames: { header: 'X-Butter-Robot-API-Key' query: 'location' } + apiVersionDescription: '' + authenticationSettings: {} } } @@ -54,11 +54,11 @@ resource operation 'Microsoft.ApiManagement/service/apis/operations@2022-08-01' name: '${resourceName}-operation' parent: api properties: { - urlTemplate: '/resource' description: '' displayName: 'DELETE Resource' method: 'DELETE' responses: [] templateParameters: [] + urlTemplate: '/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 f6c29bdc..98f8748b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/policies/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/policies/main.bicep @@ -9,19 +9,19 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Consumption' } properties: { - virtualNetworkType: 'None' certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' + virtualNetworkType: 'None' } } @@ -29,20 +29,20 @@ resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { name: '${resourceName};rev=1' parent: service properties: { - apiVersionDescription: '' - authenticationSettings: {} - displayName: 'api1' type: 'http' + apiRevisionDescription: '' apiType: 'http' + apiVersion: '' + apiVersionDescription: '' description: '' + displayName: 'api1' path: 'api1' protocols: [ 'https' ] + authenticationSettings: {} serviceUrl: '' subscriptionRequired: true - apiRevisionDescription: '' - apiVersion: '' } } 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 980f6386..8606577b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/schemas/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName @@ -9,19 +9,19 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Consumption' } properties: { - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' } } @@ -34,15 +34,15 @@ resource api 'Microsoft.ApiManagement/service/apis@2021-08-01' = { 'https' ] serviceUrl: '' - type: 'http' - apiRevisionDescription: '' + subscriptionRequired: true apiType: 'http' - apiVersionDescription: '' + authenticationSettings: {} description: '' path: 'api1' - subscriptionRequired: true + type: 'http' + apiRevisionDescription: '' apiVersion: '' - authenticationSettings: {} + apiVersionDescription: '' } } 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 e4050acc..3c42f457 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/tagdescriptions/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/tagdescriptions/main.bicep @@ -9,19 +9,19 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: 'Consumption' } properties: { - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' } + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' } } @@ -29,25 +29,20 @@ resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { name: '${resourceName}-api;rev=1' parent: service properties: { - subscriptionRequired: true - type: 'http' - apiRevisionDescription: '' apiType: 'http' - authenticationSettings: {} - displayName: 'api1' + apiVersionDescription: '' protocols: [ 'https' ] - apiVersionDescription: '' + type: 'http' + apiRevisionDescription: '' + authenticationSettings: {} + displayName: 'api1' path: 'api1' + subscriptionRequired: true } } -resource tag1 'Microsoft.ApiManagement/service/apis/tags@2022-08-01' = { - name: '${resourceName}-tag' - parent: api -} - resource tag 'Microsoft.ApiManagement/service/tags@2022-08-01' = { name: '${resourceName}-tag' parent: service @@ -65,3 +60,8 @@ resource tagDescription 'Microsoft.ApiManagement/service/apis/tagDescriptions@20 externalDocsUrl: 'https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs' } } + +resource tag1 'Microsoft.ApiManagement/service/apis/tags@2022-08-01' = { + 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 c7dff22c..526ec5a5 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apis/tags/main.bicep @@ -5,14 +5,10 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { name: '${resourceName}-service' location: location sku: { - capacity: 0 name: 'Consumption' + capacity: 0 } properties: { - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' @@ -22,6 +18,10 @@ resource service 'Microsoft.ApiManagement/service@2022-08-01' = { } disableGateway: false publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' + certificates: [] } } @@ -29,17 +29,17 @@ resource api 'Microsoft.ApiManagement/service/apis@2022-08-01' = { name: '${resourceName}-api;rev=1' parent: service properties: { - type: 'http' + apiRevisionDescription: '' apiType: 'http' apiVersionDescription: '' authenticationSettings: {} displayName: 'api1' - path: 'api1' - subscriptionRequired: true - apiRevisionDescription: '' protocols: [ 'https' ] + path: 'api1' + subscriptionRequired: true + type: 'http' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep index 0863f432..3dbc4c61 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/apiversionsets/main.bicep @@ -5,12 +5,10 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location sku: { - capacity: 0 name: 'Consumption' + capacity: 0 } properties: { - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' virtualNetworkType: 'None' certificates: [] customProperties: { @@ -22,6 +20,8 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { } disableGateway: false publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep index 7c3a967c..b7ec2d02 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/authorizationservers/main.bicep @@ -1,10 +1,10 @@ -@secure() -@description('The OAuth client secret for the authorization server') -param oauthClientSecret string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The OAuth client ID for the authorization server') param oauthClientId string +@secure() +@description('The OAuth client secret for the authorization server') +param oauthClientSecret string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName @@ -34,12 +34,10 @@ resource authorizationServer 'Microsoft.ApiManagement/service/authorizationServe name: resourceName parent: service properties: { - tokenBodyParameters: [] - authorizationEndpoint: 'https://azacceptance.hashicorptest.com/client/authorize' clientAuthenticationMethod: [] - clientId: '${oauthClientId}' clientRegistrationEndpoint: 'https://azacceptance.hashicorptest.com/client/register' - description: '' + clientSecret: '${oauthClientSecret}' + defaultScope: '' grantTypes: [ 'implicit' ] @@ -48,9 +46,11 @@ resource authorizationServer 'Microsoft.ApiManagement/service/authorizationServe authorizationMethods: [ 'GET' ] - clientSecret: '${oauthClientSecret}' - defaultScope: '' + clientId: '${oauthClientId}' + description: '' displayName: 'Test Group' resourceOwnerUsername: '' + tokenBodyParameters: [] + authorizationEndpoint: 'https://azacceptance.hashicorptest.com/client/authorize' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep index 5ad5c875..f674bbe2 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/caches/main.bicep @@ -9,7 +9,6 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Consumption' } properties: { - publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' @@ -22,6 +21,7 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false + publicNetworkAccess: 'Enabled' } } @@ -29,8 +29,8 @@ resource cache 'Microsoft.ApiManagement/service/caches@2021-08-01' = { name: resourceName parent: service properties: { - useFromLocation: 'default' 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 944a2e76..c9981a55 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/certificates/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName @@ -9,6 +9,10 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Consumption' } properties: { + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' virtualNetworkType: 'None' certificates: [] customProperties: { @@ -18,10 +22,6 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep index 8f079c22..dc67aa9a 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/diagnostics/main.bicep @@ -1,6 +1,22 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + DisableIpMasking: false + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + SamplingPercentage: 100 + } +} + resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location @@ -9,8 +25,6 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Consumption' } properties: { - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' virtualNetworkType: 'None' certificates: [] customProperties: { @@ -22,6 +36,8 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { } disableGateway: false publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' } } @@ -45,19 +61,3 @@ 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: { - publicNetworkAccessForIngestion: 'Enabled' - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - publicNetworkAccessForQuery: 'Enabled' - RetentionInDays: 90 - SamplingPercentage: 100 - } -} 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 2031fd34..4fc94795 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/certificateauthorities/main.bicep @@ -15,31 +15,31 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Developer' } properties: { + publisherName: 'pub1' virtualNetworkType: 'None' certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' - publisherName: 'pub1' } } @@ -56,13 +56,13 @@ resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { name: resourceName parent: service properties: { + description: '' locationData: { - city: '' - countryOrRegion: '' district: '' name: 'test' + city: '' + countryOrRegion: '' } - description: '' } } 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 d5aa98f2..b9439f10 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/hostnameconfigurations/main.bicep @@ -5,35 +5,35 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location sku: { - capacity: 1 name: 'Developer' + capacity: 1 } properties: { + disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' + certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' } - disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - certificates: [] } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep index d835b244..67eec3fd 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/gateways/main.bicep @@ -5,35 +5,35 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location sku: { - capacity: 1 name: 'Developer' + capacity: 1 } properties: { - certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' + certificates: [] } } @@ -41,12 +41,12 @@ resource gateway 'Microsoft.ApiManagement/service/gateways@2021-08-01' = { name: resourceName parent: service properties: { - description: '' locationData: { + countryOrRegion: '' district: '' name: 'test' city: '' - countryOrRegion: '' } + description: '' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep index b348228a..0d86305b 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/groups/main.bicep @@ -5,35 +5,35 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location sku: { - name: 'Developer' capacity: 1 + name: 'Developer' } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' + certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - certificates: [] } } @@ -41,9 +41,9 @@ resource group 'Microsoft.ApiManagement/service/groups@2021-08-01' = { name: resourceName parent: service properties: { + displayName: 'Test Group' externalId: '' type: 'custom' 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 9a2d1398..4acd22b7 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/identityproviders/main.bicep @@ -1,10 +1,10 @@ -@secure() -@description('The client secret for the Twitter identity provider') -param identityProviderClientSecret string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The client ID for the Twitter identity provider') param identityProviderClientId string +@secure() +@description('The client secret for the Twitter identity provider') +param identityProviderClientSecret string resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName @@ -14,31 +14,31 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Developer' } properties: { - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' } } @@ -46,8 +46,8 @@ resource identityProvider 'Microsoft.ApiManagement/service/identityProviders@202 name: 'twitter' parent: service properties: { + type: 'twitter' 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 380b879e..9ca416ee 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/loggers/main.bicep @@ -1,6 +1,22 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + RetentionInDays: 90 + SamplingPercentage: 100 + Application_Type: 'web' + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + } +} + resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location @@ -11,11 +27,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' @@ -29,27 +45,11 @@ resource logger 'Microsoft.ApiManagement/service/loggers@2021-08-01' = { name: resourceName parent: service properties: { - description: '' - isBuffered: true - loggerType: 'applicationInsights' credentials: { instrumentationKey: component.properties.InstrumentationKey } - } -} - -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: resourceName - location: location - kind: 'web' - properties: { - RetentionInDays: 90 - publicNetworkAccessForIngestion: 'Enabled' - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - SamplingPercentage: 100 - publicNetworkAccessForQuery: 'Enabled' + description: '' + isBuffered: true + loggerType: 'applicationInsights' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/main.bicep index 9be3230f..2b39c5bc 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/main.bicep @@ -9,30 +9,30 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Developer' } properties: { + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' } disableGateway: false - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep index 6f01405d..21c4b3ac 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/namedvalues/main.bicep @@ -12,11 +12,11 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { virtualNetworkType: 'None' certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep index ad7a728d..ca775dc0 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/openidconnectproviders/main.bicep @@ -1,32 +1,32 @@ +@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: { - name: 'Consumption' capacity: 0 + name: 'Consumption' } properties: { - publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' - certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' + certificates: [] } } @@ -34,10 +34,10 @@ resource openidConnectProvider 'Microsoft.ApiManagement/service/openidConnectPro name: resourceName parent: service properties: { - clientId: '${openidClientId}' clientSecret: '${openidClientSecret}' description: '' displayName: 'Initial Name' metadataEndpoint: 'https://azacceptance.hashicorptest.com/example/foo' + clientId: '${openidClientId}' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep index 7112f70f..bae6ffd0 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/policyfragments/main.bicep @@ -9,31 +9,31 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Developer' } properties: { - disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' } + disableGateway: false } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep index 828a3eae..779b3c12 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/portalsettings/main.bicep @@ -5,29 +5,29 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location sku: { - name: 'Developer' capacity: 1 + name: 'Developer' } properties: { certificates: [] customProperties: { + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' diff --git a/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep index 1816fa1e..1aa1454c 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/main.bicep @@ -9,7 +9,6 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Consumption' } properties: { - virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' @@ -22,6 +21,7 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' + virtualNetworkType: 'None' } } 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 7af73f08..099b9aec 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/policies/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName @@ -9,6 +9,7 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Consumption' } properties: { + publisherName: 'pub1' virtualNetworkType: 'None' certificates: [] customProperties: { @@ -21,7 +22,6 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' - publisherName: 'pub1' } } @@ -29,11 +29,11 @@ resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { name: resourceName parent: service properties: { - displayName: 'Test Product' state: 'notPublished' subscriptionRequired: false terms: '' description: '' + displayName: 'Test Product' } } @@ -41,7 +41,7 @@ resource policy2 'Microsoft.ApiManagement/service/products/policies@2021-08-01' name: 'policy' parent: product properties: { - value: 'https://gist.githubusercontent.com/riordanp/ca22f8113afae0eb38cc12d718fd048d/raw/d6ac89a2f35a6881a7729f8cb4883179dc88eea1/example.xml' 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 a2fedd52..d4a1ef50 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/products/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/products/tags/main.bicep @@ -9,6 +9,8 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Consumption' } properties: { + publisherName: 'pub1' + virtualNetworkType: 'None' certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' @@ -20,8 +22,6 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' - publisherName: 'pub1' - virtualNetworkType: 'None' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep index 98fc4fc4..000547bc 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/schemas/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName @@ -9,19 +9,19 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Consumption' } properties: { - certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' } disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' + certificates: [] } } @@ -29,8 +29,6 @@ resource schema 'Microsoft.ApiManagement/service/schemas@2021-08-01' = { name: resourceName parent: service properties: { - description: '' - schemaType: 'xml' value: ''' @@ -53,5 +51,7 @@ resource schema 'Microsoft.ApiManagement/service/schemas@2021-08-01' = { ''' + description: '' + schemaType: 'xml' } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep index 7dc0659b..6cbdb991 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/subscriptions/main.bicep @@ -11,22 +11,22 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { properties: { certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' } disableGateway: false @@ -37,18 +37,6 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { } } -resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { - name: resourceName - parent: service - properties: { - description: '' - displayName: 'Test Product' - state: 'published' - subscriptionRequired: true - terms: '' - } -} - resource subscription 'Microsoft.ApiManagement/service/subscriptions@2021-08-01' = { name: '0f393927-8f2d-499d-906f-c03943328d31' parent: service @@ -69,3 +57,15 @@ resource user 'Microsoft.ApiManagement/service/users@2021-08-01' = { lastName: 'Test' } } + +resource product 'Microsoft.ApiManagement/service/products@2021-08-01' = { + name: resourceName + parent: service + properties: { + description: '' + displayName: 'Test Product' + state: 'published' + subscriptionRequired: true + terms: '' + } +} diff --git a/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep index e6de1034..c6d358b6 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/tags/main.bicep @@ -1,17 +1,14 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName location: location sku: { - capacity: 0 name: 'Consumption' + capacity: 0 } properties: { - publisherName: 'pub1' - virtualNetworkType: 'None' - certificates: [] customProperties: { 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' @@ -22,6 +19,9 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { disableGateway: false publicNetworkAccess: 'Enabled' publisherEmail: 'pub1@email.com' + publisherName: 'pub1' + virtualNetworkType: 'None' + certificates: [] } } diff --git a/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep b/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep index 7564a195..b2903f08 100644 --- a/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep +++ b/settings/remarks/microsoft.apimanagement/samples/service/users/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: resourceName @@ -9,31 +9,31 @@ resource service 'Microsoft.ApiManagement/service@2021-08-01' = { name: 'Developer' } properties: { - publicNetworkAccess: 'Enabled' - publisherEmail: 'pub1@email.com' publisherName: 'pub1' virtualNetworkType: 'None' certificates: [] customProperties: { - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls10': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' - 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls10': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA256': 'false' 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Ssl30': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Backend.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_128_GCM_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA256': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Protocols.Tls11': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_CBC_SHA': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TLS_RSA_WITH_AES_256_GCM_SHA384': 'false' + 'Microsoft.WindowsAzure.ApiManagement.Gateway.Security.Ciphers.TripleDes168': 'false' } disableGateway: false + publicNetworkAccess: 'Enabled' + publisherEmail: 'pub1@email.com' } } @@ -41,8 +41,8 @@ resource user 'Microsoft.ApiManagement/service/users@2021-08-01' = { name: resourceName parent: service properties: { + email: 'azure-acctest230630032559695401@example.com' firstName: 'Acceptance' lastName: 'Test' - email: 'azure-acctest230630032559695401@example.com' } } diff --git a/settings/remarks/microsoft.app/samples/containerapps/main.bicep b/settings/remarks/microsoft.app/samples/containerapps/main.bicep index fe9fa556..8b42b784 100644 --- a/settings/remarks/microsoft.app/samples/containerapps/main.bicep +++ b/settings/remarks/microsoft.app/samples/containerapps/main.bicep @@ -1,25 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' - -resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { - name: resourceName - location: location - properties: { - workspaceCapping: { - dailyQuotaGb: -1 - } - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - retentionInDays: 30 - sku: { - name: 'PerGB2018' - } - } -} +param resourceName string = 'acctest0001' resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { name: resourceName @@ -31,6 +11,7 @@ resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { template: { containers: [ { + image: 'jackofallops/azure-containerapps-python-acctest:v0.0.1' name: 'acctest-cont-230630032906865620' probes: [] resources: { @@ -40,7 +21,6 @@ resource containerApp 'Microsoft.App/containerApps@2022-03-01' = { } volumeMounts: [] env: [] - image: 'jackofallops/azure-containerapps-python-acctest:v0.0.1' } ] scale: { @@ -64,3 +44,23 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { vnetConfiguration: {} } } + +resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { + name: resourceName + location: location + properties: { + workspaceCapping: { + dailyQuotaGb: -1 + } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } + } +} diff --git a/settings/remarks/microsoft.app/samples/jobs/main.bicep b/settings/remarks/microsoft.app/samples/jobs/main.bicep index 8595bc93..9b201470 100644 --- a/settings/remarks/microsoft.app/samples/jobs/main.bicep +++ b/settings/remarks/microsoft.app/samples/jobs/main.bicep @@ -7,29 +7,29 @@ resource job 'Microsoft.App/jobs@2025-01-01' = { properties: { configuration: { manualTriggerConfig: { - parallelism: 4 replicaCompletionCount: 1 + parallelism: 4 } replicaRetryLimit: 10 replicaTimeout: 10 triggerType: 'Manual' } template: { + volumes: [] containers: [ { + image: 'jackofallops/azure-containerapps-python-acctest:v0.0.1' + name: 'testcontainerappsjob0' + probes: [] resources: { cpu: any('0.5') memory: '1Gi' } volumeMounts: [] env: [] - image: 'jackofallops/azure-containerapps-python-acctest:v0.0.1' - name: 'testcontainerappsjob0' - probes: [] } ] initContainers: [] - volumes: [] } } } diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep index ee81bb17..dce19cb4 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/certificates/main.bicep @@ -1,20 +1,20 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' @secure() @description('The password for the certificate used in the managed environment') param certificatePassword string -param resourceName string = 'acctest0001' -param location string = 'westeurope' resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { name: resourceName location: location properties: { - vnetConfiguration: {} appLogsConfiguration: { destination: 'log-analytics' logAnalyticsConfiguration: { sharedKey: workspace.listKeys().primarySharedKey } } + vnetConfiguration: {} } } @@ -22,6 +22,10 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 @@ -31,10 +35,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { workspaceCapping: { dailyQuotaGb: -1 } - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } } } diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep index 07b048ea..49658a2a 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/daprcomponents/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { name: resourceName @@ -19,10 +19,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - retentionInDays: 30 - sku: { - name: 'PerGB2018' - } workspaceCapping: { dailyQuotaGb: -1 } @@ -32,6 +28,10 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { } publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } } } @@ -39,10 +39,10 @@ resource daprComponent 'Microsoft.App/managedEnvironments/daprComponents@2022-03 name: resourceName parent: managedEnvironment properties: { + version: 'v1' componentType: 'state.azure.blobstorage' ignoreErrors: false initTimeout: '5s' scopes: null - version: 'v1' } } diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep index f23e8e7e..bba52e05 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/dotnetcomponents/main.bicep @@ -19,19 +19,19 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - features: { - enableLogAccessUsingOnlyResourcePermissions: true - disableLocalAuth: false - } - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - retentionInDays: 30 sku: { name: 'PerGB2018' } workspaceCapping: { dailyQuotaGb: -1 } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 } } diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep index 34a5334e..ed67c51f 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/main.bicep @@ -5,6 +5,11 @@ 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: { @@ -13,11 +18,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { workspaceCapping: { dailyQuotaGb: -1 } - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' } } @@ -26,10 +26,10 @@ resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { location: location properties: { appLogsConfiguration: { - destination: 'log-analytics' logAnalyticsConfiguration: { sharedKey: workspace.listKeys().primarySharedKey } + destination: 'log-analytics' } vnetConfiguration: {} } diff --git a/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep b/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep index 2bc102af..0ef79761 100644 --- a/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep +++ b/settings/remarks/microsoft.app/samples/managedenvironments/storages/main.bicep @@ -1,5 +1,19 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' + +resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { + name: resourceName + location: location + properties: { + appLogsConfiguration: { + destination: 'log-analytics' + logAnalyticsConfiguration: { + sharedKey: workspace.listKeys().primarySharedKey + } + } + vnetConfiguration: {} + } +} resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName @@ -9,15 +23,9 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - accessTier: 'Hot' - allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -29,11 +37,17 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + accessTier: 'Hot' isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false + publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false + allowBlobPublicAccess: true } tags: { environment: 'accTest' @@ -44,6 +58,9 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { + sku: { + name: 'PerGB2018' + } workspaceCapping: { dailyQuotaGb: -1 } @@ -54,23 +71,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 - sku: { - name: 'PerGB2018' - } - } -} - -resource managedEnvironment 'Microsoft.App/managedEnvironments@2022-03-01' = { - name: resourceName - location: location - properties: { - vnetConfiguration: {} - appLogsConfiguration: { - destination: 'log-analytics' - logAnalyticsConfiguration: { - sharedKey: workspace.listKeys().primarySharedKey - } - } } } @@ -79,10 +79,10 @@ resource storage 'Microsoft.App/managedEnvironments/storages@2022-03-01' = { parent: managedEnvironment properties: { azureFile: { - accountName: storageAccount.name shareName: 'testsharehkez7' accessMode: 'ReadWrite' accountKey: storageAccount.listKeys().keys[0].value + accountName: storageAccount.name } } } 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 c1d73b38..9df2da1a 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apiportals/domains/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apiportals/domains/main.bicep @@ -16,9 +16,9 @@ resource apiPortal 'Microsoft.AppPlatform/Spring/apiPortals@2023-05-01-preview' name: 'default' parent: spring sku: { + tier: 'Enterprise' capacity: 1 name: 'E0' - tier: 'Enterprise' } properties: { httpsOnly: 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 e3a385a0..1a145ec2 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/applicationaccelerators/customizedaccelerators/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName @@ -21,17 +21,17 @@ resource customizedAccelerator 'Microsoft.AppPlatform/Spring/applicationAccelera name: resourceName parent: applicationAccelerator properties: { + description: '' displayName: '' gitRepository: { + gitTag: '' + url: 'https://github.com/Azure-Samples/piggymetrics' authSetting: { authType: 'Public' } branch: 'master' commit: '' - gitTag: '' - url: 'https://github.com/Azure-Samples/piggymetrics' } iconUrl: '' - description: '' } } 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 6873baf8..667b579a 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/apps/bindings/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName @@ -12,6 +12,20 @@ resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { } } +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' + } + } +} + resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { name: resourceName location: location @@ -34,17 +48,3 @@ resource binding 'Microsoft.AppPlatform/Spring/apps/bindings@2023-05-01-preview' 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/buildservices/builders/buildpackbindings/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep index aedc47b5..a91811bc 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/buildservices/builders/buildpackbindings/main.bicep @@ -1,6 +1,23 @@ param location string = 'westeurope' param resourceName string = 'acctest0001' +resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { + name: resourceName + location: location + sku: { + name: 'E0' + } + properties: { + zoneRedundant: false + } +} + +resource buildService 'Microsoft.AppPlatform/Spring/buildServices@2023-05-01-preview' = { + name: 'default' + parent: spring + properties: {} +} + resource builder 'Microsoft.AppPlatform/Spring/buildServices/builders@2023-05-01-preview' = { name: resourceName properties: { @@ -28,20 +45,3 @@ resource buildpackBinding 'Microsoft.AppPlatform/Spring/buildServices/builders/b bindingType: 'ApplicationInsights' } } - -resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { - name: resourceName - location: location - sku: { - name: 'E0' - } - properties: { - zoneRedundant: false - } -} - -resource buildService 'Microsoft.AppPlatform/Spring/buildServices@2023-05-01-preview' = { - name: 'default' - parent: spring - properties: {} -} diff --git a/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep index 80b5d0bd..701e1f08 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/devtoolportals/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName @@ -16,7 +16,6 @@ resource devToolPortal 'Microsoft.AppPlatform/Spring/DevToolPortals@2023-05-01-p name: 'default' parent: spring properties: { - public: false features: { applicationAccelerator: { state: 'Disabled' @@ -25,5 +24,6 @@ resource devToolPortal 'Microsoft.AppPlatform/Spring/DevToolPortals@2023-05-01-p state: 'Disabled' } } + public: false } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep index f11837f6..6251607d 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/gateways/main.bicep @@ -16,9 +16,9 @@ resource gateway 'Microsoft.AppPlatform/Spring/gateways@2023-05-01-preview' = { name: 'default' parent: spring sku: { + tier: 'Enterprise' capacity: 1 name: 'E0' - tier: 'Enterprise' } properties: { httpsOnly: 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 06e0f2d6..91d5a21f 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/gateways/routeconfigs/main.bicep @@ -12,13 +12,24 @@ resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { } } +resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { + name: resourceName + location: location + parent: spring + properties: { + customPersistentDisks: [] + enableEndToEndTLS: false + public: false + } +} + resource gateway 'Microsoft.AppPlatform/Spring/gateways@2023-05-01-preview' = { name: 'default' parent: spring sku: { + capacity: 1 name: 'E0' tier: 'Enterprise' - capacity: 1 } properties: { httpsOnly: false @@ -30,20 +41,9 @@ resource routeConfig 'Microsoft.AppPlatform/Spring/gateways/routeConfigs@2023-05 name: resourceName parent: gateway properties: { - appResourceId: app.id - protocol: 'HTTP' routes: [] ssoEnabled: false - } -} - -resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { - name: resourceName - location: location - parent: spring - properties: { - customPersistentDisks: [] - enableEndToEndTLS: false - public: false + appResourceId: app.id + protocol: 'HTTP' } } diff --git a/settings/remarks/microsoft.appplatform/samples/spring/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/main.bicep index 208ccc1e..bc5107b6 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { name: resourceName diff --git a/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep b/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep index f4144c4a..4d6e3fe5 100644 --- a/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep +++ b/settings/remarks/microsoft.appplatform/samples/spring/storages/main.bicep @@ -12,16 +12,6 @@ resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { } } -resource storage 'Microsoft.AppPlatform/Spring/storages@2023-05-01-preview' = { - name: resourceName - parent: spring - properties: { - accountKey: storageAccount.listKeys().keys[0].value - accountName: storageAccount.name - storageType: 'StorageAccount' - } -} - resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -30,19 +20,22 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + isNfsV3Enabled: false + publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - accessTier: 'Hot' + allowBlobPublicAccess: true + allowCrossTenantReplication: true allowSharedKeyAccess: true - isNfsV3Enabled: false + defaultToOAuthAuthentication: false + isHnsEnabled: false isSftpEnabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - allowBlobPublicAccess: true - allowCrossTenantReplication: true - defaultToOAuthAuthentication: false + accessTier: 'Hot' encryption: { + keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -51,9 +44,16 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } - keySource: 'Microsoft.Storage' } - isHnsEnabled: false - publicNetworkAccess: 'Enabled' + } +} + +resource storage 'Microsoft.AppPlatform/Spring/storages@2023-05-01-preview' = { + name: resourceName + parent: spring + properties: { + accountName: storageAccount.name + storageType: 'StorageAccount' + accountKey: storageAccount.listKeys().keys[0].value } } diff --git a/settings/remarks/microsoft.attestation/samples/attestationproviders/main.bicep b/settings/remarks/microsoft.attestation/samples/attestationproviders/main.bicep index 945985a0..3dbe0d72 100644 --- a/settings/remarks/microsoft.attestation/samples/attestationproviders/main.bicep +++ b/settings/remarks/microsoft.attestation/samples/attestationproviders/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource attestationProvider 'Microsoft.Attestation/attestationProviders@2020-10-01' = { name: resourceName diff --git a/settings/remarks/microsoft.authorization/samples/policyassignments/main.bicep b/settings/remarks/microsoft.authorization/samples/policyassignments/main.bicep index face168a..58417c9f 100644 --- a/settings/remarks/microsoft.authorization/samples/policyassignments/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policyassignments/main.bicep @@ -25,6 +25,7 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { name: resourceName properties: { + policyType: 'Custom' description: '' displayName: 'my-policy-definition' mode: 'All' @@ -49,6 +50,5 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' effect: 'audit' } } - policyType: 'Custom' } } diff --git a/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep index 344037fc..f38b2427 100644 --- a/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policydefinitions/main.bicep @@ -11,12 +11,12 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' mode: 'All' parameters: { allowedLocations: { + type: 'Array' metadata: { description: 'The list of allowed locations for resources.' displayName: 'Allowed locations' strongType: 'location' } - type: 'Array' } } policyRule: { diff --git a/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep b/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep index 47df940a..80305494 100644 --- a/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policyexemptions/main.bicep @@ -3,20 +3,32 @@ targetScope = 'subscription' param resourceName string = 'acctest0001' param location string = 'eastus' +resource policyExemption 'Microsoft.Authorization/policyExemptions@2020-07-01-preview' = { + name: resourceName + scope: subscription() + properties: { + exemptionCategory: 'Mitigated' + policyAssignmentId: policyAssignment.id + policyDefinitionReferenceIds: [] + } +} + resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' = { name: resourceName location: 'westeurope' scope: subscription() properties: { + scope: subscription().id displayName: '' enforcementMode: 'Default' - scope: subscription().id } } resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { name: resourceName properties: { + description: '' + displayName: 'my-policy-definition' mode: 'All' parameters: { allowedLocations: { @@ -40,17 +52,5 @@ resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' } } policyType: 'Custom' - description: '' - displayName: 'my-policy-definition' - } -} - -resource policyExemption 'Microsoft.Authorization/policyExemptions@2020-07-01-preview' = { - name: resourceName - scope: subscription() - properties: { - exemptionCategory: 'Mitigated' - policyAssignmentId: policyAssignment.id - policyDefinitionReferenceIds: [] } } diff --git a/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep index 1b797080..f24bd46a 100644 --- a/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/policysetdefinitions/main.bicep @@ -6,31 +6,31 @@ param location string = 'westus' resource policyDefinition 'Microsoft.Authorization/policyDefinitions@2021-06-01' = { name: resourceName properties: { + policyRule: { + if: { + not: { + field: 'location' + in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + } + } + then: { + effect: 'audit' + } + } + policyType: 'Custom' description: '' displayName: 'my-policy-definition' mode: 'All' parameters: { allowedLocations: { metadata: { - description: 'The list of allowed locations for resources.' displayName: 'Allowed locations' strongType: 'location' + description: 'The list of allowed locations for resources.' } type: 'Array' } } - policyRule: { - then: { - effect: 'audit' - } - if: { - not: { - field: 'location' - in: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} - } - } - } - policyType: 'Custom' } } @@ -51,14 +51,14 @@ resource policySetDefinition 'Microsoft.Authorization/policySetDefinitions@2025- } policyDefinitions: [ { + policyDefinitionId: policyDefinition.id + policyDefinitionReferenceId: '' + groupNames: [] parameters: { listOfAllowedLocations: { value: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } - policyDefinitionId: policyDefinition.id - policyDefinitionReferenceId: '' - groupNames: [] } ] policyType: 'Custom' diff --git a/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep b/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep index 4c98618c..01a63b3c 100644 --- a/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep +++ b/settings/remarks/microsoft.authorization/samples/roledefinitions/main.bicep @@ -12,12 +12,12 @@ resource roleDefinition 'Microsoft.Authorization/roleDefinitions@2018-01-01-prev description: '' permissions: [ { - dataActions: [] - notActions: [] notDataActions: [] actions: [ '*' ] + dataActions: [] + notActions: [] } ] roleName: resourceName diff --git a/settings/remarks/microsoft.automanage/samples/configurationprofiles/main.bicep b/settings/remarks/microsoft.automanage/samples/configurationprofiles/main.bicep index c9c9fb65..ee5285a4 100644 --- a/settings/remarks/microsoft.automanage/samples/configurationprofiles/main.bicep +++ b/settings/remarks/microsoft.automanage/samples/configurationprofiles/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource configurationProfile 'Microsoft.Automanage/configurationProfiles@2022-05-04' = { name: resourceName diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/certificates/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/certificates/main.bicep index 72b9c195..5d4a62b3 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/certificates/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/certificates/main.bicep @@ -5,13 +5,13 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { - sku: { - name: 'Basic' - } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true + sku: { + name: 'Basic' + } } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep index 47b2e853..3ad5d005 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/configurations/main.bicep @@ -5,13 +5,13 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { - encryption: { - keySource: 'Microsoft.Automation' - } publicNetworkAccess: true sku: { name: 'Basic' } + encryption: { + keySource: 'Microsoft.Automation' + } } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep index 0b4cfb15..643e2339 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/connections/main.bicep @@ -7,13 +7,13 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { + encryption: { + keySource: 'Microsoft.Automation' + } publicNetworkAccess: true sku: { name: 'Basic' } - encryption: { - keySource: 'Microsoft.Automation' - } } } @@ -21,16 +21,16 @@ resource connection 'Microsoft.Automation/automationAccounts/connections@2020-01 name: resourceName parent: automationAccount properties: { + connectionType: { + name: 'AzureServicePrincipal' + } + description: '' fieldDefinitionValues: { ApplicationId: servicePrincipalApplicationId CertificateThumbprint: '''AEB97B81A68E8988850972916A8B8B6CD8F39813 ''' - SubscriptionId: subscription() - TenantId: tenant() + SubscriptionId: subscription().subscriptionId + TenantId: tenant().tenantId } - connectionType: { - name: 'AzureServicePrincipal' - } - description: '' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep index 8b9c6912..7b1ea389 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/connectiontypes/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = { name: resourceName diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep index b7e13255..6b05cb52 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/credentials/main.bicep @@ -8,13 +8,13 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { + sku: { + name: 'Basic' + } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true - sku: { - name: 'Basic' - } } } @@ -22,8 +22,8 @@ resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01 name: resourceName parent: automationAccount properties: { + userName: 'test_user' description: '' 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 e217ba69..38a64db0 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/hybridrunbookworkers/main.bicep @@ -11,46 +11,13 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { + sku: { + name: 'Basic' + } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true - sku: { - name: 'Basic' - } - } -} - -resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { - name: resourceName - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'testconfiguration1' - properties: { - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: {} - } - } - ] - } -} - -resource hybridRunbookWorkerGroup 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups@2021-06-22' = { - name: resourceName - parent: automationAccount -} - -resource hybridRunbookWorker 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups/hybridRunbookWorkers@2021-06-22' = { - name: 'c7714056-5ba8-4bbe-920e-2993171164eb' - parent: hybridRunbookWorkerGroup - properties: { - vmResourceId: virtualMachine.id } } @@ -58,9 +25,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - applicationProfile: { - galleryApplications: [] - } diagnosticsProfile: { bootDiagnostics: { enabled: false @@ -68,6 +32,9 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } } extensionsTimeBudget: 'PT1H30M' + hardwareProfile: { + vmSize: 'Standard_D2s_v3' + } networkProfile: { networkInterfaces: [ { @@ -79,22 +46,22 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { + adminUsername: 'adminuser' allowExtensionOperations: true computerName: resourceName linuxConfiguration: { - provisionVMAgent: true - ssh: { - publicKeys: [] - } disablePasswordAuthentication: false patchSettings: { assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' } + provisionVMAgent: true + ssh: { + publicKeys: [] + } } secrets: [] adminPassword: vmAdminPassword - adminUsername: 'adminuser' } priority: 'Regular' storageProfile: { @@ -106,18 +73,18 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { version: 'latest' } osDisk: { + osType: 'Linux' + writeAcceleratorEnabled: false caching: 'ReadWrite' createOption: 'FromImage' managedDisk: { storageAccountType: 'Standard_LRS' } - osType: 'Linux' - writeAcceleratorEnabled: false } } additionalCapabilities: {} - hardwareProfile: { - vmSize: 'Standard_D2s_v3' + applicationProfile: { + galleryApplications: [] } } } @@ -138,25 +105,58 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } } -resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { +resource hybridRunbookWorkerGroup 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups@2021-06-22' = { name: resourceName parent: automationAccount - properties: { - description: '' - password: '${automationWorkerPassword}' - userName: 'test_user' - } } resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'internal' parent: virtualNetwork properties: { + serviceEndpointPolicies: [] + serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration1' + properties: { + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + } + } + ] + } +} + +resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01-13-preview' = { + name: resourceName + parent: automationAccount + properties: { + description: '' + password: '${automationWorkerPassword}' + userName: 'test_user' + } +} + +resource hybridRunbookWorker 'Microsoft.Automation/automationAccounts/hybridRunbookWorkerGroups/hybridRunbookWorkers@2021-06-22' = { + name: 'c7714056-5ba8-4bbe-920e-2993171164eb' + parent: hybridRunbookWorkerGroup + properties: { + vmResourceId: virtualMachine.id } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep index ae163f2a..a0441027 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/hybridrunbookworkergroups/main.bicep @@ -1,8 +1,8 @@ +param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The password for the automation account credential') param credentialPassword string -param resourceName string = 'acctest0001' resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = { name: resourceName @@ -22,9 +22,9 @@ resource credential 'Microsoft.Automation/automationAccounts/credentials@2020-01 name: resourceName parent: automationAccount properties: { + userName: 'test_user' description: '' password: '${credentialPassword}' - userName: 'test_user' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/main.bicep index a0e7dac9..e22b9fd8 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/main.bicep @@ -5,12 +5,12 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { + sku: { + name: 'Basic' + } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true - sku: { - name: 'Basic' - } } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep index 791b556a..b05aa278 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/runbooks/draft/main.bicep @@ -20,12 +20,12 @@ resource runbook 'Microsoft.Automation/automationAccounts/runbooks@2019-06-01' = location: location parent: automationAccount properties: { - logVerbose: true - runbookType: 'PowerShell' description: 'This is a test runbook for terraform acceptance test' draft: {} logActivityTrace: 0 logProgress: true + logVerbose: true + runbookType: 'PowerShell' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep index c0d68a56..be877f21 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/schedules/main.bicep @@ -5,13 +5,13 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { + sku: { + name: 'Basic' + } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true - sku: { - name: 'Basic' - } } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep index 9556d4ab..53bb8561 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/softwareupdateconfigurations/main.bicep @@ -1,17 +1,17 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = { name: resourceName location: location properties: { - encryption: { - keySource: 'Microsoft.Automation' - } publicNetworkAccess: true sku: { name: 'Basic' } + encryption: { + keySource: 'Microsoft.Automation' + } } } @@ -20,22 +20,22 @@ resource softwareUpdateConfiguration 'Microsoft.Automation/automationAccounts/so parent: automationAccount properties: { scheduleInfo: { - nextRunOffsetMinutes: 0 - timeZone: 'Etc/UTC' - expiryTimeOffsetMinutes: 0 - isEnabled: true - startTimeOffsetMinutes: 0 description: '' + expiryTimeOffsetMinutes: 0 frequency: 'OneTime' interval: 0 + isEnabled: true + nextRunOffsetMinutes: 0 + startTimeOffsetMinutes: 0 + timeZone: 'Etc/UTC' } updateConfiguration: { duration: 'PT2H' linux: { + excludedPackageNameMasks: [] includedPackageClassifications: 'Security' includedPackageNameMasks: [] rebootSetting: 'IfRequired' - excludedPackageNameMasks: [] } operatingSystem: 'Linux' targets: { diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep index 7e1394a9..c8104778 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/sourcecontrols/main.bicep @@ -8,13 +8,13 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2023-11-01' name: resourceName location: location properties: { + encryption: { + keySource: 'Microsoft.Automation' + } publicNetworkAccess: true sku: { name: 'Basic' } - encryption: { - keySource: 'Microsoft.Automation' - } } } @@ -22,8 +22,6 @@ resource sourceControl 'Microsoft.Automation/automationAccounts/sourceControls@2 name: resourceName parent: automationAccount properties: { - branch: 'master' - folderPath: '/' publishRunbook: false repoUrl: 'https://github.com/Azure-Samples/acr-build-helloworld-node.git' securityToken: { @@ -32,5 +30,7 @@ resource sourceControl 'Microsoft.Automation/automationAccounts/sourceControls@2 } sourceType: 'GitHub' autoSync: false + branch: 'master' + folderPath: '/' } } diff --git a/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep b/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep index 1a42425c..9d739cba 100644 --- a/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep +++ b/settings/remarks/microsoft.automation/samples/automationaccounts/variables/main.bicep @@ -1,17 +1,17 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' = { name: resourceName location: location properties: { - encryption: { - keySource: 'Microsoft.Automation' - } publicNetworkAccess: true sku: { name: 'Basic' } + encryption: { + keySource: 'Microsoft.Automation' + } } } diff --git a/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep b/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep index e37ba12a..0d284818 100644 --- a/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep +++ b/settings/remarks/microsoft.avs/samples/privateclouds/main.bicep @@ -8,10 +8,10 @@ resource privateCloud 'Microsoft.AVS/privateClouds@2022-05-01' = { name: 'av36' } properties: { - networkBlock: '192.168.48.0/22' - internet: 'Disabled' managementCluster: { clusterSize: 3 } + networkBlock: '192.168.48.0/22' + internet: 'Disabled' } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep index 0ce88aed..4adaac13 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/applications/main.bicep @@ -1,5 +1,20 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' + +resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { + name: resourceName + location: location + properties: { + poolAllocationMode: 'BatchService' + publicNetworkAccess: 'Enabled' + autoStorage: { + authenticationMode: 'StorageKeys' + } + encryption: { + keySource: 'Microsoft.Batch' + } + } +} resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName @@ -9,10 +24,9 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - networkAcls: { - defaultAction: 'Allow' - } - accessTier: 'Hot' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -24,31 +38,17 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isSftpEnabled: false - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false isHnsEnabled: false isNfsV3Enabled: false + isSftpEnabled: false minimumTlsVersion: 'TLS1_2' - } -} - -resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { - name: resourceName - location: location - properties: { - autoStorage: { - authenticationMode: 'StorageKeys' - } - encryption: { - keySource: 'Microsoft.Batch' + accessTier: 'Hot' + defaultToOAuthAuthentication: false + networkAcls: { + defaultAction: 'Allow' } - poolAllocationMode: 'BatchService' publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true } } @@ -56,8 +56,8 @@ resource application 'Microsoft.Batch/batchAccounts/applications@2022-10-01' = { name: resourceName parent: batchAccount properties: { + defaultVersion: '' displayName: '' 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 1d8cded1..39587855 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/certificates/main.bicep @@ -22,9 +22,9 @@ resource certificate 'Microsoft.Batch/batchAccounts/certificates@2022-10-01' = { name: 'SHA1-${certificateThumbprint}' parent: batchAccount properties: { - thumbprint: '${certificateThumbprint}' - thumbprintAlgorithm: 'sha1' data: '${certificateData}' format: 'Cer' + thumbprint: '${certificateThumbprint}' + thumbprintAlgorithm: 'sha1' } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/main.bicep index 7d5bccd0..884b8da7 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/main.bicep @@ -5,10 +5,10 @@ resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' encryption: { keySource: 'Microsoft.Batch' } poolAllocationMode: 'BatchService' - publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep b/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep index edc7e02c..bc25c22a 100644 --- a/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep +++ b/settings/remarks/microsoft.batch/samples/batchaccounts/pools/main.bicep @@ -1,15 +1,15 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource batchAccount 'Microsoft.Batch/batchAccounts@2022-10-01' = { name: resourceName location: location properties: { - publicNetworkAccess: 'Enabled' encryption: { keySource: 'Microsoft.Batch' } poolAllocationMode: 'BatchService' + publicNetworkAccess: 'Enabled' } } @@ -17,20 +17,27 @@ resource pool 'Microsoft.Batch/batchAccounts/pools@2022-10-01' = { name: resourceName parent: batchAccount properties: { + displayName: '' interNodeCommunication: 'Enabled' scaleSettings: { fixedScale: { - targetDedicatedNodes: 1 targetLowPriorityNodes: 0 nodeDeallocationOption: '' resizeTimeout: 'PT15M' + targetDedicatedNodes: 1 } } taskSlotsPerNode: 1 + metadata: [] vmSize: 'STANDARD_A1' certificates: null deploymentConfiguration: { virtualMachineConfiguration: { + osDisk: { + ephemeralOSDiskSettings: { + placement: '' + } + } imageReference: { offer: 'UbuntuServer' publisher: 'Canonical' @@ -38,14 +45,7 @@ resource pool 'Microsoft.Batch/batchAccounts/pools@2022-10-01' = { version: 'latest' } nodeAgentSkuId: 'batch.node.ubuntu 18.04' - osDisk: { - ephemeralOSDiskSettings: { - placement: '' - } - } } } - displayName: '' - metadata: [] } } diff --git a/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep b/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep index 870373eb..de243b23 100644 --- a/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep +++ b/settings/remarks/microsoft.billing/samples/billingaccounts/billingprofiles/main.bicep @@ -11,23 +11,14 @@ param paymentScaId string resource billingProfile 'Microsoft.Billing/billingAccounts/billingProfiles@2024-04-01' = { name: resourceName properties: { - shipTo: { - country: 'US' - isValidAddress: true - postalCode: '12345-1234' - region: 'WA' - addressLine1: 'TestWay' + billTo: { city: 'Redmond' companyName: 'TestCompany' - } - billTo: { country: 'US' isValidAddress: true postalCode: '12345-1234' region: 'WA' addressLine1: 'TestWay' - city: 'Redmond' - companyName: 'TestCompany' } displayName: '${resourceName}' enabledAzurePlans: [ @@ -35,5 +26,14 @@ resource billingProfile 'Microsoft.Billing/billingAccounts/billingProfiles@2024- skuId: '0001' } ] + shipTo: { + companyName: 'TestCompany' + country: 'US' + isValidAddress: true + postalCode: '12345-1234' + region: 'WA' + addressLine1: 'TestWay' + city: 'Redmond' + } } } diff --git a/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep b/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep index b533bbd5..4cd40253 100644 --- a/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep +++ b/settings/remarks/microsoft.botservice/samples/botservices/channels/main.bicep @@ -9,15 +9,15 @@ resource botService 'Microsoft.BotService/botServices@2021-05-01-preview' = { } kind: 'bot' properties: { - cmekKeyVaultUrl: '' - developerAppInsightKey: '' developerAppInsightsApplicationId: '' - endpoint: '' + displayName: '${resourceName}' isStreamingSupported: false msaAppId: '12345678-1234-1234-1234-123456789012' + cmekKeyVaultUrl: '' description: '' + developerAppInsightKey: '' developerAppInsightsApiKey: '' - displayName: '${resourceName}' + endpoint: '' iconUrl: 'https://docs.botframework.com/static/devportal/client/images/bot-framework-default.png' isCmekEnabled: false } diff --git a/settings/remarks/microsoft.botservice/samples/botservices/main.bicep b/settings/remarks/microsoft.botservice/samples/botservices/main.bicep index 13321f8b..66b8772a 100644 --- a/settings/remarks/microsoft.botservice/samples/botservices/main.bicep +++ b/settings/remarks/microsoft.botservice/samples/botservices/main.bicep @@ -11,14 +11,14 @@ resource botService 'Microsoft.BotService/botServices@2021-05-01-preview' = { } kind: 'sdk' properties: { - developerAppInsightKey: '' - developerAppInsightsApplicationId: '' - luisAppIds: [] msaAppId: clientId - developerAppInsightsApiKey: '' + developerAppInsightKey: '' displayName: resourceName - endpoint: '' luisKey: '' + developerAppInsightsApiKey: '' + developerAppInsightsApplicationId: '' + endpoint: '' + luisAppIds: [] } tags: { environment: 'production' diff --git a/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep b/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep index 72a635ef..6e816e11 100644 --- a/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/accesspolicies/main.bicep @@ -5,6 +5,10 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { name: resourceName location: location properties: { + disableAccessKeyAuthentication: false + enableNonSslPort: true + minimumTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' redisConfiguration: { 'maxmemory-policy': 'volatile-lru' 'preferred-data-persistence-auth-method': '' @@ -15,10 +19,6 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { family: 'C' name: 'Basic' } - disableAccessKeyAuthentication: false - enableNonSslPort: true - minimumTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep b/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep index a16b2f3c..f25e7432 100644 --- a/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/accesspolicyassignments/main.bicep @@ -8,9 +8,9 @@ resource redis 'Microsoft.Cache/redis@2023-04-01' = { enableNonSslPort: true minimumTlsVersion: '1.2' sku: { + name: 'Standard' capacity: 2 family: 'C' - name: 'Standard' } } } diff --git a/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep b/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep index fc727c2d..dc601571 100644 --- a/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/firewallrules/main.bicep @@ -1,12 +1,10 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource redis 'Microsoft.Cache/redis@2024-11-01' = { name: resourceName location: location properties: { - disableAccessKeyAuthentication: false - enableNonSslPort: false minimumTlsVersion: '1.2' publicNetworkAccess: 'Enabled' redisConfiguration: { @@ -17,10 +15,12 @@ resource redis 'Microsoft.Cache/redis@2024-11-01' = { } redisVersion: '6.0' sku: { - family: 'P' name: 'Premium' capacity: 1 + family: 'P' } + disableAccessKeyAuthentication: false + enableNonSslPort: false } } 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 index 28a95b89..9f17bbde 100644 --- a/settings/remarks/microsoft.cache/samples/redis/linkedservers/main-rg-module.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/linkedservers/main-rg-module.bicep @@ -5,6 +5,7 @@ resource redisPrimary 'Microsoft.Cache/redis@2024-11-01' = { name: '${resourceName}-primary' location: location properties: { + disableAccessKeyAuthentication: false enableNonSslPort: false minimumTlsVersion: '1.2' publicNetworkAccess: 'Enabled' @@ -16,11 +17,20 @@ resource redisPrimary 'Microsoft.Cache/redis@2024-11-01' = { } redisVersion: '6' sku: { - name: 'Premium' capacity: 1 family: 'P' + name: 'Premium' } - disableAccessKeyAuthentication: false + } +} + +resource linkedServer 'Microsoft.Cache/redis/linkedServers@2024-11-01' = { + name: '${resourceName}-secondary' + parent: redisPrimary + properties: { + linkedRedisCacheId: redisSecondary.id + linkedRedisCacheLocation: location + serverRole: 'Secondary' } } @@ -28,14 +38,15 @@ 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-policy': 'allkeys-lru' - 'maxmemory-reserved': '642' 'preferred-data-persistence-auth-method': '' 'maxmemory-delta': '642' + 'maxmemory-policy': 'allkeys-lru' + 'maxmemory-reserved': '642' } redisVersion: '6' sku: { @@ -43,16 +54,5 @@ resource redisSecondary 'Microsoft.Cache/redis@2024-11-01' = { family: 'P' name: 'Premium' } - disableAccessKeyAuthentication: false - } -} - -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 index ad12030e..2405ab0f 100644 --- a/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/linkedservers/main.bicep @@ -17,7 +17,7 @@ module module1 'main-rg-module.bicep' = { name: 'deploy-rg-resources' scope: resourceGroup params: { - resourceName: resourceName location: location + resourceName: resourceName } } diff --git a/settings/remarks/microsoft.cache/samples/redis/main.bicep b/settings/remarks/microsoft.cache/samples/redis/main.bicep index 2f2a35dd..7d269276 100644 --- a/settings/remarks/microsoft.cache/samples/redis/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redis/main.bicep @@ -5,12 +5,12 @@ 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' } - enableNonSslPort: true } } diff --git a/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep b/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep index 03202e56..dcefc4b2 100644 --- a/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redisenterprise/databases/main.bicep @@ -8,9 +8,9 @@ resource redisEnterprise 'Microsoft.Cache/redisEnterprise@2025-04-01' = { name: 'Balanced_B0' } properties: { - minimumTlsVersion: '1.2' encryption: {} highAvailability: 'Enabled' + minimumTlsVersion: '1.2' } } @@ -18,10 +18,10 @@ resource defaultDatabase 'Microsoft.Cache/redisEnterprise/databases@2025-04-01' name: 'default' parent: redisEnterprise properties: { - port: 10000 clientProtocol: 'Encrypted' clusteringPolicy: 'OSSCluster' evictionPolicy: 'VolatileLRU' modules: [] + port: 10000 } } diff --git a/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep b/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep index e4e3980a..1aa9e04a 100644 --- a/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep +++ b/settings/remarks/microsoft.cache/samples/redisenterprise/main.bicep @@ -1,5 +1,5 @@ -param location string = 'eastus' param resourceName string = 'acctest0001' +param location string = 'eastus' resource redisEnterprise 'Microsoft.Cache/redisEnterprise@2025-04-01' = { name: resourceName 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 a27c94a4..aecc6fcc 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/afdendpoints/routes/main.bicep @@ -41,10 +41,10 @@ resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2021-06-01' = { properties: { enforceCertificateNameCheck: false hostName: 'contoso.com' - httpPort: 80 httpsPort: 443 - originHostHeader: 'www.contoso.com' enabledState: 'Enabled' + httpPort: 80 + originHostHeader: 'www.contoso.com' priority: 1 weight: 1 } @@ -54,6 +54,10 @@ resource route 'Microsoft.Cdn/profiles/afdEndpoints/routes@2021-06-01' = { name: resourceName parent: afdEndpoint properties: { + enabledState: 'Enabled' + forwardingProtocol: 'MatchRequest' + httpsRedirect: 'Enabled' + linkToDefaultDomain: 'Enabled' originGroup: { id: originGroup.id } @@ -64,9 +68,5 @@ resource route 'Microsoft.Cdn/profiles/afdEndpoints/routes@2021-06-01' = { 'Https' 'Http' ] - enabledState: 'Enabled' - forwardingProtocol: 'MatchRequest' - httpsRedirect: 'Enabled' - linkToDefaultDomain: 'Enabled' } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep index 6c295351..cb9c5ff3 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/customdomains/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName @@ -16,14 +16,14 @@ resource customDomain 'Microsoft.Cdn/profiles/customDomains@2021-06-01' = { name: resourceName parent: profile properties: { - tlsSettings: { - certificateType: 'ManagedCertificate' - minimumTlsVersion: 'TLS12' - } azureDnsZone: { id: dnsZone.id } hostName: 'fabrikam.${resourceName}.com' + tlsSettings: { + minimumTlsVersion: 'TLS12' + certificateType: 'ManagedCertificate' + } } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep index 3b7ac0c5..11025868 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/endpoints/main.bicep @@ -14,18 +14,18 @@ resource endpoint 'Microsoft.Cdn/profiles/endpoints@2020-09-01' = { location: location parent: profile properties: { - queryStringCachingBehavior: 'IgnoreQueryString' - isHttpAllowed: true - isHttpsAllowed: true origins: [ { name: 'acceptanceTestCdnOrigin1' properties: { - httpsPort: 443 hostName: 'www.contoso.com' httpPort: 80 + httpsPort: 443 } } ] + queryStringCachingBehavior: 'IgnoreQueryString' + isHttpAllowed: true + isHttpsAllowed: true } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep index aa32b1a2..6b741f18 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName 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 5627fac9..d2fb1e1b 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/origingroups/origins/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/origingroups/origins/main.bicep @@ -17,9 +17,9 @@ resource originGroup 'Microsoft.Cdn/profiles/originGroups@2021-06-01' = { parent: profile properties: { loadBalancingSettings: { + additionalLatencyInMilliseconds: 0 sampleSize: 16 successfulSamplesRequired: 3 - additionalLatencyInMilliseconds: 0 } sessionAffinityState: 'Enabled' trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 @@ -30,13 +30,13 @@ resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2021-06-01' = { name: resourceName parent: originGroup properties: { - enforceCertificateNameCheck: false httpPort: 80 - weight: 1 + priority: 1 enabledState: 'Enabled' + enforceCertificateNameCheck: false hostName: 'contoso.com' httpsPort: 443 originHostHeader: 'www.contoso.com' - priority: 1 + weight: 1 } } 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 827590b3..6c1f7fb9 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/rulesets/rules/main.bicep @@ -17,13 +17,13 @@ resource originGroup 'Microsoft.Cdn/profiles/originGroups@2024-09-01' = { name: '${resourceName}-origingroup' parent: profile properties: { + sessionAffinityState: 'Enabled' trafficRestorationTimeToHealedOrNewEndpointsInMinutes: 10 loadBalancingSettings: { additionalLatencyInMilliseconds: 0 sampleSize: 16 successfulSamplesRequired: 3 } - sessionAffinityState: 'Enabled' } } @@ -36,14 +36,14 @@ resource origin 'Microsoft.Cdn/profiles/originGroups/origins@2024-09-01' = { name: '${resourceName}-origin' parent: originGroup properties: { - enforceCertificateNameCheck: false - httpsPort: 443 + priority: 1 weight: 1 enabledState: 'Enabled' + enforceCertificateNameCheck: false hostName: 'contoso.com' httpPort: 80 + httpsPort: 443 originHostHeader: 'www.contoso.com' - priority: 1 } } @@ -51,10 +51,18 @@ resource rule 'Microsoft.Cdn/profiles/ruleSets/rules@2024-09-01' = { name: 'rule${substring(resourceName, (length(resourceName) - 4), 3)}' parent: ruleSet properties: { + order: 1 actions: [ { name: 'RouteConfigurationOverride' parameters: { + cacheConfiguration: { + queryParameters: 'clientIp={client_ip}' + queryStringCachingBehavior: 'IgnoreSpecifiedQueryStrings' + cacheBehavior: 'OverrideIfOriginMissing' + cacheDuration: '23:59:59' + isCompressionEnabled: 'Disabled' + } originGroupOverride: { forwardingProtocol: 'HttpsOnly' originGroup: { @@ -62,18 +70,10 @@ resource rule 'Microsoft.Cdn/profiles/ruleSets/rules@2024-09-01' = { } } typeName: 'DeliveryRuleRouteConfigurationOverrideActionParameters' - cacheConfiguration: { - queryStringCachingBehavior: 'IgnoreSpecifiedQueryStrings' - cacheBehavior: 'OverrideIfOriginMissing' - cacheDuration: '23:59:59' - isCompressionEnabled: 'Disabled' - queryParameters: 'clientIp={client_ip}' - } } } ] conditions: [] matchProcessingBehavior: 'Continue' - order: 1 } } diff --git a/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep b/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep index 0a125258..7a587857 100644 --- a/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep +++ b/settings/remarks/microsoft.cdn/samples/profiles/securitypolicies/main.bicep @@ -1,5 +1,77 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' + +resource frontDoorWebApplicationFirewallPolicy 'Microsoft.Network/FrontDoorWebApplicationFirewallPolicies@2020-11-01' = { + name: resourceName + location: 'global' + sku: { + name: 'Premium_AzureFrontDoor' + } + properties: { + managedRules: { + managedRuleSets: [ + { + ruleSetAction: 'Block' + ruleSetType: 'DefaultRuleSet' + ruleSetVersion: 'preview-0.1' + ruleGroupOverrides: [ + { + ruleGroupName: 'PHP' + rules: [ + { + action: 'Block' + enabledState: 'Disabled' + ruleId: '933111' + } + ] + } + ] + } + { + ruleSetAction: 'Block' + ruleSetType: 'BotProtection' + ruleSetVersion: 'preview-0.1' + } + ] + } + policySettings: { + customBlockResponseBody: 'PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg==' + customBlockResponseStatusCode: 403 + enabledState: 'Enabled' + mode: 'Prevention' + redirectUrl: 'https://www.fabrikam.com' + } + customRules: { + rules: [ + { + enabledState: 'Enabled' + rateLimitDurationInMinutes: 1 + rateLimitThreshold: 10 + ruleType: 'MatchRule' + matchConditions: [ + { + operator: 'IPMatch' + matchValue: [ + '192.168.1.0/24' + '10.0.0.0/24' + ] + matchVariable: 'RemoteAddr' + negateCondition: false + } + ] + name: 'Rule1' + priority: 1 + action: 'Block' + } + ] + } + } +} + +resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { + name: '${resourceName}.com' + location: 'global' +} resource profile 'Microsoft.Cdn/profiles@2021-06-01' = { name: resourceName @@ -32,94 +104,22 @@ resource securityPolicy 'Microsoft.Cdn/profiles/securityPolicies@2021-06-01' = { parent: profile properties: { parameters: { - type: 'WebApplicationFirewall' wafPolicy: { id: frontDoorWebApplicationFirewallPolicy.id } associations: [ { - patternsToMatch: [ - '/*' - ] domains: [ { id: customDomain.id } ] - } - ] - } - } -} - -resource frontDoorWebApplicationFirewallPolicy 'Microsoft.Network/FrontDoorWebApplicationFirewallPolicies@2020-11-01' = { - name: resourceName - location: 'global' - sku: { - name: 'Premium_AzureFrontDoor' - } - properties: { - customRules: { - rules: [ - { - matchConditions: [ - { - matchValue: [ - '192.168.1.0/24' - '10.0.0.0/24' - ] - matchVariable: 'RemoteAddr' - negateCondition: false - operator: 'IPMatch' - } - ] - name: 'Rule1' - priority: 1 - rateLimitDurationInMinutes: 1 - rateLimitThreshold: 10 - ruleType: 'MatchRule' - action: 'Block' - enabledState: 'Enabled' - } - ] - } - managedRules: { - managedRuleSets: [ - { - ruleGroupOverrides: [ - { - ruleGroupName: 'PHP' - rules: [ - { - action: 'Block' - enabledState: 'Disabled' - ruleId: '933111' - } - ] - } + patternsToMatch: [ + '/*' ] - ruleSetAction: 'Block' - ruleSetType: 'DefaultRuleSet' - ruleSetVersion: 'preview-0.1' - } - { - ruleSetVersion: 'preview-0.1' - ruleSetAction: 'Block' - ruleSetType: 'BotProtection' } ] - } - policySettings: { - customBlockResponseBody: 'PGh0bWw+CjxoZWFkZXI+PHRpdGxlPkhlbGxvPC90aXRsZT48L2hlYWRlcj4KPGJvZHk+CkhlbGxvIHdvcmxkCjwvYm9keT4KPC9odG1sPg==' - customBlockResponseStatusCode: 403 - enabledState: 'Enabled' - mode: 'Prevention' - redirectUrl: 'https://www.fabrikam.com' + type: 'WebApplicationFirewall' } } } - -resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { - name: '${resourceName}.com' - location: 'global' -} diff --git a/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep b/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep index 2ec30833..97a5f03a 100644 --- a/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep +++ b/settings/remarks/microsoft.certificateregistration/samples/certificateorders/main.bicep @@ -5,10 +5,10 @@ resource certificateOrder 'Microsoft.CertificateRegistration/certificateOrders@2 name: resourceName location: 'global' properties: { + distinguishedName: 'CN=example.com' keySize: 2048 productType: 'StandardDomainValidatedSsl' validityInYears: 1 autoRenew: true - distinguishedName: 'CN=example.com' } } diff --git a/settings/remarks/microsoft.codesigning/samples/codesigningaccounts/main.bicep b/settings/remarks/microsoft.codesigning/samples/codesigningaccounts/main.bicep index 6fc40d4d..89ad9f77 100644 --- a/settings/remarks/microsoft.codesigning/samples/codesigningaccounts/main.bicep +++ b/settings/remarks/microsoft.codesigning/samples/codesigningaccounts/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource codeSigningAccount 'Microsoft.CodeSigning/codeSigningAccounts@2024-09-30-preview' = { name: resourceName diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep index 76815b8a..70341004 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/deployments/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0003' param location string = 'eastus' +param resourceName string = 'acctest0003' resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { name: resourceName @@ -9,10 +9,10 @@ resource account 'Microsoft.CognitiveServices/accounts@2022-10-01' = { } kind: 'OpenAI' properties: { - disableLocalAuth: false - dynamicThrottlingEnabled: false publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false + disableLocalAuth: false + dynamicThrottlingEnabled: false } identity: { type: 'None' diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep index afc50104..d7b103d5 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/projects/main.bicep @@ -9,12 +9,12 @@ resource account 'Microsoft.CognitiveServices/accounts@2025-06-01' = { } kind: 'AIServices' properties: { + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: false allowProjectManagement: true customSubDomainName: 'cog-${resourceName}' disableLocalAuth: false dynamicThrottlingEnabled: false - publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: false } } diff --git a/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep b/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep index 0e75bbf3..387e3beb 100644 --- a/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep +++ b/settings/remarks/microsoft.cognitiveservices/samples/accounts/raiblocklists/main.bicep @@ -9,13 +9,13 @@ resource account 'Microsoft.CognitiveServices/accounts@2024-10-01' = { } kind: 'OpenAI' properties: { + apiProperties: {} + customSubDomainName: '' disableLocalAuth: false dynamicThrottlingEnabled: false publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: false allowedFqdnList: [] - apiProperties: {} - customSubDomainName: '' } } diff --git a/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep b/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep index 4c934a77..6a559db2 100644 --- a/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep +++ b/settings/remarks/microsoft.communication/samples/emailservices/domains/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource emailService 'Microsoft.Communication/emailServices@2023-04-01-preview' = { name: resourceName @@ -14,7 +14,7 @@ resource domain 'Microsoft.Communication/emailServices/domains@2023-04-01-previe location: 'global' parent: emailService properties: { - userEngagementTracking: 'Disabled' domainManagement: 'CustomerManaged' + userEngagementTracking: 'Disabled' } } diff --git a/settings/remarks/microsoft.communication/samples/emailservices/main.bicep b/settings/remarks/microsoft.communication/samples/emailservices/main.bicep index a9e51ed4..f283e665 100644 --- a/settings/remarks/microsoft.communication/samples/emailservices/main.bicep +++ b/settings/remarks/microsoft.communication/samples/emailservices/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' 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 079d8079..798aad02 100644 --- a/settings/remarks/microsoft.compute/samples/availabilitysets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/availabilitysets/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource availabilitySet 'Microsoft.Compute/availabilitySets@2021-11-01' = { name: resourceName diff --git a/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep b/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep index d619ae9c..466c9af0 100644 --- a/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep +++ b/settings/remarks/microsoft.compute/samples/capacityreservationgroups/capacityreservations/main.bicep @@ -11,7 +11,7 @@ resource capacityReservation 'Microsoft.Compute/capacityReservationGroups/capaci location: location parent: capacityReservationGroup sku: { - name: 'Standard_F2' capacity: 2 + name: 'Standard_F2' } } diff --git a/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep b/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep index de90ab47..aa2ac550 100644 --- a/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/diskencryptionsets/main.bicep @@ -5,11 +5,11 @@ resource diskEncryptionSet 'Microsoft.Compute/diskEncryptionSets@2022-03-02' = { name: resourceName location: location properties: { - encryptionType: 'EncryptionAtRestWithCustomerKey' rotationToLatestKeyVersionEnabled: false activeKey: { sourceVault: {} } + encryptionType: 'EncryptionAtRestWithCustomerKey' } } @@ -17,13 +17,13 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName location: location properties: { - accessPolicies: [] - enableSoftDelete: true - tenantId: tenant() sku: { - name: 'standard' family: 'A' + name: 'standard' } + accessPolicies: [] + enableSoftDelete: true + tenantId: tenant().tenantId } } @@ -31,6 +31,7 @@ resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { name: resourceName parent: vault properties: { + kty: 'RSA' keyOps: [ 'encrypt' 'decrypt' @@ -40,6 +41,5 @@ resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { 'unwrapKey' ] keySize: 2048 - kty: 'RSA' } } diff --git a/settings/remarks/microsoft.compute/samples/disks/main.bicep b/settings/remarks/microsoft.compute/samples/disks/main.bicep index 74776155..7983a4b7 100644 --- a/settings/remarks/microsoft.compute/samples/disks/main.bicep +++ b/settings/remarks/microsoft.compute/samples/disks/main.bicep @@ -8,7 +8,6 @@ resource disk 'Microsoft.Compute/disks@2022-03-02' = { name: 'Standard_LRS' } properties: { - osType: '' publicNetworkAccess: 'Enabled' creationData: { createOption: 'Empty' @@ -18,5 +17,6 @@ resource disk 'Microsoft.Compute/disks@2022-03-02' = { type: 'EncryptionAtRestWithPlatformKey' } networkAccessPolicy: 'AllowAll' + osType: '' } } 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 906f6b20..fe79fb64 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/applications/versions/main.bicep @@ -17,9 +17,17 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } kind: 'StorageV2' properties: { + isLocalUserEnabled: true + minimumTlsVersion: 'TLS1_2' + isNfsV3Enabled: false + isSftpEnabled: false publicNetworkAccess: 'Enabled' + accessTier: 'Hot' defaultToOAuthAuthentication: false - isLocalUserEnabled: true + isHnsEnabled: false + supportsHttpsTrafficOnly: true + allowCrossTenantReplication: false + allowSharedKeyAccess: true networkAcls: { bypass: 'AzureServices' defaultAction: 'Allow' @@ -27,9 +35,10 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { resourceAccessRules: [] virtualNetworkRules: [] } - supportsHttpsTrafficOnly: true - accessTier: 'Hot' + allowBlobPublicAccess: true + dnsEndpointType: 'Standard' encryption: { + keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -38,16 +47,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { keyType: 'Service' } } - keySource: 'Microsoft.Storage' } - allowBlobPublicAccess: true - allowCrossTenantReplication: false - dnsEndpointType: 'Standard' - isNfsV3Enabled: false - minimumTlsVersion: 'TLS1_2' - allowSharedKeyAccess: true - isHnsEnabled: false - isSftpEnabled: false } } @@ -82,24 +82,24 @@ resource version 'Microsoft.Compute/galleries/applications/versions@2022-03-03' ] properties: { publishingProfile: { - enableHealthCheck: false - excludeFromLatest: false - manageActions: { - install: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} - remove: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} - update: '' - } source: { defaultConfigurationLink: '' mediaLink: 'https://${storageAccount.name}.blob.core.windows.net/mycontainer/myblob' } targetRegions: [ { + name: location regionalReplicaCount: 1 storageAccountType: 'Standard_LRS' - name: location } ] + enableHealthCheck: false + excludeFromLatest: false + manageActions: { + install: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + remove: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + update: '' + } } safetyProfile: { allowDeletionOfReplicatedLocations: true diff --git a/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep b/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep index 5c4c791e..da1c9ea5 100644 --- a/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep +++ b/settings/remarks/microsoft.compute/samples/galleries/images/main.bicep @@ -14,25 +14,25 @@ resource image 'Microsoft.Compute/galleries/images@2022-03-03' = { location: location parent: gallery properties: { + recommended: { + memory: {} + vCPUs: {} + } + releaseNoteUri: '' architecture: 'x64' features: null - osState: 'Generalized' - osType: 'Linux' - privacyStatementUri: '' - description: '' - disallowed: { - diskTypes: [] - } - hyperVGeneration: 'V1' identifier: { offer: 'AccTesOffer230630032848825313' publisher: 'AccTesPublisher230630032848825313' sku: 'AccTesSku230630032848825313' } - recommended: { - vCPUs: {} - memory: {} + privacyStatementUri: '' + description: '' + disallowed: { + diskTypes: [] } - releaseNoteUri: '' + hyperVGeneration: 'V1' + osState: 'Generalized' + osType: 'Linux' } } diff --git a/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep b/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep index 89fb8eaf..46d003d3 100644 --- a/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep +++ b/settings/remarks/microsoft.compute/samples/hostgroups/hosts/main.bicep @@ -17,8 +17,8 @@ resource host 'Microsoft.Compute/hostGroups/hosts@2021-11-01' = { name: 'DSv3-Type1' } properties: { + platformFaultDomain: 1 autoReplaceOnFailure: true licenseType: 'None' - platformFaultDomain: 1 } } diff --git a/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep b/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep index 547bc308..c5bb65e5 100644 --- a/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep +++ b/settings/remarks/microsoft.compute/samples/restorepointcollections/main.bicep @@ -1,6 +1,26 @@ param resourceName string = 'acctest0001' param location string = 'eastus' +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: resourceName + location: location + properties: { + ipConfigurations: [ + { + name: 'internal' + properties: { + primary: false + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + } + } + ] + enableAcceleratedNetworking: false + enableIPForwarding: false + } +} + resource restorePointCollection 'Microsoft.Compute/restorePointCollections@2024-03-01' = { name: resourceName location: location @@ -13,38 +33,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: resourceName location: location properties: { - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: true - } - } - ] - } - osProfile: { - allowExtensionOperations: true - computerName: resourceName - linuxConfiguration: { - disablePasswordAuthentication: true - patchSettings: { - assessmentMode: 'ImageDefault' - patchMode: 'ImageDefault' - } - provisionVMAgent: true - ssh: { - publicKeys: [ - { - keyData: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+wWK73dCr+jgQOAxNsHAnNNNMEMWOHYEccp6wJm2gotpr9katuF/ZAdou5AaW1C61slRkHRkpRRX9FA9CYBiitZgvCCz+3nWNN7l/Up54Zps/pHWGZLHNJZRYyAB6j5yVLMVHIHriY49d/GZTZVNB8GoJv9Gakwc/fuEZYYl4YDFiGMBP///TzlI4jhiJzjKnEvqPFki5p2ZRJqcbCiF4pJrxUQR/RXqVFQdbRLZgYfJ8xGB878RENq3yQ39d8dVOkq4edbkzwcUmwwwkYVPIoDGsYLaRHnG+To7FvMeyO7xDVQkMKzopTQV8AuKpyvpqu0a9pWOMaiCyDytO7GGN you@me.com' - path: '/home/adminuser/.ssh/authorized_keys' - } - ] - } - } - secrets: [] - adminUsername: 'adminuser' - } priority: 'Regular' storageProfile: { osDisk: { @@ -64,6 +52,8 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { version: 'latest' } } + additionalCapabilities: {} + extensionsTimeBudget: 'PT1H30M' applicationProfile: { galleryApplications: [] } @@ -73,11 +63,41 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { storageUri: '' } } - extensionsTimeBudget: 'PT1H30M' - additionalCapabilities: {} hardwareProfile: { vmSize: 'Standard_F2' } + networkProfile: { + networkInterfaces: [ + { + id: networkInterface.id + properties: { + primary: true + } + } + ] + } + osProfile: { + adminUsername: 'adminuser' + allowExtensionOperations: true + computerName: resourceName + linuxConfiguration: { + ssh: { + publicKeys: [ + { + keyData: 'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC+wWK73dCr+jgQOAxNsHAnNNNMEMWOHYEccp6wJm2gotpr9katuF/ZAdou5AaW1C61slRkHRkpRRX9FA9CYBiitZgvCCz+3nWNN7l/Up54Zps/pHWGZLHNJZRYyAB6j5yVLMVHIHriY49d/GZTZVNB8GoJv9Gakwc/fuEZYYl4YDFiGMBP///TzlI4jhiJzjKnEvqPFki5p2ZRJqcbCiF4pJrxUQR/RXqVFQdbRLZgYfJ8xGB878RENq3yQ39d8dVOkq4edbkzwcUmwwwkYVPIoDGsYLaRHnG+To7FvMeyO7xDVQkMKzopTQV8AuKpyvpqu0a9pWOMaiCyDytO7GGN you@me.com' + path: '/home/adminuser/.ssh/authorized_keys' + } + ] + } + disablePasswordAuthentication: true + patchSettings: { + patchMode: 'ImageDefault' + assessmentMode: 'ImageDefault' + } + provisionVMAgent: true + } + secrets: [] + } } } @@ -102,32 +122,12 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: resourceName parent: virtualNetwork properties: { - privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] addressPrefix: '10.0.0.0/24' defaultOutboundAccess: true delegations: [] - } -} - -resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { - name: resourceName - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'internal' - properties: { - primary: false - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: {} - } - } - ] + privateEndpointNetworkPolicies: 'Disabled' } } diff --git a/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep b/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep index fa169f49..2696c261 100644 --- a/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep +++ b/settings/remarks/microsoft.compute/samples/restorepointcollections/restorepoints/main.bicep @@ -1,26 +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: {} - } - } - ] - } -} - resource restorePointCollection 'Microsoft.Compute/restorePointCollections@2024-03-01' = { name: '${resourceName}-rpc' location: location @@ -33,27 +13,11 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: '${resourceName}-vm' location: location properties: { - priority: 'Regular' - additionalCapabilities: {} - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - hardwareProfile: { - vmSize: 'Standard_F2' - } osProfile: { adminUsername: 'adminuser' allowExtensionOperations: true computerName: '${resourceName}-vm' linuxConfiguration: { - patchSettings: { - patchMode: 'ImageDefault' - assessmentMode: 'ImageDefault' - } - provisionVMAgent: true ssh: { publicKeys: [ { @@ -63,25 +27,31 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { ] } disablePasswordAuthentication: true + patchSettings: { + assessmentMode: 'ImageDefault' + patchMode: 'ImageDefault' + } + provisionVMAgent: true } secrets: [] } + priority: 'Regular' storageProfile: { dataDisks: [] imageReference: { - publisher: 'Canonical' - sku: '22_04-lts' version: 'latest' offer: '0001-com-ubuntu-server-jammy' + publisher: 'Canonical' + sku: '22_04-lts' } osDisk: { - caching: 'ReadWrite' createOption: 'FromImage' managedDisk: { storageAccountType: 'Standard_LRS' } osType: 'Linux' writeAcceleratorEnabled: false + caching: 'ReadWrite' } } applicationProfile: { @@ -98,6 +68,16 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } ] } + additionalCapabilities: {} + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' + } + } + hardwareProfile: { + vmSize: 'Standard_F2' + } } } @@ -128,12 +108,32 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: '${resourceName}-subnet' parent: virtualNetwork properties: { - serviceEndpoints: [] - addressPrefix: '10.0.0.0/24' defaultOutboundAccess: true delegations: [] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.0.0/24' + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: '${resourceName}-nic' + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'internal' + properties: { + primary: false + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + } + } + ] } } diff --git a/settings/remarks/microsoft.compute/samples/snapshots/main.bicep b/settings/remarks/microsoft.compute/samples/snapshots/main.bicep index 198043ed..3008c7ff 100644 --- a/settings/remarks/microsoft.compute/samples/snapshots/main.bicep +++ b/settings/remarks/microsoft.compute/samples/snapshots/main.bicep @@ -1,20 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus' - -resource snapshot 'Microsoft.Compute/snapshots@2022-03-02' = { - name: '${resourceName}snapshot' - location: location - properties: { - creationData: { - createOption: 'Copy' - sourceUri: disk.id - } - diskSizeGB: 20 - incremental: false - networkAccessPolicy: 'AllowAll' - publicNetworkAccess: 'Enabled' - } -} +param resourceName string = 'acctest0001' resource disk 'Microsoft.Compute/disks@2023-04-02' = { name: '${resourceName}disk' @@ -36,3 +21,18 @@ resource disk 'Microsoft.Compute/disks@2023-04-02' = { publicNetworkAccess: 'Enabled' } } + +resource snapshot 'Microsoft.Compute/snapshots@2022-03-02' = { + name: '${resourceName}snapshot' + location: location + properties: { + creationData: { + createOption: 'Copy' + sourceUri: disk.id + } + diskSizeGB: 20 + incremental: false + networkAccessPolicy: 'AllowAll' + publicNetworkAccess: 'Enabled' + } +} diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep index e004890a..5a299e82 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/attachdatadisk/main.bicep @@ -6,9 +6,49 @@ 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 + sku: { + name: 'Standard_LRS' + } + properties: { + diskSizeGB: 1 + encryption: { + type: 'EncryptionAtRestWithPlatformKey' + } + networkAccessPolicy: 'AllowAll' + osType: 'Linux' + publicNetworkAccess: 'Enabled' + creationData: { + createOption: 'Empty' + } + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration1' + properties: { + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + primary: true + } + } + ] + } +} resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName @@ -28,12 +68,12 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { - linuxConfiguration: { - disablePasswordAuthentication: false - } adminPassword: adminPassword adminUsername: adminUsername computerName: 'hostname230630032848831819' + linuxConfiguration: { + disablePasswordAuthentication: false + } } storageProfile: { imageReference: { @@ -50,14 +90,14 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } dataDisks: [ { - lun: 1 - managedDisk: { - storageAccountType: 'Standard_LRS' - } caching: 'ReadWrite' createOption: 'Empty' name: dataDiskName diskSizeGB: 1 + lun: 1 + managedDisk: { + storageAccountType: 'Standard_LRS' + } } { caching: 'ReadWrite' @@ -93,51 +133,11 @@ 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 attachedDisk 'Microsoft.Compute/disks@2022-03-02' = { - name: attachedDataDiskName - location: location - sku: { - name: 'Standard_LRS' - } - properties: { - osType: 'Linux' - publicNetworkAccess: 'Enabled' - creationData: { - createOption: 'Empty' - } - diskSizeGB: 1 - encryption: { - type: 'EncryptionAtRestWithPlatformKey' - } - networkAccessPolicy: 'AllowAll' - } -} - -resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { - name: resourceName - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'testconfiguration1' - properties: { - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: {} - primary: true - } - } - ] + addressPrefix: '10.0.2.0/24' + delegations: [] } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep index cc74a3c9..b2faa4c8 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/attachosdisk/main.bicep @@ -1,19 +1,39 @@ +@secure() +@description('The administrator password for the virtual machine') +param adminPassword string param attachedResourceName string = 'acctest0002' param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator username for the virtual machine') param adminUsername string -@secure() -@description('The administrator password for the virtual machine') -param adminPassword string -var osDiskName = 'myosdisk1' var attachedOsDiskName = 'myosdisk2' +var osDiskName = 'myosdisk1' resource managedDisk 'Microsoft.Compute/disks@2023-10-02' existing = { name: osDiskName } +resource attachedNetworkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: attachedResourceName + location: location + properties: { + enableIPForwarding: false + ipConfigurations: [ + { + name: 'testconfiguration2' + properties: { + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + subnet: {} + } + } + ] + enableAcceleratedNetworking: false + } +} + resource snapshot 'Microsoft.Compute/snapshots@2023-10-02' = { name: resourceName location: location @@ -26,17 +46,17 @@ resource snapshot 'Microsoft.Compute/snapshots@2023-10-02' = { sourceResourceId: managedDisk.id } diskSizeGB: 30 - networkAccessPolicy: 'AllowAll' - hyperVGeneration: 'V1' - incremental: true encryption: { type: 'EncryptionAtRestWithPlatformKey' } osType: 'Linux' - publicNetworkAccess: 'Enabled' + hyperVGeneration: 'V1' + incremental: true supportedCapabilities: { architecture: 'x64' } + networkAccessPolicy: 'AllowAll' + publicNetworkAccess: 'Enabled' } } @@ -44,33 +64,30 @@ 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 } - id: networkInterface.id } ] } osProfile: { - adminPassword: adminPassword - adminUsername: adminUsername computerName: 'hostname230630032848831819' linuxConfiguration: { disablePasswordAuthentication: false } + adminPassword: adminPassword + adminUsername: adminUsername } storageProfile: { imageReference: { + offer: 'UbuntuServer' publisher: 'Canonical' sku: '16.04-LTS' version: 'latest' - offer: 'UbuntuServer' } osDisk: { caching: 'ReadWrite' @@ -79,6 +96,25 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { writeAcceleratorEnabled: false } } + hardwareProfile: { + vmSize: 'Standard_F2' + } + } +} + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] } } @@ -89,40 +125,20 @@ resource attachedManagedDisk 'Microsoft.Compute/disks@2023-10-02' = { name: 'Standard_LRS' } properties: { - networkAccessPolicy: 'AllowAll' - hyperVGeneration: 'V1' - publicNetworkAccess: 'Enabled' - supportedCapabilities: { - architecture: 'x64' - } creationData: { createOption: 'Copy' } - osType: 'Linux' diskSizeGB: 30 encryption: { type: 'EncryptionAtRestWithPlatformKey' } - } -} - -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: {} - } - } - ] + networkAccessPolicy: 'AllowAll' + hyperVGeneration: 'V1' + publicNetworkAccess: 'Enabled' + supportedCapabilities: { + architecture: 'x64' + } + osType: 'Linux' } } @@ -145,14 +161,14 @@ resource attachedVirtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = } storageProfile: { osDisk: { - name: attachedOsDiskName - osType: 'Linux' - writeAcceleratorEnabled: false managedDisk: { id: attachedManagedDisk.id } caching: 'ReadWrite' createOption: 'Attach' + name: attachedOsDiskName + osType: 'Linux' + writeAcceleratorEnabled: false } } } @@ -162,6 +178,8 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName location: location properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false ipConfigurations: [ { name: 'testconfiguration1' @@ -173,24 +191,6 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { } } ] - enableAcceleratedNetworking: false - enableIPForwarding: false - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] } } @@ -198,11 +198,11 @@ 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: [] + addressPrefix: '10.0.2.0/24' + delegations: [] } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep index a66ef1a7..84b56bd9 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/basic/main.bicep @@ -1,10 +1,10 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @description('The administrator username for the virtual machine') param adminUsername string @secure() @description('The administrator password for the virtual machine') param adminPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName @@ -16,10 +16,10 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { { name: 'testconfiguration1' properties: { + subnet: {} primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: {} } } ] @@ -30,14 +30,6 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - osProfile: { - adminPassword: adminPassword - adminUsername: adminUsername - computerName: 'hostname230630032848831819' - linuxConfiguration: { - disablePasswordAuthentication: false - } - } storageProfile: { imageReference: { offer: 'UbuntuServer' @@ -58,13 +50,21 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { networkProfile: { networkInterfaces: [ { - id: networkInterface.id properties: { primary: false } + id: networkInterface.id } ] } + osProfile: { + adminPassword: adminPassword + adminUsername: adminUsername + computerName: 'hostname230630032848831819' + linuxConfiguration: { + disablePasswordAuthentication: false + } + } } } @@ -88,11 +88,11 @@ 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: [] + addressPrefix: '10.0.2.0/24' } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep index f02ff22c..52cf41ff 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/extensions/main.bicep @@ -1,27 +1,13 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The administrator password for the virtual machine') param vmAdminPassword string +param resourceName string = 'acctest0001' resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - storageProfile: { - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '16.04-LTS' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - name: 'myosdisk1' - writeAcceleratorEnabled: false - } - } hardwareProfile: { vmSize: 'Standard_F2' } @@ -36,12 +22,26 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { ] } osProfile: { + adminPassword: vmAdminPassword + adminUsername: 'testadmin' computerName: 'hostname230630032848831819' linuxConfiguration: { disablePasswordAuthentication: false } - adminPassword: vmAdminPassword - adminUsername: 'testadmin' + } + storageProfile: { + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' + } + osDisk: { + name: 'myosdisk1' + writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' + } } } } @@ -86,12 +86,12 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' } } @@ -99,18 +99,18 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName location: location properties: { - enableAcceleratedNetworking: false enableIPForwarding: false ipConfigurations: [ { - name: 'testconfiguration1' properties: { + privateIPAllocationMethod: 'Dynamic' subnet: {} primary: true privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' } + name: 'testconfiguration1' } ] + enableAcceleratedNetworking: false } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep index af6796c1..b00f29ff 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachines/runcommands/main.bicep @@ -1,8 +1,64 @@ +param resourceName string = 'acctest0001' param location string = 'eastus' @secure() @description('The administrator password for the virtual machine') param adminPassword string -param resourceName string = 'acctest0001' + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { + name: '${resourceName}-vnet' + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + privateEndpointVNetPolicies: 'Disabled' + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { + name: 'internal' + parent: virtualNetwork + properties: { + serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + defaultOutboundAccess: true + delegations: [] + privateEndpointNetworkPolicies: 'Disabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: '${resourceName}-nic' + location: location + properties: { + enableIPForwarding: false + ipConfigurations: [ + { + name: 'internal' + properties: { + subnet: {} + primary: false + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + } + } + ] + enableAcceleratedNetworking: false + } +} + +resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: '${resourceName}-uai' + location: location +} resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: '${resourceName}-vm' @@ -18,14 +74,15 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { networkProfile: { networkInterfaces: [ { + id: networkInterface.id properties: { primary: true } - id: networkInterface.id } ] } osProfile: { + adminPassword: adminPassword adminUsername: 'adminuser' allowExtensionOperations: true computerName: '${resourceName}-vm' @@ -41,25 +98,24 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } } secrets: [] - adminPassword: adminPassword } priority: 'Regular' storageProfile: { dataDisks: [] imageReference: { - version: 'latest' offer: '0001-com-ubuntu-server-jammy' publisher: 'Canonical' sku: '22_04-lts' + version: 'latest' } osDisk: { + writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' managedDisk: { storageAccountType: 'Premium_LRS' } osType: 'Linux' - writeAcceleratorEnabled: false - caching: 'ReadWrite' - createOption: 'FromImage' } } diagnosticsProfile: { @@ -77,73 +133,17 @@ resource runCommand 'Microsoft.Compute/virtualMachines/runCommands@2023-03-01' = location: location parent: virtualMachine properties: { - errorBlobUri: '' - source: { - script: 'echo \'hello world\'' - } - asyncExecution: false outputBlobUri: '' - parameters: [] - protectedParameters: [] runAsPassword: '' runAsUser: '' timeoutInSeconds: 1200 - treatFailureAsDeploymentFailure: true - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { - name: '${resourceName}-vnet' - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] + asyncExecution: false + errorBlobUri: '' + parameters: [] + protectedParameters: [] + source: { + script: 'echo \'hello world\'' } - privateEndpointVNetPolicies: 'Disabled' - subnets: [] - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { - name: 'internal' - parent: virtualNetwork - properties: { - serviceEndpoints: [] - addressPrefix: '10.0.2.0/24' - defaultOutboundAccess: true - delegations: [] - privateEndpointNetworkPolicies: 'Disabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - } -} - -resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { - name: '${resourceName}-nic' - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'internal' - properties: { - primary: false - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: {} - } - } - ] + treatFailureAsDeploymentFailure: true } } - -resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { - name: '${resourceName}-uai' - location: location -} diff --git a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep index 2325ab51..1744c736 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/extensions/main.bicep @@ -10,19 +10,59 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- tier: 'Standard' } properties: { - orchestrationMode: 'Uniform' + doNotRunExtensionsOnOverprovisionedVMs: false scaleInPolicy: { forceDeletion: false rules: [ 'Default' ] } + upgradePolicy: { + mode: 'Manual' + } virtualMachineProfile: { + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' + } + } + extensionProfile: { + extensionsTimeBudget: 'PT1H30M' + } + networkProfile: { + networkInterfaceConfigurations: [ + { + name: 'example' + properties: { + dnsSettings: { + dnsServers: [] + } + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'internal' + properties: { + applicationGatewayBackendAddressPools: [] + applicationSecurityGroups: [] + loadBalancerBackendAddressPools: [] + loadBalancerInboundNatPools: [] + primary: true + privateIPAddressVersion: 'IPv4' + subnet: {} + } + } + ] + primary: true + } + } + ] + } osProfile: { adminUsername: 'adminuser' computerNamePrefix: resourceName linuxConfiguration: { - disablePasswordAuthentication: true provisionVMAgent: true ssh: { publicKeys: [ @@ -32,19 +72,20 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } ] } + disablePasswordAuthentication: true } secrets: [] } priority: 'Regular' storageProfile: { osDisk: { + createOption: 'FromImage' managedDisk: { storageAccountType: 'Standard_LRS' } osType: 'Linux' writeAcceleratorEnabled: false caching: 'ReadWrite' - createOption: 'FromImage' } dataDisks: [] imageReference: { @@ -54,52 +95,11 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- version: 'latest' } } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - extensionProfile: { - extensionsTimeBudget: 'PT1H30M' - } - networkProfile: { - networkInterfaceConfigurations: [ - { - name: 'example' - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - properties: { - applicationSecurityGroups: [] - loadBalancerBackendAddressPools: [] - loadBalancerInboundNatPools: [] - primary: true - privateIPAddressVersion: 'IPv4' - subnet: {} - applicationGatewayBackendAddressPools: [] - } - name: 'internal' - } - ] - primary: true - dnsSettings: { - dnsServers: [] - } - } - } - ] - } } additionalCapabilities: {} - doNotRunExtensionsOnOverprovisionedVMs: false + orchestrationMode: 'Uniform' overprovision: true singlePlacementGroup: true - upgradePolicy: { - mode: 'Manual' - } } } @@ -123,16 +123,16 @@ resource extension 'Microsoft.Compute/virtualMachineScaleSets/extensions@2023-03 name: resourceName parent: virtualMachineScaleSet properties: { + typeHandlerVersion: '2.0' autoUpgradeMinorVersion: true enableAutomaticUpgrade: false publisher: 'Microsoft.Azure.Extensions' + type: 'CustomScript' provisionAfterExtensions: [] settings: { commandToExecute: 'echo $HOSTNAME' } suppressFailures: false - type: 'CustomScript' - typeHandlerVersion: '2.0' } } @@ -140,11 +140,11 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'internal' parent: virtualNetwork properties: { - serviceEndpointPolicies: [] - serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep index 2e1554f7..aed8e600 100644 --- a/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep +++ b/settings/remarks/microsoft.compute/samples/virtualmachinescalesets/main.bicep @@ -1,6 +1,35 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: 'internal' + parent: virtualNetwork + properties: { + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + } +} + resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023-03-01' = { name: resourceName location: location @@ -10,26 +39,33 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- tier: 'Standard' } properties: { - additionalCapabilities: {} - singlePlacementGroup: true - upgradePolicy: { - mode: 'Manual' - } doNotRunExtensionsOnOverprovisionedVMs: false - orchestrationMode: 'Uniform' - overprovision: true scaleInPolicy: { + forceDeletion: false rules: [ 'Default' ] - forceDeletion: false + } + singlePlacementGroup: true + upgradePolicy: { + mode: 'Manual' } virtualMachineProfile: { + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' + } + } + extensionProfile: { + extensionsTimeBudget: 'PT1H30M' + } networkProfile: { networkInterfaceConfigurations: [ { name: 'example' properties: { + primary: true dnsSettings: { dnsServers: [] } @@ -37,19 +73,18 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- enableIPForwarding: false ipConfigurations: [ { + name: 'internal' properties: { - primary: true - privateIPAddressVersion: 'IPv4' subnet: {} applicationGatewayBackendAddressPools: [] applicationSecurityGroups: [] loadBalancerBackendAddressPools: [] loadBalancerInboundNatPools: [] + primary: true + privateIPAddressVersion: 'IPv4' } - name: 'internal' } ] - primary: true } } ] @@ -75,10 +110,10 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- storageProfile: { dataDisks: [] imageReference: { - offer: 'UbuntuServer' publisher: 'Canonical' sku: '16.04-LTS' version: 'latest' + offer: 'UbuntuServer' } osDisk: { caching: 'ReadWrite' @@ -90,44 +125,9 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- writeAcceleratorEnabled: false } } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - extensionProfile: { - extensionsTimeBudget: 'PT1H30M' - } } - } -} - -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: { - serviceEndpointPolicies: [] - serviceEndpoints: [] - addressPrefix: '10.0.2.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' + additionalCapabilities: {} + orchestrationMode: 'Uniform' + overprovision: true } } diff --git a/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep b/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep index a72c5eb3..ebea904b 100644 --- a/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep +++ b/settings/remarks/microsoft.confidentialledger/samples/ledgers/main.bicep @@ -10,9 +10,9 @@ resource ledger 'Microsoft.ConfidentialLedger/ledgers@2022-05-13' = { properties: { aadBasedSecurityPrincipals: [ { - ledgerRoleName: 'Administrator' principalId: deployer().objectId - tenantId: tenant() + tenantId: tenant().tenantId + ledgerRoleName: 'Administrator' } ] certBasedSecurityPrincipals: [ diff --git a/settings/remarks/microsoft.consumption/samples/budgets/main.bicep b/settings/remarks/microsoft.consumption/samples/budgets/main.bicep index ae8dd712..57f61a96 100644 --- a/settings/remarks/microsoft.consumption/samples/budgets/main.bicep +++ b/settings/remarks/microsoft.consumption/samples/budgets/main.bicep @@ -15,11 +15,11 @@ resource budget 'Microsoft.Consumption/budgets@2019-10-01' = { category: 'Cost' filter: { tags: { + name: 'foo' + operator: 'In' values: [ 'bar' ] - name: 'foo' - operator: 'In' } } notifications: { diff --git a/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep b/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep index 163f7cfc..9cc0a5f2 100644 --- a/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep +++ b/settings/remarks/microsoft.containerinstance/samples/containergroups/main.bicep @@ -9,8 +9,6 @@ resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' { name: 'hw' properties: { - command: [] - environmentVariables: [] image: 'ubuntu:20.04' ports: [ { @@ -24,19 +22,21 @@ resource containerGroup 'Microsoft.ContainerInstance/containerGroups@2023-05-01' memoryInGB: any('0.5') } } + command: [] + environmentVariables: [] } } ] initContainers: [] ipAddress: { + type: 'Public' + autoGeneratedDomainNameLabelScope: 'Unsecure' ports: [ { port: 80 protocol: 'TCP' } ] - type: 'Public' - autoGeneratedDomainNameLabelScope: 'Unsecure' } osType: 'Linux' restartPolicy: 'Always' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep index d66b7b67..aa1a8d13 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/agentpools/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName @@ -9,15 +9,11 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = tier: 'Premium' } properties: { - dataEndpointEnabled: false + adminUserEnabled: false encryption: { status: 'disabled' } - networkRuleBypassOptions: 'AzureServices' policies: { - trustPolicy: { - status: 'disabled' - } exportPolicy: { status: 'enabled' } @@ -27,11 +23,15 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = retentionPolicy: { status: 'disabled' } + trustPolicy: { + status: 'disabled' + } } - publicNetworkAccess: 'Enabled' - adminUserEnabled: false zoneRedundancy: 'Disabled' anonymousPullEnabled: false + dataEndpointEnabled: false + networkRuleBypassOptions: 'AzureServices' + publicNetworkAccess: 'Enabled' } } @@ -40,8 +40,8 @@ resource agentPool 'Microsoft.ContainerRegistry/registries/agentPools@2019-06-01 location: location parent: registry properties: { - count: 1 os: 'Linux' tier: 'S1' + count: 1 } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep index 0920a4c5..d274455f 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/cacherules/main.bicep @@ -8,9 +8,7 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = name: 'Basic' } properties: { - networkRuleBypassOptions: 'AzureServices' policies: { - trustPolicy: {} exportPolicy: { status: 'enabled' } @@ -18,12 +16,14 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = status: 'disabled' } retentionPolicy: {} + trustPolicy: {} } publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' adminUserEnabled: false anonymousPullEnabled: false dataEndpointEnabled: false + networkRuleBypassOptions: 'AzureServices' } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep index ae139d7d..70cf1a0b 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/connectedregistries/main.bicep @@ -13,6 +13,7 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = dataEndpointEnabled: true networkRuleBypassOptions: 'AzureServices' policies: { + trustPolicy: {} exportPolicy: { status: 'enabled' } @@ -20,7 +21,6 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = status: 'disabled' } retentionPolicy: {} - trustPolicy: {} } publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' @@ -39,9 +39,9 @@ resource connectedRegistry 'Microsoft.ContainerRegistry/registries/connectedRegi mode: 'ReadWrite' parent: { syncProperties: { - syncWindow: '' messageTtl: 'P1D' schedule: '* * * * *' + syncWindow: '' } } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep index 8ba5fb14..9334d6a6 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/credentialsets/main.bicep @@ -1,11 +1,11 @@ -param resourceName string = 'acctest0001' -param location string = 'eastus' @secure() @description('The username for the container registry credential') param credentialUsername string = 'testuser' @secure() @description('The password for the container registry credential') param credentialPassword string +param resourceName string = 'acctest0001' +param location string = 'eastus' resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = { name: resourceName @@ -14,22 +14,22 @@ resource registry 'Microsoft.ContainerRegistry/registries@2023-11-01-preview' = name: 'Basic' } properties: { + adminUserEnabled: false + anonymousPullEnabled: false dataEndpointEnabled: false networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } quarantinePolicy: { status: 'disabled' } retentionPolicy: {} trustPolicy: {} + exportPolicy: { + status: 'enabled' + } } publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - adminUserEnabled: false - anonymousPullEnabled: false } } @@ -37,15 +37,6 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: '${resourceName}vault' location: location properties: { - enableSoftDelete: true - enabledForDeployment: false - publicNetworkAccess: 'Enabled' - sku: { - family: 'A' - name: 'standard' - } - softDeleteRetentionInDays: 7 - tenantId: tenant() accessPolicies: [ { permissions: { @@ -59,14 +50,23 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { ] storage: [] } - tenantId: tenant() + tenantId: tenant().tenantId objectId: deployer().objectId } ] - createMode: 'default' + enableRbacAuthorization: false + enableSoftDelete: true + enabledForDeployment: false enabledForDiskEncryption: false + sku: { + family: 'A' + name: 'standard' + } + tenantId: tenant().tenantId + createMode: 'default' enabledForTemplateDeployment: false - enableRbacAuthorization: false + publicNetworkAccess: 'Enabled' + softDeleteRetentionInDays: 7 } } @@ -76,9 +76,9 @@ resource credentialSet 'Microsoft.ContainerRegistry/registries/credentialSets@20 properties: { authCredentials: [ { + name: 'Credential1' passwordSecretIdentifier: 'https://${resourceName}vault.vault.azure.net/secrets/password' usernameSecretIdentifier: 'https://${resourceName}vault.vault.azure.net/secrets/username' - name: 'Credential1' } ] loginServer: 'docker.io' diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep index 7d50b8c5..c3f34bbf 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/main.bicep @@ -9,16 +9,16 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = tier: 'Standard' } properties: { - anonymousPullEnabled: false + publicNetworkAccess: 'Enabled' + adminUserEnabled: false dataEndpointEnabled: false + zoneRedundancy: 'Disabled' + anonymousPullEnabled: false encryption: { status: 'disabled' } networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } quarantinePolicy: { status: 'disabled' } @@ -28,9 +28,9 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } } - adminUserEnabled: false - publicNetworkAccess: 'Enabled' - zoneRedundancy: 'Disabled' } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep index a15eda06..99d9e9fb 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/scopemaps/main.bicep @@ -9,14 +9,15 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = tier: 'Premium' } properties: { - zoneRedundancy: 'Disabled' adminUserEnabled: false + encryption: { + status: 'disabled' + } + publicNetworkAccess: 'Enabled' anonymousPullEnabled: false + dataEndpointEnabled: false networkRuleBypassOptions: 'AzureServices' policies: { - retentionPolicy: { - status: 'disabled' - } trustPolicy: { status: 'disabled' } @@ -26,12 +27,11 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = quarantinePolicy: { status: 'disabled' } + retentionPolicy: { + status: 'disabled' + } } - publicNetworkAccess: 'Enabled' - dataEndpointEnabled: false - encryption: { - status: 'disabled' - } + zoneRedundancy: 'Disabled' } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep index 80d269d9..321f6f99 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/taskruns/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName @@ -9,12 +9,16 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = tier: 'Standard' } properties: { + adminUserEnabled: false anonymousPullEnabled: false - dataEndpointEnabled: false encryption: { status: 'disabled' } + networkRuleBypassOptions: 'AzureServices' policies: { + exportPolicy: { + status: 'enabled' + } quarantinePolicy: { status: 'disabled' } @@ -24,14 +28,10 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = trustPolicy: { status: 'disabled' } - exportPolicy: { - status: 'enabled' - } } - publicNetworkAccess: 'Enabled' - adminUserEnabled: false - networkRuleBypassOptions: 'AzureServices' zoneRedundancy: 'Disabled' + dataEndpointEnabled: false + publicNetworkAccess: 'Enabled' } } @@ -41,16 +41,16 @@ resource taskRun 'Microsoft.ContainerRegistry/registries/taskRuns@2019-06-01-pre parent: registry properties: { runRequest: { - dockerFilePath: 'Dockerfile' - imageNames: [ - 'helloworld:{{.Run.ID}}' - 'helloworld:latest' - ] platform: { os: 'Linux' } sourceLocation: 'https://github.com/Azure-Samples/aci-helloworld.git#master' type: 'DockerBuildRequest' + dockerFilePath: 'Dockerfile' + imageNames: [ + 'helloworld:{{.Run.ID}}' + 'helloworld:latest' + ] } } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep index f50dde6e..501bf1ce 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/tasks/main.bicep @@ -9,29 +9,29 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = tier: 'Basic' } properties: { + anonymousPullEnabled: false + dataEndpointEnabled: false encryption: { status: 'disabled' } networkRuleBypassOptions: 'AzureServices' + publicNetworkAccess: 'Enabled' + zoneRedundancy: 'Disabled' + adminUserEnabled: false policies: { - exportPolicy: { - status: 'enabled' - } - quarantinePolicy: { - status: 'disabled' - } retentionPolicy: { status: 'disabled' } trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } + quarantinePolicy: { + status: 'disabled' + } } - publicNetworkAccess: 'Enabled' - zoneRedundancy: 'Disabled' - adminUserEnabled: false - anonymousPullEnabled: false - dataEndpointEnabled: false } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep index a1a94518..d1bd000c 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/tokens/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = { name: resourceName @@ -9,10 +9,9 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = tier: 'Premium' } properties: { + anonymousPullEnabled: false + networkRuleBypassOptions: 'AzureServices' policies: { - retentionPolicy: { - status: 'disabled' - } trustPolicy: { status: 'disabled' } @@ -22,16 +21,17 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = quarantinePolicy: { status: 'disabled' } + retentionPolicy: { + status: 'disabled' + } } - publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' adminUserEnabled: true + dataEndpointEnabled: false encryption: { status: 'disabled' } - anonymousPullEnabled: false - dataEndpointEnabled: false - networkRuleBypassOptions: 'AzureServices' + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep b/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep index c990af70..fc3087a1 100644 --- a/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep +++ b/settings/remarks/microsoft.containerregistry/samples/registries/webhooks/main.bicep @@ -5,18 +5,17 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = name: resourceName location: location sku: { - tier: 'Standard' name: 'Standard' + tier: 'Standard' } properties: { + networkRuleBypassOptions: 'AzureServices' + zoneRedundancy: 'Disabled' + anonymousPullEnabled: false encryption: { status: 'disabled' } - networkRuleBypassOptions: 'AzureServices' policies: { - exportPolicy: { - status: 'enabled' - } quarantinePolicy: { status: 'disabled' } @@ -26,11 +25,12 @@ resource registry 'Microsoft.ContainerRegistry/registries@2021-08-01-preview' = trustPolicy: { status: 'disabled' } + exportPolicy: { + status: 'enabled' + } } publicNetworkAccess: 'Enabled' - zoneRedundancy: 'Disabled' adminUserEnabled: false - anonymousPullEnabled: false dataEndpointEnabled: false } } diff --git a/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep b/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep index 7fa34adb..be35065e 100644 --- a/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/fleets/members/main.bicep @@ -17,27 +17,27 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' properties: { agentPoolProfiles: [ { + enableEncryptionAtHost: false kubeletDiskType: '' + mode: 'System' osDiskType: 'Managed' + tags: {} + type: 'VirtualMachineScaleSets' + enableAutoScaling: false + enableFIPS: false + name: 'default' + enableNodePublicIP: false + nodeLabels: {} osType: 'Linux' + scaleDownMode: 'Delete' count: 1 - enableAutoScaling: false - enableEncryptionAtHost: false enableUltraSSD: false - scaleDownMode: 'Delete' - tags: {} upgradeSettings: { + maxSurge: '10%' nodeSoakDurationInMinutes: 0 drainTimeoutInMinutes: 0 - maxSurge: '10%' } - enableFIPS: false - nodeLabels: {} - type: 'VirtualMachineScaleSets' vmSize: 'Standard_B2s' - enableNodePublicIP: false - mode: 'System' - name: 'default' } ] apiServerAccessProfile: { @@ -45,6 +45,13 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' enablePrivateCluster: false enablePrivateClusterPublicFQDN: false } + disableLocalAccounts: false + dnsPrefix: '${resourceName}' + enableRBAC: true + kubernetesVersion: '' + servicePrincipalProfile: { + clientId: 'msi' + } autoUpgradeProfile: { nodeOSUpgradeChannel: 'NodeImage' upgradeChannel: 'none' @@ -54,22 +61,15 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' enabled: false } } - disableLocalAccounts: false - enableRBAC: true metricsProfile: { costAnalysis: { enabled: false } } nodeResourceGroup: '' - addonProfiles: {} - dnsPrefix: '${resourceName}' - kubernetesVersion: '' securityProfile: {} - servicePrincipalProfile: { - clientId: 'msi' - } supportPlan: 'KubernetesOfficial' + addonProfiles: {} } } diff --git a/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep b/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep index 661d26d2..11b3c03d 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/agentpools/main.bicep @@ -5,15 +5,15 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p name: resourceName location: location properties: { - dnsPrefix: '${resourceName}' agentPoolProfiles: [ { - count: 1 mode: 'System' name: 'default' vmSize: 'Standard_DS2_v2' + count: 1 } ] + dnsPrefix: '${resourceName}' } } @@ -21,8 +21,8 @@ resource agentPool 'Microsoft.ContainerService/managedClusters/agentPools@2023-0 name: 'internal' parent: managedCluster properties: { + vmSize: 'Standard_DS2_v2' count: 1 mode: 'User' - vmSize: 'Standard_DS2_v2' } } diff --git a/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep b/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep index 6580c21c..2943afd6 100644 --- a/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep +++ b/settings/remarks/microsoft.containerservice/samples/managedclusters/trustedaccessrolebindings/main.bicep @@ -1,6 +1,23 @@ param resourceName string = 'acctest0001' param location string = 'westus' +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 @@ -9,61 +26,88 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2025-02-01' tier: 'Free' } properties: { - securityProfile: {} - servicePrincipalProfile: { - clientId: 'msi' - } - addonProfiles: {} + supportPlan: 'KubernetesOfficial' agentPoolProfiles: [ { - enableFIPS: false - enableUltraSSD: false - mode: 'System' + nodeLabels: {} + osType: 'Linux' scaleDownMode: 'Delete' - tags: {} - type: 'VirtualMachineScaleSets' + vmSize: 'Standard_B2s' + enableEncryptionAtHost: false + enableUltraSSD: false upgradeSettings: { drainTimeoutInMinutes: 0 maxSurge: '10%' nodeSoakDurationInMinutes: 0 } - name: 'default' - vmSize: 'Standard_B2s' - enableEncryptionAtHost: false - enableNodePublicIP: false - osType: 'Linux' + mode: 'System' count: 1 + enableNodePublicIP: false + name: 'default' + osDiskType: 'Managed' + tags: {} + type: 'VirtualMachineScaleSets' enableAutoScaling: false + enableFIPS: false kubeletDiskType: '' - nodeLabels: {} - osDiskType: 'Managed' } ] autoUpgradeProfile: { nodeOSUpgradeChannel: 'NodeImage' upgradeChannel: 'none' } + disableLocalAccounts: false + dnsPrefix: 'aks-${resourceName}' + enableRBAC: true + kubernetesVersion: '' + nodeResourceGroup: '' + addonProfiles: {} + apiServerAccessProfile: { + enablePrivateClusterPublicFQDN: false + disableRunCommand: false + enablePrivateCluster: false + } azureMonitorProfile: { metrics: { enabled: false } } - kubernetesVersion: '' metricsProfile: { costAnalysis: { enabled: false } } - supportPlan: 'KubernetesOfficial' - apiServerAccessProfile: { - enablePrivateClusterPublicFQDN: false - disableRunCommand: false - enablePrivateCluster: false + securityProfile: {} + servicePrincipalProfile: { + clientId: 'msi' } - disableLocalAccounts: false - dnsPrefix: 'aks-${resourceName}' - enableRBAC: true - nodeResourceGroup: '' + } +} + +resource trustedAccessRoleBinding 'Microsoft.ContainerService/managedClusters/trustedAccessRoleBindings@2025-02-01' = { + name: 'tarb-${resourceName}' + parent: managedCluster + properties: { + sourceResourceId: workspace.id + roles: [ + 'Microsoft.MachineLearningServices/workspaces/mlworkload' + ] + } +} + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: 'ai-${resourceName}' + location: location + kind: 'web' + properties: { + Application_Type: 'web' + DisableIpMasking: false + DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + publicNetworkAccessForIngestion: 'Enabled' + RetentionInDays: 90 + SamplingPercentage: 100 + publicNetworkAccessForQuery: 'Enabled' } } @@ -75,17 +119,21 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } kind: 'StorageV2' properties: { + isNfsV3Enabled: false + publicNetworkAccess: 'Enabled' allowBlobPublicAccess: true + dnsEndpointType: 'Standard' isSftpEnabled: false - allowCrossTenantReplication: false - minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' + networkAcls: { + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + } supportsHttpsTrafficOnly: true + accessTier: 'Hot' allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - dnsEndpointType: 'Standard' - isHnsEnabled: false - isNfsV3Enabled: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -97,15 +145,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } + isHnsEnabled: false + minimumTlsVersion: 'TLS1_2' + allowCrossTenantReplication: false + defaultToOAuthAuthentication: false isLocalUserEnabled: true - networkAcls: { - bypass: 'AzureServices' - defaultAction: 'Allow' - ipRules: [] - resourceAccessRules: [] - virtualNetworkRules: [] - } - accessTier: 'Hot' } } @@ -113,62 +157,18 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: 'kv${resourceName}' location: location properties: { - accessPolicies: [] - createMode: 'default' + tenantId: tenant().tenantId enableRbacAuthorization: false enabledForDeployment: false - softDeleteRetentionInDays: 7 - tenantId: tenant() - enabledForDiskEncryption: false - enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' sku: { family: 'A' name: 'standard' } - } -} - -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 + accessPolicies: [] + createMode: 'default' + enabledForDiskEncryption: false + enabledForTemplateDeployment: false publicNetworkAccess: 'Enabled' - storageAccount: storageAccount.id - v1LegacyMode: false - } -} - -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: { - publicNetworkAccessForIngestion: 'Enabled' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - publicNetworkAccessForQuery: 'Enabled' - Application_Type: 'web' - SamplingPercentage: 100 + softDeleteRetentionInDays: 7 } } diff --git a/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep b/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep index dbe54ec2..ed6c126e 100644 --- a/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep +++ b/settings/remarks/microsoft.costmanagement/samples/scheduledactions/main.bicep @@ -1,36 +1,36 @@ targetScope = 'subscription' -param resourceName string = 'acctest0001' param location string = 'eastus' +param resourceName string = 'acctest0001' resource scheduledAction 'Microsoft.CostManagement/scheduledActions@2022-10-01' = { name: resourceName scope: subscription() kind: 'Email' properties: { - notificationEmail: 'test@test.com' - schedule: { - daysOfWeek: null - endDate: '2023-07-02T00:00:00Z' - frequency: 'Daily' - hourOfDay: 0 - startDate: '2023-07-01T00:00:00Z' - weeksOfMonth: null - dayOfMonth: 0 - } - status: 'Enabled' viewId: resourceId('Microsoft.CostManagement/views', 'ms:CostByService') displayName: 'CostByServiceViewerz3k' fileDestination: { fileFormats: [] } notification: { - message: '' subject: 'Cost Management Report for Terraform Testing on Azure with TTL = 2 Day' to: [ 'test@test.com' 'hashicorp@test.com' ] + message: '' } + notificationEmail: 'test@test.com' + schedule: { + dayOfMonth: 0 + daysOfWeek: null + endDate: '2023-07-02T00:00:00Z' + frequency: 'Daily' + hourOfDay: 0 + startDate: '2023-07-01T00:00:00Z' + weeksOfMonth: null + } + status: 'Enabled' } } diff --git a/settings/remarks/microsoft.costmanagement/samples/views/main.bicep b/settings/remarks/microsoft.costmanagement/samples/views/main.bicep index 73d26d45..5294f43a 100644 --- a/settings/remarks/microsoft.costmanagement/samples/views/main.bicep +++ b/settings/remarks/microsoft.costmanagement/samples/views/main.bicep @@ -29,17 +29,6 @@ resource view 'Microsoft.CostManagement/views@2022-10-01' = { ] query: { dataSet: { - aggregation: { - totalCost: { - function: 'Sum' - name: 'Cost' - } - totalCostUSD: { - function: 'Sum' - name: 'CostUSD' - } - } - granularity: 'Monthly' grouping: [ { name: 'ResourceGroupName' @@ -48,10 +37,21 @@ resource view 'Microsoft.CostManagement/views@2022-10-01' = { ] sorting: [ { - name: 'BillingMonth' direction: 'Ascending' + name: 'BillingMonth' } ] + aggregation: { + totalCost: { + function: 'Sum' + name: 'Cost' + } + totalCostUSD: { + function: 'Sum' + name: 'CostUSD' + } + } + granularity: 'Monthly' } timeframe: 'MonthToDate' type: 'Usage' diff --git a/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep b/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep index 9c6a6b79..a1ea4cbe 100644 --- a/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep +++ b/settings/remarks/microsoft.dashboard/samples/grafana/main.bicep @@ -8,10 +8,10 @@ resource grafana 'Microsoft.Dashboard/grafana@2022-08-01' = { name: 'Standard' } properties: { + apiKey: 'Disabled' autoGeneratedDomainNameLabelScope: 'TenantReuse' deterministicOutboundIP: 'Disabled' publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' - apiKey: 'Disabled' } } diff --git a/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep b/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep index cc5099c2..91f5c747 100644 --- a/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.dashboard/samples/grafana/managedprivateendpoints/main.bicep @@ -16,12 +16,12 @@ resource grafana 'Microsoft.Dashboard/grafana@2023-09-01' = { name: 'Standard' } properties: { - apiKey: 'Disabled' - autoGeneratedDomainNameLabelScope: 'TenantReuse' - deterministicOutboundIP: 'Disabled' grafanaMajorVersion: '11' publicNetworkAccess: 'Enabled' zoneRedundancy: 'Disabled' + apiKey: 'Disabled' + autoGeneratedDomainNameLabelScope: 'TenantReuse' + deterministicOutboundIP: 'Disabled' } } @@ -30,12 +30,12 @@ resource managedPrivateEndpoint 'Microsoft.Dashboard/grafana/managedPrivateEndpo location: location parent: grafana properties: { - requestMessage: '' groupIds: [ 'prometheusMetrics' ] privateLinkResourceId: account.id privateLinkResourceRegion: location privateLinkServiceUrl: '' + requestMessage: '' } } diff --git a/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep b/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep index e46b581f..a958c089 100644 --- a/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep +++ b/settings/remarks/microsoft.databricks/samples/workspaces/virtualnetworkpeerings/main.bicep @@ -1,6 +1,22 @@ 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.1.0/24' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] + } +} + resource workspace 'Microsoft.Databricks/workspaces@2023-02-01' = { name: resourceName location: location @@ -8,8 +24,8 @@ resource workspace 'Microsoft.Databricks/workspaces@2023-02-01' = { name: 'standard' } properties: { - publicNetworkAccess: 'Enabled' managedResourceGroupId: resourceGroup().id + publicNetworkAccess: 'Enabled' } } @@ -17,6 +33,9 @@ resource virtualNetworkPeering 'Microsoft.Databricks/workspaces/virtualNetworkPe name: resourceName parent: workspace properties: { + allowForwardedTraffic: false + allowGatewayTransit: false + allowVirtualNetworkAccess: true databricksAddressSpace: { addressPrefixes: [ '10.139.0.0/16' @@ -31,24 +50,5 @@ resource virtualNetworkPeering 'Microsoft.Databricks/workspaces/virtualNetworkPe id: virtualNetwork.id } useRemoteGateways: false - allowForwardedTraffic: false - allowGatewayTransit: false - allowVirtualNetworkAccess: true - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.1.0/24' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] } } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep index 0afb1869..bc0fc241 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/credentials/main.bicep @@ -1,5 +1,10 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' + +resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' +} resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { name: resourceName @@ -24,8 +29,3 @@ resource credential 'Microsoft.DataFactory/factories/credentials@2018-06-01' = { } } } - -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 688fa489..34192ef7 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/dataflows/main.bicep @@ -10,42 +10,6 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { } } -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - sku: { - name: 'Standard_LRS' - } - kind: 'StorageV2' - properties: { - supportsHttpsTrafficOnly: true - allowSharedKeyAccess: true - encryption: { - keySource: 'Microsoft.Storage' - services: { - queue: { - keyType: 'Service' - } - table: { - keyType: 'Service' - } - } - } - isNfsV3Enabled: false - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - defaultToOAuthAuthentication: false - isHnsEnabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - } -} - resource dataflow 'Microsoft.DataFactory/factories/dataflows@2018-06-01' = { name: resourceName parent: factory @@ -67,12 +31,12 @@ source1 sink( ''' sinks: [ { - name: 'sink1' description: '' linkedService: { parameters: {} type: 'LinkedServiceReference' } + name: 'sink1' } ] sources: [ @@ -100,3 +64,39 @@ resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-0 } } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: { + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + encryption: { + keySource: 'Microsoft.Storage' + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + } + isHnsEnabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + accessTier: 'Hot' + defaultToOAuthAuthentication: false + isNfsV3Enabled: false + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + } +} diff --git a/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep index 8f940739..9854b6c7 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/datasets/main.bicep @@ -1,15 +1,6 @@ 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 storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -18,31 +9,40 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + isNfsV3Enabled: false minimumTlsVersion: 'TLS1_2' + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowBlobPublicAccess: true + isSftpEnabled: false networkAcls: { defaultAction: 'Allow' } - accessTier: 'Hot' - allowBlobPublicAccess: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - isNfsV3Enabled: false publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { - table: { + queue: { keyType: 'Service' } - queue: { + table: { keyType: 'Service' } } } isHnsEnabled: false - isSftpEnabled: false + } +} + +resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { + name: resourceName + location: location + properties: { + publicNetworkAccess: 'Enabled' + repoConfiguration: null } } @@ -50,20 +50,20 @@ resource dataset 'Microsoft.DataFactory/factories/datasets@2018-06-01' = { name: resourceName parent: factory properties: { - description: '' - linkedServiceName: { - type: 'LinkedServiceReference' - } type: 'Json' typeProperties: { encodingName: 'UTF-8' location: { - container: 'container' - fileName: 'bar.txt' folderPath: 'foo/bar/' type: 'AzureBlobStorageLocation' + container: 'container' + fileName: 'bar.txt' } } + description: '' + linkedServiceName: { + type: 'LinkedServiceReference' + } } } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep index 1147b531..6d04151b 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/integrationruntimes/main.bicep @@ -5,8 +5,8 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { name: resourceName location: location properties: { - publicNetworkAccess: 'Enabled' repoConfiguration: null + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep index 3d11a402..55957f79 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/linkedservices/main.bicep @@ -1,15 +1,6 @@ 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 @@ -19,11 +10,8 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { kind: 'StorageV2' properties: { defaultToOAuthAuthentication: false - isNfsV3Enabled: false - minimumTlsVersion: 'TLS1_2' - supportsHttpsTrafficOnly: true - accessTier: 'Hot' encryption: { + keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -32,10 +20,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } - keySource: 'Microsoft.Storage' } isHnsEnabled: false isSftpEnabled: false + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } @@ -46,6 +37,15 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } +resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { + name: resourceName + location: location + properties: { + publicNetworkAccess: 'Enabled' + repoConfiguration: null + } +} + resource linkedservice 'Microsoft.DataFactory/factories/linkedservices@2018-06-01' = { name: resourceName parent: factory diff --git a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep index 1d550e51..affba0d1 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/main.bicep @@ -5,9 +5,9 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { name: resourceName location: location properties: { - repoConfiguration: null globalParameters: {} publicNetworkAccess: 'Enabled' + repoConfiguration: null } } 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 ce1c53f8..abcbf666 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/managedvirtualnetworks/managedprivateendpoints/main.bicep @@ -19,31 +19,31 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'BlobStorage' properties: { - isSftpEnabled: false accessTier: 'Hot' - minimumTlsVersion: 'TLS1_2' + allowCrossTenantReplication: true + allowSharedKeyAccess: true + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { - queue: { + table: { keyType: 'Service' } - table: { + queue: { keyType: 'Service' } } } - isHnsEnabled: false - isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + supportsHttpsTrafficOnly: true } } diff --git a/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep b/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep index 693bc09b..972874d7 100644 --- a/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep +++ b/settings/remarks/microsoft.datafactory/samples/factories/triggers/main.bicep @@ -5,45 +5,45 @@ resource factory 'Microsoft.DataFactory/factories@2018-06-01' = { name: resourceName location: location properties: { - repoConfiguration: null publicNetworkAccess: 'Enabled' + repoConfiguration: null } } -resource trigger 'Microsoft.DataFactory/factories/triggers@2018-06-01' = { +resource pipeline 'Microsoft.DataFactory/factories/pipelines@2018-06-01' = { name: resourceName parent: factory properties: { - description: '' - pipeline: { - parameters: {} - pipelineReference: { - referenceName: pipeline.name - type: 'PipelineReference' + parameters: { + test: { + defaultValue: 'testparameter' + type: 'String' } } - type: 'TumblingWindowTrigger' - typeProperties: { - frequency: 'Minute' - interval: 15 - maxConcurrency: 50 - startTime: '2022-09-21T00:00:00Z' - } + variables: {} + annotations: [] + description: '' } } -resource pipeline 'Microsoft.DataFactory/factories/pipelines@2018-06-01' = { +resource trigger 'Microsoft.DataFactory/factories/triggers@2018-06-01' = { name: resourceName parent: factory properties: { - parameters: { - test: { - type: 'String' - defaultValue: 'testparameter' - } + typeProperties: { + frequency: 'Minute' + interval: 15 + maxConcurrency: 50 + startTime: '2022-09-21T00:00:00Z' } - variables: {} - annotations: [] description: '' + pipeline: { + parameters: {} + pipelineReference: { + referenceName: pipeline.name + type: 'PipelineReference' + } + } + type: 'TumblingWindowTrigger' } } diff --git a/settings/remarks/microsoft.datamigration/samples/services/main.bicep b/settings/remarks/microsoft.datamigration/samples/services/main.bicep index 86c80b14..55935afe 100644 --- a/settings/remarks/microsoft.datamigration/samples/services/main.bicep +++ b/settings/remarks/microsoft.datamigration/samples/services/main.bicep @@ -31,11 +31,11 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { - addressPrefix: '10.0.1.0/24' - delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.1.0/24' + delegations: [] } } diff --git a/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep b/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep index 5677b9b0..40a2de4b 100644 --- a/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep +++ b/settings/remarks/microsoft.datamigration/samples/services/projects/main.bicep @@ -1,16 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource service 'Microsoft.DataMigration/services@2018-04-19' = { - name: resourceName - location: location - sku: { - name: 'Standard_1vCores' - } - kind: 'Cloud' - properties: {} -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location @@ -27,6 +17,16 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } } +resource service 'Microsoft.DataMigration/services@2018-04-19' = { + name: resourceName + location: location + sku: { + name: 'Standard_1vCores' + } + kind: 'Cloud' + properties: {} +} + resource project 'Microsoft.DataMigration/services/projects@2018-04-19' = { name: resourceName location: location @@ -41,11 +41,11 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { - serviceEndpointPolicies: [] - serviceEndpoints: [] addressPrefix: '10.0.1.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep index 01c712c4..95b698c8 100644 --- a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backupinstances/main.bicep @@ -4,32 +4,6 @@ param location string = 'westeurope' @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: 'B_Gen5_2' - tier: 'Basic' - } - properties: { - administratorLogin: 'psqladmin' - createMode: 'Default' - sslEnforcement: 'Enabled' - storageProfile: { - backupRetentionDays: 7 - storageAutogrow: 'Enabled' - storageMB: 5120 - } - administratorLoginPassword: '${administratorLoginPassword}' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - version: '9.5' - } -} - resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { name: resourceName location: location @@ -43,45 +17,15 @@ resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { } } -resource backupInstance 'Microsoft.DataProtection/backupVaults/backupInstances@2022-04-01' = { - name: resourceName - parent: backupVault - properties: { - dataSourceInfo: { - datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' - objectType: 'Datasource' - resourceType: 'Microsoft.DBforPostgreSQL/servers/databases' - resourceUri: '' - } - dataSourceSetInfo: { - datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' - objectType: 'DatasourceSet' - resourceID: server.id - resourceLocation: server.location - resourceName: server.name - resourceType: 'Microsoft.DBForPostgreSQL/servers' - resourceUri: '' - } - datasourceAuthCredentials: null - friendlyName: resourceName - objectType: 'BackupInstance' - policyInfo: {} - } -} - resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022-04-01' = { name: resourceName parent: backupVault properties: { - datasourceTypes: [ - 'Microsoft.DBforPostgreSQL/servers/databases' - ] - objectType: 'BackupPolicy' policyRules: [ { backupParameters: { - backupType: 'Full' objectType: 'AzureBackupParams' + backupType: 'Full' } dataStore: { dataStoreType: 'VaultStore' @@ -98,35 +42,65 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 } taggingCriteria: [ { + isDefault: true tagInfo: { id: 'Default_' tagName: 'Default' } taggingPriority: 99 - isDefault: true } ] } } { - objectType: 'AzureRetentionRule' - isDefault: true lifecycles: [ { - deleteAfter: { - duration: 'P4M' - objectType: 'AbsoluteDeleteOption' - } sourceDataStore: { dataStoreType: 'VaultStore' objectType: 'DataStoreInfoBase' } targetDataStoreCopySettings: [] + deleteAfter: { + duration: 'P4M' + objectType: 'AbsoluteDeleteOption' + } } ] name: 'Default' + objectType: 'AzureRetentionRule' + isDefault: true } ] + datasourceTypes: [ + 'Microsoft.DBforPostgreSQL/servers/databases' + ] + objectType: 'BackupPolicy' + } +} + +resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { + name: resourceName + location: location + sku: { + capacity: 2 + family: 'Gen5' + name: 'B_Gen5_2' + tier: 'Basic' + } + properties: { + infrastructureEncryption: 'Disabled' + version: '9.5' + administratorLogin: 'psqladmin' + minimalTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' + storageProfile: { + backupRetentionDays: 7 + storageAutogrow: 'Enabled' + storageMB: 5120 + } + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' } } @@ -138,3 +112,29 @@ resource database 'Microsoft.DBforPostgreSQL/servers/databases@2017-12-01' = { collation: 'English_United States.1252' } } + +resource backupInstance 'Microsoft.DataProtection/backupVaults/backupInstances@2022-04-01' = { + name: resourceName + parent: backupVault + properties: { + dataSourceInfo: { + datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' + objectType: 'Datasource' + resourceType: 'Microsoft.DBforPostgreSQL/servers/databases' + resourceUri: '' + } + dataSourceSetInfo: { + resourceID: server.id + resourceLocation: server.location + resourceName: server.name + resourceType: 'Microsoft.DBForPostgreSQL/servers' + resourceUri: '' + datasourceType: 'Microsoft.DBforPostgreSQL/servers/databases' + objectType: 'DatasourceSet' + } + datasourceAuthCredentials: null + friendlyName: resourceName + objectType: 'BackupInstance' + policyInfo: {} + } +} diff --git a/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep b/settings/remarks/microsoft.dataprotection/samples/backupvaults/backuppolicies/main.bicep index 722a5749..19cfe72f 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 location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { name: resourceName @@ -7,8 +7,8 @@ resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { properties: { storageSettings: [ { - type: 'LocallyRedundant' datastoreType: 'VaultStore' + type: 'LocallyRedundant' } ] } @@ -18,59 +18,59 @@ resource backupPolicy 'Microsoft.DataProtection/backupVaults/backupPolicies@2022 name: resourceName parent: backupVault properties: { + datasourceTypes: [ + 'Microsoft.DBforPostgreSQL/servers/databases' + ] + objectType: 'BackupPolicy' policyRules: [ { - backupParameters: { - objectType: 'AzureBackupParams' - backupType: 'Full' - } - dataStore: { - dataStoreType: 'VaultStore' - objectType: 'DataStoreInfoBase' - } name: 'BackupIntervals' objectType: 'AzureBackupRule' trigger: { + objectType: 'ScheduleBasedTriggerContext' + schedule: { + repeatingTimeIntervals: [ + 'R/2021-05-23T02:30:00+00:00/P1W' + ] + } taggingCriteria: [ { + isDefault: true tagInfo: { id: 'Default_' tagName: 'Default' } taggingPriority: 99 - isDefault: true } ] - objectType: 'ScheduleBasedTriggerContext' - schedule: { - repeatingTimeIntervals: [ - 'R/2021-05-23T02:30:00+00:00/P1W' - ] - } + } + backupParameters: { + backupType: 'Full' + objectType: 'AzureBackupParams' + } + dataStore: { + dataStoreType: 'VaultStore' + objectType: 'DataStoreInfoBase' } } { + objectType: 'AzureRetentionRule' isDefault: true lifecycles: [ { + targetDataStoreCopySettings: [] deleteAfter: { duration: 'P4M' objectType: 'AbsoluteDeleteOption' } sourceDataStore: { - dataStoreType: 'VaultStore' objectType: 'DataStoreInfoBase' + dataStoreType: 'VaultStore' } - targetDataStoreCopySettings: [] } ] name: 'Default' - objectType: 'AzureRetentionRule' } ] - datasourceTypes: [ - 'Microsoft.DBforPostgreSQL/servers/databases' - ] - objectType: 'BackupPolicy' } } diff --git a/settings/remarks/microsoft.dataprotection/samples/backupvaults/main.bicep b/settings/remarks/microsoft.dataprotection/samples/backupvaults/main.bicep index 00c95459..6197b89f 100644 --- a/settings/remarks/microsoft.dataprotection/samples/backupvaults/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/backupvaults/main.bicep @@ -7,8 +7,8 @@ resource backupVault 'Microsoft.DataProtection/backupVaults@2022-04-01' = { properties: { storageSettings: [ { - datastoreType: 'VaultStore' type: 'LocallyRedundant' + datastoreType: 'VaultStore' } ] } diff --git a/settings/remarks/microsoft.dataprotection/samples/resourceguards/main.bicep b/settings/remarks/microsoft.dataprotection/samples/resourceguards/main.bicep index afec4f52..388188e4 100644 --- a/settings/remarks/microsoft.dataprotection/samples/resourceguards/main.bicep +++ b/settings/remarks/microsoft.dataprotection/samples/resourceguards/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource resourceGuard 'Microsoft.DataProtection/resourceGuards@2022-04-01' = { name: resourceName diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep index 204a4994..f1c4af72 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/configurations/main.bicep @@ -1,33 +1,33 @@ -@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' param location string = 'westeurope' +@description('The administrator login for the MariaDB server') +param administratorLogin string resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location sku: { - capacity: 2 family: 'Gen5' name: 'GP_Gen5_2' tier: 'GeneralPurpose' + capacity: 2 } properties: { - publicNetworkAccess: 'Enabled' - administratorLogin: '${administratorLogin}' - administratorLoginPassword: '${administratorLoginPassword}' createMode: 'Default' + minimalTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + version: '10.2' + administratorLoginPassword: '${administratorLoginPassword}' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } - version: '10.2' - minimalTlsVersion: 'TLS1_2' + administratorLogin: '${administratorLogin}' } } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep index e22ee0bc..4ecb5f88 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/databases/main.bicep @@ -19,15 +19,15 @@ resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { administratorLogin: '${administratorLogin}' administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - sslEnforcement: 'Enabled' - version: '10.2' - createMode: 'Default' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } + createMode: 'Default' + publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' + version: '10.2' } } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep index 815d1915..4f4eb737 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/firewallrules/main.bicep @@ -1,33 +1,33 @@ +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' + capacity: 2 } properties: { - administratorLogin: '${administratorLogin}' - createMode: 'Default' + minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' + version: '10.2' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' sslEnforcement: 'Enabled' storageProfile: { + backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 - backupRetentionDays: 7 } - administratorLoginPassword: '${administratorLoginPassword}' - minimalTlsVersion: 'TLS1_2' - version: '10.2' + administratorLogin: '${administratorLogin}' } } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep index 5f216302..bb48197e 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/main.bicep @@ -16,17 +16,17 @@ resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { tier: 'GeneralPurpose' } properties: { - minimalTlsVersion: 'TLS1_2' - administratorLogin: '${administratorLogin}' - administratorLoginPassword: '${administratorLoginPassword}' - publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + administratorLogin: '${administratorLogin}' + minimalTlsVersion: 'TLS1_2' storageProfile: { + storageMB: 51200 backupRetentionDays: 7 storageAutogrow: 'Enabled' - storageMB: 51200 } version: '10.2' + administratorLoginPassword: '${administratorLoginPassword}' createMode: 'Default' + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep index f064b127..3fcb1ad0 100644 --- a/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbformariadb/samples/servers/virtualnetworkrules/main.bicep @@ -1,33 +1,33 @@ +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' -param location string = 'westeurope' resource server 'Microsoft.DBforMariaDB/servers@2018-06-01' = { name: resourceName location: location sku: { + capacity: 2 family: 'Gen5' name: 'GP_Gen5_2' tier: 'GeneralPurpose' - capacity: 2 } properties: { administratorLogin: '${administratorLogin}' - administratorLoginPassword: '${administratorLoginPassword}' - createMode: 'Default' - minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' storageProfile: { - storageMB: 51200 backupRetentionDays: 7 storageAutogrow: 'Enabled' + storageMB: 51200 } version: '10.2' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + minimalTlsVersion: 'TLS1_2' } } @@ -51,7 +51,6 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { - addressPrefix: '10.7.29.0/29' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' @@ -61,6 +60,7 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { service: 'Microsoft.Sql' } ] + addressPrefix: '10.7.29.0/29' } } @@ -68,7 +68,7 @@ resource virtualNetworkRule 'Microsoft.DBforMariaDB/servers/virtualNetworkRules@ name: resourceName parent: server properties: { - ignoreMissingVnetServiceEndpoint: false virtualNetworkSubnetId: subnet.id + ignoreMissingVnetServiceEndpoint: false } } diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep index 0432b97c..20a63a2d 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/administrators/main.bicep @@ -4,19 +4,20 @@ param location string = 'westus' @description('The administrator login password for the MySQL flexible server') param administratorLoginPassword string -resource userassignedidentity1 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { - name: '${resourceName}-uai2' - location: location -} - resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { name: '${resourceName}-mysql' location: location sku: { - tier: 'Burstable' name: 'Standard_B1ms' + tier: 'Burstable' } properties: { + administratorLogin: 'tfadmin' + administratorLoginPassword: '${administratorLoginPassword}' + backup: { + backupRetentionDays: 7 + geoRedundantBackup: 'Disabled' + } dataEncryption: { type: 'SystemManaged' } @@ -24,12 +25,6 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { mode: 'Disabled' } version: '8.0.21' - administratorLogin: 'tfadmin' - administratorLoginPassword: '${administratorLoginPassword}' - backup: { - backupRetentionDays: 7 - geoRedundantBackup: 'Disabled' - } } } @@ -37,11 +32,11 @@ resource administrator 'Microsoft.DBforMySQL/flexibleServers/administrators@2023 name: 'ActiveDirectory' parent: flexibleServer properties: { - identityResourceId: userAssignedIdentity.id - login: 'sqladmin' sid: deployer().objectId - tenantId: tenant() + tenantId: tenant().tenantId administratorType: 'ActiveDirectory' + identityResourceId: userAssignedIdentity.id + login: 'sqladmin' } } @@ -49,3 +44,8 @@ resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@ name: '${resourceName}-uai1' location: location } + +resource userassignedidentity1 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: '${resourceName}-uai2' + location: location +} diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep index ffa46d43..4e9293f0 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/configurations/main.bicep @@ -12,6 +12,12 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { tier: 'Burstable' } properties: { + administratorLogin: 'tfadmin' + administratorLoginPassword: '${administratorLoginPassword}' + backup: { + backupRetentionDays: 7 + geoRedundantBackup: 'Disabled' + } dataEncryption: { type: 'SystemManaged' } @@ -19,12 +25,6 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2023-12-30' = { mode: 'Disabled' } version: '8.0.21' - administratorLogin: 'tfadmin' - administratorLoginPassword: '${administratorLoginPassword}' - backup: { - backupRetentionDays: 7 - geoRedundantBackup: 'Disabled' - } } } diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep index 23eaee1b..d3400219 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/databases/main.bicep @@ -14,21 +14,21 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { tier: 'Burstable' } properties: { + backup: { + backupRetentionDays: 7 + geoRedundantBackup: 'Disabled' + } createMode: '' highAvailability: { mode: 'Disabled' } network: {} version: '' - administratorLogin: '${administratorLogin}' - administratorLoginPassword: '${administratorLoginPassword}' - backup: { - backupRetentionDays: 7 - geoRedundantBackup: 'Disabled' - } dataEncryption: { type: 'SystemManaged' } + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' } } diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep index 75dbe674..f4591008 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/firewallrules/main.bicep @@ -12,20 +12,20 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { tier: 'Burstable' } properties: { - createMode: '' - dataEncryption: { - type: 'SystemManaged' - } administratorLogin: 'adminTerraform' administratorLoginPassword: '${mysqlAdministratorPassword}' backup: { backupRetentionDays: 7 geoRedundantBackup: 'Disabled' } + dataEncryption: { + type: 'SystemManaged' + } + network: {} + createMode: '' highAvailability: { mode: 'Disabled' } - network: {} version: '5.7' } } diff --git a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep index 0bd0753a..0b7b7c35 100644 --- a/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/flexibleservers/main.bicep @@ -1,10 +1,10 @@ -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 @@ -14,6 +14,12 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { tier: 'Burstable' } properties: { + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + backup: { + backupRetentionDays: 7 + geoRedundantBackup: 'Disabled' + } createMode: '' dataEncryption: { type: 'SystemManaged' @@ -22,11 +28,5 @@ resource flexibleServer 'Microsoft.DBforMySQL/flexibleServers@2021-05-01' = { mode: 'Disabled' } network: {} - administratorLogin: '${administratorLogin}' - administratorLoginPassword: '${administratorLoginPassword}' - backup: { - backupRetentionDays: 7 - geoRedundantBackup: 'Disabled' - } } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep index e4a4b26c..4404f640 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/administrators/main.bicep @@ -1,10 +1,10 @@ -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 @@ -12,25 +12,25 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location sku: { - name: 'GP_Gen5_2' tier: 'GeneralPurpose' capacity: 2 family: 'Gen5' + name: 'GP_Gen5_2' } properties: { - administratorLogin: '${administratorLogin}' - publicNetworkAccess: 'Enabled' + minimalTlsVersion: 'TLS1_2' sslEnforcement: 'Enabled' storageProfile: { + backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 - backupRetentionDays: 7 } + createMode: 'Default' + publicNetworkAccess: 'Enabled' version: '5.7' + administratorLogin: '${administratorLogin}' administratorLoginPassword: '${administratorLoginPassword}' - createMode: 'Default' infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' } } @@ -38,9 +38,9 @@ resource administrator 'Microsoft.DBforMySQL/servers/administrators@2017-12-01' name: 'activeDirectory' parent: server properties: { + tenantId: tenant().tenantId administratorType: 'ActiveDirectory' login: 'sqladmin' sid: clientId - tenantId: tenant() } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep index 2fde956c..33fff895 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/configurations/main.bicep @@ -10,25 +10,25 @@ resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location sku: { + capacity: 2 family: 'Gen5' name: 'GP_Gen5_2' tier: 'GeneralPurpose' - capacity: 2 } properties: { - sslEnforcement: 'Enabled' - version: '5.7' createMode: 'Default' minimalTlsVersion: 'TLS1_2' + version: '5.7' + infrastructureEncryption: 'Disabled' + publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' storageProfile: { + storageMB: 51200 backupRetentionDays: 7 storageAutogrow: 'Enabled' - storageMB: 51200 } administratorLogin: '${administratorLogin}' administratorLoginPassword: '${administratorLoginPassword}' - infrastructureEncryption: 'Disabled' - publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep index 303ca953..98b47973 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/databases/main.bicep @@ -1,33 +1,33 @@ +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' + capacity: 2 + family: 'Gen5' } properties: { administratorLoginPassword: '${administratorLoginPassword}' - createMode: 'Default' infrastructureEncryption: 'Disabled' - sslEnforcement: 'Enabled' - version: '5.7' minimalTlsVersion: 'TLS1_1' publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' storageProfile: { - storageAutogrow: 'Enabled' storageMB: 51200 + storageAutogrow: 'Enabled' } administratorLogin: '${administratorLogin}' + createMode: 'Default' + version: '5.7' } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep index d8fa2d8b..5d729e23 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/firewallrules/main.bicep @@ -1,34 +1,34 @@ +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' + capacity: 2 } properties: { + version: '5.7' + createMode: 'Default' + publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' administratorLogin: '${administratorLogin}' administratorLoginPassword: '${administratorLoginPassword}' infrastructureEncryption: 'Disabled' - publicNetworkAccess: 'Enabled' + minimalTlsVersion: 'TLS1_2' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } - version: '5.7' - createMode: 'Default' - minimalTlsVersion: 'TLS1_2' } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep index c073d954..a2d2ed16 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/main.bicep @@ -1,32 +1,32 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @description('The administrator login for the MySQL server') param administratorLogin string @secure() @description('The administrator login password for the MySQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location sku: { - tier: 'GeneralPurpose' capacity: 2 family: 'Gen5' name: 'GP_Gen5_2' + tier: 'GeneralPurpose' } properties: { - infrastructureEncryption: 'Disabled' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' minimalTlsVersion: 'TLS1_1' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' + version: '5.7' + administratorLogin: '${administratorLogin}' + infrastructureEncryption: 'Disabled' storageProfile: { storageAutogrow: 'Enabled' storageMB: 51200 } - administratorLogin: '${administratorLogin}' - administratorLoginPassword: '${administratorLoginPassword}' - createMode: 'Default' - version: '5.7' } } diff --git a/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep index 24e28064..48d70e30 100644 --- a/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbformysql/samples/servers/virtualnetworkrules/main.bicep @@ -1,34 +1,34 @@ -@secure() -@description('The administrator login password for the MySQL server') -param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the MySQL server') param administratorLogin string +@secure() +@description('The administrator login password for the MySQL server') +param administratorLoginPassword string resource server 'Microsoft.DBforMySQL/servers@2017-12-01' = { name: resourceName location: location sku: { - family: 'Gen5' - name: 'GP_Gen5_2' tier: 'GeneralPurpose' capacity: 2 + family: 'Gen5' + name: 'GP_Gen5_2' } properties: { + administratorLoginPassword: '${administratorLoginPassword}' infrastructureEncryption: 'Disabled' + minimalTlsVersion: 'TLS1_2' + sslEnforcement: 'Enabled' + createMode: 'Default' publicNetworkAccess: 'Enabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } - createMode: 'Default' - minimalTlsVersion: 'TLS1_2' - sslEnforcement: 'Enabled' version: '5.7' administratorLogin: '${administratorLogin}' - administratorLoginPassword: '${administratorLoginPassword}' } } @@ -52,6 +52,7 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { + delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] @@ -61,7 +62,6 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { } ] addressPrefix: '10.7.29.0/29' - delegations: [] } } @@ -69,7 +69,7 @@ resource virtualNetworkRule 'Microsoft.DBforMySQL/servers/virtualNetworkRules@20 name: resourceName parent: server properties: { - virtualNetworkSubnetId: subnet.id 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 7e5c33e1..54e403db 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/administrators/main.bicep @@ -1,23 +1,24 @@ +param location string = 'westeurope' @description('The administrator login for the PostgreSQL flexible server') param administratorLogin string @secure() @description('The administrator login password for the PostgreSQL flexible server') param administratorLoginPassword string param resourceName string = 'acctest0001' -param location string = 'westeurope' resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = { name: resourceName location: location sku: { - name: 'Standard_D2s_v3' tier: 'GeneralPurpose' + name: 'Standard_D2s_v3' } properties: { + administratorLoginPassword: administratorLoginPassword authConfig: { + tenantId: tenant().tenantId activeDirectoryAuth: 'Enabled' passwordAuth: 'Enabled' - tenantId: tenant() } availabilityZone: '2' backup: { @@ -30,9 +31,8 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = storage: { storageSizeGB: 32 } - administratorLogin: administratorLogin - administratorLoginPassword: administratorLoginPassword version: '12' + administratorLogin: administratorLogin } } @@ -41,6 +41,6 @@ resource administrator 'Microsoft.DBforPostgreSQL/flexibleServers/administrators parent: flexibleServer properties: { principalType: 'ServicePrincipal' - tenantId: tenant() + 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 d72c60e6..3403eba8 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/configurations/main.bicep @@ -12,20 +12,20 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-pr tier: 'GeneralPurpose' } properties: { - highAvailability: { - mode: 'Disabled' - } - version: '12' - administratorLogin: 'adminTerraform' - administratorLoginPassword: '${postgresqlAdministratorPassword}' - availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' } - network: {} storage: { storageSizeGB: 32 } + administratorLogin: 'adminTerraform' + administratorLoginPassword: '${postgresqlAdministratorPassword}' + availabilityZone: '2' + highAvailability: { + mode: 'Disabled' + } + network: {} + version: '12' } identity: { type: 'None' @@ -37,8 +37,8 @@ resource pgbouncerEnabled 'Microsoft.DBforPostgreSQL/flexibleServers/configurati name: 'pgbouncer.enabled' parent: flexibleServer properties: { - source: 'user-override' value: 'true' + source: 'user-override' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep index ec352c67..337eb98f 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/databases/main.bicep @@ -12,20 +12,20 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2022-12-01' = tier: 'GeneralPurpose' } properties: { + version: '12' administratorLogin: 'adminTerraform' administratorLoginPassword: '${postgresqlAdministratorPassword}' availabilityZone: '2' - network: {} - storage: { - storageSizeGB: 32 - } backup: { geoRedundantBackup: 'Disabled' } highAvailability: { mode: 'Disabled' } - version: '12' + network: {} + storage: { + storageSizeGB: 32 + } } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep index c2315a37..ae32ce8d 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/firewallrules/main.bicep @@ -1,31 +1,31 @@ +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: { - tier: 'GeneralPurpose' name: 'Standard_D2s_v3' + tier: 'GeneralPurpose' } properties: { - administratorLogin: 'adminTerraform' - administratorLoginPassword: '${postgresqlAdministratorPassword}' - availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' } - network: {} - version: '12' highAvailability: { mode: 'Disabled' } + administratorLogin: 'adminTerraform' + network: {} storage: { storageSizeGB: 32 } + version: '12' + administratorLoginPassword: '${postgresqlAdministratorPassword}' + availabilityZone: '2' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep index 442f386f..01fbc488 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/main.bicep @@ -15,19 +15,19 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2023-06-01-pr } properties: { administratorLogin: '${administratorLogin}' - availabilityZone: '2' + administratorLoginPassword: '${administratorLoginPassword}' highAvailability: { mode: 'Disabled' } - network: {} - storage: { - storageSizeGB: 32 - } version: '12' - administratorLoginPassword: '${administratorLoginPassword}' + availabilityZone: '2' backup: { geoRedundantBackup: 'Disabled' } + network: {} + storage: { + storageSizeGB: 32 + } } 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 bd56adf0..a02dba1a 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/flexibleservers/virtualendpoints/main.bicep @@ -1,27 +1,13 @@ -param resourceName string = 'acctest0001' param location string = 'westus' @secure() @description('The administrator login password for the PostgreSQL flexible server') param administratorLoginPassword string +param resourceName string = 'acctest0001' -resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { - name: '${resourceName}-primary' +resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { + name: '${resourceName}-replica' location: location - sku: { - name: 'Standard_D2ads_v5' - tier: 'GeneralPurpose' - } properties: { - highAvailability: { - mode: 'Disabled' - } - version: '16' - administratorLogin: 'psqladmin' - administratorLoginPassword: '${administratorLoginPassword}' - availabilityZone: '1' - backup: { - geoRedundantBackup: 'Disabled' - } network: { publicNetworkAccess: 'Disabled' } @@ -30,23 +16,38 @@ resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = storageSizeGB: 32 tier: 'P30' } + backup: { + geoRedundantBackup: 'Disabled' + } + sourceServerResourceId: flexibleServer.id + version: '16' + availabilityZone: '1' + createMode: 'Replica' + highAvailability: { + mode: 'Disabled' + } } } -resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { - name: '${resourceName}-replica' +resource flexibleServer 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' = { + name: '${resourceName}-primary' location: location + sku: { + name: 'Standard_D2ads_v5' + tier: 'GeneralPurpose' + } properties: { - sourceServerResourceId: flexibleServer.id + backup: { + geoRedundantBackup: 'Disabled' + } storage: { autoGrow: 'Disabled' storageSizeGB: 32 tier: 'P30' } - backup: { - geoRedundantBackup: 'Disabled' - } - createMode: 'Replica' + administratorLogin: 'psqladmin' + administratorLoginPassword: '${administratorLoginPassword}' + availabilityZone: '1' highAvailability: { mode: 'Disabled' } @@ -54,7 +55,6 @@ resource flexibleserver1 'Microsoft.DBforPostgreSQL/flexibleServers@2024-08-01' publicNetworkAccess: 'Disabled' } version: '16' - availabilityZone: '1' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep index b1898976..26b94bbf 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servergroupsv2/main.bicep @@ -8,14 +8,14 @@ resource serverGroupsv2 'Microsoft.DBforPostgreSQL/serverGroupsv2@2022-11-08' = name: resourceName location: location properties: { + administratorLoginPassword: '${administratorLoginPassword}' coordinatorEnablePublicIpAccess: true + coordinatorVCores: 2 enableHa: false nodeCount: 0 nodeEnablePublicIpAccess: false - administratorLoginPassword: '${administratorLoginPassword}' coordinatorServerEdition: 'GeneralPurpose' coordinatorStorageQuotaInMb: 131072 - coordinatorVCores: 2 nodeServerEdition: 'MemoryOptimized' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep index 3a9c2b2f..d21b6032 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/administrators/main.bicep @@ -1,12 +1,12 @@ -@secure() -@description('The administrator login password for the PostgreSQL server') -param administratorLoginPassword string @description('The administrator login name for the PostgreSQL server admin') param adminLogin string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the PostgreSQL server') param administratorLogin string +@secure() +@description('The administrator login password for the PostgreSQL server') +param administratorLoginPassword string param clientId string @@ -14,14 +14,18 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location sku: { - name: 'GP_Gen5_2' - tier: 'GeneralPurpose' capacity: 2 family: 'Gen5' + name: 'GP_Gen5_2' + tier: 'GeneralPurpose' } properties: { administratorLogin: '${administratorLogin}' createMode: 'Default' + publicNetworkAccess: 'Enabled' + version: '9.6' + administratorLoginPassword: '${administratorLoginPassword}' + infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' sslEnforcement: 'Enabled' storageProfile: { @@ -29,10 +33,6 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { storageAutogrow: 'Enabled' storageMB: 51200 } - version: '9.6' - administratorLoginPassword: '${administratorLoginPassword}' - infrastructureEncryption: 'Disabled' - publicNetworkAccess: 'Enabled' } } @@ -43,6 +43,6 @@ resource administrator 'Microsoft.DBforPostgreSQL/servers/administrators@2017-12 administratorType: 'ActiveDirectory' login: adminLogin sid: clientId - tenantId: tenant() + 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 432a5870..c3cb52be 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/configurations/main.bicep @@ -1,27 +1,22 @@ -@secure() -@description('The administrator login password for the PostgreSQL server') -param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the PostgreSQL server') param administratorLogin string +@secure() +@description('The administrator login password for the PostgreSQL server') +param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location sku: { + tier: 'GeneralPurpose' capacity: 2 family: 'Gen5' name: 'GP_Gen5_2' - tier: 'GeneralPurpose' } properties: { administratorLogin: '${administratorLogin}' - administratorLoginPassword: '${administratorLoginPassword}' - createMode: 'Default' - sslEnforcement: 'Enabled' - version: '9.6' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' storageProfile: { @@ -29,6 +24,11 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { storageAutogrow: 'Enabled' storageMB: 51200 } + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' + sslEnforcement: 'Enabled' + version: '9.6' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep index a47f0bb7..5e9d024c 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/databases/main.bicep @@ -1,10 +1,10 @@ -@secure() -@description('The administrator login password for the PostgreSQL server') -param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login for the PostgreSQL server') param administratorLogin string +@secure() +@description('The administrator login password for the PostgreSQL server') +param administratorLoginPassword string resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName @@ -17,12 +17,12 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { } properties: { administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' + administratorLogin: '${administratorLogin}' publicNetworkAccess: 'Enabled' sslEnforcement: 'Enabled' - administratorLogin: '${administratorLogin}' - createMode: 'Default' - infrastructureEncryption: 'Disabled' storageProfile: { storageMB: 51200 backupRetentionDays: 7 diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep index 10c2c39a..c5e00b45 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/firewallrules/main.bicep @@ -10,25 +10,25 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location sku: { + capacity: 2 family: 'Gen5' name: 'GP_Gen5_2' tier: 'GeneralPurpose' - capacity: 2 } properties: { administratorLogin: '${administratorLogin}' - administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' + sslEnforcement: 'Enabled' + version: '9.6' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' storageProfile: { backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 } - version: '9.6' - createMode: 'Default' - infrastructureEncryption: 'Disabled' - minimalTlsVersion: 'TLS1_2' - sslEnforcement: 'Enabled' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep index 7ea6fb8e..88b254e3 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/main.bicep @@ -1,33 +1,33 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the PostgreSQL server') param administratorLogin string @secure() @description('The administrator login password for the PostgreSQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location sku: { - capacity: 2 family: 'Gen5' name: 'GP_Gen5_2' tier: 'GeneralPurpose' + capacity: 2 } properties: { - administratorLogin: '${administratorLogin}' administratorLoginPassword: '${administratorLoginPassword}' - createMode: 'Default' - sslEnforcement: 'Enabled' - version: '9.5' - infrastructureEncryption: 'Disabled' minimalTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } + administratorLogin: '${administratorLogin}' + createMode: 'Default' + infrastructureEncryption: 'Disabled' + sslEnforcement: 'Enabled' + version: '9.5' } } diff --git a/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep index 1271dca0..38efaa44 100644 --- a/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.dbforpostgresql/samples/servers/virtualnetworkrules/main.bicep @@ -10,25 +10,25 @@ resource server 'Microsoft.DBforPostgreSQL/servers@2017-12-01' = { name: resourceName location: location sku: { - capacity: 2 - family: 'Gen5' name: 'GP_Gen5_2' tier: 'GeneralPurpose' + capacity: 2 + family: 'Gen5' } properties: { + infrastructureEncryption: 'Disabled' + minimalTlsVersion: 'TLS1_2' + sslEnforcement: 'Enabled' + publicNetworkAccess: 'Enabled' storageProfile: { - backupRetentionDays: 7 storageAutogrow: 'Enabled' storageMB: 51200 + backupRetentionDays: 7 } - administratorLoginPassword: '${administratorLoginPassword}' - createMode: 'Default' - infrastructureEncryption: 'Disabled' - sslEnforcement: 'Enabled' version: '9.5' administratorLogin: '${administratorLogin}' - minimalTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' + administratorLoginPassword: '${administratorLoginPassword}' + createMode: 'Default' } } @@ -36,15 +36,15 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { - dhcpOptions: { - dnsServers: [] - } - subnets: [] addressSpace: { addressPrefixes: [ '10.7.29.0/29' ] } + dhcpOptions: { + dnsServers: [] + } + subnets: [] } } @@ -52,6 +52,7 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { + serviceEndpointPolicies: [] serviceEndpoints: [ { service: 'Microsoft.Sql' @@ -61,7 +62,6 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] } } diff --git a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep index bcf23d39..93ec41f8 100644 --- a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep +++ b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/applications/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@2023-09-05' = { name: resourceName diff --git a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep index 9cff28c5..d7df0203 100644 --- a/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep +++ b/settings/remarks/microsoft.desktopvirtualization/samples/applicationgroups/main.bicep @@ -5,9 +5,9 @@ resource applicationGroup 'Microsoft.DesktopVirtualization/applicationGroups@202 name: '${resourceName}-ag' location: location properties: { - applicationGroupType: 'Desktop' description: '' friendlyName: '' + applicationGroupType: 'Desktop' } } @@ -15,17 +15,17 @@ resource hostPool 'Microsoft.DesktopVirtualization/hostPools@2024-04-03' = { name: '${resourceName}-hp' location: location properties: { - publicNetworkAccess: 'Enabled' - startVMOnConnect: false - loadBalancerType: 'BreadthFirst' - personalDesktopAssignmentType: '' - validationEnvironment: false vmTemplate: '' customRdpProperty: '' - description: '' friendlyName: '' hostPoolType: 'Pooled' maxSessionLimit: 999999 + personalDesktopAssignmentType: '' preferredAppGroupType: 'Desktop' + validationEnvironment: false + description: '' + loadBalancerType: 'BreadthFirst' + publicNetworkAccess: 'Enabled' + startVMOnConnect: false } } diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep index 5d6fd22b..9d1e3ad6 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/catalogs/main.bicep @@ -12,10 +12,10 @@ resource catalog 'Microsoft.DevCenter/devCenters/catalogs@2025-02-01' = { parent: devCenter properties: { adoGit: { - branch: 'main' path: '/template' secretIdentifier: 'https://amlim-kv.vault.azure.net/secrets/ado/6279752c2bdd4a38a3e79d958cc36a75' uri: 'https://amlim@dev.azure.com/amlim/testCatalog/_git/testCatalog' + branch: 'main' } } } diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep index fa7c5c37..e4a7054a 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/devboxdefinitions/main.bicep @@ -1,12 +1,12 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource devCenter 'Microsoft.DevCenter/devcenters@2023-04-01' = { name: resourceName location: location identity: { - userAssignedIdentities: null type: 'SystemAssigned' + userAssignedIdentities: null } } diff --git a/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep b/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep index 9ae6d9d5..c091a718 100644 --- a/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/devcenters/main.bicep @@ -1,5 +1,5 @@ -param location string = 'eastus' param resourceName string = 'acctest0001' +param location string = 'eastus' 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 6fd54a6c..c642e839 100644 --- a/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/networkconnections/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource networkConnection 'Microsoft.DevCenter/networkConnections@2023-04-01' = { name: resourceName diff --git a/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep b/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep index bb16b7f4..283b47fe 100644 --- a/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep +++ b/settings/remarks/microsoft.devcenter/samples/projects/environmenttypes/main.bicep @@ -1,32 +1,32 @@ 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 properties: { + description: '' devCenterId: devCenter.id maxDevBoxesPerUser: 0 - description: '' } } +resource environmentType 'Microsoft.DevCenter/devCenters/environmentTypes@2025-02-01' = { + name: '${resourceName}-envtype' + parent: devCenter +} + resource environmenttype1 'Microsoft.DevCenter/projects/environmentTypes@2025-02-01' = { name: 'azapi_resource.environmentType.name' parent: project properties: { - deploymentTargetId: '/subscriptions/${subscription()}' + 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 58191ef5..8a189b49 100644 --- a/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep +++ b/settings/remarks/microsoft.devices/samples/iothubs/certificates/main.bicep @@ -12,6 +12,7 @@ resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: 'B1' } properties: { + storageEndpoints: {} cloudToDevice: {} enableFileUploadNotifications: false messagingEndpoints: {} @@ -25,7 +26,6 @@ resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { condition: 'true' } } - storageEndpoints: {} } } diff --git a/settings/remarks/microsoft.devices/samples/iothubs/main.bicep b/settings/remarks/microsoft.devices/samples/iothubs/main.bicep index ebf0e45c..462703d5 100644 --- a/settings/remarks/microsoft.devices/samples/iothubs/main.bicep +++ b/settings/remarks/microsoft.devices/samples/iothubs/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: resourceName @@ -9,6 +9,7 @@ resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: 'S1' } properties: { + cloudToDevice: {} enableFileUploadNotifications: false messagingEndpoints: {} routing: { @@ -22,6 +23,5 @@ resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { } } storageEndpoints: {} - cloudToDevice: {} } } diff --git a/settings/remarks/microsoft.devices/samples/provisioningservices/certificates/main.bicep b/settings/remarks/microsoft.devices/samples/provisioningservices/certificates/main.bicep index 92cf4ca1..9dfdd9a4 100644 --- a/settings/remarks/microsoft.devices/samples/provisioningservices/certificates/main.bicep +++ b/settings/remarks/microsoft.devices/samples/provisioningservices/certificates/main.bicep @@ -9,10 +9,10 @@ resource provisioningService 'Microsoft.Devices/provisioningServices@2022-02-05' name: 'S1' } properties: { - publicNetworkAccess: 'Enabled' allocationPolicy: 'Hashed' enableDataResidency: false iotHubs: [] + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.devices/samples/provisioningservices/main.bicep b/settings/remarks/microsoft.devices/samples/provisioningservices/main.bicep index f0b374e9..2db45788 100644 --- a/settings/remarks/microsoft.devices/samples/provisioningservices/main.bicep +++ b/settings/remarks/microsoft.devices/samples/provisioningservices/main.bicep @@ -9,9 +9,9 @@ resource provisioningService 'Microsoft.Devices/provisioningServices@2022-02-05' name: 'S1' } properties: { - iotHubs: [] - publicNetworkAccess: 'Enabled' allocationPolicy: 'Hashed' enableDataResidency: false + iotHubs: [] + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep b/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep index ba733893..fcf6ba48 100644 --- a/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep +++ b/settings/remarks/microsoft.deviceupdate/samples/accounts/instances/main.bicep @@ -1,31 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { - name: resourceName - location: location - sku: { - name: 'S1' - capacity: 1 - } - properties: { - cloudToDevice: {} - enableFileUploadNotifications: false - messagingEndpoints: {} - routing: { - fallbackRoute: { - isEnabled: true - source: 'DeviceMessages' - condition: 'true' - endpointNames: [ - 'events' - ] - } - } - storageEndpoints: {} - } -} - resource account 'Microsoft.DeviceUpdate/accounts@2022-10-01' = { name: resourceName location: location @@ -49,3 +24,28 @@ resource instance 'Microsoft.DeviceUpdate/accounts/instances@2022-10-01' = { ] } } + +resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { + name: resourceName + location: location + sku: { + capacity: 1 + name: 'S1' + } + properties: { + messagingEndpoints: {} + routing: { + fallbackRoute: { + condition: 'true' + endpointNames: [ + 'events' + ] + isEnabled: true + source: 'DeviceMessages' + } + } + storageEndpoints: {} + cloudToDevice: {} + enableFileUploadNotifications: false + } +} diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep index e42e1703..7c56340b 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/schedules/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { name: resourceName @@ -14,9 +14,6 @@ resource schedule 'Microsoft.DevTestLab/labs/schedules@2018-09-15' = { location: location parent: lab properties: { - status: 'Disabled' - taskType: 'LabVmsShutdownTask' - timeZoneId: 'India Standard Time' dailyRecurrence: { time: '0100' } @@ -25,6 +22,9 @@ resource schedule 'Microsoft.DevTestLab/labs/schedules@2018-09-15' = { timeInMinutes: 0 webhookUrl: '' } + status: 'Disabled' + taskType: 'LabVmsShutdownTask' + timeZoneId: 'India Standard Time' } tags: { environment: 'Production' diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep index 6826624e..4e8d849a 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/virtualmachines/main.bicep @@ -1,8 +1,8 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' @secure() @description('The password for the DevTest Lab virtual machine') param vmPassword string -param resourceName string = 'acctest0001' -param location string = 'westeurope' resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { name: resourceName @@ -17,24 +17,24 @@ resource virtualMachine 'Microsoft.DevTestLab/labs/virtualMachines@2018-09-15' = location: location parent: lab properties: { - password: vmPassword + labSubnetName: '${resourceName}Subnet' + osType: 'Windows' size: 'Standard_F2' - allowClaim: true + userName: 'acct5stU5er' galleryImageReference: { - offer: 'WindowsServer' osType: 'Windows' publisher: 'MicrosoftWindowsServer' sku: '2012-Datacenter' version: 'latest' + offer: 'WindowsServer' } - labSubnetName: '${resourceName}Subnet' + networkInterface: {} + notes: '' + password: vmPassword storageType: 'Standard' - userName: 'acct5stU5er' + allowClaim: true disallowPublicIpAddress: false isAuthenticationWithSshKey: false - networkInterface: {} - notes: '' - osType: 'Windows' } } diff --git a/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep b/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep index f2aaaafe..9f6d7df2 100644 --- a/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/labs/virtualnetworks/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource lab 'Microsoft.DevTestLab/labs@2018-09-15' = { name: resourceName diff --git a/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep b/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep index 77512219..d6bdf33e 100644 --- a/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep +++ b/settings/remarks/microsoft.devtestlab/samples/schedules/main.bicep @@ -4,6 +4,75 @@ param location string = 'westeurope' @description('The administrator password for the virtual machine') param adminPassword string +resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { + name: resourceName + location: location + properties: { + additionalCapabilities: {} + applicationProfile: { + galleryApplications: [] + } + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' + } + } + hardwareProfile: { + vmSize: 'Standard_B2s' + } + priority: 'Regular' + storageProfile: { + osDisk: { + managedDisk: { + storageAccountType: 'Standard_LRS' + } + name: 'myosdisk-230630033106863551' + osType: 'Linux' + writeAcceleratorEnabled: false + caching: 'ReadWrite' + createOption: 'FromImage' + } + dataDisks: [] + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '18.04-LTS' + version: 'latest' + } + } + extensionsTimeBudget: 'PT1H30M' + networkProfile: { + networkInterfaces: [ + { + id: networkInterface.id + properties: { + primary: true + } + } + ] + } + osProfile: { + adminPassword: adminPassword + adminUsername: 'testadmin' + allowExtensionOperations: true + computerName: resourceName + linuxConfiguration: { + provisionVMAgent: true + ssh: { + publicKeys: [] + } + disablePasswordAuthentication: false + patchSettings: { + assessmentMode: 'ImageDefault' + patchMode: 'ImageDefault' + } + } + secrets: [] + } + } +} + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location @@ -24,12 +93,12 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] } } @@ -43,10 +112,10 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { { name: 'testconfiguration1' properties: { - primary: true - privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' subnet: {} + primary: true + privateIPAddressVersion: 'IPv4' } } ] @@ -57,89 +126,20 @@ resource schedule 'Microsoft.DevTestLab/schedules@2018-09-15' = { name: resourceName location: location properties: { - status: 'Enabled' - taskType: 'ComputeVmShutdownTask' - timeZoneId: 'Pacific Standard Time' dailyRecurrence: { time: '0100' } notificationSettings: { - timeInMinutes: 30 - webhookUrl: '' emailRecipient: '' status: 'Disabled' + timeInMinutes: 30 + webhookUrl: '' } + status: 'Enabled' + taskType: 'ComputeVmShutdownTask' + timeZoneId: 'Pacific Standard Time' } tags: { environment: 'Production' } } - -resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { - name: resourceName - location: location - properties: { - applicationProfile: { - galleryApplications: [] - } - extensionsTimeBudget: 'PT1H30M' - hardwareProfile: { - vmSize: 'Standard_B2s' - } - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: true - } - } - ] - } - osProfile: { - adminPassword: adminPassword - adminUsername: 'testadmin' - allowExtensionOperations: true - computerName: resourceName - linuxConfiguration: { - patchSettings: { - assessmentMode: 'ImageDefault' - patchMode: 'ImageDefault' - } - provisionVMAgent: true - ssh: { - publicKeys: [] - } - disablePasswordAuthentication: false - } - secrets: [] - } - priority: 'Regular' - additionalCapabilities: {} - diagnosticsProfile: { - bootDiagnostics: { - storageUri: '' - enabled: false - } - } - storageProfile: { - dataDisks: [] - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '18.04-LTS' - version: 'latest' - } - osDisk: { - writeAcceleratorEnabled: false - caching: 'ReadWrite' - createOption: 'FromImage' - managedDisk: { - storageAccountType: 'Standard_LRS' - } - name: 'myosdisk-230630033106863551' - osType: 'Linux' - } - } - } -} diff --git a/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep b/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep index a98b82fb..8f160520 100644 --- a/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep +++ b/settings/remarks/microsoft.digitaltwins/samples/digitaltwinsinstances/endpoints/main.bicep @@ -1,22 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' - -resource digitalTwinsInstance 'Microsoft.DigitalTwins/digitalTwinsInstances@2020-12-01' = { - name: resourceName - location: location -} - -resource endpoint 'Microsoft.DigitalTwins/digitalTwinsInstances/endpoints@2020-12-01' = { - name: resourceName - parent: digitalTwinsInstance - properties: { - primaryConnectionString: authorizationRule.listKeys().primaryConnectionString - secondaryConnectionString: authorizationRule.listKeys().secondaryConnectionString - authenticationType: 'KeyBased' - deadLetterSecret: '' - endpointType: 'ServiceBus' - } -} +param resourceName string = 'acctest0001' resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { name: resourceName @@ -56,3 +39,20 @@ resource authorizationRule 'Microsoft.ServiceBus/namespaces/topics/authorization ] } } + +resource digitalTwinsInstance 'Microsoft.DigitalTwins/digitalTwinsInstances@2020-12-01' = { + name: resourceName + location: location +} + +resource endpoint 'Microsoft.DigitalTwins/digitalTwinsInstances/endpoints@2020-12-01' = { + name: resourceName + parent: digitalTwinsInstance + properties: { + authenticationType: 'KeyBased' + deadLetterSecret: '' + endpointType: 'ServiceBus' + primaryConnectionString: authorizationRule.listKeys().primaryConnectionString + secondaryConnectionString: authorizationRule.listKeys().secondaryConnectionString + } +} diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep index 5286d9bb..adb90ec2 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/main.bicep @@ -6,27 +6,18 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + ipRules: [] isVirtualNetworkFilterEnabled: false - networkAclBypass: 'None' capabilities: [ { name: 'EnableCassandra' } ] + enableAnalyticalStorage: false + networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' databaseAccountOfferType: 'Standard' disableKeyBasedMetadataWriteAccess: false - virtualNetworkRules: [] - consistencyPolicy: { - maxStalenessPrefix: 100 - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - } - disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - enableFreeTier: false - ipRules: [] - enableMultipleWriteLocations: false locations: [ { failoverPriority: 0 @@ -34,9 +25,18 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' + networkAclBypass: 'None' + enableAutomaticFailover: false + enableFreeTier: false + virtualNetworkRules: [] + consistencyPolicy: { + maxStalenessPrefix: 100 + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + } defaultIdentity: 'FirstPartyIdentity' + disableLocalAuth: false + enableMultipleWriteLocations: false } } 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 849aab69..f645a6ea 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/cassandrakeyspaces/tables/main.bicep @@ -1,50 +1,50 @@ param resourceName string = 'acctest0001' param location string = 'eastus' +var accountName = 'resourcename' var keyspaceName = 'resourcenameks' var tableName = 'resourcenametbl' -var accountName = 'resourcename' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: accountName location: location kind: 'GlobalDocumentDB' properties: { + disableLocalAuth: false + enableFreeTier: false + ipRules: [] + consistencyPolicy: { + maxStalenessPrefix: 100 + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + } + defaultIdentity: 'FirstPartyIdentity' + enableBurstCapacity: false + enablePartitionMerge: false + locations: [ + { + isZoneRedundant: false + locationName: '${location}' + failoverPriority: 0 + } + ] + networkAclBypassResourceIds: [] capabilities: [ { name: 'EnableCassandra' } ] - enableBurstCapacity: false - enableFreeTier: false - enablePartitionMerge: false - minimalTlsVersion: 'Tls12' - networkAclBypassResourceIds: [] databaseAccountOfferType: 'Standard' - disableLocalAuth: false + disableKeyBasedMetadataWriteAccess: false + virtualNetworkRules: [] enableAnalyticalStorage: true enableAutomaticFailover: false - backupPolicy: null - disableKeyBasedMetadataWriteAccess: false enableMultipleWriteLocations: false - ipRules: [] isVirtualNetworkFilterEnabled: false - locations: [ - { - failoverPriority: 0 - isZoneRedundant: false - locationName: '${location}' - } - ] + minimalTlsVersion: 'Tls12' networkAclBypass: 'None' publicNetworkAccess: 'Enabled' - consistencyPolicy: { - maxStalenessPrefix: 100 - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - } - defaultIdentity: 'FirstPartyIdentity' - virtualNetworkRules: [] + backupPolicy: null } } @@ -65,9 +65,12 @@ resource table 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces/tables@ properties: { options: {} resource: { - analyticalStorageTtl: 1 - id: '${tableName}' schema: { + partitionKeys: [ + { + name: 'test1' + } + ] clusterKeys: [] columns: [ { @@ -75,16 +78,13 @@ resource table 'Microsoft.DocumentDB/databaseAccounts/cassandraKeyspaces/tables@ type: 'ascii' } { - type: 'int' name: 'test2' - } - ] - partitionKeys: [ - { - name: 'test1' + type: 'int' } ] } + analyticalStorageTtl: 1 + id: '${tableName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep index 723c8a18..2ff1a69f 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/graphs/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: resourceName @@ -11,9 +11,14 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: 'EnableGremlin' } ] + defaultIdentity: 'FirstPartyIdentity' disableLocalAuth: false + virtualNetworkRules: [] + databaseAccountOfferType: 'Standard' + disableKeyBasedMetadataWriteAccess: false enableAnalyticalStorage: false - enableFreeTier: false + enableMultipleWriteLocations: false + ipRules: [] locations: [ { failoverPriority: 0 @@ -21,22 +26,17 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - virtualNetworkRules: [] + networkAclBypass: 'None' + networkAclBypassResourceIds: [] consistencyPolicy: { - maxIntervalInSeconds: 5 maxStalenessPrefix: 100 defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 } - databaseAccountOfferType: 'Standard' - disableKeyBasedMetadataWriteAccess: false - enableAutomaticFailover: false - enableMultipleWriteLocations: false - ipRules: [] - networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - defaultIdentity: 'FirstPartyIdentity' + enableAutomaticFailover: false + enableFreeTier: false isVirtualNetworkFilterEnabled: false - networkAclBypass: 'None' } } @@ -59,13 +59,13 @@ resource graph 'Microsoft.DocumentDB/databaseAccounts/gremlinDatabases/graphs@20 throughput: 400 } resource: { + id: '${resourceName}' partitionKey: { kind: 'Hash' paths: [ '/test' ] } - id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep index 05aedff2..3490c095 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/gremlindatabases/main.bicep @@ -6,17 +6,30 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - databaseAccountOfferType: 'Standard' - disableKeyBasedMetadataWriteAccess: false + networkAclBypassResourceIds: [] + capabilities: [ + { + name: 'EnableGremlin' + } + ] + consistencyPolicy: { + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + ipRules: [] + virtualNetworkRules: [] + networkAclBypass: 'None' disableLocalAuth: false + enableAnalyticalStorage: false + enableAutomaticFailover: false + databaseAccountOfferType: 'Standard' isVirtualNetworkFilterEnabled: false - networkAclBypass: 'None' - networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' defaultIdentity: 'FirstPartyIdentity' - enableAutomaticFailover: false + disableKeyBasedMetadataWriteAccess: false + enableFreeTier: false enableMultipleWriteLocations: false - ipRules: [] - virtualNetworkRules: [] locations: [ { failoverPriority: 0 @@ -24,19 +37,6 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - capabilities: [ - { - name: 'EnableGremlin' - } - ] - enableAnalyticalStorage: false - enableFreeTier: false - publicNetworkAccess: 'Enabled' - consistencyPolicy: { - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - defaultConsistencyLevel: 'Strong' - } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep index 810e1dda..a1560784 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/main.bicep @@ -6,32 +6,32 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - consistencyPolicy: { - defaultConsistencyLevel: 'BoundedStaleness' - maxIntervalInSeconds: 10 - maxStalenessPrefix: 200 - } - databaseAccountOfferType: 'Standard' - enableAutomaticFailover: false - ipRules: [] + defaultIdentity: 'FirstPartyIdentity' + disableKeyBasedMetadataWriteAccess: false + enableFreeTier: false + enableMultipleWriteLocations: false + isVirtualNetworkFilterEnabled: false locations: [ { - locationName: 'West Europe' failoverPriority: 0 isZoneRedundant: false + locationName: 'West Europe' } ] - virtualNetworkRules: [] disableLocalAuth: false enableAnalyticalStorage: false - enableFreeTier: false - enableMultipleWriteLocations: false - isVirtualNetworkFilterEnabled: false - networkAclBypass: 'None' - publicNetworkAccess: 'Enabled' - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false + ipRules: [] + databaseAccountOfferType: 'Standard' + enableAutomaticFailover: false networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' + virtualNetworkRules: [] + networkAclBypass: 'None' capabilities: [] + consistencyPolicy: { + defaultConsistencyLevel: 'BoundedStaleness' + maxIntervalInSeconds: 10 + maxStalenessPrefix: 200 + } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep index 18337e30..b8fa9a5f 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbdatabases/main.bicep @@ -1,23 +1,21 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: resourceName location: location kind: 'MongoDB' properties: { + publicNetworkAccess: 'Enabled' + virtualNetworkRules: [] + disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false enableAutomaticFailover: false - enableMultipleWriteLocations: false - networkAclBypass: 'None' - capabilities: [ - { - name: 'EnableMongo' - } - ] databaseAccountOfferType: 'Standard' defaultIdentity: 'FirstPartyIdentity' enableAnalyticalStorage: false enableFreeTier: false + enableMultipleWriteLocations: false ipRules: [] locations: [ { @@ -26,17 +24,19 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - publicNetworkAccess: 'Enabled' - isVirtualNetworkFilterEnabled: false - virtualNetworkRules: [] - disableLocalAuth: false networkAclBypassResourceIds: [] + capabilities: [ + { + name: 'EnableMongo' + } + ] + isVirtualNetworkFilterEnabled: false + networkAclBypass: 'None' consistencyPolicy: { defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - disableKeyBasedMetadataWriteAccess: false } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep index 979242e9..23078d70 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbroledefinitions/main.bicep @@ -1,42 +1,41 @@ param resourceName string = 'acctest0001' param location string = 'eastus' +var accountName = 'resourcename' var dbName = 'resourcenamedb' var roleName = 'resourcenamerole' -var accountName = 'resourcename' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: accountName location: location kind: 'MongoDB' properties: { - minimalTlsVersion: 'Tls12' - virtualNetworkRules: [] - backupPolicy: null - disableKeyBasedMetadataWriteAccess: false - enableAutomaticFailover: false - isVirtualNetworkFilterEnabled: false - networkAclBypassResourceIds: [] consistencyPolicy: { + maxIntervalInSeconds: 5 maxStalenessPrefix: 100 defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 } - disableLocalAuth: false - enableAnalyticalStorage: false - enableFreeTier: false + databaseAccountOfferType: 'Standard' + defaultIdentity: 'FirstPartyIdentity' + disableKeyBasedMetadataWriteAccess: false locations: [ { - failoverPriority: 0 isZoneRedundant: false locationName: '${location}' + failoverPriority: 0 } ] - publicNetworkAccess: 'Enabled' - defaultIdentity: 'FirstPartyIdentity' + networkAclBypass: 'None' + networkAclBypassResourceIds: [] enableBurstCapacity: false enablePartitionMerge: false - networkAclBypass: 'None' + ipRules: [] + backupPolicy: null + disableLocalAuth: false + enableAnalyticalStorage: false + enableAutomaticFailover: false + isVirtualNetworkFilterEnabled: false + publicNetworkAccess: 'Enabled' capabilities: [ { name: 'EnableMongoRoleBasedAccessControl' @@ -45,9 +44,10 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: 'EnableMongo' } ] - databaseAccountOfferType: 'Standard' + enableFreeTier: false enableMultipleWriteLocations: false - ipRules: [] + minimalTlsVersion: 'Tls12' + virtualNetworkRules: [] } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep index edcc23ef..32516524 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/mongodbuserdefinitions/main.bicep @@ -9,29 +9,13 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { location: location kind: 'MongoDB' properties: { - consistencyPolicy: { - maxStalenessPrefix: 100 - defaultConsistencyLevel: 'Strong' - maxIntervalInSeconds: 5 - } - enablePartitionMerge: false - ipRules: [] - isVirtualNetworkFilterEnabled: false - publicNetworkAccess: 'Enabled' + networkAclBypass: 'None' + backupPolicy: null disableLocalAuth: false - enableAutomaticFailover: false - databaseAccountOfferType: 'Standard' enableAnalyticalStorage: false - locations: [ - { - failoverPriority: 0 - isZoneRedundant: false - locationName: '${location}' - } - ] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] - virtualNetworkRules: [] + enableAutomaticFailover: false + enableFreeTier: false + isVirtualNetworkFilterEnabled: false capabilities: [ { name: 'EnableMongoRoleBasedAccessControl' @@ -40,12 +24,28 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2024-08-15' = { name: 'EnableMongo' } ] - disableKeyBasedMetadataWriteAccess: false enableBurstCapacity: false - enableFreeTier: false enableMultipleWriteLocations: false + enablePartitionMerge: false + ipRules: [] + virtualNetworkRules: [] + databaseAccountOfferType: 'Standard' + disableKeyBasedMetadataWriteAccess: false + networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' + consistencyPolicy: { + defaultConsistencyLevel: 'Strong' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + locations: [ + { + locationName: '${location}' + failoverPriority: 0 + isZoneRedundant: false + } + ] minimalTlsVersion: 'Tls12' - backupPolicy: null } } @@ -64,9 +64,9 @@ resource mongodbUserDefinition 'Microsoft.DocumentDB/databaseAccounts/mongodbUse name: '${mongodbDatabas.name}.myUserName' parent: databaseAccount properties: { + password: mongodbUserPassword userName: 'myUserName' databaseName: mongodbDatabas.name mechanisms: 'SCRAM-SHA-256' - password: mongodbUserPassword } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep index 0f669d02..2c91304d 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/services/main.bicep @@ -8,31 +8,31 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { properties: { enableFreeTier: false enableMultipleWriteLocations: false - isVirtualNetworkFilterEnabled: false - capabilities: [] + publicNetworkAccess: 'Enabled' defaultIdentity: 'FirstPartyIdentity' - enableAnalyticalStorage: false - networkAclBypass: 'None' - virtualNetworkRules: [] - databaseAccountOfferType: 'Standard' enableAutomaticFailover: false - consistencyPolicy: { - defaultConsistencyLevel: 'BoundedStaleness' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } - disableLocalAuth: false + networkAclBypassResourceIds: [] ipRules: [] locations: [ { - failoverPriority: 0 isZoneRedundant: false locationName: 'West Europe' + failoverPriority: 0 } ] - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' + networkAclBypass: 'None' + capabilities: [] + consistencyPolicy: { + defaultConsistencyLevel: 'BoundedStaleness' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + databaseAccountOfferType: 'Standard' + enableAnalyticalStorage: false + isVirtualNetworkFilterEnabled: false + virtualNetworkRules: [] disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false } } 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 20612393..5f783e8d 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/main.bicep @@ -7,17 +7,24 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { kind: 'GlobalDocumentDB' properties: { disableKeyBasedMetadataWriteAccess: false + enableAnalyticalStorage: false + networkAclBypass: 'None' enableAutomaticFailover: false - enableFreeTier: false virtualNetworkRules: [] consistencyPolicy: { - defaultConsistencyLevel: 'BoundedStaleness' maxIntervalInSeconds: 10 maxStalenessPrefix: 200 + defaultConsistencyLevel: 'BoundedStaleness' } + defaultIdentity: 'FirstPartyIdentity' + disableLocalAuth: false ipRules: [] - networkAclBypass: 'None' + isVirtualNetworkFilterEnabled: false publicNetworkAccess: 'Enabled' + capabilities: [] + databaseAccountOfferType: 'Standard' + enableFreeTier: false + enableMultipleWriteLocations: false locations: [ { failoverPriority: 0 @@ -25,14 +32,7 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - capabilities: [] - defaultIdentity: 'FirstPartyIdentity' - disableLocalAuth: false - enableAnalyticalStorage: false - isVirtualNetworkFilterEnabled: false networkAclBypassResourceIds: [] - databaseAccountOfferType: 'Standard' - enableMultipleWriteLocations: false } } @@ -40,12 +40,12 @@ resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10 name: resourceName parent: databaseAccount properties: { - resource: { - id: '${resourceName}' - } options: { throughput: 400 } + resource: { + id: '${resourceName}' + } } } @@ -53,15 +53,15 @@ resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/container name: resourceName parent: sqlDatabase properties: { + options: {} resource: { id: 'test-containerWest Europe' partitionKey: { - kind: 'Hash' paths: [ '/definition' ] + kind: 'Hash' } } - options: {} } } 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 a1a506dd..ce445583 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/storedprocedures/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/storedprocedures/main.bicep @@ -6,12 +6,26 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { + networkAclBypassResourceIds: [] + virtualNetworkRules: [] + capabilities: [] + defaultIdentity: 'FirstPartyIdentity' + enableAutomaticFailover: false + enableFreeTier: false ipRules: [] networkAclBypass: 'None' publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] - capabilities: [] + enableAnalyticalStorage: false + consistencyPolicy: { + defaultConsistencyLevel: 'Session' + maxIntervalInSeconds: 5 + maxStalenessPrefix: 100 + } + disableLocalAuth: false + isVirtualNetworkFilterEnabled: false + databaseAccountOfferType: 'Standard' disableKeyBasedMetadataWriteAccess: false + enableMultipleWriteLocations: false locations: [ { failoverPriority: 0 @@ -19,20 +33,6 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypassResourceIds: [] - consistencyPolicy: { - defaultConsistencyLevel: 'Session' - maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 - } - databaseAccountOfferType: 'Standard' - disableLocalAuth: false - enableAutomaticFailover: false - defaultIdentity: 'FirstPartyIdentity' - enableAnalyticalStorage: false - enableFreeTier: false - enableMultipleWriteLocations: false - isVirtualNetworkFilterEnabled: false } } @@ -53,13 +53,13 @@ resource container 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/container properties: { options: {} resource: { + id: '${resourceName}' partitionKey: { - kind: 'Hash' paths: [ '/definition/id' ] + kind: 'Hash' } - 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 bb877b86..0f666b57 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/triggers/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/triggers/main.bicep @@ -6,33 +6,33 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - defaultIdentity: 'FirstPartyIdentity' + disableKeyBasedMetadataWriteAccess: false enableAnalyticalStorage: false - enableFreeTier: false - enableMultipleWriteLocations: false - ipRules: [] locations: [ { - locationName: 'West Europe' failoverPriority: 0 isZoneRedundant: false + locationName: 'West Europe' } ] - virtualNetworkRules: [] - capabilities: [] + networkAclBypass: 'None' + publicNetworkAccess: 'Enabled' + isVirtualNetworkFilterEnabled: false consistencyPolicy: { defaultConsistencyLevel: 'Session' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - disableKeyBasedMetadataWriteAccess: false - networkAclBypassResourceIds: [] - networkAclBypass: 'None' databaseAccountOfferType: 'Standard' + defaultIdentity: 'FirstPartyIdentity' disableLocalAuth: false + enableFreeTier: false + ipRules: [] + capabilities: [] enableAutomaticFailover: false - isVirtualNetworkFilterEnabled: false - publicNetworkAccess: 'Enabled' + enableMultipleWriteLocations: false + networkAclBypassResourceIds: [] + virtualNetworkRules: [] } } @@ -40,10 +40,10 @@ resource sqlDatabase 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases@2021-10 name: resourceName parent: databaseAccount properties: { + options: {} resource: { id: '${resourceName}' } - options: {} } } @@ -70,10 +70,10 @@ resource trigger 'Microsoft.DocumentDB/databaseAccounts/sqlDatabases/containers/ properties: { options: {} resource: { - body: 'function trigger(){}' - id: '${resourceName}' triggerOperation: 'All' triggerType: 'Pre' + body: 'function trigger(){}' + id: '${resourceName}' } } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep index bae70b37..ec86414f 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/containers/userdefinedfunctions/main.bicep @@ -6,33 +6,33 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - locations: [ - { - failoverPriority: 0 - isZoneRedundant: false - locationName: 'West Europe' - } - ] networkAclBypass: 'None' - disableKeyBasedMetadataWriteAccess: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - networkAclBypassResourceIds: [] - virtualNetworkRules: [] + defaultIdentity: 'FirstPartyIdentity' enableFreeTier: false - enableMultipleWriteLocations: false - isVirtualNetworkFilterEnabled: false - publicNetworkAccess: 'Enabled' + ipRules: [] capabilities: [] databaseAccountOfferType: 'Standard' + disableLocalAuth: false + enableAutomaticFailover: false + isVirtualNetworkFilterEnabled: false + networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' + virtualNetworkRules: [] consistencyPolicy: { defaultConsistencyLevel: 'Session' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 } - defaultIdentity: 'FirstPartyIdentity' - disableLocalAuth: false - ipRules: [] + enableAnalyticalStorage: false + locations: [ + { + failoverPriority: 0 + isZoneRedundant: false + locationName: 'West Europe' + } + ] + disableKeyBasedMetadataWriteAccess: false + enableMultipleWriteLocations: false } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep index 035e7042..5e61acd8 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqldatabases/main.bicep @@ -6,22 +6,12 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - defaultIdentity: 'FirstPartyIdentity' - enableMultipleWriteLocations: false - networkAclBypass: 'None' - consistencyPolicy: { - maxStalenessPrefix: 200 - defaultConsistencyLevel: 'BoundedStaleness' - maxIntervalInSeconds: 10 - } disableKeyBasedMetadataWriteAccess: false - ipRules: [] - isVirtualNetworkFilterEnabled: false + enableAutomaticFailover: false publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] - disableLocalAuth: false enableAnalyticalStorage: false - networkAclBypassResourceIds: [] + enableFreeTier: false + ipRules: [] locations: [ { failoverPriority: 0 @@ -30,9 +20,19 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } ] capabilities: [] + disableLocalAuth: false + isVirtualNetworkFilterEnabled: false + enableMultipleWriteLocations: false + networkAclBypassResourceIds: [] + virtualNetworkRules: [] + networkAclBypass: 'None' + consistencyPolicy: { + defaultConsistencyLevel: 'BoundedStaleness' + maxIntervalInSeconds: 10 + maxStalenessPrefix: 200 + } databaseAccountOfferType: 'Standard' - enableAutomaticFailover: false - enableFreeTier: false + defaultIdentity: 'FirstPartyIdentity' } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep index 46d373aa..5db65510 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroleassignments/main.bicep @@ -6,37 +6,21 @@ resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinit parent: databaseAccount } -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 - enablePurge: false - engineType: 'V2' - restrictOutboundNetworkAccess: 'Disabled' - enableDiskEncryption: false - enableDoubleEncryption: false - enableStreamingIngest: false - publicIPType: 'IPv4' - publicNetworkAccess: 'Enabled' - trustedExternalTenants: [] - } -} - resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: resourceName location: location kind: 'GlobalDocumentDB' properties: { databaseAccountOfferType: 'Standard' + defaultIdentity: 'FirstPartyIdentity' disableKeyBasedMetadataWriteAccess: false - disableLocalAuth: false enableAnalyticalStorage: false + enableFreeTier: false + enableMultipleWriteLocations: false + ipRules: [] + networkAclBypassResourceIds: [] + disableLocalAuth: false + virtualNetworkRules: [] capabilities: [] consistencyPolicy: { defaultConsistencyLevel: 'Session' @@ -44,6 +28,7 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { maxStalenessPrefix: 100 } enableAutomaticFailover: false + isVirtualNetworkFilterEnabled: false locations: [ { failoverPriority: 0 @@ -52,31 +37,46 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { } ] networkAclBypass: 'None' - networkAclBypassResourceIds: [] - enableFreeTier: false - enableMultipleWriteLocations: false - virtualNetworkRules: [] - defaultIdentity: 'FirstPartyIdentity' - ipRules: [] - isVirtualNetworkFilterEnabled: false publicNetworkAccess: 'Enabled' } } -resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { - name: resourceName - location: location - parent: cluster - kind: 'ReadWrite' - properties: {} -} - resource sqlRoleAssignment 'Microsoft.DocumentDB/databaseAccounts/sqlRoleAssignments@2021-10-15' = { name: 'ff419bf7-f8ca-ef51-00d2-3576700c341b' parent: databaseAccount properties: { - principalId: cluster.identity.principalId roleDefinitionId: sqlRoleDefinition.id scope: databaseAccount.id + principalId: cluster.identity.principalId + } +} + +resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { + name: resourceName + location: location + sku: { + capacity: 1 + name: 'Dev(No SLA)_Standard_D11_v2' + tier: 'Basic' } + properties: { + enableDiskEncryption: false + enableDoubleEncryption: false + enableStreamingIngest: false + engineType: 'V2' + trustedExternalTenants: [] + enableAutoStop: true + enablePurge: false + publicIPType: 'IPv4' + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: 'Disabled' + } +} + +resource database 'Microsoft.Kusto/clusters/databases@2023-05-02' = { + name: resourceName + location: location + parent: cluster + kind: 'ReadWrite' + properties: {} } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep index a3bdf7e7..4152b83d 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/sqlroledefinitions/main.bicep @@ -1,27 +1,25 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { name: resourceName location: location kind: 'GlobalDocumentDB' properties: { - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false disableLocalAuth: false - enableAutomaticFailover: false - isVirtualNetworkFilterEnabled: false + enableMultipleWriteLocations: false networkAclBypass: 'None' + networkAclBypassResourceIds: [] publicNetworkAccess: 'Enabled' - virtualNetworkRules: [] + disableKeyBasedMetadataWriteAccess: false + enableAutomaticFailover: false + ipRules: [] + isVirtualNetworkFilterEnabled: false consistencyPolicy: { + defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 maxStalenessPrefix: 100 - defaultConsistencyLevel: 'Strong' } - enableAnalyticalStorage: false - enableFreeTier: false - enableMultipleWriteLocations: false locations: [ { failoverPriority: 0 @@ -31,8 +29,10 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { ] capabilities: [] databaseAccountOfferType: 'Standard' - ipRules: [] - networkAclBypassResourceIds: [] + defaultIdentity: 'FirstPartyIdentity' + enableAnalyticalStorage: false + enableFreeTier: false + virtualNetworkRules: [] } } @@ -40,6 +40,10 @@ resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinit name: 'c3ce1661-d0b9-3476-0a7c-2654ce2f3055' parent: databaseAccount properties: { + type: 'CustomRole' + assignableScopes: [ + databaseAccount.id + ] permissions: [ { dataActions: [ @@ -48,9 +52,5 @@ resource sqlRoleDefinition 'Microsoft.DocumentDB/databaseAccounts/sqlRoleDefinit } ] roleName: resourceName - type: 'CustomRole' - assignableScopes: [ - databaseAccount.id - ] } } diff --git a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep index dc400124..8db8e18f 100644 --- a/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/databaseaccounts/tables/main.bicep @@ -6,28 +6,29 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { location: location kind: 'GlobalDocumentDB' properties: { - publicNetworkAccess: 'Enabled' + databaseAccountOfferType: 'Standard' + enableAutomaticFailover: false + enableFreeTier: false + capabilities: [ + { + name: 'EnableTable' + } + ] consistencyPolicy: { + maxStalenessPrefix: 100 defaultConsistencyLevel: 'Strong' maxIntervalInSeconds: 5 - maxStalenessPrefix: 100 } - defaultIdentity: 'FirstPartyIdentity' disableLocalAuth: false - enableAnalyticalStorage: false - enableAutomaticFailover: false - databaseAccountOfferType: 'Standard' ipRules: [] - networkAclBypass: 'None' virtualNetworkRules: [] - capabilities: [ - { - name: 'EnableTable' - } - ] disableKeyBasedMetadataWriteAccess: false - enableMultipleWriteLocations: false + enableAnalyticalStorage: false isVirtualNetworkFilterEnabled: false + networkAclBypassResourceIds: [] + publicNetworkAccess: 'Enabled' + defaultIdentity: 'FirstPartyIdentity' + enableMultipleWriteLocations: false locations: [ { failoverPriority: 0 @@ -35,8 +36,7 @@ resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { locationName: 'West Europe' } ] - networkAclBypassResourceIds: [] - enableFreeTier: false + networkAclBypass: 'None' } } diff --git a/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep b/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep index 190aede4..37511746 100644 --- a/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/mongoclusters/firewallrules/main.bicep @@ -5,28 +5,28 @@ resource mongoCluster 'Microsoft.DocumentDB/mongoClusters@2025-09-01' = { name: resourceName location: location properties: { - authConfig: { - allowedModes: [ - 'MicrosoftEntraID' - ] - } compute: { tier: 'M40' } previewFeatures: [ 'ShardRebalancer' ] + publicNetworkAccess: 'Enabled' sharding: { shardCount: 1 } - storage: { - sizeGb: 32 + authConfig: { + allowedModes: [ + 'MicrosoftEntraID' + ] } highAvailability: { targetMode: 'Disabled' } - publicNetworkAccess: 'Enabled' serverVersion: '5.0' + storage: { + sizeGb: 32 + } } } diff --git a/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep b/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep index 101961e7..3193751b 100644 --- a/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep +++ b/settings/remarks/microsoft.documentdb/samples/mongoclusters/users/main.bicep @@ -28,11 +28,6 @@ resource mongoClusterSSDv2 'Microsoft.DocumentDB/mongoClusters@2025-09-01' = { } } -resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { - name: resourceName - location: location -} - resource mongouserEntraserviceprincipal 'Microsoft.DocumentDB/mongoClusters/users@2025-09-01' = { name: 'azapi_resource.userAssignedIdentity.output.properties.principalId' parent: mongoClusterSSDv2 @@ -51,3 +46,8 @@ resource mongouserEntraserviceprincipal 'Microsoft.DocumentDB/mongoClusters/user ] } } + +resource userAssignedIdentity 'Microsoft.ManagedIdentity/userAssignedIdentities@2023-01-31' = { + name: resourceName + location: location +} diff --git a/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep b/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep index b5a4b9c9..fbe50598 100644 --- a/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep +++ b/settings/remarks/microsoft.elasticsan/samples/elasticsans/main.bicep @@ -1,15 +1,15 @@ -param location string = 'westus' param resourceName string = 'acctest0001' +param location string = 'westus' resource elasticSan 'Microsoft.ElasticSan/elasticSans@2023-01-01' = { name: resourceName location: location properties: { - baseSizeTiB: 1 - extendedCapacitySizeTiB: 0 sku: { name: 'Premium_LRS' tier: 'Premium' } + baseSizeTiB: 1 + extendedCapacitySizeTiB: 0 } } diff --git a/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep b/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep index 14bc5da2..484c73f2 100644 --- a/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/domains/main.bicep @@ -1,15 +1,15 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { name: resourceName location: location properties: { + disableLocalAuth: false inputSchema: 'EventGridSchema' inputSchemaMapping: null publicNetworkAccess: 'Enabled' autoCreateTopicWithFirstSubscription: true autoDeleteTopicWithLastSubscription: true - disableLocalAuth: false } } diff --git a/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep index 6e14062c..31c7a7e8 100644 --- a/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/domains/topics/main.bicep @@ -1,16 +1,16 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource domain 'Microsoft.EventGrid/domains@2021-12-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' autoCreateTopicWithFirstSubscription: true autoDeleteTopicWithLastSubscription: true disableLocalAuth: false inputSchema: 'EventGridSchema' inputSchemaMapping: null - publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep b/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep index 5f5caeee..7f4bea3c 100644 --- a/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/eventsubscriptions/main.bicep @@ -1,21 +1,5 @@ -param resourceName string = 'acctest0001' 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: { - publicNetworkAccess: 'Enabled' - zoneRedundant: false - disableLocalAuth: false - isAutoInflateEnabled: false - } -} +param resourceName string = 'acctest0001' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName @@ -27,39 +11,29 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { properties: { isNfsV3Enabled: false isSftpEnabled: false - networkAcls: { - defaultAction: 'Allow' - } - accessTier: 'Hot' - allowCrossTenantReplication: true - allowSharedKeyAccess: true minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - allowBlobPublicAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { - queue: { + table: { keyType: 'Service' } - table: { + queue: { keyType: 'Service' } } } isHnsEnabled: false - } -} - -resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { - name: resourceName - parent: namespace - properties: { - messageRetentionInDays: 1 - partitionCount: 1 - status: 'Active' + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true } } @@ -67,13 +41,6 @@ resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = name: resourceName scope: storageAccount properties: { - destination: { - endpointType: 'EventHub' - properties: { - deliveryAttributeMappings: null - } - } - eventDeliverySchema: 'EventGridSchema' filter: { includedEventTypes: [ 'Microsoft.Storage.BlobCreated' @@ -86,5 +53,38 @@ resource eventSubscription 'Microsoft.EventGrid/eventSubscriptions@2021-12-01' = maxDeliveryAttempts: 10 } deadLetterDestination: null + destination: { + endpointType: 'EventHub' + properties: { + deliveryAttributeMappings: null + } + } + eventDeliverySchema: 'EventGridSchema' + } +} + +resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { + name: resourceName + location: location + sku: { + capacity: 1 + name: 'Standard' + tier: 'Standard' + } + properties: { + publicNetworkAccess: 'Enabled' + zoneRedundant: false + disableLocalAuth: false + isAutoInflateEnabled: false + } +} + +resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { + name: resourceName + parent: namespace + properties: { + status: 'Active' + 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 75baaa3b..e59655c9 100644 --- a/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/namespaces/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westus' param resourceName string = 'acctest0001' +param location string = 'westus' resource namespace 'Microsoft.EventGrid/namespaces@2023-12-15-preview' = { name: '${resourceName}-ns' diff --git a/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep b/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep index 14c26c72..f85f37ca 100644 --- a/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/systemtopics/eventsubscriptions/main.bicep @@ -1,21 +1,12 @@ param resourceName string = 'acctest0001' param location string = 'westus' -var eventSubscription2Name = 'resourceName-es2' var systemTopicName = 'resourceName-st' var storageAccountName = 'resourceNamesa01' var queueName = 'resourceNamequeue' -var queueServiceId = '${storageAccount.id}/queueServices/default' var eventSubscription1Name = 'resourceName-es1' - -resource systemTopic 'Microsoft.EventGrid/systemTopics@2022-06-15' = { - name: systemTopicName - location: 'global' - properties: { - source: resourceGroup().id - topicType: 'Microsoft.Resources.ResourceGroups' - } -} +var eventSubscription2Name = 'resourceName-es2' +var queueServiceId = '${storageAccount.id}/queueServices/default' resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: storageAccountName @@ -26,24 +17,14 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { kind: 'StorageV2' properties: { isLocalUserEnabled: true - minimumTlsVersion: 'TLS1_2' - allowSharedKeyAccess: true - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - allowBlobPublicAccess: true - allowCrossTenantReplication: false - defaultToOAuthAuthentication: false - isHnsEnabled: false - isNfsV3Enabled: false + isSftpEnabled: false networkAcls: { - resourceAccessRules: [] - virtualNetworkRules: [] bypass: 'AzureServices' defaultAction: 'Allow' ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] } - accessTier: 'Hot' - dnsEndpointType: 'Standard' encryption: { keySource: 'Microsoft.Storage' services: { @@ -55,7 +36,26 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - isSftpEnabled: false + publicNetworkAccess: 'Enabled' + isHnsEnabled: false + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + defaultToOAuthAuthentication: false + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + allowBlobPublicAccess: true + allowCrossTenantReplication: false + allowSharedKeyAccess: true + dnsEndpointType: 'Standard' + } +} + +resource systemTopic 'Microsoft.EventGrid/systemTopics@2022-06-15' = { + name: systemTopicName + location: 'global' + properties: { + source: resourceGroup().id + topicType: 'Microsoft.Resources.ResourceGroups' } } @@ -85,11 +85,11 @@ resource eventSubscription 'Microsoft.EventGrid/systemTopics/eventSubscriptions@ filter: { advancedFilters: [ { + key: 'subject' operatorType: 'StringBeginsWith' values: [ 'foo' ] - key: 'subject' } ] } @@ -104,26 +104,26 @@ resource eventsubscription1 'Microsoft.EventGrid/systemTopics/eventSubscriptions queue ] properties: { - destination: { - endpointType: 'StorageQueue' - properties: { - queueName: queueName - resourceId: storageAccount.id - } - } - eventDeliverySchema: 'EventGridSchema' filter: { advancedFilters: [ { - key: 'subject' - operatorType: 'StringEndsWith' values: [ 'bar' ] + key: 'subject' + operatorType: 'StringEndsWith' } ] } labels: [] deadLetterDestination: null + destination: { + endpointType: 'StorageQueue' + properties: { + queueName: queueName + resourceId: storageAccount.id + } + } + eventDeliverySchema: 'EventGridSchema' } } diff --git a/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep b/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep index 7036e6b5..7d52cb0d 100644 --- a/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep +++ b/settings/remarks/microsoft.eventgrid/samples/topics/main.bicep @@ -5,9 +5,9 @@ resource topic 'Microsoft.EventGrid/topics@2021-12-01' = { name: resourceName location: location properties: { - inputSchemaMapping: null - publicNetworkAccess: 'Enabled' disableLocalAuth: false inputSchema: 'EventGridSchema' + inputSchemaMapping: null + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.eventhub/samples/clusters/main.bicep b/settings/remarks/microsoft.eventhub/samples/clusters/main.bicep index 6bab59e7..0f1ada93 100644 --- a/settings/remarks/microsoft.eventhub/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/clusters/main.bicep @@ -5,7 +5,7 @@ resource cluster 'Microsoft.EventHub/clusters@2021-11-01' = { name: resourceName location: location sku: { - name: 'Dedicated' capacity: 1 + name: 'Dedicated' } } diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep index 9a86144d..25499a90 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/disasterrecoveryconfigs/main.bicep @@ -1,9 +1,9 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource namespace2 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { +resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName - location: 'westus2' + location: location sku: { capacity: 1 name: 'Standard' @@ -17,9 +17,17 @@ resource namespace2 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { } } -resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { +resource disasterRecoveryConfig 'Microsoft.EventHub/namespaces/disasterRecoveryConfigs@2021-11-01' = { name: resourceName - location: location + parent: namespace + properties: { + partnerNamespace: namespace2.id + } +} + +resource namespace2 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { + name: resourceName + location: 'westus2' sku: { capacity: 1 name: 'Standard' @@ -32,11 +40,3 @@ resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { zoneRedundant: false } } - -resource disasterRecoveryConfig 'Microsoft.EventHub/namespaces/disasterRecoveryConfigs@2021-11-01' = { - 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 f963d6ca..fc971ee4 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/authorizationrules/main.bicep @@ -21,9 +21,9 @@ resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { name: resourceName parent: namespace properties: { + messageRetentionInDays: 1 partitionCount: 2 status: 'Active' - messageRetentionInDays: 1 } } 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 ec3a8a37..1fd26319 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/consumergroups/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName @@ -10,10 +10,10 @@ resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { tier: 'Standard' } properties: { - publicNetworkAccess: 'Enabled' - zoneRedundant: false disableLocalAuth: false isAutoInflateEnabled: false + publicNetworkAccess: 'Enabled' + zoneRedundant: false } } diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep index bd59a83e..38a5fa38 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/eventhubs/main.bicep @@ -5,9 +5,9 @@ resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location sku: { - capacity: 1 name: 'Standard' tier: 'Standard' + capacity: 1 } properties: { disableLocalAuth: false @@ -21,8 +21,8 @@ resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { name: resourceName parent: namespace properties: { - status: 'Active' messageRetentionInDays: 1 partitionCount: 2 + status: 'Active' } } diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep index 5187e28c..9194ceb9 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/main.bicep @@ -5,9 +5,9 @@ resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location sku: { + name: 'Standard' tier: 'Standard' capacity: 1 - name: 'Standard' } properties: { disableLocalAuth: false diff --git a/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep b/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep index 739eb2be..c6baac52 100644 --- a/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep +++ b/settings/remarks/microsoft.eventhub/samples/namespaces/schemagroups/main.bicep @@ -5,15 +5,15 @@ resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location sku: { - capacity: 1 name: 'Standard' tier: 'Standard' + capacity: 1 } properties: { + disableLocalAuth: false isAutoInflateEnabled: false publicNetworkAccess: 'Enabled' zoneRedundant: false - disableLocalAuth: false } } diff --git a/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep b/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep index b01d7ff8..75577bad 100644 --- a/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep +++ b/settings/remarks/microsoft.guestconfiguration/samples/guestconfigurationassignments/main.bicep @@ -1,52 +1,14 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' @secure() @description('The administrator password for the virtual machine') param adminPassword string -param resourceName string = 'acctest0001' -param location string = 'westeurope' - -resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { - name: resourceName - location: location - properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'internal' - properties: { - subnet: {} - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - } - } - ] - } -} resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - priority: 'Regular' - storageProfile: { - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - managedDisk: { - storageAccountType: 'Standard_LRS' - } - osType: 'Windows' - writeAcceleratorEnabled: false - } - dataDisks: [] - imageReference: { - offer: 'WindowsServer' - publisher: 'MicrosoftWindowsServer' - sku: '2016-Datacenter' - version: 'latest' - } - } + additionalCapabilities: {} applicationProfile: { galleryApplications: [] } @@ -56,6 +18,11 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { storageUri: '' } } + extensionsTimeBudget: 'PT1H30M' + priority: 'Regular' + hardwareProfile: { + vmSize: 'Standard_F2' + } networkProfile: { networkInterfaces: [ { @@ -85,27 +52,81 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { adminUsername: 'adminuser' allowExtensionOperations: true } - additionalCapabilities: {} - extensionsTimeBudget: 'PT1H30M' - hardwareProfile: { - vmSize: 'Standard_F2' + storageProfile: { + dataDisks: [] + imageReference: { + version: 'latest' + offer: 'WindowsServer' + publisher: 'MicrosoftWindowsServer' + sku: '2016-Datacenter' + } + osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' + managedDisk: { + storageAccountType: 'Standard_LRS' + } + osType: 'Windows' + writeAcceleratorEnabled: false + } + } + } +} + +resource guestConfigurationAssignment 'Microsoft.GuestConfiguration/guestConfigurationAssignments@2020-06-25' = { + name: 'WhitelistedApplication' + location: location + scope: virtualMachine + properties: { + guestConfiguration: { + name: 'WhitelistedApplication' + version: '1.*' + assignmentType: '' + configurationParameter: [ + { + value: 'NotePad,sql' + name: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + } + ] + contentHash: '' + contentUri: '' } } } +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + ipConfigurations: [ + { + name: 'internal' + properties: { + subnet: {} + primary: true + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + } + } + ] + enableAcceleratedNetworking: false + enableIPForwarding: false + } +} + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + dhcpOptions: { + dnsServers: [] + } + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' ] } - dhcpOptions: { - dnsServers: [] - } - subnets: [] } } @@ -113,32 +134,11 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'internal' parent: virtualNetwork properties: { - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' - } -} - -resource guestConfigurationAssignment 'Microsoft.GuestConfiguration/guestConfigurationAssignments@2020-06-25' = { - name: 'WhitelistedApplication' - location: location - scope: virtualMachine - properties: { - guestConfiguration: { - assignmentType: '' - configurationParameter: [ - { - name: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} - value: 'NotePad,sql' - } - ] - contentHash: '' - contentUri: '' - name: 'WhitelistedApplication' - version: '1.*' - } + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] } } diff --git a/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep b/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep index c084b991..9488589b 100644 --- a/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.hdinsight/samples/clusters/main.bicep @@ -18,23 +18,41 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { name: resourceName location: location properties: { + storageProfile: { + storageaccounts: [ + { + isDefault: true + key: storageAccount.listKeys().keys[0].value + name: '.blob.core.windows.net' + } + ] + } + tier: 'standard' clusterDefinition: { + componentVersion: { + Spark: '2.4' + } configurations: { gateway: { + 'restAuthCredential.isEnabled': true 'restAuthCredential.password': restCredentialPassword 'restAuthCredential.username': 'acctestusrgw' - 'restAuthCredential.isEnabled': true } } kind: 'Spark' - componentVersion: { - Spark: '2.4' - } } clusterVersion: '4.0.3000.1' + encryptionInTransitProperties: { + isEncryptionInTransitEnabled: false + } + minSupportedTlsVersion: '1.2' + osType: 'Linux' computeProfile: { roles: [ { + hardwareProfile: { + vmSize: 'standard_a4_v2' + } name: 'headnode' osProfile: { linuxOperatingSystemProfile: { @@ -43,14 +61,8 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { } } targetInstanceCount: 2 - hardwareProfile: { - vmSize: 'standard_a4_v2' - } } { - hardwareProfile: { - vmSize: 'standard_a4_v2' - } name: 'workernode' osProfile: { linuxOperatingSystemProfile: { @@ -59,6 +71,9 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { } } targetInstanceCount: 3 + hardwareProfile: { + vmSize: 'standard_a4_v2' + } } { hardwareProfile: { @@ -75,21 +90,6 @@ resource cluster 'Microsoft.HDInsight/clusters@2018-06-01-preview' = { } ] } - encryptionInTransitProperties: { - isEncryptionInTransitEnabled: false - } - minSupportedTlsVersion: '1.2' - osType: 'Linux' - storageProfile: { - storageaccounts: [ - { - isDefault: true - key: storageAccount.listKeys().keys[0].value - name: '.blob.core.windows.net' - } - ] - } - tier: 'standard' } } @@ -101,31 +101,31 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - minimumTlsVersion: 'TLS1_2' + encryption: { + keySource: 'Microsoft.Storage' + services: { + queue: { + keyType: 'Service' + } + table: { + keyType: 'Service' + } + } + } isHnsEnabled: false + isNfsV3Enabled: false isSftpEnabled: false + accessTier: 'Hot' + minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true defaultToOAuthAuthentication: false - encryption: { - keySource: 'Microsoft.Storage' - services: { - table: { - keyType: 'Service' - } - queue: { - keyType: 'Service' - } - } - } - isNfsV3Enabled: false } } diff --git a/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep index 0debdcea..6cdc8773 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/services/main.bicep @@ -6,8 +6,6 @@ resource service 'Microsoft.HealthcareApis/services@2022-12-01' = { location: location kind: 'fhir' properties: { - authenticationConfiguration: {} - corsConfiguration: {} cosmosDbConfiguration: { offerThroughput: 1000 } @@ -17,5 +15,7 @@ resource service 'Microsoft.HealthcareApis/services@2022-12-01' = { objectId: deployer().objectId } ] + authenticationConfiguration: {} + corsConfiguration: {} } } diff --git a/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep b/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep index 67b32716..60655fe3 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/fhirservices/main.bicep @@ -1,49 +1,49 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { name: resourceName location: location } -resource fhirService2 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { +resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { name: resourceName location: location parent: workspace kind: 'fhir-R4' properties: { - acrConfiguration: {} - authenticationConfiguration: { - audience: fhirService.properties.authenticationConfiguration.audience - authority: fhirService.properties.authenticationConfiguration.authority - smartProxyEnabled: false - } corsConfiguration: { + origins: [] allowCredentials: false headers: [] methods: [] - origins: [] + } + acrConfiguration: {} + authenticationConfiguration: { + audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' + authority: 'https://login.microsoftonline.com/${tenant().tenantId}' + smartProxyEnabled: false } } } -resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { +resource fhirService2 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { name: resourceName location: location parent: workspace kind: 'fhir-R4' properties: { - corsConfiguration: { - methods: [] - origins: [] - allowCredentials: false - headers: [] - } acrConfiguration: {} authenticationConfiguration: { - authority: 'https://login.microsoftonline.com/${tenant()}' + authority: fhirService.properties.authenticationConfiguration.authority smartProxyEnabled: false - audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' + audience: fhirService.properties.authenticationConfiguration.audience + } + corsConfiguration: { + allowCredentials: false + headers: [] + methods: [] + origins: [] } } } 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 eb94e1c0..5d8d3b7c 100644 --- a/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep +++ b/settings/remarks/microsoft.healthcareapis/samples/workspaces/iotconnectors/fhirdestinations/main.bicep @@ -5,23 +5,18 @@ resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location sku: { + capacity: 1 name: 'Standard' tier: 'Standard' - capacity: 1 } properties: { - publicNetworkAccess: 'Enabled' - zoneRedundant: false disableLocalAuth: false isAutoInflateEnabled: false + publicNetworkAccess: 'Enabled' + zoneRedundant: false } } -resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { - name: resourceName - location: location -} - resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { name: resourceName parent: namespace @@ -32,27 +27,19 @@ resource eventhub 'Microsoft.EventHub/namespaces/eventhubs@2021-11-01' = { } } -resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { +resource consumerGroup 'Microsoft.EventHub/namespaces/eventhubs/consumerGroups@2021-11-01' = { name: resourceName - location: location - parent: workspace - kind: 'fhir-R4' + parent: eventhub properties: { - acrConfiguration: {} - authenticationConfiguration: { - smartProxyEnabled: false - audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' - authority: 'https://login.microsoftonline.com/${tenant()}' - } - corsConfiguration: { - allowCredentials: false - headers: [] - methods: [] - origins: [] - } + userMetadata: '' } } +resource workspace 'Microsoft.HealthcareApis/workspaces@2022-12-01' = { + name: resourceName + location: location +} + resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12-01' = { name: resourceName location: location @@ -71,14 +58,6 @@ resource iotConnector 'Microsoft.HealthcareApis/workspaces/iotConnectors@2022-12 } } -resource consumerGroup 'Microsoft.EventHub/namespaces/eventhubs/consumerGroups@2021-11-01' = { - name: resourceName - parent: eventhub - properties: { - userMetadata: '' - } -} - resource fhirDestination 'Microsoft.HealthcareApis/workspaces/iotConnectors/fhirDestinations@2022-12-01' = { name: resourceName location: location @@ -94,3 +73,24 @@ resource fhirDestination 'Microsoft.HealthcareApis/workspaces/iotConnectors/fhir resourceIdentityResolutionType: 'Create' } } + +resource fhirService 'Microsoft.HealthcareApis/workspaces/fhirServices@2022-12-01' = { + name: resourceName + location: location + parent: workspace + kind: 'fhir-R4' + properties: { + acrConfiguration: {} + authenticationConfiguration: { + audience: 'https://acctestfhir.fhir.azurehealthcareapis.com' + authority: 'https://login.microsoftonline.com/${tenant().tenantId}' + smartProxyEnabled: false + } + corsConfiguration: { + allowCredentials: false + headers: [] + methods: [] + origins: [] + } + } +} diff --git a/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep b/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep index 79234bee..7e935631 100644 --- a/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep +++ b/settings/remarks/microsoft.impact/samples/workloadimpacts/main.bicep @@ -14,10 +14,10 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { networkProfile: { networkInterfaces: [ { - id: networkInterface.id properties: { primary: false } + id: networkInterface.id } ] } @@ -30,18 +30,18 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } } storageProfile: { + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' + } osDisk: { caching: 'ReadWrite' createOption: 'FromImage' name: 'myosdisk1' writeAcceleratorEnabled: false } - imageReference: { - version: 'latest' - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '16.04-LTS' - } } } } @@ -50,62 +50,63 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { - dhcpOptions: { - dnsServers: [] - } - subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' ] } + dhcpOptions: { + dnsServers: [] + } + subnets: [] } } resource workloadImpact 'Microsoft.Impact/workloadImpacts@2023-12-01-preview' = { name: resourceName properties: { + startDateTime: '2024-12-03T01:15:00Z' + workload: { + context: 'context' + toolset: 'Ansible' + } + armCorrelationIds: [ + 'id1' + 'id2' + ] + clientIncidentDetails: { + clientIncidentId: 'id' + clientIncidentSource: 'AzureDevops' + } errorDetails: { errorCode: 'code' errorMessage: 'errorMessage' } impactCategory: 'Resource.Availability' + impactDescription: 'impact description' impactedResourceId: virtualMachine.id performance: [ { + unit: 'ByteSeconds' + actual: 2 + expected: 2 expectedValueRange: { - max: 5 min: 1 + max: 5 } metricName: 'example' - unit: 'ByteSeconds' - actual: 2 - expected: 2 } ] - startDateTime: '2024-12-03T01:15:00Z' - workload: { - context: 'context' - toolset: 'Ansible' - } additionalProperties: { - NodeId: 'node-123' - Manufacturer: 'ManufacturerName' - ModelNumber: 'Model123' - PhysicalHostName: 'host123' - SerialNumber: 'SN123456' VmUniqueId: 'vm-unique-id' - CollectTelemetry: true Location: 'DataCenter1' LogUrl: 'http://example.com/log' - } - armCorrelationIds: [ - 'id1' - 'id2' - ] - clientIncidentDetails: { - clientIncidentId: 'id' - clientIncidentSource: 'AzureDevops' + Manufacturer: 'ManufacturerName' + PhysicalHostName: 'host123' + CollectTelemetry: true + ModelNumber: 'Model123' + NodeId: 'node-123' + SerialNumber: 'SN123456' } confidenceLevel: 'High' connectivity: { @@ -119,7 +120,6 @@ resource workloadImpact 'Microsoft.Impact/workloadImpacts@2023-12-01-preview' = } } endDateTime: '2024-12-04T01:15:00Z' - impactDescription: 'impact description' impactGroupId: 'impact groupid' } } @@ -128,12 +128,12 @@ 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: [] - addressPrefix: '10.0.2.0/24' } } @@ -141,18 +141,18 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName location: location properties: { - enableIPForwarding: false ipConfigurations: [ { name: 'testconfiguration1' properties: { + subnet: {} primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' - subnet: {} } } ] enableAcceleratedNetworking: false + enableIPForwarding: false } } diff --git a/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep b/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep index e15d1e15..71993d5f 100644 --- a/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep +++ b/settings/remarks/microsoft.insights/samples/actiongroups/main.bicep @@ -5,18 +5,18 @@ resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { name: resourceName location: 'global' properties: { - armRoleReceivers: [] - automationRunbookReceivers: [] - azureAppPushReceivers: [] + emailReceivers: [] + enabled: true eventHubReceivers: [] - groupShortName: 'acctestag' - itsmReceivers: [] logicAppReceivers: [] + voiceReceivers: [] webhookReceivers: [] + automationRunbookReceivers: [] + azureAppPushReceivers: [] azureFunctionReceivers: [] - emailReceivers: [] - enabled: true + groupShortName: 'acctestag' + itsmReceivers: [] smsReceivers: [] - voiceReceivers: [] + armRoleReceivers: [] } } diff --git a/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep b/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep index f350148a..d9a15191 100644 --- a/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep +++ b/settings/remarks/microsoft.insights/samples/activitylogalerts/main.bicep @@ -1,6 +1,46 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { + name: resourceName + location: 'global' + properties: { + azureAppPushReceivers: [] + azureFunctionReceivers: [] + eventHubReceivers: [] + groupShortName: 'acctestag1' + itsmReceivers: [] + smsReceivers: [] + voiceReceivers: [] + webhookReceivers: [] + armRoleReceivers: [] + automationRunbookReceivers: [] + emailReceivers: [] + enabled: true + logicAppReceivers: [] + } +} + +resource actionGroup2 'Microsoft.Insights/actionGroups@2023-01-01' = { + name: resourceName + location: 'global' + properties: { + webhookReceivers: [] + armRoleReceivers: [] + automationRunbookReceivers: [] + emailReceivers: [] + eventHubReceivers: [] + logicAppReceivers: [] + azureAppPushReceivers: [] + azureFunctionReceivers: [] + enabled: true + groupShortName: 'acctestag2' + itsmReceivers: [] + smsReceivers: [] + voiceReceivers: [] + } +} + resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { name: resourceName location: 'global' @@ -34,8 +74,8 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { field: 'properties.currentHealthStatus' } { - field: 'properties.currentHealthStatus' equals: 'Degraded' + field: 'properties.currentHealthStatus' } ] } @@ -46,8 +86,8 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { field: 'properties.previousHealthStatus' } { - equals: 'Available' field: 'properties.previousHealthStatus' + equals: 'Available' } ] } @@ -58,8 +98,8 @@ resource activityLogAlert 'Microsoft.Insights/activityLogAlerts@2020-10-01' = { field: 'properties.cause' } { - field: 'properties.cause' equals: 'UserInitiated' + field: 'properties.cause' } ] } @@ -78,13 +118,12 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + isNfsV3Enabled: false publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true + defaultToOAuthAuthentication: false encryption: { + keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -93,55 +132,16 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } - keySource: 'Microsoft.Storage' } - isNfsV3Enabled: false + isHnsEnabled: false isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - defaultToOAuthAuthentication: false - isHnsEnabled: false - minimumTlsVersion: 'TLS1_2' - } -} - -resource actionGroup 'Microsoft.Insights/actionGroups@2023-01-01' = { - name: resourceName - location: 'global' - properties: { - azureAppPushReceivers: [] - emailReceivers: [] - eventHubReceivers: [] - groupShortName: 'acctestag1' - itsmReceivers: [] - logicAppReceivers: [] - smsReceivers: [] - voiceReceivers: [] - armRoleReceivers: [] - automationRunbookReceivers: [] - azureFunctionReceivers: [] - enabled: true - webhookReceivers: [] - } -} - -resource actionGroup2 'Microsoft.Insights/actionGroups@2023-01-01' = { - name: resourceName - location: 'global' - properties: { - armRoleReceivers: [] - automationRunbookReceivers: [] - azureAppPushReceivers: [] - azureFunctionReceivers: [] - emailReceivers: [] - eventHubReceivers: [] - smsReceivers: [] - voiceReceivers: [] - enabled: true - groupShortName: 'acctestag2' - itsmReceivers: [] - logicAppReceivers: [] - webhookReceivers: [] + supportsHttpsTrafficOnly: true + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true } } diff --git a/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep b/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep index f145024c..8c406d8a 100644 --- a/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep +++ b/settings/remarks/microsoft.insights/samples/autoscalesettings/main.bicep @@ -1,10 +1,10 @@ +param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator username for the virtual machine scale set') param adminUsername string @secure() @description('The administrator password for the virtual machine scale set') param adminPassword string -param resourceName string = 'acctest0001' resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName @@ -26,12 +26,12 @@ 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: [] - addressPrefix: '10.0.2.0/24' - delegations: [] } } @@ -51,23 +51,23 @@ resource autoScaleSetting 'Microsoft.Insights/autoScaleSettings@2022-10-01' = { name: 'metricRules' rules: [ { - scaleAction: { - direction: 'Increase' - type: 'ChangeCount' - value: '1' - cooldown: 'PT1M' - } metricTrigger: { - dimensions: [] - statistic: 'Average' - timeAggregation: 'Last' + timeGrain: 'PT1M' timeWindow: 'PT5M' dividePerInstance: true + timeAggregation: 'Last' + dimensions: [] metricName: 'Percentage CPU' metricNamespace: '' operator: 'GreaterThan' + statistic: 'Average' threshold: 75 - timeGrain: 'PT1M' + } + scaleAction: { + direction: 'Increase' + type: 'ChangeCount' + value: '1' + cooldown: 'PT1M' } } ] @@ -80,25 +80,11 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- name: resourceName location: location sku: { + tier: 'Standard' capacity: 2 name: 'Standard_F2' - tier: 'Standard' } properties: { - additionalCapabilities: {} - doNotRunExtensionsOnOverprovisionedVMs: false - overprovision: true - scaleInPolicy: { - forceDeletion: false - rules: [ - 'Default' - ] - } - singlePlacementGroup: true - upgradePolicy: { - mode: 'Manual' - } - orchestrationMode: 'Uniform' virtualMachineProfile: { diagnosticsProfile: { bootDiagnostics: { @@ -114,32 +100,31 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- { name: 'TestNetworkProfile-230630033559396108' properties: { + dnsSettings: { + dnsServers: [] + } + enableAcceleratedNetworking: false enableIPForwarding: false ipConfigurations: [ { + name: 'TestIPConfiguration' properties: { - privateIPAddressVersion: 'IPv4' - subnet: {} applicationGatewayBackendAddressPools: [] applicationSecurityGroups: [] loadBalancerBackendAddressPools: [] loadBalancerInboundNatPools: [] primary: true + privateIPAddressVersion: 'IPv4' + subnet: {} } - name: 'TestIPConfiguration' } ] primary: true - dnsSettings: { - dnsServers: [] - } - enableAcceleratedNetworking: false } } ] } osProfile: { - computerNamePrefix: 'testvm-230630033559396108' linuxConfiguration: { disablePasswordAuthentication: false provisionVMAgent: true @@ -155,15 +140,16 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- secrets: [] adminPassword: adminPassword adminUsername: adminUsername + computerNamePrefix: 'testvm-230630033559396108' } priority: 'Regular' storageProfile: { dataDisks: [] imageReference: { - offer: 'UbuntuServer' publisher: 'Canonical' sku: '16.04-LTS' version: 'latest' + offer: 'UbuntuServer' } osDisk: { caching: 'ReadWrite' @@ -176,5 +162,19 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2023- } } } + additionalCapabilities: {} + doNotRunExtensionsOnOverprovisionedVMs: false + orchestrationMode: 'Uniform' + singlePlacementGroup: true + overprovision: true + scaleInPolicy: { + forceDeletion: false + rules: [ + 'Default' + ] + } + upgradePolicy: { + mode: 'Manual' + } } } diff --git a/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep b/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep index e3c73143..3f1b96c8 100644 --- a/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep +++ b/settings/remarks/microsoft.insights/samples/components/analyticsitems/main.bicep @@ -6,14 +6,14 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - publicNetworkAccessForIngestion: 'Enabled' - DisableLocalAuth: false ForceCustomerStorageForProfiler: false RetentionInDays: 90 - SamplingPercentage: 100 publicNetworkAccessForQuery: 'Enabled' Application_Type: 'web' DisableIpMasking: false + DisableLocalAuth: false + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' } } diff --git a/settings/remarks/microsoft.insights/samples/components/main.bicep b/settings/remarks/microsoft.insights/samples/components/main.bicep index f373c726..b61771fe 100644 --- a/settings/remarks/microsoft.insights/samples/components/main.bicep +++ b/settings/remarks/microsoft.insights/samples/components/main.bicep @@ -6,13 +6,13 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - DisableIpMasking: false + Application_Type: 'web' DisableLocalAuth: false + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' - Application_Type: 'web' - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 + DisableIpMasking: false } } diff --git a/settings/remarks/microsoft.insights/samples/components/proactivedetectionconfigs/main.bicep b/settings/remarks/microsoft.insights/samples/components/proactivedetectionconfigs/main.bicep index 33fe787f..e49442eb 100644 --- a/settings/remarks/microsoft.insights/samples/components/proactivedetectionconfigs/main.bicep +++ b/settings/remarks/microsoft.insights/samples/components/proactivedetectionconfigs/main.bicep @@ -6,13 +6,13 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' Application_Type: 'web' + RetentionInDays: 90 DisableIpMasking: false DisableLocalAuth: false ForceCustomerStorageForProfiler: false - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - RetentionInDays: 90 SamplingPercentage: 100 } } diff --git a/settings/remarks/microsoft.insights/samples/datacollectionendpoints/main.bicep b/settings/remarks/microsoft.insights/samples/datacollectionendpoints/main.bicep index a5e2f8e0..3f0bf9f1 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionendpoints/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionendpoints/main.bicep @@ -5,9 +5,9 @@ resource dataCollectionEndpoint 'Microsoft.Insights/dataCollectionEndpoints@2022 name: resourceName location: location properties: { + description: '' networkAcls: { publicNetworkAccess: 'Enabled' } - description: '' } } diff --git a/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep b/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep index bc1dbdee..fcb904e3 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionruleassociations/main.bicep @@ -28,56 +28,31 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: 'machine-230630033559397415' location: location properties: { - extensionsTimeBudget: 'PT1H30M' - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: true - } - } - ] - } - priority: 'Regular' - additionalCapabilities: {} - applicationProfile: { - galleryApplications: [] - } - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - hardwareProfile: { - vmSize: 'Standard_B1ls' - } osProfile: { + adminPassword: adminPassword + adminUsername: 'adminuser' + allowExtensionOperations: true computerName: 'machine-230630033559397415' linuxConfiguration: { + disablePasswordAuthentication: false patchSettings: { - assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' + assessmentMode: 'ImageDefault' } provisionVMAgent: true ssh: { publicKeys: [] } - disablePasswordAuthentication: false } secrets: [] - adminPassword: adminPassword - adminUsername: 'adminuser' - allowExtensionOperations: true } storageProfile: { dataDisks: [] imageReference: { - offer: 'UbuntuServer' publisher: 'Canonical' sku: '16.04-LTS' version: 'latest' + offer: 'UbuntuServer' } osDisk: { managedDisk: { @@ -89,6 +64,31 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { createOption: 'FromImage' } } + additionalCapabilities: {} + networkProfile: { + networkInterfaces: [ + { + id: networkInterface.id + properties: { + primary: true + } + } + ] + } + priority: 'Regular' + applicationProfile: { + galleryApplications: [] + } + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' + } + } + extensionsTimeBudget: 'PT1H30M' + hardwareProfile: { + vmSize: 'Standard_B1ls' + } } } @@ -125,6 +125,7 @@ resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' name: resourceName location: location properties: { + description: '' destinations: { azureMonitorMetrics: { name: 'test-destination-metrics' @@ -140,7 +141,6 @@ resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' ] } ] - description: '' } } diff --git a/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep b/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep index 4be39973..e4f9c1a6 100644 --- a/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep +++ b/settings/remarks/microsoft.insights/samples/datacollectionrules/main.bicep @@ -1,10 +1,11 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { name: resourceName location: location properties: { + description: '' destinations: { azureMonitorMetrics: { name: 'test-destination-metrics' @@ -20,6 +21,5 @@ resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' ] } ] - description: '' } } diff --git a/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep b/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep index 16c6457f..fe040ff0 100644 --- a/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep +++ b/settings/remarks/microsoft.insights/samples/diagnosticsettings/main.bicep @@ -5,9 +5,9 @@ resource namespace 'Microsoft.EventHub/namespaces@2022-01-01-preview' = { name: resourceName location: location sku: { - name: 'Basic' tier: 'Basic' capacity: 1 + name: 'Basic' } properties: { disableLocalAuth: false @@ -21,19 +21,19 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { + accessPolicies: [] + createMode: 'default' + enableSoftDelete: true enabledForDeployment: false enabledForDiskEncryption: false - enabledForTemplateDeployment: false publicNetworkAccess: 'Enabled' sku: { family: 'A' name: 'standard' } - tenantId: tenant() - accessPolicies: [] - createMode: 'default' enableRbacAuthorization: false - enableSoftDelete: true + enabledForTemplateDeployment: false + tenantId: tenant().tenantId } } @@ -53,23 +53,23 @@ resource diagnosticSetting 'Microsoft.Insights/diagnosticSettings@2021-05-01-pre name: resourceName scope: vault properties: { - metrics: [ + logs: [ { + categoryGroup: 'Audit' + enabled: true retentionPolicy: { days: 0 enabled: false } - category: 'AllMetrics' - enabled: true } ] - logs: [ + metrics: [ { - categoryGroup: 'Audit' + category: 'AllMetrics' enabled: true retentionPolicy: { - enabled: false 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 index 556e7af8..942311db 100644 --- a/settings/remarks/microsoft.insights/samples/logprofiles/main-rg-module.bicep +++ b/settings/remarks/microsoft.insights/samples/logprofiles/main-rg-module.bicep @@ -9,19 +9,8 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - minimumTlsVersion: 'TLS1_2' - accessTier: 'Hot' - isHnsEnabled: false - isNfsV3Enabled: false - networkAcls: { - defaultAction: 'Allow' - } publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - allowBlobPublicAccess: true - allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -33,6 +22,17 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } + isHnsEnabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + defaultToOAuthAuthentication: false + isNfsV3Enabled: false isSftpEnabled: false } } diff --git a/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep b/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep index 5898f17e..8df98c8b 100644 --- a/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep +++ b/settings/remarks/microsoft.insights/samples/logprofiles/main.bicep @@ -11,6 +11,10 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { resource logProfile 'Microsoft.Insights/logProfiles@2016-03-01' = { name: resourceName properties: { + retentionPolicy: { + days: 7 + enabled: true + } categories: [ 'Action' ] @@ -18,10 +22,6 @@ resource logProfile 'Microsoft.Insights/logProfiles@2016-03-01' = { 'westeurope' 'westeurope' ] - retentionPolicy: { - days: 7 - enabled: true - } } } diff --git a/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep b/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep index d9ad0060..07cc690a 100644 --- a/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep +++ b/settings/remarks/microsoft.insights/samples/metricalerts/main.bicep @@ -1,72 +1,36 @@ -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' - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - isNfsV3Enabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - allowBlobPublicAccess: true - encryption: { - keySource: 'Microsoft.Storage' - services: { - queue: { - keyType: 'Service' - } - table: { - keyType: 'Service' - } - } - } - isHnsEnabled: false - isSftpEnabled: false - supportsHttpsTrafficOnly: true - } -} +param resourceName string = 'acctest0001' resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = { name: resourceName location: 'global' properties: { - severity: 3 + targetResourceRegion: '' + targetResourceType: '' criteria: { allOf: [ { dimensions: [] - metricName: 'UsedCapacity' + metricNamespace: 'Microsoft.Storage/storageAccounts' name: 'Metric1' operator: 'GreaterThan' - skipMetricValidation: false - threshold: any('55.5') timeAggregation: 'Average' criterionType: 'StaticThresholdCriterion' - metricNamespace: 'Microsoft.Storage/storageAccounts' + metricName: 'UsedCapacity' + skipMetricValidation: false + threshold: any('55.5') } ] 'odata.type': 'Microsoft.Azure.Monitor.MultipleResourceMultipleMetricCriteria' } - description: '' - enabled: true - targetResourceRegion: '' - targetResourceType: '' + evaluationFrequency: 'PT1M' windowSize: 'PT1H' actions: [] autoMitigate: true - evaluationFrequency: 'PT1M' + description: '' + enabled: true scopes: [] + severity: 3 } tags: { CUSTOMER: 'CUSTOMERx' @@ -75,3 +39,39 @@ resource metricAlert 'Microsoft.Insights/metricAlerts@2018-03-01' = { test: '123' } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: { + allowCrossTenantReplication: true + allowSharedKeyAccess: true + isHnsEnabled: false + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + allowBlobPublicAccess: true + defaultToOAuthAuthentication: false + encryption: { + keySource: 'Microsoft.Storage' + services: { + table: { + keyType: 'Service' + } + queue: { + keyType: 'Service' + } + } + } + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + } +} diff --git a/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep b/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep index cb40125f..25ba4bcf 100644 --- a/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep +++ b/settings/remarks/microsoft.insights/samples/privatelinkscopes/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-preview' = { name: resourceName diff --git a/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep b/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep index 5a78e5b1..1acbd281 100644 --- a/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep +++ b/settings/remarks/microsoft.insights/samples/privatelinkscopes/scopedresources/main.bicep @@ -1,32 +1,32 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' - -resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-preview' = { - name: resourceName - location: 'Global' - properties: {} -} - -resource scopedResource 'Microsoft.Insights/privateLinkScopes/scopedResources@2019-10-17-preview' = { - name: resourceName - parent: privateLinkScope - properties: { - linkedResourceId: component.id - } -} +param resourceName string = 'acctest0001' resource component 'Microsoft.Insights/components@2020-02-02' = { name: resourceName location: location kind: 'web' properties: { - publicNetworkAccessForIngestion: 'Enabled' Application_Type: 'web' DisableIpMasking: false DisableLocalAuth: false ForceCustomerStorageForProfiler: false SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' RetentionInDays: 90 } } + +resource privateLinkScope 'Microsoft.Insights/privateLinkScopes@2019-10-17-preview' = { + name: resourceName + location: 'Global' + properties: {} +} + +resource scopedResource 'Microsoft.Insights/privateLinkScopes/scopedResources@2019-10-17-preview' = { + 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 33a957b2..1e6c519c 100644 --- a/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep +++ b/settings/remarks/microsoft.insights/samples/scheduledqueryrules/main.bicep @@ -1,50 +1,50 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 + publicNetworkAccessForQuery: 'Enabled' + Application_Type: 'web' + DisableIpMasking: false + DisableLocalAuth: false + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' + } +} + resource scheduledQueryRule 'Microsoft.Insights/scheduledQueryRules@2021-08-01' = { name: resourceName location: location kind: 'LogAlert' properties: { - enabled: true - evaluationFrequency: 'PT5M' - targetResourceTypes: null - scopes: [ - component.id - ] - severity: 3 - skipQueryValidation: false - windowSize: 'PT5M' autoMitigate: false checkWorkspaceAlertsStorageConfigured: false criteria: { allOf: [ { + dimensions: null operator: 'Equal' query: ''' requests | summarize CountByCountry=count() by client_CountryOrRegion ''' threshold: 5 timeAggregation: 'Count' - dimensions: null } ] } - } -} - -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: resourceName - location: location - kind: 'web' - properties: { - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - SamplingPercentage: 100 - Application_Type: 'web' - DisableIpMasking: false + severity: 3 + targetResourceTypes: null + windowSize: 'PT5M' + enabled: true + evaluationFrequency: 'PT5M' + scopes: [ + component.id + ] + skipQueryValidation: false } } diff --git a/settings/remarks/microsoft.insights/samples/webtests/main.bicep b/settings/remarks/microsoft.insights/samples/webtests/main.bicep index 4e376302..22c750a8 100644 --- a/settings/remarks/microsoft.insights/samples/webtests/main.bicep +++ b/settings/remarks/microsoft.insights/samples/webtests/main.bicep @@ -1,31 +1,15 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' - -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: resourceName - location: location - kind: 'web' - properties: { - SamplingPercentage: 100 - Application_Type: 'web' - DisableIpMasking: false - DisableLocalAuth: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - } -} +param location string = 'westeurope' resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { name: resourceName location: location kind: 'standard' properties: { + Description: '' Enabled: false - Kind: 'standard' + Name: resourceName Request: { - FollowRedirects: false Headers: [ { key: 'x-header' @@ -39,24 +23,40 @@ resource webTest 'Microsoft.Insights/webTests@2022-06-15' = { HttpVerb: 'GET' ParseDependentRequests: false RequestUrl: 'http://microsoft.com' + FollowRedirects: false } - RetryEnabled: false SyntheticMonitorId: resourceName - ValidationRules: { - SSLCheck: false - ExpectedHttpStatusCode: 200 - } - Description: '' + Timeout: 30 Frequency: 300 + Kind: 'standard' Locations: [ { Id: 'us-tx-sn1-azr' } ] - Name: resourceName - Timeout: 30 + RetryEnabled: false + ValidationRules: { + ExpectedHttpStatusCode: 200 + SSLCheck: false + } } tags: { 'hidden-link:${component.id}': 'Resource' } } + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: resourceName + location: location + kind: 'web' + properties: { + Application_Type: 'web' + ForceCustomerStorageForProfiler: false + publicNetworkAccessForQuery: 'Enabled' + DisableIpMasking: false + DisableLocalAuth: false + RetentionInDays: 90 + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' + } +} diff --git a/settings/remarks/microsoft.insights/samples/workbooks/main.bicep b/settings/remarks/microsoft.insights/samples/workbooks/main.bicep index 01dea22a..9cb7e9e0 100644 --- a/settings/remarks/microsoft.insights/samples/workbooks/main.bicep +++ b/settings/remarks/microsoft.insights/samples/workbooks/main.bicep @@ -6,9 +6,9 @@ resource workbook 'Microsoft.Insights/workbooks@2022-04-01' = { location: location kind: 'shared' properties: { - serializedData: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} - sourceId: 'azure monitor' category: 'workbook' displayName: 'acctest-amw-230630032616547405' + serializedData: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + sourceId: 'azure monitor' } } diff --git a/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep b/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep index 435efbb2..1384b88f 100644 --- a/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep +++ b/settings/remarks/microsoft.insights/samples/workbooktemplates/main.bicep @@ -5,9 +5,17 @@ resource workbookTemplate 'Microsoft.Insights/workbookTemplates@2020-11-20' = { name: resourceName location: location properties: { + galleries: [ + { + order: 0 + resourceType: 'Azure Monitor' + type: 'workbook' + category: 'workbook' + name: 'test' + } + ] + priority: 0 templateData: { - styleSettings: {} - version: 'Notebook/1.0' '$schema': 'https://github.com/Microsoft/Application-Insights-Workbooks/blob/master/schema/workbook.json' items: [ { @@ -21,16 +29,8 @@ Welcome to your new workbook.''' type: 1 } ] + styleSettings: {} + version: 'Notebook/1.0' } - galleries: [ - { - category: 'workbook' - name: 'test' - order: 0 - resourceType: 'Azure Monitor' - type: 'workbook' - } - ] - priority: 0 } } diff --git a/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep b/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep index 1b37fd4d..266adc33 100644 --- a/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep +++ b/settings/remarks/microsoft.iotcentral/samples/iotapps/main.bicep @@ -8,9 +8,9 @@ resource iotApp 'Microsoft.IoTCentral/iotApps@2021-11-01-preview' = { name: 'ST1' } properties: { + publicNetworkAccess: 'Enabled' subdomain: 'subdomain-2306300333537' template: 'iotc-pnp-preview@1.0.0' displayName: '${resourceName}' - publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep b/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep index 1efa10d3..1db1bad5 100644 --- a/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/managedhsms/main.bicep @@ -17,6 +17,6 @@ resource managedHSM 'Microsoft.KeyVault/managedHSMs@2021-10-01' = { ] publicNetworkAccess: 'Enabled' softDeleteRetentionInDays: 90 - tenantId: tenant() + 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 b2ae1aa3..59203d63 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/accesspolicies/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/accesspolicies/main.bicep @@ -1,17 +1,17 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName location: location properties: { + enableSoftDelete: true + tenantId: tenant().tenantId sku: { family: 'A' name: 'standard' } accessPolicies: [] - enableSoftDelete: true - tenantId: tenant() } } @@ -23,18 +23,18 @@ resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = { objectId: deployer().objectId permissions: { - secrets: [ - 'Set' - ] - storage: [] certificates: [ 'ManageContacts' ] keys: [ 'Create' ] + secrets: [ + 'Set' + ] + storage: [] } - tenantId: tenant() + 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 55951e76..6a4e6d1b 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/keys/main.bicep @@ -5,14 +5,14 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName location: location properties: { - enableSoftDelete: true - enablePurgeProtection: true - tenantId: tenant() sku: { family: 'A' name: 'standard' } accessPolicies: [] + enableSoftDelete: true + enablePurgeProtection: true + tenantId: tenant().tenantId } } @@ -24,6 +24,13 @@ resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = { objectId: deployer().objectId permissions: { + secrets: [ + 'Get' + ] + storage: [] + certificates: [ + 'ManageContacts' + ] keys: [ 'Get' 'Create' @@ -39,15 +46,8 @@ resource putAccesspolicy 'Microsoft.KeyVault/vaults/accessPolicies@2023-02-01' = 'Sign' 'Verify' ] - secrets: [ - 'Get' - ] - storage: [] - certificates: [ - 'ManageContacts' - ] } - tenantId: tenant() + tenantId: tenant().tenantId } ] } diff --git a/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep b/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep index 87f9df77..ce681013 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/main.bicep @@ -5,36 +5,36 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { + softDeleteRetentionInDays: 7 + enableRbacAuthorization: false + enabledForDiskEncryption: false + enabledForTemplateDeployment: false + publicNetworkAccess: 'Enabled' + tenantId: tenant().tenantId accessPolicies: [ { objectId: deployer().objectId permissions: { - secrets: [ - 'Set' - ] - storage: [] certificates: [ 'ManageContacts' ] keys: [ 'Create' ] + secrets: [ + 'Set' + ] + storage: [] } - tenantId: tenant() + tenantId: tenant().tenantId } ] + createMode: 'default' enableSoftDelete: true enabledForDeployment: false - enabledForDiskEncryption: false - enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' sku: { - family: 'A' name: 'standard' + family: 'A' } - tenantId: tenant() - createMode: 'default' - enableRbacAuthorization: false - softDeleteRetentionInDays: 7 } } diff --git a/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep b/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep index 179adcb8..afc77277 100644 --- a/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep +++ b/settings/remarks/microsoft.keyvault/samples/vaults/secrets/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: resourceName @@ -11,7 +11,7 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { } accessPolicies: [] enableSoftDelete: true - tenantId: tenant() + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.kubernetes/samples/connectedclusters/main.bicep b/settings/remarks/microsoft.kubernetes/samples/connectedclusters/main.bicep index f6d1ddef..c92ee190 100644 --- a/settings/remarks/microsoft.kubernetes/samples/connectedclusters/main.bicep +++ b/settings/remarks/microsoft.kubernetes/samples/connectedclusters/main.bicep @@ -6,9 +6,9 @@ resource connectedCluster 'Microsoft.Kubernetes/connectedClusters@2024-01-01' = location: location kind: 'ProvisionedCluster' properties: { + agentPublicKeyCertificate: '' arcAgentProfile: { agentAutoUpgrade: 'Enabled' } - agentPublicKeyCertificate: '' } } diff --git a/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep b/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep index 83b500c3..db4aa7a1 100644 --- a/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep +++ b/settings/remarks/microsoft.kubernetesconfiguration/samples/extensions/main.bicep @@ -7,10 +7,10 @@ resource managedCluster 'Microsoft.ContainerService/managedClusters@2023-04-02-p properties: { agentPoolProfiles: [ { - name: 'default' - vmSize: 'Standard_DS2_v2' count: 1 mode: 'System' + name: 'default' + vmSize: 'Standard_DS2_v2' } ] dnsPrefix: '${resourceName}' @@ -21,7 +21,7 @@ resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = { name: resourceName scope: managedCluster properties: { - extensionType: 'microsoft.flux' 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 76ae70fb..98db6444 100644 --- a/settings/remarks/microsoft.kubernetesconfiguration/samples/fluxconfigurations/main.bicep +++ b/settings/remarks/microsoft.kubernetesconfiguration/samples/fluxconfigurations/main.bicep @@ -21,8 +21,8 @@ resource extension 'Microsoft.KubernetesConfiguration/extensions@2022-11-01' = { name: resourceName scope: managedCluster properties: { - extensionType: 'microsoft.flux' autoUpgradeMinorVersion: true + extensionType: 'microsoft.flux' } } @@ -45,6 +45,7 @@ resource fluxConfiguration 'Microsoft.KubernetesConfiguration/fluxConfigurations } kustomizations: { applications: { + timeoutInSeconds: 600 dependsOn: [ 'shared' ] @@ -53,15 +54,14 @@ resource fluxConfiguration 'Microsoft.KubernetesConfiguration/fluxConfigurations prune: false retryIntervalInSeconds: 60 syncIntervalInSeconds: 60 - timeoutInSeconds: 600 } shared: { - force: false path: 'cluster-config/shared' prune: false retryIntervalInSeconds: 60 syncIntervalInSeconds: 60 timeoutInSeconds: 600 + force: false } } namespace: 'flux-system' diff --git a/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep index 201b8ce8..9e244e0c 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/main.bicep @@ -14,11 +14,11 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { enableDiskEncryption: false enablePurge: false enableStreamingIngest: false - publicIPType: 'IPv4' - publicNetworkAccess: 'Enabled' - enableDoubleEncryption: false engineType: 'V2' + publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' + enableDoubleEncryption: false + publicIPType: 'IPv4' trustedExternalTenants: [] } } 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 e199efef..f1b7fbd9 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/principalassignments/main.bicep @@ -12,16 +12,16 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { tier: 'Basic' } properties: { - enableDoubleEncryption: false - publicIPType: 'IPv4' - publicNetworkAccess: 'Enabled' trustedExternalTenants: [] - enableAutoStop: true + enableDoubleEncryption: false enablePurge: false enableStreamingIngest: false engineType: 'V2' + publicIPType: 'IPv4' restrictOutboundNetworkAccess: 'Disabled' + enableAutoStop: true enableDiskEncryption: false + publicNetworkAccess: 'Enabled' } } @@ -40,6 +40,6 @@ resource principalAssignment 'Microsoft.Kusto/clusters/databases/principalAssign principalId: clientId principalType: 'App' role: 'Viewer' - tenantId: tenant() + 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 cd2b20da..78d8ba67 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/databases/scripts/main.bicep @@ -10,16 +10,16 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { tier: 'Basic' } properties: { - enableAutoStop: true - enableDoubleEncryption: false - enablePurge: false - publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' - enableDiskEncryption: false enableStreamingIngest: false engineType: 'V2' publicIPType: 'IPv4' + restrictOutboundNetworkAccess: 'Disabled' + enableAutoStop: true + enableDiskEncryption: false + enablePurge: false + publicNetworkAccess: 'Enabled' trustedExternalTenants: [] + enableDoubleEncryption: false } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/main.bicep index bc8b6577..158dd904 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/main.bicep @@ -5,20 +5,20 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { name: resourceName location: location sku: { + capacity: 1 name: 'Dev(No SLA)_Standard_D11_v2' tier: 'Basic' - capacity: 1 } properties: { + enableDiskEncryption: false + enableStreamingIngest: false + enableAutoStop: true enableDoubleEncryption: false - publicIPType: 'IPv4' - publicNetworkAccess: 'Enabled' - trustedExternalTenants: [] enablePurge: false - enableStreamingIngest: false engineType: 'V2' + publicIPType: 'IPv4' + publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' - enableAutoStop: true - enableDiskEncryption: false + trustedExternalTenants: [] } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep index f8ee9875..40a4ad8e 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/managedprivateendpoints/main.bicep @@ -11,27 +11,18 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { } properties: { enableDiskEncryption: false + enableDoubleEncryption: false + enableStreamingIngest: false + restrictOutboundNetworkAccess: 'Disabled' + trustedExternalTenants: [] enablePurge: false engineType: 'V2' publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' - trustedExternalTenants: [] - enableDoubleEncryption: false - enableStreamingIngest: false - restrictOutboundNetworkAccess: 'Disabled' enableAutoStop: true } } -resource managedPrivateEndpoint 'Microsoft.Kusto/clusters/managedPrivateEndpoints@2023-05-02' = { - name: resourceName - parent: cluster - properties: { - groupId: 'blob' - privateLinkResourceId: storageAccount.id - } -} - resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -40,12 +31,9 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true + accessTier: 'Hot' allowBlobPublicAccess: true - allowCrossTenantReplication: true - defaultToOAuthAuthentication: false + allowSharedKeyAccess: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -57,13 +45,25 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } + isHnsEnabled: false + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + allowCrossTenantReplication: true + defaultToOAuthAuthentication: false + isNfsV3Enabled: false isSftpEnabled: false networkAcls: { defaultAction: 'Allow' } - accessTier: 'Hot' - allowSharedKeyAccess: true - isHnsEnabled: false - isNfsV3Enabled: false + } +} + +resource managedPrivateEndpoint 'Microsoft.Kusto/clusters/managedPrivateEndpoints@2023-05-02' = { + name: resourceName + parent: cluster + properties: { + privateLinkResourceId: storageAccount.id + groupId: 'blob' } } diff --git a/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep b/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep index 1bd346c4..8682a730 100644 --- a/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep +++ b/settings/remarks/microsoft.kusto/samples/clusters/principalassignments/main.bicep @@ -12,16 +12,16 @@ resource cluster 'Microsoft.Kusto/clusters@2023-05-02' = { tier: 'Basic' } properties: { - publicIPType: 'IPv4' - restrictOutboundNetworkAccess: 'Disabled' + enableAutoStop: true enableDoubleEncryption: false enableStreamingIngest: false - engineType: 'V2' + publicIPType: 'IPv4' publicNetworkAccess: 'Enabled' - trustedExternalTenants: [] - enableAutoStop: true + restrictOutboundNetworkAccess: 'Disabled' enableDiskEncryption: false enablePurge: false + engineType: 'V2' + trustedExternalTenants: [] } } @@ -29,9 +29,9 @@ resource principalAssignment 'Microsoft.Kusto/clusters/principalAssignments@2023 name: resourceName parent: cluster properties: { - tenantId: tenant() principalId: clientId principalType: 'App' role: 'AllDatabasesViewer' + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.labservices/samples/labplans/main.bicep b/settings/remarks/microsoft.labservices/samples/labplans/main.bicep index 23bceec0..8d5d8966 100644 --- a/settings/remarks/microsoft.labservices/samples/labplans/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labplans/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource labPlan 'Microsoft.LabServices/labPlans@2022-08-01' = { name: resourceName diff --git a/settings/remarks/microsoft.labservices/samples/labs/main.bicep b/settings/remarks/microsoft.labservices/samples/labs/main.bicep index 8e5ad51e..fd5efa59 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/main.bicep @@ -8,8 +8,26 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { name: resourceName location: location properties: { + autoShutdownProfile: { + shutdownOnDisconnect: 'Disabled' + shutdownOnIdle: 'None' + shutdownWhenNotConnected: 'Disabled' + } + connectionProfile: { + clientRdpAccess: 'None' + clientSshAccess: 'None' + webRdpAccess: 'None' + webSshAccess: 'None' + } + securityProfile: { + openAccess: 'Disabled' + } title: 'Test Title' virtualMachineProfile: { + sku: { + capacity: 1 + name: 'Classic_Fsv2_2_4GB_128_S_SSD' + } usageQuota: 'PT0S' useSharedPassword: 'Disabled' additionalCapabilities: { @@ -21,29 +39,11 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { } createOption: 'Image' imageReference: { + offer: '0001-com-ubuntu-server-focal' publisher: 'canonical' sku: '20_04-lts' version: 'latest' - offer: '0001-com-ubuntu-server-focal' - } - sku: { - capacity: 1 - name: 'Classic_Fsv2_2_4GB_128_S_SSD' } } - autoShutdownProfile: { - shutdownOnIdle: 'None' - shutdownWhenNotConnected: 'Disabled' - shutdownOnDisconnect: 'Disabled' - } - connectionProfile: { - clientRdpAccess: 'None' - clientSshAccess: 'None' - webRdpAccess: 'None' - webSshAccess: 'None' - } - securityProfile: { - openAccess: 'Disabled' - } } } diff --git a/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep b/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep index 9521fa7e..d0b21a31 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/schedules/main.bicep @@ -1,13 +1,27 @@ +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 location: location properties: { + autoShutdownProfile: { + shutdownWhenNotConnected: 'Disabled' + shutdownOnDisconnect: 'Disabled' + shutdownOnIdle: 'None' + } + connectionProfile: { + webSshAccess: 'None' + clientRdpAccess: 'None' + clientSshAccess: 'None' + webRdpAccess: 'None' + } + securityProfile: { + openAccess: 'Disabled' + } title: 'Test Title' virtualMachineProfile: { useSharedPassword: 'Disabled' @@ -31,20 +45,6 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { } usageQuota: 'PT0S' } - autoShutdownProfile: { - shutdownOnDisconnect: 'Disabled' - shutdownOnIdle: 'None' - shutdownWhenNotConnected: 'Disabled' - } - connectionProfile: { - clientRdpAccess: 'None' - clientSshAccess: 'None' - webRdpAccess: 'None' - webSshAccess: 'None' - } - securityProfile: { - openAccess: 'Disabled' - } } } @@ -52,7 +52,7 @@ resource schedule 'Microsoft.LabServices/labs/schedules@2022-08-01' = { name: resourceName parent: lab properties: { - timeZoneId: 'America/Los_Angeles' 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 88286c3d..6ef85d3d 100644 --- a/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep +++ b/settings/remarks/microsoft.labservices/samples/labs/users/main.bicep @@ -1,13 +1,18 @@ -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 location: location properties: { + autoShutdownProfile: { + shutdownOnDisconnect: 'Disabled' + shutdownOnIdle: 'None' + shutdownWhenNotConnected: 'Disabled' + } connectionProfile: { clientRdpAccess: 'None' clientSshAccess: 'None' @@ -19,12 +24,6 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { } title: 'Test Title' virtualMachineProfile: { - sku: { - name: 'Classic_Fsv2_2_4GB_128_S_SSD' - capacity: 1 - } - usageQuota: 'PT0S' - useSharedPassword: 'Disabled' additionalCapabilities: { installGpuDrivers: 'Disabled' } @@ -39,11 +38,12 @@ resource lab 'Microsoft.LabServices/labs@2022-08-01' = { sku: '20_04-lts' version: 'latest' } - } - autoShutdownProfile: { - shutdownWhenNotConnected: 'Disabled' - shutdownOnDisconnect: 'Disabled' - shutdownOnIdle: 'None' + sku: { + name: 'Classic_Fsv2_2_4GB_128_S_SSD' + capacity: 1 + } + usageQuota: 'PT0S' + useSharedPassword: 'Disabled' } } } diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep index 0bad4cfb..6ed6e6ba 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/agreements/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName @@ -14,68 +14,72 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = name: resourceName parent: integrationAccount properties: { + hostIdentity: { + qualifier: 'AS2Identity' + value: 'FabrikamNY' + } agreementType: 'AS2' content: { aS2: { receiveAgreement: { protocolSettings: { + envelopeSettings: { + transmitFileNameInMimeHeader: false + autogenerateFileName: false + fileNameTemplate: '%FILE().ReceivedFileName%' + messageContentType: 'text/plain' + suspendMessageOnFileNameGenerationError: true + } + errorSettings: { + resendIfMDNNotReceived: false + suspendDuplicateMessage: false + } mdnSettings: { + needMDN: false sendInboundMDNToMessageBox: true sendMDNAsynchronously: false signMDN: false signOutboundMDNIfOptional: false dispositionNotificationTo: 'http://localhost' micHashingAlgorithm: 'SHA1' - needMDN: false } messageConnectionSettings: { - ignoreCertificateNameMismatch: false - keepHttpConnectionAlive: true supportHttpStatusCodeContinue: true unfoldHttpHeaders: true + ignoreCertificateNameMismatch: false + keepHttpConnectionAlive: true } securitySettings: { - enableNRRForInboundEncodedMessages: false - enableNRRForInboundMDN: false enableNRRForOutboundDecodedMessages: false enableNRRForOutboundEncodedMessages: false enableNRRForOutboundMDN: false overrideGroupSigningCertificate: false enableNRRForInboundDecodedMessages: false + enableNRRForInboundEncodedMessages: false + enableNRRForInboundMDN: false } validationSettings: { - interchangeDuplicatesValidityDays: 5 + compressMessage: false + encryptionAlgorithm: 'DES3' overrideMessageProperties: false - signingAlgorithm: 'Default' + signMessage: false checkCertificateRevocationListOnReceive: false checkCertificateRevocationListOnSend: false checkDuplicateMessage: false - compressMessage: false - encryptionAlgorithm: 'DES3' - signMessage: false encryptMessage: false + interchangeDuplicatesValidityDays: 5 + signingAlgorithm: 'Default' } acknowledgementConnectionSettings: { - unfoldHttpHeaders: false - ignoreCertificateNameMismatch: false keepHttpConnectionAlive: false supportHttpStatusCodeContinue: false - } - envelopeSettings: { - autogenerateFileName: false - fileNameTemplate: '%FILE().ReceivedFileName%' - messageContentType: 'text/plain' - suspendMessageOnFileNameGenerationError: true - transmitFileNameInMimeHeader: false - } - errorSettings: { - resendIfMDNNotReceived: false - suspendDuplicateMessage: false + unfoldHttpHeaders: false + ignoreCertificateNameMismatch: false } } receiverBusinessIdentity: { - qualifier: 'AS2Identity' value: 'FabrikamNY' + qualifier: 'AS2Identity' } senderBusinessIdentity: { qualifier: 'AS2Identity' @@ -92,9 +96,22 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = value: 'FabrikamNY' } protocolSettings: { + acknowledgementConnectionSettings: { + supportHttpStatusCodeContinue: false + unfoldHttpHeaders: false + ignoreCertificateNameMismatch: false + keepHttpConnectionAlive: false + } + envelopeSettings: { + transmitFileNameInMimeHeader: false + autogenerateFileName: false + fileNameTemplate: '%FILE().ReceivedFileName%' + messageContentType: 'text/plain' + suspendMessageOnFileNameGenerationError: true + } errorSettings: { - suspendDuplicateMessage: false resendIfMDNNotReceived: false + suspendDuplicateMessage: false } mdnSettings: { micHashingAlgorithm: 'SHA1' @@ -106,56 +123,39 @@ resource agreement 'Microsoft.Logic/integrationAccounts/agreements@2019-05-01' = dispositionNotificationTo: 'http://localhost' } messageConnectionSettings: { - ignoreCertificateNameMismatch: false keepHttpConnectionAlive: true supportHttpStatusCodeContinue: true unfoldHttpHeaders: true + ignoreCertificateNameMismatch: false } securitySettings: { + enableNRRForOutboundMDN: false + overrideGroupSigningCertificate: false enableNRRForInboundDecodedMessages: false enableNRRForInboundEncodedMessages: false enableNRRForInboundMDN: false enableNRRForOutboundDecodedMessages: false enableNRRForOutboundEncodedMessages: false - enableNRRForOutboundMDN: false - overrideGroupSigningCertificate: false } validationSettings: { - checkDuplicateMessage: false + checkCertificateRevocationListOnSend: false compressMessage: false + encryptMessage: false + interchangeDuplicatesValidityDays: 5 overrideMessageProperties: false signMessage: false - signingAlgorithm: 'Default' checkCertificateRevocationListOnReceive: false - checkCertificateRevocationListOnSend: false - encryptMessage: false + checkDuplicateMessage: false encryptionAlgorithm: 'DES3' - interchangeDuplicatesValidityDays: 5 - } - acknowledgementConnectionSettings: { - ignoreCertificateNameMismatch: false - keepHttpConnectionAlive: false - supportHttpStatusCodeContinue: false - unfoldHttpHeaders: false - } - envelopeSettings: { - autogenerateFileName: false - fileNameTemplate: '%FILE().ReceivedFileName%' - messageContentType: 'text/plain' - suspendMessageOnFileNameGenerationError: true - transmitFileNameInMimeHeader: false + signingAlgorithm: 'Default' } } } } } guestIdentity: { - value: 'FabrikamDC' - qualifier: 'AS2Identity' - } - hostIdentity: { qualifier: 'AS2Identity' - value: 'FabrikamNY' + value: 'FabrikamDC' } } } @@ -164,17 +164,17 @@ resource partner 'Microsoft.Logic/integrationAccounts/partners@2019-05-01' = { name: resourceName parent: integrationAccount properties: { - partnerType: 'B2B' content: { b2b: { businessIdentities: [ { - value: 'FabrikamNY' qualifier: 'AS2Identity' + value: 'FabrikamNY' } ] } } + partnerType: 'B2B' } } diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep index 6daead8e..d7c3c7a6 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/assemblies/main.bicep @@ -18,12 +18,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } kind: 'StorageV2' properties: { - allowBlobPublicAccess: true - isHnsEnabled: false - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - isNfsV3Enabled: false - minimumTlsVersion: 'TLS1_2' + isSftpEnabled: false networkAcls: { ipRules: [] resourceAccessRules: [] @@ -31,12 +26,17 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { bypass: 'AzureServices' defaultAction: 'Allow' } - allowCrossTenantReplication: false isLocalUserEnabled: true - accessTier: 'Hot' - allowSharedKeyAccess: true + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true defaultToOAuthAuthentication: false dnsEndpointType: 'Standard' + accessTier: 'Hot' + allowBlobPublicAccess: true + allowCrossTenantReplication: false + allowSharedKeyAccess: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -48,7 +48,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - isSftpEnabled: false + isHnsEnabled: false } } diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep index a3120411..05dec948 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep index b954fa13..6c6af484 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/maps/main.bicep @@ -14,8 +14,6 @@ resource map 'Microsoft.Logic/integrationAccounts/maps@2019-05-01' = { name: resourceName parent: integrationAccount properties: { - contentType: 'application/xml' - mapType: 'Xslt' content: ''' ''' + contentType: 'application/xml' + mapType: 'Xslt' } } diff --git a/settings/remarks/microsoft.logic/samples/integrationaccounts/schemas/main.bicep b/settings/remarks/microsoft.logic/samples/integrationaccounts/schemas/main.bicep index 27dcecde..1790d398 100644 --- a/settings/remarks/microsoft.logic/samples/integrationaccounts/schemas/main.bicep +++ b/settings/remarks/microsoft.logic/samples/integrationaccounts/schemas/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource integrationAccount 'Microsoft.Logic/integrationAccounts@2019-05-01' = { name: resourceName diff --git a/settings/remarks/microsoft.logic/samples/workflows/main.bicep b/settings/remarks/microsoft.logic/samples/workflows/main.bicep index 837fca77..2f43df3e 100644 --- a/settings/remarks/microsoft.logic/samples/workflows/main.bicep +++ b/settings/remarks/microsoft.logic/samples/workflows/main.bicep @@ -6,11 +6,11 @@ resource workflow 'Microsoft.Logic/workflows@2019-05-01' = { location: location properties: { definition: { + triggers: {} '$schema': 'https://schema.management.azure.com/providers/Microsoft.Logic/schemas/2016-06-01/workflowdefinition.json#' actions: {} contentVersion: '1.0.0.0' parameters: null - triggers: {} } parameters: {} state: 'Enabled' diff --git a/settings/remarks/microsoft.machinelearningservices/samples/workspaces/computes/main.bicep b/settings/remarks/microsoft.machinelearningservices/samples/workspaces/computes/main.bicep index 14bfc512..d8590e5a 100644 --- a/settings/remarks/microsoft.machinelearningservices/samples/workspaces/computes/main.bicep +++ b/settings/remarks/microsoft.machinelearningservices/samples/workspaces/computes/main.bicep @@ -14,20 +14,20 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { - enableRbacAuthorization: false - enabledForDeployment: false - enabledForDiskEncryption: false - publicNetworkAccess: 'Enabled' accessPolicies: [] enablePurgeProtection: true + enabledForDeployment: false + createMode: 'default' + enableRbacAuthorization: false enableSoftDelete: true + enabledForDiskEncryption: false enabledForTemplateDeployment: false + publicNetworkAccess: 'Enabled' sku: { - family: 'A' name: 'standard' + family: 'A' } - tenantId: tenant() - createMode: 'default' + tenantId: tenant().tenantId } } @@ -39,11 +39,11 @@ resource workspace 'Microsoft.MachineLearningServices/workspaces@2022-05-01' = { tier: 'Basic' } properties: { + applicationInsights: component.id + keyVault: vault.id publicNetworkAccess: 'Enabled' storageAccount: storageAccount.id v1LegacyMode: false - applicationInsights: component.id - keyVault: vault.id } } @@ -67,13 +67,13 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - ForceCustomerStorageForProfiler: false + DisableIpMasking: false + DisableLocalAuth: false RetentionInDays: 90 - SamplingPercentage: 100 + publicNetworkAccessForQuery: 'Enabled' Application_Type: 'web' + ForceCustomerStorageForProfiler: false + SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - DisableIpMasking: false - DisableLocalAuth: false } } diff --git a/settings/remarks/microsoft.machinelearningservices/samples/workspaces/datastores/main.bicep b/settings/remarks/microsoft.machinelearningservices/samples/workspaces/datastores/main.bicep index 7daa15b7..4df6d4d8 100644 --- a/settings/remarks/microsoft.machinelearningservices/samples/workspaces/datastores/main.bicep +++ b/settings/remarks/microsoft.machinelearningservices/samples/workspaces/datastores/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westus' param resourceName string = 'acctest0001' +param location string = 'westus' resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: '${toLower(substring(resourceName, 0, 16))}acc' @@ -9,37 +9,66 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } kind: 'StorageV2' properties: { - allowBlobPublicAccess: true allowCrossTenantReplication: false + defaultToOAuthAuthentication: false dnsEndpointType: 'Standard' - isHnsEnabled: false - isLocalUserEnabled: true - publicNetworkAccess: 'Enabled' + networkAcls: { + resourceAccessRules: [] + virtualNetworkRules: [] + bypass: 'AzureServices' + defaultAction: 'Allow' + ipRules: [] + } supportsHttpsTrafficOnly: true - allowSharedKeyAccess: true + allowBlobPublicAccess: true encryption: { keySource: 'Microsoft.Storage' services: { - table: { + queue: { keyType: 'Service' } - queue: { + table: { keyType: 'Service' } } } - networkAcls: { - bypass: 'AzureServices' - defaultAction: 'Allow' - ipRules: [] - resourceAccessRules: [] - virtualNetworkRules: [] - } + isLocalUserEnabled: true accessTier: 'Hot' - defaultToOAuthAuthentication: false - isSftpEnabled: false + isHnsEnabled: false isNfsV3Enabled: false + isSftpEnabled: false minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + allowSharedKeyAccess: true + } +} + +resource storageaccountBlobservices 'Microsoft.Storage/storageAccounts/blobServices@2023-05-01' = { + name: 'default' + parent: storageAccount +} + +resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2023-05-01' = { + name: 'datacontainer' + parent: storageaccountBlobservices + properties: { + publicAccess: 'None' + } +} + +resource component 'Microsoft.Insights/components@2020-02-02' = { + name: '${resourceName}-ai' + location: location + kind: 'web' + properties: { + SamplingPercentage: 100 + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + DisableLocalAuth: false + Application_Type: 'web' + DisableIpMasking: false + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 } } @@ -47,20 +76,20 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: '${resourceName}vault' location: location properties: { - accessPolicies: [] - enabledForDeployment: false - enabledForDiskEncryption: false - enabledForTemplateDeployment: false + createMode: 'default' + enableRbacAuthorization: false publicNetworkAccess: 'Enabled' sku: { family: 'A' name: 'standard' } - tenantId: tenant() - createMode: 'default' + tenantId: tenant().tenantId + accessPolicies: [] enablePurgeProtection: true - enableRbacAuthorization: false enableSoftDelete: true + enabledForDeployment: false + enabledForDiskEncryption: false + enabledForTemplateDeployment: false } } @@ -73,24 +102,11 @@ resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-04-01' = { } kind: 'Default' properties: { - publicNetworkAccess: 'Enabled' storageAccount: storageAccount.id v1LegacyMode: false applicationInsights: component.id keyVault: vault.id - } -} - -resource storageaccountBlobservices 'Microsoft.Storage/storageAccounts/blobServices@2023-05-01' = { - name: 'default' - parent: storageAccount -} - -resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2023-05-01' = { - name: 'datacontainer' - parent: storageaccountBlobservices - properties: { - publicAccess: 'None' + publicNetworkAccess: 'Enabled' } } @@ -116,19 +132,3 @@ resource dataStore 'Microsoft.MachineLearningServices/workspaces/dataStores@2024 endpoint: 'core.windows.net' } } - -resource component 'Microsoft.Insights/components@2020-02-02' = { - name: '${resourceName}-ai' - location: location - kind: 'web' - properties: { - DisableIpMasking: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 - SamplingPercentage: 100 - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - Application_Type: 'web' - DisableLocalAuth: false - } -} diff --git a/settings/remarks/microsoft.machinelearningservices/samples/workspaces/main.bicep b/settings/remarks/microsoft.machinelearningservices/samples/workspaces/main.bicep index a65b56e0..591ba886 100644 --- a/settings/remarks/microsoft.machinelearningservices/samples/workspaces/main.bicep +++ b/settings/remarks/microsoft.machinelearningservices/samples/workspaces/main.bicep @@ -6,14 +6,14 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { + ForceCustomerStorageForProfiler: false + RetentionInDays: 90 SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' Application_Type: 'web' - DisableLocalAuth: false DisableIpMasking: false - ForceCustomerStorageForProfiler: false - RetentionInDays: 90 + DisableLocalAuth: false } } @@ -25,13 +25,6 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - accessTier: 'Hot' - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -44,12 +37,19 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + accessTier: 'Hot' + allowSharedKeyAccess: true + isHnsEnabled: false + isSftpEnabled: false + supportsHttpsTrafficOnly: true allowBlobPublicAccess: true allowCrossTenantReplication: true - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' } } @@ -57,14 +57,13 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { + createMode: 'default' + enablePurgeProtection: true enabledForDiskEncryption: false - sku: { - family: 'A' - name: 'standard' - } - tenantId: tenant() + enabledForTemplateDeployment: false accessPolicies: [ { + objectId: '45a2d1ea-488a-44b0-bb2e-3cd8e485ebef' permissions: { certificates: [ 'all' @@ -77,17 +76,18 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { ] storage: [] } - tenantId: tenant() - objectId: '45a2d1ea-488a-44b0-bb2e-3cd8e485ebef' + tenantId: tenant().tenantId } ] - createMode: 'default' - enabledForDeployment: false - enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' - enablePurgeProtection: true enableRbacAuthorization: false enableSoftDelete: true + enabledForDeployment: false + publicNetworkAccess: 'Enabled' + sku: { + family: 'A' + name: 'standard' + } + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.machinelearningservices/samples/workspaces/outboundrules/main.bicep b/settings/remarks/microsoft.machinelearningservices/samples/workspaces/outboundrules/main.bicep index f550c422..29808cc5 100644 --- a/settings/remarks/microsoft.machinelearningservices/samples/workspaces/outboundrules/main.bicep +++ b/settings/remarks/microsoft.machinelearningservices/samples/workspaces/outboundrules/main.bicep @@ -1,14 +1,14 @@ param resourceName string = 'acctest0001' param location string = 'westus' -var workspaceName = 'resourceName-mlw' +var keyVaultName = 'kvkvBase' var outboundName = 'resourceName-outbound' var baseName = 'resourcename' +var aiName = 'resourceName-ai' +var workspaceName = 'resourceName-mlw' var saBase = 'baseName' var kvBase = 'baseName' var storageName = 'sasaBase' -var keyVaultName = 'kvkvBase' -var aiName = 'resourceName-ai' resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { name: storageName @@ -18,10 +18,14 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } kind: 'StorageV2' properties: { + defaultToOAuthAuthentication: false isNfsV3Enabled: false - minimumTlsVersion: 'TLS1_2' + allowBlobPublicAccess: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false + dnsEndpointType: 'Standard' + isHnsEnabled: false + isLocalUserEnabled: true + isSftpEnabled: false networkAcls: { bypass: 'AzureServices' defaultAction: 'Allow' @@ -30,6 +34,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { virtualNetworkRules: [] } publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true accessTier: 'Hot' allowCrossTenantReplication: false encryption: { @@ -43,12 +48,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - isHnsEnabled: false - supportsHttpsTrafficOnly: true - allowBlobPublicAccess: true - dnsEndpointType: 'Standard' - isLocalUserEnabled: true - isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' } } @@ -56,20 +56,20 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { name: keyVaultName location: location properties: { + enablePurgeProtection: true + enableRbacAuthorization: false + enableSoftDelete: true publicNetworkAccess: 'Enabled' - sku: { - family: 'A' - name: 'standard' - } - tenantId: tenant() + tenantId: tenant().tenantId accessPolicies: [] - enablePurgeProtection: true + createMode: 'default' enabledForDeployment: false enabledForDiskEncryption: false enabledForTemplateDeployment: false - createMode: 'default' - enableRbacAuthorization: false - enableSoftDelete: true + sku: { + family: 'A' + name: 'standard' + } } } @@ -81,6 +81,7 @@ resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-04-01' = { } kind: 'Default' properties: { + keyVault: vault.id managedNetwork: { isolationMode: 'AllowOnlyApprovedOutbound' } @@ -88,7 +89,6 @@ resource workspace 'Microsoft.MachineLearningServices/workspaces@2024-04-01' = { storageAccount: storageAccount.id v1LegacyMode: false applicationInsights: component.id - keyVault: vault.id } } @@ -107,13 +107,13 @@ resource component 'Microsoft.Insights/components@2020-02-02' = { location: location kind: 'web' properties: { - ForceCustomerStorageForProfiler: false - publicNetworkAccessForQuery: 'Enabled' Application_Type: 'web' DisableIpMasking: false DisableLocalAuth: false RetentionInDays: 90 SamplingPercentage: 100 publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + ForceCustomerStorageForProfiler: false } } diff --git a/settings/remarks/microsoft.maintenance/samples/configurationassignments/main.bicep b/settings/remarks/microsoft.maintenance/samples/configurationassignments/main.bicep index c84a96f9..1fead333 100644 --- a/settings/remarks/microsoft.maintenance/samples/configurationassignments/main.bicep +++ b/settings/remarks/microsoft.maintenance/samples/configurationassignments/main.bicep @@ -8,19 +8,19 @@ 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: {} - primary: true } } ] + enableAcceleratedNetworking: false } } @@ -28,35 +28,31 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - diagnosticsProfile: { - bootDiagnostics: { - enabled: false - storageUri: '' - } - } - hardwareProfile: { - vmSize: 'Standard_F2' - } osProfile: { + secrets: [] + adminPassword: adminPassword adminUsername: 'adminuser' allowExtensionOperations: true computerName: resourceName linuxConfiguration: { + provisionVMAgent: true + ssh: { + publicKeys: [] + } disablePasswordAuthentication: false patchSettings: { assessmentMode: 'ImageDefault' patchMode: 'ImageDefault' } - provisionVMAgent: true - ssh: { - publicKeys: [] - } } - secrets: [] - adminPassword: adminPassword } - priority: 'Regular' additionalCapabilities: {} + diagnosticsProfile: { + bootDiagnostics: { + enabled: false + storageUri: '' + } + } extensionsTimeBudget: 'PT1H30M' networkProfile: { networkInterfaces: [ @@ -68,27 +64,31 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { } ] } + priority: 'Regular' storageProfile: { - dataDisks: [] imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' sku: '16.04-LTS' version: 'latest' + offer: 'UbuntuServer' + publisher: 'Canonical' } osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' managedDisk: { storageAccountType: 'Standard_LRS' } osType: 'Linux' writeAcceleratorEnabled: false - caching: 'ReadWrite' - createOption: 'FromImage' } + dataDisks: [] } applicationProfile: { galleryApplications: [] } + hardwareProfile: { + vmSize: 'Standard_F2' + } } } @@ -112,12 +112,12 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'internal' parent: virtualNetwork properties: { - serviceEndpointPolicies: [] - serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.maintenance/samples/maintenanceconfigurations/main.bicep b/settings/remarks/microsoft.maintenance/samples/maintenanceconfigurations/main.bicep index 78ee5514..48cfeef3 100644 --- a/settings/remarks/microsoft.maintenance/samples/maintenanceconfigurations/main.bicep +++ b/settings/remarks/microsoft.maintenance/samples/maintenanceconfigurations/main.bicep @@ -5,9 +5,9 @@ resource maintenanceConfiguration 'Microsoft.Maintenance/maintenanceConfiguratio name: resourceName location: location properties: { - extensionProperties: {} - maintenanceScope: 'SQLDB' namespace: 'Microsoft.Maintenance' visibility: 'Custom' + extensionProperties: {} + maintenanceScope: 'SQLDB' } } diff --git a/settings/remarks/microsoft.managedidentity/samples/userassignedidentities/federatedidentitycredentials/main.bicep b/settings/remarks/microsoft.managedidentity/samples/userassignedidentities/federatedidentitycredentials/main.bicep index 45e46e09..8681e09f 100644 --- a/settings/remarks/microsoft.managedidentity/samples/userassignedidentities/federatedidentitycredentials/main.bicep +++ b/settings/remarks/microsoft.managedidentity/samples/userassignedidentities/federatedidentitycredentials/main.bicep @@ -11,10 +11,10 @@ resource federatedIdentityCredential 'Microsoft.ManagedIdentity/userAssignedIden location: location parent: userAssignedIdentity properties: { - subject: 'foo' audiences: [ 'foo' ] issuer: 'https://foo' + subject: 'foo' } } diff --git a/settings/remarks/microsoft.maps/samples/accounts/main.bicep b/settings/remarks/microsoft.maps/samples/accounts/main.bicep index 1c123d9f..813cd0a7 100644 --- a/settings/remarks/microsoft.maps/samples/accounts/main.bicep +++ b/settings/remarks/microsoft.maps/samples/accounts/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource account 'Microsoft.Maps/accounts@2021-02-01' = { name: resourceName diff --git a/settings/remarks/microsoft.media/samples/mediaservices/accountfilters/main.bicep b/settings/remarks/microsoft.media/samples/mediaservices/accountfilters/main.bicep index c8d4f5c0..0aa1da49 100644 --- a/settings/remarks/microsoft.media/samples/mediaservices/accountfilters/main.bicep +++ b/settings/remarks/microsoft.media/samples/mediaservices/accountfilters/main.bicep @@ -1,6 +1,19 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { + name: resourceName + location: location + properties: { + publicNetworkAccess: 'Enabled' + storageAccounts: [ + { + type: 'Primary' + } + ] + } +} + resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -9,44 +22,31 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - allowBlobPublicAccess: true + allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { - table: { + queue: { keyType: 'Service' } - queue: { + table: { keyType: 'Service' } } } + isSftpEnabled: false + publicNetworkAccess: 'Enabled' + accessTier: 'Hot' + allowBlobPublicAccess: true isHnsEnabled: false isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - accessTier: 'Hot' + supportsHttpsTrafficOnly: true allowCrossTenantReplication: true - allowSharedKeyAccess: true - isSftpEnabled: false - } -} - -resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { - name: resourceName - location: location - properties: { - publicNetworkAccess: 'Enabled' - storageAccounts: [ - { - type: 'Primary' - } - ] } } diff --git a/settings/remarks/microsoft.media/samples/mediaservices/assets/assetfilters/main.bicep b/settings/remarks/microsoft.media/samples/mediaservices/assets/assetfilters/main.bicep index 3cb26d27..4e1a881b 100644 --- a/settings/remarks/microsoft.media/samples/mediaservices/assets/assetfilters/main.bicep +++ b/settings/remarks/microsoft.media/samples/mediaservices/assets/assetfilters/main.bicep @@ -14,6 +14,24 @@ resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { } } +resource asset 'Microsoft.Media/mediaServices/assets@2022-08-01' = { + name: resourceName + parent: mediaService + properties: { + description: '' + } +} + +resource assetFilter 'Microsoft.Media/mediaServices/assets/assetFilters@2022-08-01' = { + name: resourceName + parent: asset + properties: { + firstQuality: { + bitrate: 0 + } + } +} + resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -22,16 +40,15 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - allowBlobPublicAccess: true - allowCrossTenantReplication: true allowSharedKeyAccess: true + defaultToOAuthAuthentication: false isHnsEnabled: false + minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - supportsHttpsTrafficOnly: true - accessTier: 'Hot' - defaultToOAuthAuthentication: false + publicNetworkAccess: 'Enabled' + allowCrossTenantReplication: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -45,25 +62,8 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - } -} - -resource asset 'Microsoft.Media/mediaServices/assets@2022-08-01' = { - name: resourceName - parent: mediaService - properties: { - description: '' - } -} - -resource assetFilter 'Microsoft.Media/mediaServices/assets/assetFilters@2022-08-01' = { - name: resourceName - parent: asset - properties: { - firstQuality: { - bitrate: 0 - } + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowBlobPublicAccess: true } } diff --git a/settings/remarks/microsoft.media/samples/mediaservices/assets/main.bicep b/settings/remarks/microsoft.media/samples/mediaservices/assets/main.bicep index a3f9ff70..cedd5461 100644 --- a/settings/remarks/microsoft.media/samples/mediaservices/assets/main.bicep +++ b/settings/remarks/microsoft.media/samples/mediaservices/assets/main.bicep @@ -14,14 +14,6 @@ resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { } } -resource asset 'Microsoft.Media/mediaServices/assets@2022-08-01' = { - name: resourceName - parent: mediaService - properties: { - description: '' - } -} - resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -30,7 +22,19 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + allowCrossTenantReplication: true + allowSharedKeyAccess: true + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + accessTier: 'Hot' + allowBlobPublicAccess: true + defaultToOAuthAuthentication: false encryption: { + keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -39,21 +43,17 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } - keySource: 'Microsoft.Storage' } - isNfsV3Enabled: false - isSftpEnabled: false - publicNetworkAccess: 'Enabled' - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - isHnsEnabled: false minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } + publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false + } +} + +resource asset 'Microsoft.Media/mediaServices/assets@2022-08-01' = { + name: resourceName + parent: mediaService + properties: { + description: '' } } diff --git a/settings/remarks/microsoft.media/samples/mediaservices/contentkeypolicies/main.bicep b/settings/remarks/microsoft.media/samples/mediaservices/contentkeypolicies/main.bicep index 445350f0..b35bd01a 100644 --- a/settings/remarks/microsoft.media/samples/mediaservices/contentkeypolicies/main.bicep +++ b/settings/remarks/microsoft.media/samples/mediaservices/contentkeypolicies/main.bicep @@ -1,19 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { - name: resourceName - location: location - properties: { - publicNetworkAccess: 'Enabled' - storageAccounts: [ - { - type: 'Primary' - } - ] - } -} - resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -22,31 +9,44 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true accessTier: 'Hot' allowBlobPublicAccess: true allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false + isNfsV3Enabled: false encryption: { keySource: 'Microsoft.Storage' services: { - queue: { + table: { keyType: 'Service' } - table: { + queue: { keyType: 'Service' } } } - supportsHttpsTrafficOnly: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } + } +} + +resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { + name: resourceName + location: location + properties: { + publicNetworkAccess: 'Enabled' + storageAccounts: [ + { + type: 'Primary' + } + ] } } diff --git a/settings/remarks/microsoft.media/samples/mediaservices/liveevents/main.bicep b/settings/remarks/microsoft.media/samples/mediaservices/liveevents/main.bicep index 7584a0d5..8ba2d2ae 100644 --- a/settings/remarks/microsoft.media/samples/mediaservices/liveevents/main.bicep +++ b/settings/remarks/microsoft.media/samples/mediaservices/liveevents/main.bicep @@ -29,19 +29,19 @@ resource liveEvent 'Microsoft.Media/mediaServices/liveEvents@2022-08-01' = { parent: mediaService properties: { input: { - streamingProtocol: 'RTMP' accessControl: { ip: { allow: [ { + subnetPrefixLength: 0 address: '0.0.0.0' name: 'AllowAll' - subnetPrefixLength: 0 } ] } } keyFrameIntervalDuration: 'PT6S' + streamingProtocol: 'RTMP' } } } diff --git a/settings/remarks/microsoft.media/samples/mediaservices/main.bicep b/settings/remarks/microsoft.media/samples/mediaservices/main.bicep index a681d920..2955302f 100644 --- a/settings/remarks/microsoft.media/samples/mediaservices/main.bicep +++ b/settings/remarks/microsoft.media/samples/mediaservices/main.bicep @@ -1,6 +1,19 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { + name: resourceName + location: location + properties: { + publicNetworkAccess: 'Enabled' + storageAccounts: [ + { + type: 'Primary' + } + ] + } +} + resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -9,9 +22,14 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - allowBlobPublicAccess: true + networkAcls: { + defaultAction: 'Allow' + } + supportsHttpsTrafficOnly: true + accessTier: 'Hot' allowCrossTenantReplication: true allowSharedKeyAccess: true + defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -23,29 +41,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - supportsHttpsTrafficOnly: true - accessTier: 'Hot' - defaultToOAuthAuthentication: false - isHnsEnabled: false isNfsV3Enabled: false isSftpEnabled: false publicNetworkAccess: 'Enabled' - } -} - -resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { - name: resourceName - location: location - properties: { - storageAccounts: [ - { - type: 'Primary' - } - ] - publicNetworkAccess: 'Enabled' + allowBlobPublicAccess: true + isHnsEnabled: false + minimumTlsVersion: 'TLS1_2' } } diff --git a/settings/remarks/microsoft.media/samples/mediaservices/streamingendpoints/main.bicep b/settings/remarks/microsoft.media/samples/mediaservices/streamingendpoints/main.bicep index e131e81f..9ef9301a 100644 --- a/settings/remarks/microsoft.media/samples/mediaservices/streamingendpoints/main.bicep +++ b/settings/remarks/microsoft.media/samples/mediaservices/streamingendpoints/main.bicep @@ -1,16 +1,16 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' storageAccounts: [ { type: 'Primary' } ] - publicNetworkAccess: 'Enabled' } } @@ -22,10 +22,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + isHnsEnabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true allowBlobPublicAccess: true + allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -38,15 +39,14 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - supportsHttpsTrafficOnly: true + publicNetworkAccess: 'Enabled' accessTier: 'Hot' allowCrossTenantReplication: true - allowSharedKeyAccess: true } } diff --git a/settings/remarks/microsoft.media/samples/mediaservices/streaminglocators/main.bicep b/settings/remarks/microsoft.media/samples/mediaservices/streaminglocators/main.bicep index cb60da15..28f2cfbc 100644 --- a/settings/remarks/microsoft.media/samples/mediaservices/streaminglocators/main.bicep +++ b/settings/remarks/microsoft.media/samples/mediaservices/streaminglocators/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { name: resourceName @@ -22,8 +22,16 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + allowCrossTenantReplication: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + accessTier: 'Hot' encryption: { - keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -32,21 +40,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } + isHnsEnabled: false + isNfsV3Enabled: false isSftpEnabled: false minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - accessTier: 'Hot' allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - isHnsEnabled: false - isNfsV3Enabled: false - networkAcls: { - defaultAction: 'Allow' - } } } diff --git a/settings/remarks/microsoft.media/samples/mediaservices/streamingpolicies/main.bicep b/settings/remarks/microsoft.media/samples/mediaservices/streamingpolicies/main.bicep index 531d541f..2f1104e6 100644 --- a/settings/remarks/microsoft.media/samples/mediaservices/streamingpolicies/main.bicep +++ b/settings/remarks/microsoft.media/samples/mediaservices/streamingpolicies/main.bicep @@ -1,6 +1,19 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { + name: resourceName + location: location + properties: { + publicNetworkAccess: 'Enabled' + storageAccounts: [ + { + type: 'Primary' + } + ] + } +} + resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -9,14 +22,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -28,25 +40,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } + isHnsEnabled: false + isNfsV3Enabled: false minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - } -} - -resource mediaService 'Microsoft.Media/mediaServices@2021-11-01' = { - name: resourceName - location: location - properties: { - publicNetworkAccess: 'Enabled' - storageAccounts: [ - { - type: 'Primary' - } - ] + allowBlobPublicAccess: true + allowCrossTenantReplication: true + defaultToOAuthAuthentication: false } } @@ -56,10 +56,10 @@ resource streamingPolicy 'Microsoft.Media/mediaServices/streamingPolicies@2022-0 properties: { noEncryption: { enabledProtocols: { - download: true - hls: true smoothStreaming: true dash: true + download: true + hls: true } } } diff --git a/settings/remarks/microsoft.media/samples/mediaservices/transforms/main.bicep b/settings/remarks/microsoft.media/samples/mediaservices/transforms/main.bicep index de6bf6a1..e0a19d90 100644 --- a/settings/remarks/microsoft.media/samples/mediaservices/transforms/main.bicep +++ b/settings/remarks/microsoft.media/samples/mediaservices/transforms/main.bicep @@ -23,6 +23,12 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { kind: 'StorageV2' properties: { allowSharedKeyAccess: true + isHnsEnabled: false + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + accessTier: 'Hot' defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -35,18 +41,12 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isSftpEnabled: false + isNfsV3Enabled: false minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } publicNetworkAccess: 'Enabled' - accessTier: 'Hot' + supportsHttpsTrafficOnly: true allowBlobPublicAccess: true allowCrossTenantReplication: true - isNfsV3Enabled: false - supportsHttpsTrafficOnly: true } } @@ -57,12 +57,12 @@ resource transform 'Microsoft.Media/mediaServices/transforms@2022-07-01' = { description: '' outputs: [ { - onError: 'ContinueJob' preset: { - presetName: 'AACGoodQualityAudio' '@odata.type': '#Microsoft.Media.BuiltInStandardEncoderPreset' + presetName: 'AACGoodQualityAudio' } relativePriority: 'Normal' + onError: 'ContinueJob' } ] } diff --git a/settings/remarks/microsoft.migrate/samples/migrateprojects/main.bicep b/settings/remarks/microsoft.migrate/samples/migrateprojects/main.bicep index bb56e831..8380a66b 100644 --- a/settings/remarks/microsoft.migrate/samples/migrateprojects/main.bicep +++ b/settings/remarks/microsoft.migrate/samples/migrateprojects/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource project 'Microsoft.Migrate/migrateProjects@2020-05-01' = { name: resourceName @@ -17,15 +17,12 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowBlobPublicAccess: true + isNfsV3Enabled: false + networkAcls: { + defaultAction: 'Allow' + } allowCrossTenantReplication: true allowSharedKeyAccess: true - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -37,10 +34,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - networkAcls: { - defaultAction: 'Allow' - } + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowBlobPublicAccess: true + defaultToOAuthAuthentication: false + isHnsEnabled: false } } diff --git a/settings/remarks/microsoft.migrate/samples/migrateprojects/solutions/main.bicep b/settings/remarks/microsoft.migrate/samples/migrateprojects/solutions/main.bicep index 45902a2a..8987c15e 100644 --- a/settings/remarks/microsoft.migrate/samples/migrateprojects/solutions/main.bicep +++ b/settings/remarks/microsoft.migrate/samples/migrateprojects/solutions/main.bicep @@ -17,21 +17,16 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + accessTier: 'Hot' + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false isNfsV3Enabled: false + isSftpEnabled: false + publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true allowBlobPublicAccess: true allowCrossTenantReplication: true - defaultToOAuthAuthentication: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - accessTier: 'Hot' - allowSharedKeyAccess: true encryption: { - keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -40,8 +35,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } isHnsEnabled: false + minimumTlsVersion: 'TLS1_2' + networkAcls: { + defaultAction: 'Allow' + } } } diff --git a/settings/remarks/microsoft.mixedreality/samples/spatialanchorsaccounts/main.bicep b/settings/remarks/microsoft.mixedreality/samples/spatialanchorsaccounts/main.bicep index b7eadca1..195aee0e 100644 --- a/settings/remarks/microsoft.mixedreality/samples/spatialanchorsaccounts/main.bicep +++ b/settings/remarks/microsoft.mixedreality/samples/spatialanchorsaccounts/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource spatialAnchorsAccount 'Microsoft.MixedReality/spatialAnchorsAccounts@2021-01-01' = { name: resourceName diff --git a/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/datanetworks/main.bicep b/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/datanetworks/main.bicep index 44986235..bfd12511 100644 --- a/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/datanetworks/main.bicep +++ b/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/datanetworks/main.bicep @@ -6,8 +6,8 @@ resource mobileNetwork 'Microsoft.MobileNetwork/mobileNetworks@2022-11-01' = { location: location properties: { publicLandMobileNetworkIdentifier: { - mcc: '001' mnc: '01' + mcc: '001' } } } diff --git a/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/services/main.bicep b/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/services/main.bicep index 2f7192ed..1fc47a99 100644 --- a/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/services/main.bicep +++ b/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/services/main.bicep @@ -19,6 +19,7 @@ resource service 'Microsoft.MobileNetwork/mobileNetworks/services@2022-11-01' = properties: { pccRules: [ { + ruleName: 'default-rule' rulePrecedence: 1 serviceDataFlowTemplates: [ { @@ -34,7 +35,6 @@ resource service 'Microsoft.MobileNetwork/mobileNetworks/services@2022-11-01' = } ] trafficControl: 'Enabled' - ruleName: 'default-rule' } ] servicePrecedence: 0 diff --git a/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/simpolicies/main.bicep b/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/simpolicies/main.bicep index fe28605c..11cf36e1 100644 --- a/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/simpolicies/main.bicep +++ b/settings/remarks/microsoft.mobilenetwork/samples/mobilenetworks/simpolicies/main.bicep @@ -6,8 +6,8 @@ resource mobileNetwork 'Microsoft.MobileNetwork/mobileNetworks@2022-11-01' = { location: location properties: { publicLandMobileNetworkIdentifier: { - mcc: '001' mnc: '01' + mcc: '001' } } } @@ -30,15 +30,15 @@ resource service 'Microsoft.MobileNetwork/mobileNetworks/services@2022-11-01' = rulePrecedence: 1 serviceDataFlowTemplates: [ { + templateName: 'IP-to-server' + direction: 'Uplink' + ports: [] protocol: [ 'ip' ] remoteIpList: [ '10.3.4.0/24' ] - templateName: 'IP-to-server' - direction: 'Uplink' - ports: [] } ] trafficControl: 'Enabled' @@ -53,28 +53,29 @@ resource simPolicy 'Microsoft.MobileNetwork/mobileNetworks/simPolicies@2022-11-0 location: location parent: mobileNetwork properties: { + defaultSlice: {} registrationTimer: 3240 sliceConfigurations: [ { dataNetworkConfigurations: [ { + '5qi': 9 + additionalAllowedSessionTypes: null + allocationAndRetentionPriorityLevel: 9 allowedServices: [ { id: service.id } ] - defaultSessionType: 'IPv4' + dataNetwork: { + id: dataNetwork.id + } preemptionCapability: 'NotPreempt' sessionAmbr: { downlink: '1 Gbps' uplink: '500 Mbps' } - '5qi': 9 - additionalAllowedSessionTypes: null - allocationAndRetentionPriorityLevel: 9 - dataNetwork: { - id: dataNetwork.id - } + defaultSessionType: 'IPv4' maximumNumberOfBufferedPackets: 10 preemptionVulnerability: 'Preemptable' } @@ -86,10 +87,9 @@ resource simPolicy 'Microsoft.MobileNetwork/mobileNetworks/simPolicies@2022-11-0 } ] ueAmbr: { - uplink: '500 Mbps' downlink: '1 Gbps' + uplink: '500 Mbps' } - defaultSlice: {} } tags: { key: 'value' diff --git a/settings/remarks/microsoft.mobilenetwork/samples/packetcorecontrolplanes/main.bicep b/settings/remarks/microsoft.mobilenetwork/samples/packetcorecontrolplanes/main.bicep index a366fc2e..4f8792e4 100644 --- a/settings/remarks/microsoft.mobilenetwork/samples/packetcorecontrolplanes/main.bicep +++ b/settings/remarks/microsoft.mobilenetwork/samples/packetcorecontrolplanes/main.bicep @@ -1,6 +1,26 @@ param resourceName string = 'acctest0001' param location string = 'eastus' +resource dataBoxEdgeDevice 'Microsoft.DataBoxEdge/dataBoxEdgeDevices@2022-03-01' = { + name: resourceName + location: location + sku: { + name: 'EdgeP_Base' + tier: 'Standard' + } +} + +resource mobileNetwork 'Microsoft.MobileNetwork/mobileNetworks@2022-11-01' = { + name: resourceName + location: location + properties: { + publicLandMobileNetworkIdentifier: { + mnc: '01' + mcc: '001' + } + } +} + resource packetCoreControlPlane 'Microsoft.MobileNetwork/packetCoreControlPlanes@2022-11-01' = { name: resourceName location: location @@ -23,29 +43,9 @@ resource packetCoreControlPlane 'Microsoft.MobileNetwork/packetCoreControlPlanes } } -resource mobileNetwork 'Microsoft.MobileNetwork/mobileNetworks@2022-11-01' = { - name: resourceName - location: location - properties: { - publicLandMobileNetworkIdentifier: { - mcc: '001' - mnc: '01' - } - } -} - resource site 'Microsoft.MobileNetwork/mobileNetworks/sites@2022-11-01' = { name: resourceName location: location parent: mobileNetwork properties: {} } - -resource dataBoxEdgeDevice 'Microsoft.DataBoxEdge/dataBoxEdgeDevices@2022-03-01' = { - name: resourceName - location: location - sku: { - name: 'EdgeP_Base' - tier: 'Standard' - } -} diff --git a/settings/remarks/microsoft.monitor/samples/accounts/privateendpointconnections/main.bicep b/settings/remarks/microsoft.monitor/samples/accounts/privateendpointconnections/main.bicep index fe71a341..a345511f 100644 --- a/settings/remarks/microsoft.monitor/samples/accounts/privateendpointconnections/main.bicep +++ b/settings/remarks/microsoft.monitor/samples/accounts/privateendpointconnections/main.bicep @@ -8,6 +8,8 @@ resource grafana 'Microsoft.Dashboard/grafana@2023-09-01' = { name: 'Standard' } properties: { + publicNetworkAccess: 'Disabled' + zoneRedundancy: 'Disabled' grafanaIntegrations: { azureMonitorWorkspaceIntegrations: [ { @@ -18,12 +20,10 @@ resource grafana 'Microsoft.Dashboard/grafana@2023-09-01' = { apiKey: 'Disabled' autoGeneratedDomainNameLabelScope: 'TenantReuse' deterministicOutboundIP: 'Disabled' - publicNetworkAccess: 'Disabled' - zoneRedundancy: 'Disabled' } identity: { - userAssignedIdentities: null type: 'None' + userAssignedIdentities: null } } @@ -32,11 +32,11 @@ resource managedPrivateEndpoint 'Microsoft.Dashboard/grafana/managedPrivateEndpo location: location parent: grafana properties: { - privateLinkResourceRegion: location groupIds: [ 'prometheusMetrics' ] privateLinkResourceId: account.id + privateLinkResourceRegion: location } } @@ -56,9 +56,9 @@ resource grafanaManagedPrivateEndpointConnectionApproval 'Microsoft.Monitor/acco ] properties: { privateLinkServiceConnectionState: { + status: 'Approved' actionsRequired: 'None' description: 'Approved via Terraform' - status: 'Approved' } } } diff --git a/settings/remarks/microsoft.netapp/samples/netappaccounts/backuppolicies/main.bicep b/settings/remarks/microsoft.netapp/samples/netappaccounts/backuppolicies/main.bicep index 59470abe..8167ef32 100644 --- a/settings/remarks/microsoft.netapp/samples/netappaccounts/backuppolicies/main.bicep +++ b/settings/remarks/microsoft.netapp/samples/netappaccounts/backuppolicies/main.bicep @@ -12,9 +12,9 @@ resource backupPolicy 'Microsoft.NetApp/netAppAccounts/backupPolicies@2025-01-01 location: location parent: netAppAccount properties: { - dailyBackupsToKeep: 2 - enabled: true monthlyBackupsToKeep: 1 weeklyBackupsToKeep: 1 + dailyBackupsToKeep: 2 + enabled: true } } diff --git a/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/main.bicep b/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/main.bicep index d91685b2..ea7ab145 100644 --- a/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/main.bicep +++ b/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/main.bicep @@ -17,8 +17,8 @@ resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2022-05-01' location: location parent: netAppAccount properties: { - size: 4398046511104 serviceLevel: 'Standard' + size: 4398046511104 } tags: { SkipASMAzSecPack: 'true' diff --git a/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/main.bicep b/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/main.bicep index 9cfbc976..83f3e830 100644 --- a/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/main.bicep +++ b/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/main.bicep @@ -1,43 +1,43 @@ param resourceName string = 'acctest0001' param location string = 'centralus' -resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2022-05-01' = { +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { - activeDirectories: [] + subnets: [] + addressSpace: { + addressPrefixes: [ + '10.6.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } } tags: { SkipASMAzSecPack: 'true' } } -resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2022-05-01' = { +resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2022-05-01' = { name: resourceName location: location - parent: netAppAccount properties: { - serviceLevel: 'Standard' - size: 4398046511104 + activeDirectories: [] } tags: { SkipASMAzSecPack: 'true' } } -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { +resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2022-05-01' = { name: resourceName location: location + parent: netAppAccount properties: { - addressSpace: { - addressPrefixes: [ - '10.6.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] + serviceLevel: 'Standard' + size: 4398046511104 } tags: { SkipASMAzSecPack: 'true' @@ -48,12 +48,12 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'GatewaySubnet' parent: virtualNetwork properties: { - addressPrefix: '10.6.1.0/24' - delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.6.1.0/24' + delegations: [] } } @@ -64,10 +64,10 @@ resource subnet2 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { addressPrefix: '10.6.2.0/24' delegations: [ { + name: 'testdelegation' properties: { serviceName: 'Microsoft.Netapp/volumes' } - name: 'testdelegation' } ] privateEndpointNetworkPolicies: 'Enabled' @@ -82,32 +82,32 @@ resource volume 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes@2022-05-0 location: location parent: capacityPool properties: { - serviceLevel: 'Standard' + networkFeatures: 'Basic' snapshotDirectoryVisible: true - subnetId: subnet2.id + usageThreshold: any('1.073741824e+11') volumeType: '' avsDataStore: 'Enabled' - creationToken: 'my-unique-file-path-230630034120103726' - usageThreshold: any('1.073741824e+11') dataProtection: {} + protocolTypes: [ + 'NFSv3' + ] + serviceLevel: 'Standard' + subnetId: subnet2.id + creationToken: 'my-unique-file-path-230630034120103726' exportPolicy: { rules: [ { - allowedClients: '0.0.0.0/0' - nfsv3: true + cifs: false + hasRootAccess: true nfsv41: false ruleIndex: 1 unixReadOnly: false - cifs: false - hasRootAccess: true + allowedClients: '0.0.0.0/0' + nfsv3: true unixReadWrite: true } ] } - networkFeatures: 'Basic' - protocolTypes: [ - 'NFSv3' - ] } tags: { SkipASMAzSecPack: 'true' diff --git a/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/snapshots/main.bicep b/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/snapshots/main.bicep index bd4c167a..2dfcb65c 100644 --- a/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/snapshots/main.bicep +++ b/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/snapshots/main.bicep @@ -5,33 +5,15 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + dhcpOptions: { + dnsServers: [] + } + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' ] } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - -resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2022-05-01' = { - name: resourceName - location: location - properties: { - activeDirectories: [] - } -} - -resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2022-05-01' = { - name: resourceName - location: location - parent: netAppAccount - properties: { - serviceLevel: 'Premium' - size: 4398046511104 } } @@ -39,19 +21,37 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { - privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [ { + name: 'netapp' properties: { serviceName: 'Microsoft.Netapp/volumes' } - name: 'netapp' } ] privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + } +} + +resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2022-05-01' = { + name: resourceName + location: location + properties: { + activeDirectories: [] + } +} + +resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2022-05-01' = { + name: resourceName + location: location + parent: netAppAccount + properties: { + serviceLevel: 'Premium' + size: 4398046511104 } } @@ -60,23 +60,23 @@ resource volume 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes@2022-05-0 location: location parent: capacityPool properties: { + protocolTypes: [ + 'NFSv3' + ] + serviceLevel: 'Premium' + snapshotDirectoryVisible: false + snapshotId: '' + creationToken: 'my-unique-file-path-230630033642692134' exportPolicy: { rules: [] } networkFeatures: 'Basic' securityStyle: 'Unix' - serviceLevel: 'Premium' subnetId: subnet.id usageThreshold: any('1.073741824e+11') volumeType: '' - creationToken: 'my-unique-file-path-230630033642692134' - dataProtection: {} - protocolTypes: [ - 'NFSv3' - ] - snapshotDirectoryVisible: false - snapshotId: '' avsDataStore: 'Disabled' + dataProtection: {} } } diff --git a/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/volumequotarules/main.bicep b/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/volumequotarules/main.bicep index 3d296105..0e68df9d 100644 --- a/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/volumequotarules/main.bicep +++ b/settings/remarks/microsoft.netapp/samples/netappaccounts/capacitypools/volumes/volumequotarules/main.bicep @@ -17,12 +17,29 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } } +resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2025-01-01' = { + name: '${resourceName}-acct' + location: location + properties: {} +} + +resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2025-01-01' = { + name: '${resourceName}-pool' + location: location + parent: netAppAccount + properties: { + coolAccess: false + encryptionType: 'Single' + qosType: 'Auto' + serviceLevel: 'Standard' + size: 4398046511104 + } +} + resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: '${resourceName}-subnet' parent: virtualNetwork properties: { - addressPrefix: '10.88.2.0/24' - defaultOutboundAccess: true delegations: [ { name: 'netapp-delegation' @@ -31,32 +48,15 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { } } ] - serviceEndpointPolicies: [] networkSecurityGroup: { id: networkSecurityGroup.id } privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] serviceEndpoints: [] - } -} - -resource netAppAccount 'Microsoft.NetApp/netAppAccounts@2025-01-01' = { - name: '${resourceName}-acct' - location: location - properties: {} -} - -resource capacityPool 'Microsoft.NetApp/netAppAccounts/capacityPools@2025-01-01' = { - name: '${resourceName}-pool' - location: location - parent: netAppAccount - properties: { - qosType: 'Auto' - serviceLevel: 'Standard' - size: 4398046511104 - coolAccess: false - encryptionType: 'Single' + addressPrefix: '10.88.2.0/24' + defaultOutboundAccess: true } } @@ -65,8 +65,6 @@ resource volume 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes@2025-01-0 location: location parent: capacityPool properties: { - creationToken: '${resourceName}-path' - dataProtection: {} exportPolicy: { rules: [] } @@ -76,6 +74,8 @@ resource volume 'Microsoft.NetApp/netAppAccounts/capacityPools/volumes@2025-01-0 serviceLevel: 'Standard' subnetId: subnet.id usageThreshold: any('1.073741824e+11') + creationToken: '${resourceName}-path' + dataProtection: {} } } diff --git a/settings/remarks/microsoft.network/samples/applicationgateways/main.bicep b/settings/remarks/microsoft.network/samples/applicationgateways/main.bicep index 8d48b368..c36b5670 100644 --- a/settings/remarks/microsoft.network/samples/applicationgateways/main.bicep +++ b/settings/remarks/microsoft.network/samples/applicationgateways/main.bicep @@ -5,51 +5,52 @@ resource applicationGateway 'Microsoft.Network/applicationGateways@2022-07-01' = name: resourceName location: location properties: { - backendHttpSettingsCollection: [ + authenticationCertificates: [] + privateLinkConfigurations: [] + probes: [] + trustedClientCertificates: [] + urlPathMaps: [] + enableHttp2: false + frontendPorts: [ { - name: '${virtualNetwork.name}-be-htst' + name: '${virtualNetwork.name}-feport' properties: { - authenticationCertificates: [] - cookieBasedAffinity: 'Disabled' - protocol: 'Http' - trustedRootCertificates: [] - path: '' - pickHostNameFromBackendAddress: false port: 80 - requestTimeout: 1 } } ] - frontendIPConfigurations: [ + gatewayIPConfigurations: [ { - name: '${virtualNetwork.name}-feip' + name: 'my-gateway-ip-configuration' properties: { - privateIPAllocationMethod: 'Dynamic' - publicIPAddress: {} + subnet: {} } } ] - frontendPorts: [ + rewriteRuleSets: [] + sku: { + capacity: 2 + name: 'Standard_v2' + tier: 'Standard_v2' + } + backendHttpSettingsCollection: [ { - name: '${virtualNetwork.name}-feport' + name: '${virtualNetwork.name}-be-htst' properties: { + authenticationCertificates: [] + pickHostNameFromBackendAddress: false + protocol: 'Http' + requestTimeout: 1 + cookieBasedAffinity: 'Disabled' + path: '' port: 80 - } - } - ] - trustedClientCertificates: [] - backendAddressPools: [ - { - name: '${virtualNetwork.name}-beap' - properties: { - backendAddresses: [] + trustedRootCertificates: [] } } ] customErrorConfigurations: [] httpListeners: [ { - name: '${virtualNetwork.name}-httplstn' properties: { customErrorConfigurations: [] frontendIPConfiguration: { @@ -71,24 +72,7 @@ resource applicationGateway 'Microsoft.Network/applicationGateways@2022-07-01' = protocol: 'Http' requireServerNameIndication: false } - } - ] - privateLinkConfigurations: [] - probes: [] - redirectConfigurations: [] - sku: { - capacity: 2 - name: 'Standard_v2' - tier: 'Standard_v2' - } - sslPolicy: {} - authenticationCertificates: [] - gatewayIPConfigurations: [ - { - name: 'my-gateway-ip-configuration' - properties: { - subnet: {} - } + name: '${virtualNetwork.name}-httplstn' } ] requestRoutingRules: [ @@ -124,12 +108,28 @@ resource applicationGateway 'Microsoft.Network/applicationGateways@2022-07-01' = } } ] - rewriteRuleSets: [] + sslPolicy: {} + backendAddressPools: [ + { + name: '${virtualNetwork.name}-beap' + properties: { + backendAddresses: [] + } + } + ] + frontendIPConfigurations: [ + { + name: '${virtualNetwork.name}-feip' + properties: { + privateIPAllocationMethod: 'Dynamic' + publicIPAddress: {} + } + } + ] + redirectConfigurations: [] sslCertificates: [] - trustedRootCertificates: [] - urlPathMaps: [] - enableHttp2: false sslProfiles: [] + trustedRootCertificates: [] } } @@ -141,12 +141,12 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { tier: 'Regional' } properties: { + publicIPAddressVersion: 'IPv4' publicIPAllocationMethod: 'Static' ddosSettings: { protectionMode: 'VirtualNetworkInherited' } idleTimeoutInMinutes: 4 - publicIPAddressVersion: 'IPv4' } } @@ -170,11 +170,11 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'subnet-230630033653837171' parent: virtualNetwork properties: { + privateLinkServiceNetworkPolicies: 'Disabled' serviceEndpointPolicies: [] serviceEndpoints: [] addressPrefix: '10.0.0.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Disabled' } } diff --git a/settings/remarks/microsoft.network/samples/applicationgatewaywebapplicationfirewallpolicies/main.bicep b/settings/remarks/microsoft.network/samples/applicationgatewaywebapplicationfirewallpolicies/main.bicep index 11f7ce25..2d514f1f 100644 --- a/settings/remarks/microsoft.network/samples/applicationgatewaywebapplicationfirewallpolicies/main.bicep +++ b/settings/remarks/microsoft.network/samples/applicationgatewaywebapplicationfirewallpolicies/main.bicep @@ -5,23 +5,23 @@ resource applicationGatewayWebApplicationFirewallPolicy 'Microsoft.Network/Appli name: resourceName location: location properties: { + customRules: [] managedRules: { exclusions: [] managedRuleSets: [ { - ruleSetVersion: '3.1' ruleGroupOverrides: [] ruleSetType: 'OWASP' + ruleSetVersion: '3.1' } ] } policySettings: { + fileUploadLimitInMb: 100 maxRequestBodySizeInKb: 128 mode: 'Detection' requestBodyCheck: true state: 'Enabled' - fileUploadLimitInMb: 100 } - customRules: [] } } diff --git a/settings/remarks/microsoft.network/samples/azurefirewalls/main.bicep b/settings/remarks/microsoft.network/samples/azurefirewalls/main.bicep index 89932c4a..f6bed31f 100644 --- a/settings/remarks/microsoft.network/samples/azurefirewalls/main.bicep +++ b/settings/remarks/microsoft.network/samples/azurefirewalls/main.bicep @@ -5,21 +5,21 @@ resource azureFirewall 'Microsoft.Network/azureFirewalls@2022-07-01' = { name: resourceName location: location properties: { + threatIntelMode: 'Deny' additionalProperties: {} ipConfigurations: [ { + name: 'configuration' properties: { publicIPAddress: {} subnet: {} } - name: 'configuration' } ] sku: { name: 'AZFW_VNet' tier: 'Standard' } - threatIntelMode: 'Deny' } } @@ -31,12 +31,12 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { tier: 'Regional' } properties: { - publicIPAllocationMethod: 'Static' ddosSettings: { protectionMode: 'VirtualNetworkInherited' } idleTimeoutInMinutes: 4 publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Static' } } @@ -60,11 +60,11 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'AzureFirewallSubnet' parent: virtualNetwork properties: { - addressPrefix: '10.0.1.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.1.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' } } diff --git a/settings/remarks/microsoft.network/samples/bastionhosts/main.bicep b/settings/remarks/microsoft.network/samples/bastionhosts/main.bicep index 1bd0aa56..265b3deb 100644 --- a/settings/remarks/microsoft.network/samples/bastionhosts/main.bicep +++ b/settings/remarks/microsoft.network/samples/bastionhosts/main.bicep @@ -1,6 +1,35 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '192.168.1.0/24' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: 'AzureBastionSubnet' + parent: virtualNetwork + properties: { + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '192.168.1.224/27' + delegations: [] + } +} + resource bastionHost 'Microsoft.Network/bastionHosts@2022-07-01' = { name: resourceName location: location @@ -8,6 +37,9 @@ resource bastionHost 'Microsoft.Network/bastionHosts@2022-07-01' = { name: 'Basic' } properties: { + enableFileCopy: false + enableIpConnect: false + enableShareableLink: false enableTunneling: false ipConfigurations: [ { @@ -20,9 +52,6 @@ resource bastionHost 'Microsoft.Network/bastionHosts@2022-07-01' = { ] scaleUnits: 2 disableCopyPaste: false - enableFileCopy: false - enableIpConnect: false - enableShareableLink: false } } @@ -34,40 +63,11 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { tier: 'Regional' } properties: { - idleTimeoutInMinutes: 4 publicIPAddressVersion: 'IPv4' publicIPAllocationMethod: 'Static' ddosSettings: { protectionMode: 'VirtualNetworkInherited' } - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '192.168.1.0/24' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - name: 'AzureBastionSubnet' - parent: virtualNetwork - properties: { - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - addressPrefix: '192.168.1.224/27' - delegations: [] + idleTimeoutInMinutes: 4 } } diff --git a/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/forwardingrules/main.bicep b/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/forwardingrules/main.bicep index c832f145..aa7ea6d0 100644 --- a/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/forwardingrules/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/forwardingrules/main.bicep @@ -1,16 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource dnsForwardingRuleset 'Microsoft.Network/dnsForwardingRulesets@2022-07-01' = { - name: resourceName - location: location - properties: { - dnsResolverOutboundEndpoints: [ - {} - ] - } -} - resource dnsResolver 'Microsoft.Network/dnsResolvers@2022-07-01' = { name: resourceName location: location @@ -23,7 +13,6 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { - subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -32,6 +21,17 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { dhcpOptions: { dnsServers: [] } + subnets: [] + } +} + +resource dnsForwardingRuleset 'Microsoft.Network/dnsForwardingRulesets@2022-07-01' = { + name: resourceName + location: location + properties: { + dnsResolverOutboundEndpoints: [ + {} + ] } } @@ -64,7 +64,6 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'outbounddns' parent: virtualNetwork properties: { - serviceEndpoints: [] addressPrefix: '10.0.0.64/28' delegations: [ { @@ -77,5 +76,6 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] + serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/main.bicep b/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/main.bicep index 6a30fbb5..52e32564 100644 --- a/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/main.bicep @@ -5,6 +5,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -13,7 +14,23 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { dhcpOptions: { dnsServers: [] } - subnets: [] + } +} + +resource dnsResolver 'Microsoft.Network/dnsResolvers@2022-07-01' = { + name: resourceName + location: location + properties: { + virtualNetwork: {} + } +} + +resource outboundEndpoint 'Microsoft.Network/dnsResolvers/outboundEndpoints@2022-07-01' = { + name: resourceName + location: location + parent: dnsResolver + properties: { + subnet: {} } } @@ -24,10 +41,10 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { addressPrefix: '10.0.0.64/28' delegations: [ { - name: 'Microsoft.Network.dnsResolvers' properties: { serviceName: 'Microsoft.Network/dnsResolvers' } + name: 'Microsoft.Network.dnsResolvers' } ] privateEndpointNetworkPolicies: 'Enabled' @@ -46,20 +63,3 @@ resource dnsForwardingRuleset 'Microsoft.Network/dnsForwardingRulesets@2022-07-0 ] } } - -resource dnsResolver 'Microsoft.Network/dnsResolvers@2022-07-01' = { - name: resourceName - location: location - properties: { - virtualNetwork: {} - } -} - -resource outboundEndpoint 'Microsoft.Network/dnsResolvers/outboundEndpoints@2022-07-01' = { - name: resourceName - location: location - parent: dnsResolver - properties: { - subnet: {} - } -} diff --git a/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/virtualnetworklinks/main.bicep b/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/virtualnetworklinks/main.bicep index 02f7fedb..d07c2021 100644 --- a/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/virtualnetworklinks/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnsforwardingrulesets/virtualnetworklinks/main.bicep @@ -23,6 +23,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -31,7 +32,6 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { dhcpOptions: { dnsServers: [] } - subnets: [] } } @@ -48,6 +48,7 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'outbounddns' parent: virtualNetwork properties: { + addressPrefix: '10.0.0.64/28' delegations: [ { name: 'Microsoft.Network.dnsResolvers' @@ -60,7 +61,6 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] - addressPrefix: '10.0.0.64/28' } } diff --git a/settings/remarks/microsoft.network/samples/dnsresolvers/inboundendpoints/main.bicep b/settings/remarks/microsoft.network/samples/dnsresolvers/inboundendpoints/main.bicep index 019db847..f25a2f49 100644 --- a/settings/remarks/microsoft.network/samples/dnsresolvers/inboundendpoints/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnsresolvers/inboundendpoints/main.bicep @@ -9,6 +9,20 @@ resource dnsResolver 'Microsoft.Network/dnsResolvers@2022-07-01' = { } } +resource inboundEndpoint 'Microsoft.Network/dnsResolvers/inboundEndpoints@2022-07-01' = { + name: resourceName + location: location + parent: dnsResolver + properties: { + ipConfigurations: [ + { + privateIpAllocationMethod: 'Dynamic' + subnet: {} + } + ] + } +} + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location @@ -25,24 +39,15 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } } -resource inboundEndpoint 'Microsoft.Network/dnsResolvers/inboundEndpoints@2022-07-01' = { - name: resourceName - location: location - parent: dnsResolver - properties: { - ipConfigurations: [ - { - privateIpAllocationMethod: 'Dynamic' - subnet: {} - } - ] - } -} - resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'inbounddns' parent: virtualNetwork properties: { + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.0.0/28' delegations: [ { name: 'Microsoft.Network.dnsResolvers' @@ -51,10 +56,5 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { } } ] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - addressPrefix: '10.0.0.0/28' } } diff --git a/settings/remarks/microsoft.network/samples/dnsresolvers/main.bicep b/settings/remarks/microsoft.network/samples/dnsresolvers/main.bicep index a55b27d9..0478cb8b 100644 --- a/settings/remarks/microsoft.network/samples/dnsresolvers/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnsresolvers/main.bicep @@ -1,18 +1,11 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource dnsResolver 'Microsoft.Network/dnsResolvers@2022-07-01' = { - name: resourceName - location: location - properties: { - virtualNetwork: {} - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -21,6 +14,13 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { dhcpOptions: { dnsServers: [] } - subnets: [] + } +} + +resource dnsResolver 'Microsoft.Network/dnsResolvers@2022-07-01' = { + name: resourceName + location: location + properties: { + virtualNetwork: {} } } diff --git a/settings/remarks/microsoft.network/samples/dnszones/aaaa/main.bicep b/settings/remarks/microsoft.network/samples/dnszones/aaaa/main.bicep index f3768211..1251cb54 100644 --- a/settings/remarks/microsoft.network/samples/dnszones/aaaa/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnszones/aaaa/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { name: '${resourceName}.com' diff --git a/settings/remarks/microsoft.network/samples/dnszones/caa/main.bicep b/settings/remarks/microsoft.network/samples/dnszones/caa/main.bicep index f6f00cbd..225a0933 100644 --- a/settings/remarks/microsoft.network/samples/dnszones/caa/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnszones/caa/main.bicep @@ -13,9 +13,9 @@ resource cAA 'Microsoft.Network/dnsZones/CAA@2018-05-01' = { TTL: 300 caaRecords: [ { + value: ';' flags: 1 tag: 'issuewild' - value: ';' } { flags: 0 @@ -28,9 +28,9 @@ resource cAA 'Microsoft.Network/dnsZones/CAA@2018-05-01' = { value: 'example.com' } { - value: 'example.net' flags: 0 tag: 'issue' + value: 'example.net' } ] metadata: {} diff --git a/settings/remarks/microsoft.network/samples/dnszones/main.bicep b/settings/remarks/microsoft.network/samples/dnszones/main.bicep index 1ec6cc95..2c3a4c4f 100644 --- a/settings/remarks/microsoft.network/samples/dnszones/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnszones/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource dnsZone 'Microsoft.Network/dnsZones@2018-05-01' = { name: '${resourceName}.com' diff --git a/settings/remarks/microsoft.network/samples/dnszones/ptr/main.bicep b/settings/remarks/microsoft.network/samples/dnszones/ptr/main.bicep index 6a00c1a7..4796112b 100644 --- a/settings/remarks/microsoft.network/samples/dnszones/ptr/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnszones/ptr/main.bicep @@ -10,7 +10,6 @@ resource pTR 'Microsoft.Network/dnsZones/PTR@2018-05-01' = { name: resourceName parent: dnsZone properties: { - TTL: 300 metadata: {} PTRRecords: [ { @@ -20,5 +19,6 @@ resource pTR 'Microsoft.Network/dnsZones/PTR@2018-05-01' = { ptrdname: 'microsoft.com' } ] + TTL: 300 } } diff --git a/settings/remarks/microsoft.network/samples/dnszones/srv/main.bicep b/settings/remarks/microsoft.network/samples/dnszones/srv/main.bicep index efb951c0..8b38c51e 100644 --- a/settings/remarks/microsoft.network/samples/dnszones/srv/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnszones/srv/main.bicep @@ -10,6 +10,7 @@ resource sRV 'Microsoft.Network/dnsZones/SRV@2018-05-01' = { name: resourceName parent: dnsZone properties: { + metadata: {} SRVRecords: [ { port: 8080 @@ -25,6 +26,5 @@ resource sRV 'Microsoft.Network/dnsZones/SRV@2018-05-01' = { } ] TTL: 300 - metadata: {} } } diff --git a/settings/remarks/microsoft.network/samples/dnszones/txt/main.bicep b/settings/remarks/microsoft.network/samples/dnszones/txt/main.bicep index 12d38e30..1d0cfafe 100644 --- a/settings/remarks/microsoft.network/samples/dnszones/txt/main.bicep +++ b/settings/remarks/microsoft.network/samples/dnszones/txt/main.bicep @@ -10,8 +10,6 @@ resource tXT 'Microsoft.Network/dnsZones/TXT@2018-05-01' = { name: resourceName parent: dnsZone properties: { - metadata: {} - TTL: 300 TXTRecords: [ { value: [ @@ -26,5 +24,7 @@ resource tXT 'Microsoft.Network/dnsZones/TXT@2018-05-01' = { ] } ] + metadata: {} + TTL: 300 } } diff --git a/settings/remarks/microsoft.network/samples/expressroutecircuits/authorizations/main.bicep b/settings/remarks/microsoft.network/samples/expressroutecircuits/authorizations/main.bicep index 59406a9c..5acc8aee 100644 --- a/settings/remarks/microsoft.network/samples/expressroutecircuits/authorizations/main.bicep +++ b/settings/remarks/microsoft.network/samples/expressroutecircuits/authorizations/main.bicep @@ -1,13 +1,13 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource expressRouteCircuit 'Microsoft.Network/expressRouteCircuits@2022-07-01' = { name: resourceName location: location sku: { - tier: 'Standard' family: 'MeteredData' name: 'Standard_MeteredData' + tier: 'Standard' } properties: { authorizationKey: '' diff --git a/settings/remarks/microsoft.network/samples/expressroutecircuits/main.bicep b/settings/remarks/microsoft.network/samples/expressroutecircuits/main.bicep index e8718ee9..48c63126 100644 --- a/settings/remarks/microsoft.network/samples/expressroutecircuits/main.bicep +++ b/settings/remarks/microsoft.network/samples/expressroutecircuits/main.bicep @@ -1,29 +1,29 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' + +resource expressRoutePort 'Microsoft.Network/ExpressRoutePorts@2022-07-01' = { + name: resourceName + location: location + properties: { + bandwidthInGbps: 10 + encapsulation: 'Dot1Q' + peeringLocation: 'CDC-Canberra' + } +} resource expressRouteCircuit 'Microsoft.Network/expressRouteCircuits@2022-07-01' = { name: resourceName location: location sku: { + family: 'MeteredData' name: 'Premium_MeteredData' tier: 'Premium' - family: 'MeteredData' } properties: { + authorizationKey: '' + bandwidthInGbps: 5 expressRoutePort: { id: expressRoutePort.id } - authorizationKey: '' - bandwidthInGbps: 5 - } -} - -resource expressRoutePort 'Microsoft.Network/ExpressRoutePorts@2022-07-01' = { - name: resourceName - location: location - properties: { - bandwidthInGbps: 10 - encapsulation: 'Dot1Q' - peeringLocation: 'CDC-Canberra' } } diff --git a/settings/remarks/microsoft.network/samples/expressroutecircuits/peerings/connections/main.bicep b/settings/remarks/microsoft.network/samples/expressroutecircuits/peerings/connections/main.bicep index 4cfedebd..88211acc 100644 --- a/settings/remarks/microsoft.network/samples/expressroutecircuits/peerings/connections/main.bicep +++ b/settings/remarks/microsoft.network/samples/expressroutecircuits/peerings/connections/main.bicep @@ -4,7 +4,7 @@ param location string = 'westeurope' @description('The shared key for the Express Route circuit peering connections') param expressRouteConnectionSharedKey string -resource expressRouteCircuit 'Microsoft.Network/expressRouteCircuits@2022-07-01' = { +resource expressRouteCircuit2 'Microsoft.Network/expressRouteCircuits@2022-07-01' = { name: resourceName location: location sku: { @@ -16,12 +16,12 @@ resource expressRouteCircuit 'Microsoft.Network/expressRouteCircuits@2022-07-01' authorizationKey: '' bandwidthInGbps: 5 expressRoutePort: { - id: expressRoutePort.id + id: expressRoutePort2.id } } } -resource expressRouteCircuit2 'Microsoft.Network/expressRouteCircuits@2022-07-01' = { +resource expressRouteCircuit 'Microsoft.Network/expressRouteCircuits@2022-07-01' = { name: resourceName location: location sku: { @@ -33,7 +33,7 @@ resource expressRouteCircuit2 'Microsoft.Network/expressRouteCircuits@2022-07-01 authorizationKey: '' bandwidthInGbps: 5 expressRoutePort: { - id: expressRoutePort2.id + id: expressRoutePort.id } } } @@ -44,13 +44,13 @@ resource peering 'Microsoft.Network/expressRouteCircuits/peerings@2022-07-01' = properties: { gatewayManagerEtag: '' peerASN: 100 - secondaryPeerAddressPrefix: '192.168.1.0/30' + sharedKey: '${expressRouteConnectionSharedKey}' state: 'Enabled' - azureASN: 12076 + vlanId: 100 peeringType: 'AzurePrivatePeering' primaryPeerAddressPrefix: '192.168.1.0/30' - sharedKey: '${expressRouteConnectionSharedKey}' - vlanId: 100 + secondaryPeerAddressPrefix: '192.168.1.0/30' + azureASN: 12076 } } @@ -58,15 +58,15 @@ resource peering2 'Microsoft.Network/expressRouteCircuits/peerings@2022-07-01' = name: 'AzurePrivatePeering' parent: expressRouteCircuit2 properties: { - azureASN: 12076 gatewayManagerEtag: '' + peeringType: 'AzurePrivatePeering' + primaryPeerAddressPrefix: '192.168.1.0/30' + vlanId: 100 + azureASN: 12076 peerASN: 100 secondaryPeerAddressPrefix: '192.168.1.0/30' sharedKey: '${expressRouteConnectionSharedKey}' state: 'Enabled' - vlanId: 100 - peeringType: 'AzurePrivatePeering' - primaryPeerAddressPrefix: '192.168.1.0/30' } } @@ -74,13 +74,13 @@ resource connection 'Microsoft.Network/expressRouteCircuits/peerings/connections name: resourceName parent: peering properties: { + peerExpressRouteCircuitPeering: { + id: peering2.id + } addressPrefix: '192.169.8.0/29' expressRouteCircuitPeering: { id: peering.id } - peerExpressRouteCircuitPeering: { - id: peering2.id - } } } @@ -88,9 +88,9 @@ resource expressRoutePort 'Microsoft.Network/ExpressRoutePorts@2022-07-01' = { name: resourceName location: location properties: { + peeringLocation: 'Airtel-Chennai2-CLS' bandwidthInGbps: 10 encapsulation: 'Dot1Q' - peeringLocation: 'Airtel-Chennai2-CLS' } } @@ -98,8 +98,8 @@ resource expressRoutePort2 'Microsoft.Network/ExpressRoutePorts@2022-07-01' = { name: resourceName location: location properties: { - bandwidthInGbps: 10 encapsulation: 'Dot1Q' peeringLocation: 'CDC-Canberra' + bandwidthInGbps: 10 } } diff --git a/settings/remarks/microsoft.network/samples/expressroutecircuits/peerings/main.bicep b/settings/remarks/microsoft.network/samples/expressroutecircuits/peerings/main.bicep index b60f4200..42e41da2 100644 --- a/settings/remarks/microsoft.network/samples/expressroutecircuits/peerings/main.bicep +++ b/settings/remarks/microsoft.network/samples/expressroutecircuits/peerings/main.bicep @@ -18,9 +18,9 @@ resource expressRouteCircuit 'Microsoft.Network/expressRouteCircuits@2022-07-01' name: resourceName location: location sku: { + family: 'MeteredData' name: 'Premium_MeteredData' tier: 'Premium' - family: 'MeteredData' } properties: { authorizationKey: '' @@ -35,13 +35,13 @@ resource peering 'Microsoft.Network/expressRouteCircuits/peerings@2022-07-01' = name: 'AzurePrivatePeering' parent: expressRouteCircuit properties: { - vlanId: 100 + state: 'Enabled' azureASN: 12076 gatewayManagerEtag: '' + primaryPeerAddressPrefix: '192.168.1.0/30' + vlanId: 100 peerASN: 100 - state: 'Enabled' peeringType: 'AzurePrivatePeering' - primaryPeerAddressPrefix: '192.168.1.0/30' secondaryPeerAddressPrefix: '192.168.2.0/30' sharedKey: '${expressRouteSharedKey}' } diff --git a/settings/remarks/microsoft.network/samples/expressroutegateways/expressrouteconnections/main.bicep b/settings/remarks/microsoft.network/samples/expressroutegateways/expressrouteconnections/main.bicep index 1b9de77b..60f47078 100644 --- a/settings/remarks/microsoft.network/samples/expressroutegateways/expressrouteconnections/main.bicep +++ b/settings/remarks/microsoft.network/samples/expressroutegateways/expressrouteconnections/main.bicep @@ -1,32 +1,16 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The shared key for the ExpressRoute connection') param sharedKey string +param resourceName string = 'acctest0001' -resource expressRouteGateway 'Microsoft.Network/expressRouteGateways@2022-07-01' = { +resource expressRoutePort 'Microsoft.Network/ExpressRoutePorts@2022-07-01' = { name: resourceName location: location properties: { - allowNonVirtualWanTraffic: false - autoScaleConfiguration: { - bounds: { - min: 1 - } - } - virtualHub: {} - } -} - -resource expressRouteConnection 'Microsoft.Network/expressRouteGateways/expressRouteConnections@2022-07-01' = { - name: resourceName - parent: expressRouteGateway - properties: { - enableInternetSecurity: false - expressRouteCircuitPeering: {} - expressRouteGatewayBypass: false - routingConfiguration: {} - routingWeight: 0 + bandwidthInGbps: 10 + encapsulation: 'Dot1Q' + peeringLocation: 'CDC-Canberra' } } @@ -47,29 +31,17 @@ resource expressRouteCircuit 'Microsoft.Network/expressRouteCircuits@2022-07-01' } } -resource peering 'Microsoft.Network/expressRouteCircuits/peerings@2022-07-01' = { - name: 'AzurePrivatePeering' - parent: expressRouteCircuit - properties: { - gatewayManagerEtag: '' - sharedKey: '${sharedKey}' - azureASN: 12076 - peerASN: 100 - peeringType: 'AzurePrivatePeering' - primaryPeerAddressPrefix: '192.168.1.0/30' - secondaryPeerAddressPrefix: '192.168.2.0/30' - state: 'Enabled' - vlanId: 100 - } -} - -resource expressRoutePort 'Microsoft.Network/ExpressRoutePorts@2022-07-01' = { +resource expressRouteGateway 'Microsoft.Network/expressRouteGateways@2022-07-01' = { name: resourceName location: location properties: { - bandwidthInGbps: 10 - encapsulation: 'Dot1Q' - peeringLocation: 'CDC-Canberra' + autoScaleConfiguration: { + bounds: { + min: 1 + } + } + virtualHub: {} + allowNonVirtualWanTraffic: false } } @@ -77,12 +49,12 @@ resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { name: resourceName location: location properties: { + virtualWan: {} addressPrefix: '10.0.1.0/24' hubRoutingPreference: 'ExpressRoute' virtualRouterAutoScaleConfiguration: { minCapacity: 2 } - virtualWan: {} } } @@ -90,9 +62,37 @@ resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { name: resourceName location: location properties: { - office365LocalBreakoutCategory: 'None' - type: 'Standard' allowBranchToBranchTraffic: true disableVpnEncryption: false + office365LocalBreakoutCategory: 'None' + type: 'Standard' + } +} + +resource expressRouteConnection 'Microsoft.Network/expressRouteGateways/expressRouteConnections@2022-07-01' = { + name: resourceName + parent: expressRouteGateway + properties: { + enableInternetSecurity: false + expressRouteCircuitPeering: {} + expressRouteGatewayBypass: false + routingConfiguration: {} + routingWeight: 0 + } +} + +resource peering 'Microsoft.Network/expressRouteCircuits/peerings@2022-07-01' = { + name: 'AzurePrivatePeering' + parent: expressRouteCircuit + properties: { + azureASN: 12076 + gatewayManagerEtag: '' + peerASN: 100 + secondaryPeerAddressPrefix: '192.168.2.0/30' + sharedKey: '${sharedKey}' + state: 'Enabled' + vlanId: 100 + peeringType: 'AzurePrivatePeering' + primaryPeerAddressPrefix: '192.168.1.0/30' } } diff --git a/settings/remarks/microsoft.network/samples/expressroutegateways/main.bicep b/settings/remarks/microsoft.network/samples/expressroutegateways/main.bicep index ec8ae76c..d63ee525 100644 --- a/settings/remarks/microsoft.network/samples/expressroutegateways/main.bicep +++ b/settings/remarks/microsoft.network/samples/expressroutegateways/main.bicep @@ -1,19 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' - -resource expressRouteGateway 'Microsoft.Network/expressRouteGateways@2022-07-01' = { - name: resourceName - location: location - properties: { - autoScaleConfiguration: { - bounds: { - min: 1 - } - } - virtualHub: {} - allowNonVirtualWanTraffic: false - } -} +param resourceName string = 'acctest0001' resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { name: resourceName @@ -32,9 +18,23 @@ resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { name: resourceName location: location properties: { - office365LocalBreakoutCategory: 'None' - type: 'Standard' allowBranchToBranchTraffic: true disableVpnEncryption: false + office365LocalBreakoutCategory: 'None' + type: 'Standard' + } +} + +resource expressRouteGateway 'Microsoft.Network/expressRouteGateways@2022-07-01' = { + name: resourceName + location: location + properties: { + autoScaleConfiguration: { + bounds: { + min: 1 + } + } + virtualHub: {} + allowNonVirtualWanTraffic: false } } diff --git a/settings/remarks/microsoft.network/samples/frontdoorwebapplicationfirewallpolicies/main.bicep b/settings/remarks/microsoft.network/samples/frontdoorwebapplicationfirewallpolicies/main.bicep index 4f9420e4..72d1233c 100644 --- a/settings/remarks/microsoft.network/samples/frontdoorwebapplicationfirewallpolicies/main.bicep +++ b/settings/remarks/microsoft.network/samples/frontdoorwebapplicationfirewallpolicies/main.bicep @@ -11,7 +11,7 @@ resource frontDoorWebApplicationFirewallPolicy 'Microsoft.Network/FrontDoorWebAp customRules: { rules: [ { - action: 'Block' + enabledState: 'Enabled' matchConditions: [ { matchValue: [ @@ -23,20 +23,18 @@ resource frontDoorWebApplicationFirewallPolicy 'Microsoft.Network/FrontDoorWebAp operator: 'IPMatch' } ] - priority: 1 - rateLimitThreshold: 10 - ruleType: 'MatchRule' - enabledState: 'Enabled' name: 'Rule1' + priority: 1 rateLimitDurationInMinutes: 1 + ruleType: 'MatchRule' + action: 'Block' + rateLimitThreshold: 10 } ] } managedRules: { managedRuleSets: [ { - ruleSetAction: 'Block' - ruleSetType: 'DefaultRuleSet' ruleSetVersion: 'preview-0.1' ruleGroupOverrides: [ { @@ -50,6 +48,8 @@ resource frontDoorWebApplicationFirewallPolicy 'Microsoft.Network/FrontDoorWebAp ] } ] + ruleSetAction: 'Block' + ruleSetType: 'DefaultRuleSet' } { ruleSetAction: 'Block' diff --git a/settings/remarks/microsoft.network/samples/loadbalancers/backendaddresspools/main.bicep b/settings/remarks/microsoft.network/samples/loadbalancers/backendaddresspools/main.bicep index 4fc4ad63..e699e403 100644 --- a/settings/remarks/microsoft.network/samples/loadbalancers/backendaddresspools/main.bicep +++ b/settings/remarks/microsoft.network/samples/loadbalancers/backendaddresspools/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource loadBalancer 'Microsoft.Network/loadBalancers@2022-07-01' = { name: resourceName @@ -11,10 +11,10 @@ resource loadBalancer 'Microsoft.Network/loadBalancers@2022-07-01' = { properties: { frontendIPConfigurations: [ { - name: 'internal' properties: { publicIPAddress: {} } + name: 'internal' } ] } @@ -28,12 +28,12 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { tier: 'Regional' } properties: { + publicIPAllocationMethod: 'Static' ddosSettings: { protectionMode: 'VirtualNetworkInherited' } idleTimeoutInMinutes: 4 publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Static' } } diff --git a/settings/remarks/microsoft.network/samples/loadbalancers/main.bicep b/settings/remarks/microsoft.network/samples/loadbalancers/main.bicep index 9f53c32b..a99f1dc4 100644 --- a/settings/remarks/microsoft.network/samples/loadbalancers/main.bicep +++ b/settings/remarks/microsoft.network/samples/loadbalancers/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource loadBalancer 'Microsoft.Network/loadBalancers@2022-07-01' = { name: resourceName @@ -11,10 +11,10 @@ resource loadBalancer 'Microsoft.Network/loadBalancers@2022-07-01' = { properties: { frontendIPConfigurations: [ { + name: resourceName properties: { publicIPAddress: {} } - name: resourceName } ] } @@ -28,11 +28,11 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { tier: 'Regional' } properties: { - publicIPAllocationMethod: 'Static' ddosSettings: { protectionMode: 'VirtualNetworkInherited' } idleTimeoutInMinutes: 4 publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Static' } } diff --git a/settings/remarks/microsoft.network/samples/localnetworkgateways/main.bicep b/settings/remarks/microsoft.network/samples/localnetworkgateways/main.bicep index b2ecd304..2fa2ca78 100644 --- a/settings/remarks/microsoft.network/samples/localnetworkgateways/main.bicep +++ b/settings/remarks/microsoft.network/samples/localnetworkgateways/main.bicep @@ -5,11 +5,11 @@ resource localNetworkGateway 'Microsoft.Network/localNetworkGateways@2022-07-01' name: resourceName location: location properties: { + gatewayIpAddress: '168.62.225.23' localNetworkAddressSpace: { addressPrefixes: [ '10.1.1.0/24' ] } - gatewayIpAddress: '168.62.225.23' } } diff --git a/settings/remarks/microsoft.network/samples/networkinterfaces/main.bicep b/settings/remarks/microsoft.network/samples/networkinterfaces/main.bicep index 4334e10d..cc65b411 100644 --- a/settings/remarks/microsoft.network/samples/networkinterfaces/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkinterfaces/main.bicep @@ -1,10 +1,12 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { name: resourceName location: location properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false ipConfigurations: [ { name: 'testconfiguration1' @@ -16,8 +18,6 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { } } ] - enableAcceleratedNetworking: false - enableIPForwarding: false } } @@ -41,11 +41,11 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] } } diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/connectivityconfigurations/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/connectivityconfigurations/main.bicep index 2b4a7763..63fe8a85 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/connectivityconfigurations/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/connectivityconfigurations/main.bicep @@ -5,16 +5,16 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } dhcpOptions: { dnsServers: [] } flowTimeoutInMinutes: 10 subnets: [] + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } } } @@ -49,9 +49,9 @@ resource connectivityConfiguration 'Microsoft.Network/networkManagers/connectivi isGlobal: 'False' appliesToGroups: [ { - groupConnectivity: 'None' isGlobal: 'False' useHubGateway: 'False' + groupConnectivity: 'None' } ] connectivityTopology: 'HubAndSpoke' diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/ipampools/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/ipampools/main.bicep index 4c8b2e86..298a97ea 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/ipampools/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/ipampools/main.bicep @@ -12,7 +12,7 @@ resource networkManager 'Microsoft.Network/networkManagers@2022-09-01' = { networkManagerScopes: { managementGroups: [] subscriptions: [ - '/subscriptions/${subscription()}' + '/subscriptions/${subscription().subscriptionId}' ] } } diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/ipampools/staticcidr/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/ipampools/staticcidr/main.bicep index 9cc4a3d0..464e4a93 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/ipampools/staticcidr/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/ipampools/staticcidr/main.bicep @@ -10,10 +10,10 @@ resource networkManager 'Microsoft.Network/networkManagers@2022-09-01' = { 'SecurityAdmin' ] networkManagerScopes: { - managementGroups: [] subscriptions: [ - '/subscriptions/${subscription()}' + '/subscriptions/${subscription().subscriptionId}' ] + managementGroups: [] } } } @@ -23,12 +23,12 @@ resource ipamPool 'Microsoft.Network/networkManagers/ipamPools@2024-01-01-previe location: location parent: networkManager properties: { + displayName: 'testDisplayName' + parentPoolName: '' addressPrefixes: [ '10.0.0.0/24' ] description: 'Test description.' - displayName: 'testDisplayName' - parentPoolName: '' } } @@ -36,10 +36,10 @@ resource staticCidr 'Microsoft.Network/networkManagers/ipamPools/staticCidrs@202 name: resourceName parent: ipamPool properties: { + numberOfIPAddressesToAllocate: '' addressPrefixes: [ '10.0.0.0/25' ] description: 'test description' - numberOfIPAddressesToAllocate: '' } } diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/networkgroups/staticmembers/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/networkgroups/staticmembers/main.bicep index fa4056bc..2621ec5f 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/networkgroups/staticmembers/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/networkgroups/staticmembers/main.bicep @@ -28,8 +28,8 @@ resource networkGroupForSubnet 'Microsoft.Network/networkManagers/networkGroups@ name: '${resourceName}-subnet' parent: networkManager properties: { - memberType: 'Subnet' description: 'example network group' + memberType: 'Subnet' } } @@ -37,15 +37,15 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-10-01' = { name: resourceName location: location properties: { - dhcpOptions: { - dnsServers: [] - } subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/22' ] } + dhcpOptions: { + dnsServers: [] + } } } diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/scopeconnections/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/scopeconnections/main.bicep index a82b5112..a4c50b24 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/scopeconnections/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/scopeconnections/main.bicep @@ -5,6 +5,7 @@ resource networkManager 'Microsoft.Network/networkManagers@2022-09-01' = { name: resourceName location: location properties: { + description: '' networkManagerScopeAccesses: [ 'SecurityAdmin' ] @@ -14,7 +15,6 @@ resource networkManager 'Microsoft.Network/networkManagers@2022-09-01' = { subscription().id ] } - description: '' } } diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/main.bicep index 57c7b3f2..a86e15c9 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource networkManager 'Microsoft.Network/networkManagers@2022-09-01' = { name: resourceName diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/rulecollections/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/rulecollections/main.bicep index 9658a625..947b9d6a 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/rulecollections/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/rulecollections/main.bicep @@ -1,20 +1,20 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource networkManager 'Microsoft.Network/networkManagers@2022-09-01' = { name: resourceName location: location properties: { + networkManagerScopeAccesses: [ + 'SecurityAdmin' + ] networkManagerScopes: { - managementGroups: [] subscriptions: [ subscription().id ] + managementGroups: [] } description: '' - networkManagerScopeAccesses: [ - 'SecurityAdmin' - ] } } diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/rulecollections/rules/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/rulecollections/rules/main.bicep index 961d1228..e98e5f84 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/rulecollections/rules/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/securityadminconfigurations/rulecollections/rules/main.bicep @@ -18,6 +18,12 @@ resource networkManager 'Microsoft.Network/networkManagers@2022-09-01' = { } } +resource networkGroup 'Microsoft.Network/networkManagers/networkGroups@2022-09-01' = { + name: resourceName + parent: networkManager + properties: {} +} + resource securityAdminConfiguration 'Microsoft.Network/networkManagers/securityAdminConfigurations@2022-09-01' = { name: resourceName parent: networkManager @@ -43,19 +49,13 @@ resource rule 'Microsoft.Network/networkManagers/securityAdminConfigurations/rul parent: ruleCollection kind: 'Custom' properties: { + sourcePortRanges: [] sources: [] + access: 'Deny' destinationPortRanges: [] destinations: [] direction: 'Outbound' - access: 'Deny' priority: 1 protocol: 'Tcp' - sourcePortRanges: [] } } - -resource networkGroup 'Microsoft.Network/networkManagers/networkGroups@2022-09-01' = { - name: resourceName - parent: networkManager - properties: {} -} diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/main.bicep index 02f075d4..6c524e0c 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/main.bicep @@ -5,16 +5,16 @@ resource networkManager 'Microsoft.Network/networkManagers@2022-09-01' = { name: resourceName location: location properties: { - description: '' networkManagerScopeAccesses: [ 'SecurityAdmin' ] networkManagerScopes: { managementGroups: [] subscriptions: [ - '/subscriptions/${subscription()}' + '/subscriptions/${subscription().subscriptionId}' ] } + description: '' } } diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/reachabilityanalysisintent/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/reachabilityanalysisintent/main.bicep index 5542d1d3..f1b0d9fc 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/reachabilityanalysisintent/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/reachabilityanalysisintent/main.bicep @@ -1,54 +1,87 @@ +param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The admin username for the virtual machine') param adminUsername string @secure() @description('The admin password for the virtual machine') param adminPassword string -param resourceName string = 'acctest0001' + +resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { + name: resourceName + location: location + properties: { + ipConfigurations: [ + { + properties: { + privateIPAllocationMethod: 'Dynamic' + subnet: {} + primary: true + privateIPAddressVersion: 'IPv4' + } + name: 'testconfiguration1' + } + ] + enableAcceleratedNetworking: false + enableIPForwarding: false + } +} resource networkManager 'Microsoft.Network/networkManagers@2022-09-01' = { name: resourceName location: location properties: { - description: '' networkManagerScopeAccesses: [ 'SecurityAdmin' ] networkManagerScopes: { - managementGroups: [] subscriptions: [ - '/subscriptions/${subscription()}' + '/subscriptions/${subscription().subscriptionId}' ] + managementGroups: [] } + description: '' } } -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { +resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { name: resourceName location: location properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' + hardwareProfile: { + vmSize: 'Standard_F2' + } + networkProfile: { + networkInterfaces: [ + { + properties: { + primary: false + } + id: networkInterface.id + } ] } - dhcpOptions: { - dnsServers: [] + osProfile: { + adminPassword: adminPassword + adminUsername: adminUsername + computerName: 'hostname230630032848831819' + linuxConfiguration: { + disablePasswordAuthentication: false + } + } + storageProfile: { + imageReference: { + offer: 'UbuntuServer' + publisher: 'Canonical' + sku: '16.04-LTS' + version: 'latest' + } + osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' + name: 'myosdisk1' + writeAcceleratorEnabled: false + } } - 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: [] } } @@ -65,10 +98,15 @@ resource reachabilityAnalysisIntent 'Microsoft.Network/networkManagers/verifierW name: resourceName parent: verifierWorkspace properties: { - sourceResourceId: virtualMachine.id description: 'A sample reachability analysis intent' destinationResourceId: virtualMachine.id ipTraffic: { + sourcePorts: [ + '0' + ] + destinationIps: [ + '10.4.0.1' + ] destinationPorts: [ '0' ] @@ -78,83 +116,45 @@ resource reachabilityAnalysisIntent 'Microsoft.Network/networkManagers/verifierW sourceIps: [ '10.4.0.0' ] - sourcePorts: [ - '0' - ] - destinationIps: [ - '10.4.0.1' - ] } + sourceResourceId: virtualMachine.id } } -resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { +resource reachabilityAnalysisRun 'Microsoft.Network/networkManagers/verifierWorkspaces/reachabilityAnalysisRuns@2024-01-01-preview' = { name: resourceName - location: location + parent: verifierWorkspace properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'testconfiguration1' - properties: { - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: {} - } - } - ] + description: 'A sample reachability analysis run' + intentId: reachabilityAnalysisIntent.id } } -resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { - hardwareProfile: { - vmSize: 'Standard_F2' - } - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: false - } - } + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' ] } - osProfile: { - adminPassword: adminPassword - adminUsername: adminUsername - computerName: 'hostname230630032848831819' - linuxConfiguration: { - disablePasswordAuthentication: false - } - } - storageProfile: { - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '16.04-LTS' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - name: 'myosdisk1' - writeAcceleratorEnabled: false - } + dhcpOptions: { + dnsServers: [] } + subnets: [] } } -resource reachabilityAnalysisRun 'Microsoft.Network/networkManagers/verifierWorkspaces/reachabilityAnalysisRuns@2024-01-01-preview' = { +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName - parent: verifierWorkspace + parent: virtualNetwork properties: { - description: 'A sample reachability analysis run' - intentId: reachabilityAnalysisIntent.id + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' } } diff --git a/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/reachabilityanalysisintent/reachabilityanalysisrun/main.bicep b/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/reachabilityanalysisintent/reachabilityanalysisrun/main.bicep index 0de6751f..24e94ba6 100644 --- a/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/reachabilityanalysisintent/reachabilityanalysisrun/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkmanagers/verifierworkspace/reachabilityanalysisintent/reachabilityanalysisrun/main.bicep @@ -4,53 +4,10 @@ param location string = 'westeurope' @description('The administrator password for the virtual machine') param vmAdminPassword string -resource virtualMachine 'Microsoft.Compute/virtualMachines@2023-03-01' = { - name: resourceName - location: location - properties: { - storageProfile: { - imageReference: { - offer: 'UbuntuServer' - publisher: 'Canonical' - sku: '16.04-LTS' - version: 'latest' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - name: 'myosdisk1' - writeAcceleratorEnabled: false - } - } - hardwareProfile: { - vmSize: 'Standard_F2' - } - networkProfile: { - networkInterfaces: [ - { - id: networkInterface.id - properties: { - primary: false - } - } - ] - } - osProfile: { - computerName: 'hostname230630032848831819' - linuxConfiguration: { - disablePasswordAuthentication: false - } - adminPassword: vmAdminPassword - adminUsername: 'testadmin' - } - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { - subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -59,6 +16,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { dhcpOptions: { dnsServers: [] } + subnets: [] } } @@ -86,7 +44,7 @@ resource networkManager 'Microsoft.Network/networkManagers@2022-09-01' = { networkManagerScopes: { managementGroups: [] subscriptions: [ - '/subscriptions/${subscription()}' + '/subscriptions/${subscription().subscriptionId}' ] } } @@ -147,3 +105,45 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2022-07-01' = { ] } } + +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: { + adminUsername: 'testadmin' + computerName: 'hostname230630032848831819' + linuxConfiguration: { + disablePasswordAuthentication: false + } + adminPassword: vmAdminPassword + } + 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.network/samples/networkprofiles/main.bicep b/settings/remarks/microsoft.network/samples/networkprofiles/main.bicep index 419c28a2..b224e0ef 100644 --- a/settings/remarks/microsoft.network/samples/networkprofiles/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkprofiles/main.bicep @@ -21,6 +21,7 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { + addressPrefix: '10.1.0.0/24' delegations: [ { name: 'acctestdelegation-230630033653886950' @@ -33,7 +34,6 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] - addressPrefix: '10.1.0.0/24' } } diff --git a/settings/remarks/microsoft.network/samples/networksecuritygroups/securityrules/main.bicep b/settings/remarks/microsoft.network/samples/networksecuritygroups/securityrules/main.bicep index 3e599ed2..d0eece6f 100644 --- a/settings/remarks/microsoft.network/samples/networksecuritygroups/securityrules/main.bicep +++ b/settings/remarks/microsoft.network/samples/networksecuritygroups/securityrules/main.bicep @@ -14,6 +14,7 @@ resource securityRule 'Microsoft.Network/networkSecurityGroups/securityRules@202 parent: networkSecurityGroup properties: { destinationAddressPrefix: '*' + destinationPortRange: '' destinationPortRanges: [ '9000' '1438' @@ -21,12 +22,11 @@ resource securityRule 'Microsoft.Network/networkSecurityGroups/securityRules@202 '9003' '1452' ] - priority: 106 + protocol: 'Tcp' sourcePortRange: '*' access: 'Allow' - destinationPortRange: '' direction: 'Inbound' - protocol: 'Tcp' + priority: 106 sourceAddressPrefix: '*' } } diff --git a/settings/remarks/microsoft.network/samples/networkwatchers/flowlogs/main.bicep b/settings/remarks/microsoft.network/samples/networkwatchers/flowlogs/main.bicep index 26b998b9..8693aa5f 100644 --- a/settings/remarks/microsoft.network/samples/networkwatchers/flowlogs/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkwatchers/flowlogs/main.bicep @@ -1,5 +1,11 @@ -param resourceName string = 'acctest0001' param location string = 'eastus2' +param resourceName string = 'acctest0001' + +resource networkWatchers 'Microsoft.Network/networkWatchers@2023-11-01' = { + name: resourceName + location: location + properties: {} +} resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName @@ -9,8 +15,14 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + defaultToOAuthAuthentication: false + isSftpEnabled: false + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowCrossTenantReplication: true + allowSharedKeyAccess: true encryption: { - keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -19,21 +31,15 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } isHnsEnabled: false isNfsV3Enabled: false - isSftpEnabled: false - supportsHttpsTrafficOnly: true - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - defaultToOAuthAuthentication: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - publicNetworkAccess: 'Enabled' - allowSharedKeyAccess: true + allowBlobPublicAccess: true } } @@ -41,7 +47,6 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { - subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -50,24 +55,15 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { dhcpOptions: { dnsServers: [] } + subnets: [] } } -resource networkWatchers 'Microsoft.Network/networkWatchers@2023-11-01' = { - name: resourceName - location: location - properties: {} -} - resource flowLog 'Microsoft.Network/networkWatchers/flowLogs@2023-11-01' = { name: resourceName location: location parent: networkWatchers properties: { - retentionPolicy: { - enabled: true - days: 7 - } storageId: storageAccount.id targetResourceId: virtualNetwork.id enabled: true @@ -80,5 +76,9 @@ resource flowLog 'Microsoft.Network/networkWatchers/flowLogs@2023-11-01' = { type: 'JSON' version: 2 } + retentionPolicy: { + days: 7 + enabled: true + } } } diff --git a/settings/remarks/microsoft.network/samples/networkwatchers/packetcaptures/main.bicep b/settings/remarks/microsoft.network/samples/networkwatchers/packetcaptures/main.bicep index 4cf46b35..a1da0ee5 100644 --- a/settings/remarks/microsoft.network/samples/networkwatchers/packetcaptures/main.bicep +++ b/settings/remarks/microsoft.network/samples/networkwatchers/packetcaptures/main.bicep @@ -4,6 +4,22 @@ param location string = 'westus' @description('The administrator password for the virtual machine') param adminPassword string +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { + name: '${resourceName}-vnet' + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + privateEndpointVNetPolicies: 'Disabled' + } +} + resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { name: '${resourceName}-vm' location: location @@ -31,51 +47,35 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } storageProfile: { imageReference: { - offer: '0001-com-ubuntu-server-jammy' publisher: 'Canonical' sku: '22_04-lts' version: 'latest' + offer: '0001-com-ubuntu-server-jammy' } osDisk: { + caching: 'ReadWrite' createOption: 'FromImage' managedDisk: { storageAccountType: 'Standard_LRS' } name: '${resourceName}-osdisk' writeAcceleratorEnabled: false - caching: 'ReadWrite' } } } } -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { - name: '${resourceName}-vnet' - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - privateEndpointVNetPolicies: 'Disabled' - } -} - resource extension 'Microsoft.Compute/virtualMachines/extensions@2024-03-01' = { name: 'network-watcher' location: location parent: virtualMachine properties: { + autoUpgradeMinorVersion: true enableAutomaticUpgrade: false publisher: 'Microsoft.Azure.NetworkWatcher' suppressFailures: false type: 'NetworkWatcherAgentLinux' typeHandlerVersion: '1.4' - autoUpgradeMinorVersion: true } } @@ -88,14 +88,14 @@ resource packetCapture 'Microsoft.Network/networkWatchers/packetCaptures@2024-05 name: '${resourceName}-pc' parent: networkWatcher properties: { - storageLocation: { - filePath: '/var/captures/packet.cap' - } target: virtualMachine.id targetType: 'AzureVM' timeLimitInSeconds: 18000 totalBytesPerSession: 1073741824 bytesToCapturePerPacket: 0 + storageLocation: { + filePath: '/var/captures/packet.cap' + } } } @@ -103,13 +103,13 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: 'internal' parent: virtualNetwork properties: { + addressPrefix: '10.0.2.0/24' + defaultOutboundAccess: true delegations: [] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] - addressPrefix: '10.0.2.0/24' - defaultOutboundAccess: true } } @@ -123,10 +123,10 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { { name: 'ipconfig1' properties: { + primary: true privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' subnet: {} - primary: true } } ] diff --git a/settings/remarks/microsoft.network/samples/p2svpngateways/main.bicep b/settings/remarks/microsoft.network/samples/p2svpngateways/main.bicep index 6954410f..d731dce8 100644 --- a/settings/remarks/microsoft.network/samples/p2svpngateways/main.bicep +++ b/settings/remarks/microsoft.network/samples/p2svpngateways/main.bicep @@ -1,30 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource p2svpnGateway 'Microsoft.Network/p2svpnGateways@2022-07-01' = { - name: resourceName - location: location - properties: { - isRoutingPreferenceInternet: false - p2SConnectionConfigurations: [ - { - properties: { - vpnClientAddressPool: { - addressPrefixes: [ - '172.100.0.0/14' - ] - } - enableInternetSecurity: false - } - name: 'first' - } - ] - virtualHub: {} - vpnGatewayScaleUnit: 1 - vpnServerConfiguration: {} - } -} - resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { name: resourceName location: location @@ -42,10 +18,10 @@ resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { name: resourceName location: location properties: { - office365LocalBreakoutCategory: 'None' type: 'Standard' allowBranchToBranchTraffic: true disableVpnEncryption: false + office365LocalBreakoutCategory: 'None' } } @@ -53,6 +29,9 @@ resource vpnServerConfiguration 'Microsoft.Network/vpnServerConfigurations@2022- name: resourceName location: location properties: { + vpnAuthenticationTypes: [ + 'Certificate' + ] vpnClientIpsecPolicies: [] vpnClientRevokedCertificates: [] vpnClientRootCertificates: [ @@ -85,8 +64,29 @@ M/s/1JRtO3bDSzD9TazRVzn2oBqzSa8VgIo5C1nOnoAKJTlsClJKvIhnRlaLQqk= 'OpenVPN' 'IkeV2' ] - vpnAuthenticationTypes: [ - 'Certificate' + } +} + +resource p2svpnGateway 'Microsoft.Network/p2svpnGateways@2022-07-01' = { + name: resourceName + location: location + properties: { + vpnServerConfiguration: {} + isRoutingPreferenceInternet: false + p2SConnectionConfigurations: [ + { + properties: { + enableInternetSecurity: false + vpnClientAddressPool: { + addressPrefixes: [ + '172.100.0.0/14' + ] + } + } + name: 'first' + } ] + virtualHub: {} + vpnGatewayScaleUnit: 1 } } diff --git a/settings/remarks/microsoft.network/samples/privatednszones/a/main.bicep b/settings/remarks/microsoft.network/samples/privatednszones/a/main.bicep index bae1b3ea..96c80db4 100644 --- a/settings/remarks/microsoft.network/samples/privatednszones/a/main.bicep +++ b/settings/remarks/microsoft.network/samples/privatednszones/a/main.bicep @@ -10,8 +10,6 @@ resource a 'Microsoft.Network/privateDnsZones/A@2018-09-01' = { name: resourceName parent: privateDnsZone properties: { - metadata: {} - ttl: 300 aRecords: [ { ipv4Address: '1.2.4.5' @@ -20,5 +18,7 @@ resource a 'Microsoft.Network/privateDnsZones/A@2018-09-01' = { ipv4Address: '1.2.3.4' } ] + metadata: {} + ttl: 300 } } diff --git a/settings/remarks/microsoft.network/samples/privatednszones/aaaa/main.bicep b/settings/remarks/microsoft.network/samples/privatednszones/aaaa/main.bicep index 2d30df96..62388553 100644 --- a/settings/remarks/microsoft.network/samples/privatednszones/aaaa/main.bicep +++ b/settings/remarks/microsoft.network/samples/privatednszones/aaaa/main.bicep @@ -10,8 +10,6 @@ resource aAAA 'Microsoft.Network/privateDnsZones/AAAA@2018-09-01' = { name: resourceName parent: privateDnsZone properties: { - metadata: {} - ttl: 300 aaaaRecords: [ { ipv6Address: 'fd5d:70bc:930e:d008:0000:0000:0000:7334' @@ -20,5 +18,7 @@ resource aAAA 'Microsoft.Network/privateDnsZones/AAAA@2018-09-01' = { ipv6Address: 'fd5d:70bc:930e:d008::7335' } ] + metadata: {} + ttl: 300 } } diff --git a/settings/remarks/microsoft.network/samples/privatednszones/cname/main.bicep b/settings/remarks/microsoft.network/samples/privatednszones/cname/main.bicep index 6ace99f6..f7b8a70f 100644 --- a/settings/remarks/microsoft.network/samples/privatednszones/cname/main.bicep +++ b/settings/remarks/microsoft.network/samples/privatednszones/cname/main.bicep @@ -10,10 +10,10 @@ resource cNAME 'Microsoft.Network/privateDnsZones/CNAME@2018-09-01' = { name: resourceName parent: privateDnsZone properties: { - metadata: {} - ttl: 300 cnameRecord: { cname: 'contoso.com' } + metadata: {} + ttl: 300 } } diff --git a/settings/remarks/microsoft.network/samples/privatednszones/main.bicep b/settings/remarks/microsoft.network/samples/privatednszones/main.bicep index b3fada1a..e6839466 100644 --- a/settings/remarks/microsoft.network/samples/privatednszones/main.bicep +++ b/settings/remarks/microsoft.network/samples/privatednszones/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource privateDnsZone 'Microsoft.Network/privateDnsZones@2018-09-01' = { name: '${resourceName}.com' diff --git a/settings/remarks/microsoft.network/samples/privatednszones/mx/main.bicep b/settings/remarks/microsoft.network/samples/privatednszones/mx/main.bicep index edea6cbc..5bdf55ad 100644 --- a/settings/remarks/microsoft.network/samples/privatednszones/mx/main.bicep +++ b/settings/remarks/microsoft.network/samples/privatednszones/mx/main.bicep @@ -13,8 +13,8 @@ resource mX 'Microsoft.Network/privateDnsZones/MX@2018-09-01' = { metadata: {} mxRecords: [ { - preference: 10 exchange: 'mx1.contoso.com' + preference: 10 } { exchange: 'mx2.contoso.com' diff --git a/settings/remarks/microsoft.network/samples/privatednszones/ptr/main.bicep b/settings/remarks/microsoft.network/samples/privatednszones/ptr/main.bicep index 4917179f..fb0f1272 100644 --- a/settings/remarks/microsoft.network/samples/privatednszones/ptr/main.bicep +++ b/settings/remarks/microsoft.network/samples/privatednszones/ptr/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource privateDnsZone 'Microsoft.Network/privateDnsZones@2018-09-01' = { name: '230630033756174960.0.10.in-addr.arpa' diff --git a/settings/remarks/microsoft.network/samples/privatednszones/srv/main.bicep b/settings/remarks/microsoft.network/samples/privatednszones/srv/main.bicep index 610d634e..4bc5dc55 100644 --- a/settings/remarks/microsoft.network/samples/privatednszones/srv/main.bicep +++ b/settings/remarks/microsoft.network/samples/privatednszones/srv/main.bicep @@ -10,6 +10,7 @@ resource sRV 'Microsoft.Network/privateDnsZones/SRV@2018-09-01' = { name: resourceName parent: privateDnsZone properties: { + metadata: {} srvRecords: [ { port: 8080 @@ -18,13 +19,12 @@ resource sRV 'Microsoft.Network/privateDnsZones/SRV@2018-09-01' = { weight: 10 } { - target: 'target1.contoso.com' - weight: 5 port: 8080 priority: 1 + target: 'target1.contoso.com' + weight: 5 } ] ttl: 300 - metadata: {} } } diff --git a/settings/remarks/microsoft.network/samples/privatednszones/txt/main.bicep b/settings/remarks/microsoft.network/samples/privatednszones/txt/main.bicep index 2f33dc5b..d177cd8a 100644 --- a/settings/remarks/microsoft.network/samples/privatednszones/txt/main.bicep +++ b/settings/remarks/microsoft.network/samples/privatednszones/txt/main.bicep @@ -10,6 +10,8 @@ resource tXT 'Microsoft.Network/privateDnsZones/TXT@2018-09-01' = { name: resourceName parent: privateDnsZone properties: { + metadata: {} + ttl: 300 txtRecords: [ { value: [ @@ -24,7 +26,5 @@ resource tXT 'Microsoft.Network/privateDnsZones/TXT@2018-09-01' = { ] } ] - metadata: {} - ttl: 300 } } diff --git a/settings/remarks/microsoft.network/samples/privatednszones/virtualnetworklinks/main.bicep b/settings/remarks/microsoft.network/samples/privatednszones/virtualnetworklinks/main.bicep index 7ab0ec89..36472a77 100644 --- a/settings/remarks/microsoft.network/samples/privatednszones/virtualnetworklinks/main.bicep +++ b/settings/remarks/microsoft.network/samples/privatednszones/virtualnetworklinks/main.bicep @@ -1,27 +1,20 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource privateDnsZone 'Microsoft.Network/privateDnsZones@2018-09-01' = { name: '${resourceName}.com' location: 'global' } -resource virtualNetworkLink 'Microsoft.Network/privateDnsZones/virtualNetworkLinks@2018-09-01' = { - name: resourceName - location: 'global' - parent: privateDnsZone - properties: { - registrationEnabled: false - virtualNetwork: { - id: virtualNetwork.id - } - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } dhcpOptions: { dnsServers: [] } @@ -33,10 +26,17 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } } ] - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] + } +} + +resource virtualNetworkLink 'Microsoft.Network/privateDnsZones/virtualNetworkLinks@2018-09-01' = { + name: resourceName + location: 'global' + parent: privateDnsZone + properties: { + registrationEnabled: false + virtualNetwork: { + id: virtualNetwork.id } } } diff --git a/settings/remarks/microsoft.network/samples/privateendpoints/main.bicep b/settings/remarks/microsoft.network/samples/privateendpoints/main.bicep index 1f590a55..ee492f63 100644 --- a/settings/remarks/microsoft.network/samples/privateendpoints/main.bicep +++ b/settings/remarks/microsoft.network/samples/privateendpoints/main.bicep @@ -1,34 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.5.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - name: resourceName - parent: virtualNetwork - properties: { - addressPrefix: '10.5.4.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Disabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - } -} +param location string = 'westeurope' resource loadBalancer 'Microsoft.Network/loadBalancers@2022-07-01' = { name: resourceName @@ -66,9 +37,6 @@ resource privateLinkService 'Microsoft.Network/privateLinkServices@2022-07-01' = name: resourceName location: location properties: { - autoApproval: { - subscriptions: [] - } enableProxyProtocol: false fqdns: [] ipConfigurations: [ @@ -91,6 +59,9 @@ resource privateLinkService 'Microsoft.Network/privateLinkServices@2022-07-01' = visibility: { subscriptions: [] } + autoApproval: { + subscriptions: [] + } } } @@ -110,3 +81,32 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { publicIPAllocationMethod: 'Static' } } + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.5.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] + } +} + +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: resourceName + parent: virtualNetwork + properties: { + addressPrefix: '10.5.4.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Disabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + } +} diff --git a/settings/remarks/microsoft.network/samples/privatelinkservices/main.bicep b/settings/remarks/microsoft.network/samples/privatelinkservices/main.bicep index 6e460e3b..17d9cc15 100644 --- a/settings/remarks/microsoft.network/samples/privatelinkservices/main.bicep +++ b/settings/remarks/microsoft.network/samples/privatelinkservices/main.bicep @@ -1,46 +1,19 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource loadBalancer 'Microsoft.Network/loadBalancers@2022-07-01' = { - name: resourceName - location: location - sku: { - name: 'Standard' - tier: 'Regional' - } - properties: { - frontendIPConfigurations: [ - { - name: resourceName - properties: { - publicIPAddress: {} - } - } - ] - } -} - resource privateLinkService 'Microsoft.Network/privateLinkServices@2022-07-01' = { name: resourceName location: location properties: { - visibility: { - subscriptions: [] - } - autoApproval: { - subscriptions: [] - } - enableProxyProtocol: false - fqdns: [] ipConfigurations: [ { name: 'primaryIpConfiguration-230630033653892379' properties: { + privateIPAllocationMethod: 'Dynamic' + subnet: {} primary: true privateIPAddress: '' privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - subnet: {} } } ] @@ -49,6 +22,14 @@ resource privateLinkService 'Microsoft.Network/privateLinkServices@2022-07-01' = id: loadBalancer.properties.frontendIPConfigurations[0].id } ] + visibility: { + subscriptions: [] + } + autoApproval: { + subscriptions: [] + } + enableProxyProtocol: false + fqdns: [] } } @@ -60,12 +41,12 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { tier: 'Regional' } properties: { - publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Static' ddosSettings: { protectionMode: 'VirtualNetworkInherited' } idleTimeoutInMinutes: 4 + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Static' } } @@ -89,11 +70,30 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { - serviceEndpoints: [] - addressPrefix: '10.5.4.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Disabled' serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.5.4.0/24' + } +} + +resource loadBalancer 'Microsoft.Network/loadBalancers@2022-07-01' = { + name: resourceName + location: location + sku: { + tier: 'Regional' + name: 'Standard' + } + properties: { + frontendIPConfigurations: [ + { + name: resourceName + properties: { + publicIPAddress: {} + } + } + ] } } diff --git a/settings/remarks/microsoft.network/samples/publicipaddresses/main.bicep b/settings/remarks/microsoft.network/samples/publicipaddresses/main.bicep index 88702675..3373e695 100644 --- a/settings/remarks/microsoft.network/samples/publicipaddresses/main.bicep +++ b/settings/remarks/microsoft.network/samples/publicipaddresses/main.bicep @@ -9,11 +9,11 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { tier: 'Regional' } properties: { - idleTimeoutInMinutes: 4 - publicIPAddressVersion: 'IPv4' publicIPAllocationMethod: 'Static' ddosSettings: { protectionMode: 'VirtualNetworkInherited' } + idleTimeoutInMinutes: 4 + publicIPAddressVersion: 'IPv4' } } diff --git a/settings/remarks/microsoft.network/samples/routefilters/main.bicep b/settings/remarks/microsoft.network/samples/routefilters/main.bicep index 5fbe7dc0..7fa79b76 100644 --- a/settings/remarks/microsoft.network/samples/routefilters/main.bicep +++ b/settings/remarks/microsoft.network/samples/routefilters/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource routeFilter 'Microsoft.Network/routeFilters@2022-09-01' = { name: resourceName diff --git a/settings/remarks/microsoft.network/samples/routetables/main.bicep b/settings/remarks/microsoft.network/samples/routetables/main.bicep index 51adf321..c17b7426 100644 --- a/settings/remarks/microsoft.network/samples/routetables/main.bicep +++ b/settings/remarks/microsoft.network/samples/routetables/main.bicep @@ -10,9 +10,9 @@ resource routeTable 'Microsoft.Network/routeTables@2022-09-01' = { { name: 'first' properties: { + addressPrefix: '10.100.0.0/14' nextHopIpAddress: '10.10.1.1' nextHopType: 'VirtualAppliance' - addressPrefix: '10.100.0.0/14' } } ] diff --git a/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/azureendpoints/main.bicep b/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/azureendpoints/main.bicep index 7df27527..8b5592ab 100644 --- a/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/azureendpoints/main.bicep +++ b/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/azureendpoints/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource trafficManagerProfile 'Microsoft.Network/trafficManagerProfiles@2018-08-01' = { name: resourceName @@ -26,11 +26,11 @@ resource azureEndpoint 'Microsoft.Network/trafficManagerProfiles/AzureEndpoints@ name: resourceName parent: trafficManagerProfile properties: { - customHeaders: [] endpointStatus: 'Enabled' subnets: [] targetResourceId: publicIPAddress.id weight: 3 + customHeaders: [] } } @@ -38,11 +38,10 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { name: resourceName location: location sku: { - name: 'Basic' tier: 'Regional' + name: 'Basic' } properties: { - publicIPAllocationMethod: 'Static' ddosSettings: { protectionMode: 'VirtualNetworkInherited' } @@ -51,5 +50,6 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { } idleTimeoutInMinutes: 4 publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Static' } } diff --git a/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/externalendpoints/main.bicep b/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/externalendpoints/main.bicep index b2eb9ce4..349cf49c 100644 --- a/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/externalendpoints/main.bicep +++ b/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/externalendpoints/main.bicep @@ -5,20 +5,20 @@ resource trafficManagerProfile 'Microsoft.Network/trafficManagerProfiles@2018-08 name: resourceName location: 'global' properties: { + dnsConfig: { + relativeName: 'acctest-tmp-230630034107608613' + ttl: 30 + } monitorConfig: { + port: 443 protocol: 'HTTPS' timeoutInSeconds: 10 toleratedNumberOfFailures: 3 expectedStatusCodeRanges: [] intervalInSeconds: 30 path: '/' - port: 443 } trafficRoutingMethod: 'Weighted' - dnsConfig: { - relativeName: 'acctest-tmp-230630034107608613' - ttl: 30 - } } } @@ -26,10 +26,10 @@ resource externalEndpoint 'Microsoft.Network/trafficManagerProfiles/ExternalEndp name: resourceName parent: trafficManagerProfile properties: { - target: 'www.example.com' - weight: 3 customHeaders: [] endpointStatus: 'Enabled' subnets: [] + target: 'www.example.com' + weight: 3 } } diff --git a/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/main.bicep b/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/main.bicep index 1a5cf2b8..13baff71 100644 --- a/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/main.bicep +++ b/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/main.bicep @@ -6,8 +6,8 @@ resource trafficManagerProfile 'Microsoft.Network/trafficManagerProfiles@2018-08 location: 'global' properties: { dnsConfig: { - ttl: 30 relativeName: 'acctest-tmp-230630034107605443' + ttl: 30 } monitorConfig: { path: '/' diff --git a/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/nestedendpoints/main.bicep b/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/nestedendpoints/main.bicep index 25dd80d7..6667c89e 100644 --- a/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/nestedendpoints/main.bicep +++ b/settings/remarks/microsoft.network/samples/trafficmanagerprofiles/nestedendpoints/main.bicep @@ -10,13 +10,13 @@ resource trafficManagerProfile 'Microsoft.Network/trafficManagerProfiles@2018-08 ttl: 30 } monitorConfig: { - intervalInSeconds: 30 - path: '/' - port: 443 protocol: 'HTTPS' timeoutInSeconds: 10 toleratedNumberOfFailures: 3 expectedStatusCodeRanges: [] + intervalInSeconds: 30 + path: '/' + port: 443 } trafficRoutingMethod: 'Weighted' } @@ -26,20 +26,20 @@ resource trafficManagerProfile2 'Microsoft.Network/trafficManagerProfiles@2018-0 name: resourceName location: 'global' properties: { - dnsConfig: { - ttl: 30 - relativeName: 'acctesttmpchild230630034107605443' - } monitorConfig: { - port: 443 - protocol: 'HTTPS' - timeoutInSeconds: 10 toleratedNumberOfFailures: 3 expectedStatusCodeRanges: [] intervalInSeconds: 30 path: '/' + port: 443 + protocol: 'HTTPS' + timeoutInSeconds: 10 } trafficRoutingMethod: 'Priority' + dnsConfig: { + relativeName: 'acctesttmpchild230630034107605443' + ttl: 30 + } } } @@ -47,11 +47,11 @@ resource nestedEndpoint 'Microsoft.Network/trafficManagerProfiles/NestedEndpoint name: resourceName parent: trafficManagerProfile properties: { - weight: 3 - customHeaders: [] endpointStatus: 'Enabled' minChildEndpoints: 5 subnets: [] targetResourceId: trafficManagerProfile2.id + weight: 3 + customHeaders: [] } } diff --git a/settings/remarks/microsoft.network/samples/virtualhubs/hubvirtualnetworkconnections/main.bicep b/settings/remarks/microsoft.network/samples/virtualhubs/hubvirtualnetworkconnections/main.bicep index 2bd2a324..250b3fb0 100644 --- a/settings/remarks/microsoft.network/samples/virtualhubs/hubvirtualnetworkconnections/main.bicep +++ b/settings/remarks/microsoft.network/samples/virtualhubs/hubvirtualnetworkconnections/main.bicep @@ -1,6 +1,17 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { + name: resourceName + location: location + properties: { + allowBranchToBranchTraffic: true + disableVpnEncryption: false + office365LocalBreakoutCategory: 'None' + type: 'Standard' + } +} + resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { name: resourceName location: location @@ -14,10 +25,22 @@ resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { } } +resource hubVirtualNetworkConnection 'Microsoft.Network/virtualHubs/hubVirtualNetworkConnections@2022-07-01' = { + name: resourceName + parent: virtualHub + properties: { + enableInternetSecurity: false + remoteVirtualNetwork: { + id: virtualNetwork.id + } + } +} + resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + subnets: [] addressSpace: { addressPrefixes: [ '10.5.0.0/16' @@ -26,28 +49,5 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { dhcpOptions: { dnsServers: [] } - subnets: [] - } -} - -resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { - name: resourceName - location: location - properties: { - allowBranchToBranchTraffic: true - disableVpnEncryption: false - office365LocalBreakoutCategory: 'None' - type: 'Standard' - } -} - -resource hubVirtualNetworkConnection 'Microsoft.Network/virtualHubs/hubVirtualNetworkConnections@2022-07-01' = { - name: resourceName - parent: virtualHub - properties: { - remoteVirtualNetwork: { - id: virtualNetwork.id - } - enableInternetSecurity: false } } diff --git a/settings/remarks/microsoft.network/samples/virtualhubs/ipconfigurations/main.bicep b/settings/remarks/microsoft.network/samples/virtualhubs/ipconfigurations/main.bicep index f9752761..a5c2827f 100644 --- a/settings/remarks/microsoft.network/samples/virtualhubs/ipconfigurations/main.bicep +++ b/settings/remarks/microsoft.network/samples/virtualhubs/ipconfigurations/main.bicep @@ -17,31 +17,6 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { } } -resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { - name: resourceName - location: location - properties: { - hubRoutingPreference: 'ExpressRoute' - sku: 'Standard' - virtualRouterAutoScaleConfiguration: { - minCapacity: 2 - } - } -} - -resource ipConfiguration 'Microsoft.Network/virtualHubs/ipConfigurations@2022-07-01' = { - name: resourceName - parent: virtualHub - properties: { - publicIPAddress: { - id: publicIPAddress.id - } - subnet: {} - privateIPAddress: '10.5.1.18' - privateIPAllocationMethod: 'Static' - } -} - resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'RouteServerSubnet' parent: virtualNetwork @@ -71,3 +46,28 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { publicIPAllocationMethod: 'Static' } } + +resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { + name: resourceName + location: location + properties: { + hubRoutingPreference: 'ExpressRoute' + sku: 'Standard' + virtualRouterAutoScaleConfiguration: { + minCapacity: 2 + } + } +} + +resource ipConfiguration 'Microsoft.Network/virtualHubs/ipConfigurations@2022-07-01' = { + name: resourceName + parent: virtualHub + properties: { + privateIPAddress: '10.5.1.18' + privateIPAllocationMethod: 'Static' + publicIPAddress: { + id: publicIPAddress.id + } + subnet: {} + } +} diff --git a/settings/remarks/microsoft.network/samples/virtualhubs/main.bicep b/settings/remarks/microsoft.network/samples/virtualhubs/main.bicep index 1a29deb6..86a8b196 100644 --- a/settings/remarks/microsoft.network/samples/virtualhubs/main.bicep +++ b/settings/remarks/microsoft.network/samples/virtualhubs/main.bicep @@ -1,26 +1,26 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' -resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { +resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { name: resourceName location: location properties: { - virtualWan: {} - addressPrefix: '10.0.0.0/24' - hubRoutingPreference: 'ExpressRoute' - virtualRouterAutoScaleConfiguration: { - minCapacity: 2 - } + type: 'Standard' + allowBranchToBranchTraffic: true + disableVpnEncryption: false + office365LocalBreakoutCategory: 'None' } } -resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { +resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { name: resourceName location: location properties: { - disableVpnEncryption: false - office365LocalBreakoutCategory: 'None' - type: 'Standard' - allowBranchToBranchTraffic: true + addressPrefix: '10.0.0.0/24' + hubRoutingPreference: 'ExpressRoute' + virtualRouterAutoScaleConfiguration: { + minCapacity: 2 + } + virtualWan: {} } } diff --git a/settings/remarks/microsoft.network/samples/virtualnetworkgateways/main.bicep b/settings/remarks/microsoft.network/samples/virtualnetworkgateways/main.bicep index 237f1f4d..bacb49ad 100644 --- a/settings/remarks/microsoft.network/samples/virtualnetworkgateways/main.bicep +++ b/settings/remarks/microsoft.network/samples/virtualnetworkgateways/main.bicep @@ -1,27 +1,11 @@ param resourceName string = 'acctest0001' param location string = 'centralus' -resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { - name: resourceName - location: location - sku: { - name: 'Standard' - tier: 'Regional' - } - properties: { - idleTimeoutInMinutes: 4 - publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Static' - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' - } - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { + subnets: [] addressSpace: { addressPrefixes: [ '10.6.0.0/16' @@ -30,30 +14,57 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { dhcpOptions: { dnsServers: [] } - subnets: [] } tags: { SkipASMAzSecPack: 'true' } } +resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { + name: 'GatewaySubnet' + parent: virtualNetwork + properties: { + addressPrefix: '10.6.1.0/24' + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + } +} + +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { + name: resourceName + location: location + sku: { + name: 'Standard' + tier: 'Regional' + } + properties: { + publicIPAllocationMethod: 'Static' + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + idleTimeoutInMinutes: 4 + publicIPAddressVersion: 'IPv4' + } +} + resource virtualNetworkGateway 'Microsoft.Network/virtualNetworkGateways@2022-07-01' = { name: resourceName location: location properties: { - activeActive: false - enableBgp: false enablePrivateIpAddress: false gatewayType: 'ExpressRoute' ipConfigurations: [ { name: 'vnetGatewayConfig' properties: { - subnet: {} privateIPAllocationMethod: 'Dynamic' publicIPAddress: { id: publicIPAddress.id } + subnet: {} } } ] @@ -62,18 +73,7 @@ resource virtualNetworkGateway 'Microsoft.Network/virtualNetworkGateways@2022-07 tier: 'Standard' } vpnType: 'RouteBased' - } -} - -resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { - name: 'GatewaySubnet' - parent: virtualNetwork - properties: { - addressPrefix: '10.6.1.0/24' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] + activeActive: false + enableBgp: false } } diff --git a/settings/remarks/microsoft.network/samples/virtualnetworkgateways/natrules/main.bicep b/settings/remarks/microsoft.network/samples/virtualnetworkgateways/natrules/main.bicep index 3f180ecc..80b610f9 100644 --- a/settings/remarks/microsoft.network/samples/virtualnetworkgateways/natrules/main.bicep +++ b/settings/remarks/microsoft.network/samples/virtualnetworkgateways/natrules/main.bicep @@ -1,39 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { - name: resourceName - location: location - sku: { - tier: 'Regional' - name: 'Basic' - } - properties: { - publicIPAllocationMethod: 'Dynamic' - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' - } - idleTimeoutInMinutes: 4 - publicIPAddressVersion: 'IPv4' - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - subnets: [] - } -} - resource virtualNetworkGateway 'Microsoft.Network/virtualNetworkGateways@2022-07-01' = { name: resourceName location: location @@ -46,11 +13,11 @@ resource virtualNetworkGateway 'Microsoft.Network/virtualNetworkGateways@2022-07 { name: 'vnetGatewayConfig' properties: { + privateIPAllocationMethod: 'Dynamic' publicIPAddress: { id: publicIPAddress.id } subnet: {} - privateIPAllocationMethod: 'Dynamic' } } ] @@ -66,7 +33,6 @@ resource natRule 'Microsoft.Network/virtualNetworkGateways/natRules@2022-07-01' name: resourceName parent: virtualNetworkGateway properties: { - type: 'Static' externalMappings: [ { addressSpace: '10.1.0.0/26' @@ -78,6 +44,23 @@ resource natRule 'Microsoft.Network/virtualNetworkGateways/natRules@2022-07-01' } ] mode: 'EgressSnat' + type: 'Static' + } +} + +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + subnets: [] } } @@ -85,11 +68,28 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: 'GatewaySubnet' parent: virtualNetwork properties: { - serviceEndpointPolicies: [] - serviceEndpoints: [] addressPrefix: '10.0.1.0/24' delegations: [] privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + } +} + +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2022-07-01' = { + name: resourceName + location: location + sku: { + name: 'Basic' + tier: 'Regional' + } + properties: { + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + idleTimeoutInMinutes: 4 + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Dynamic' } } diff --git a/settings/remarks/microsoft.network/samples/virtualnetworks/main.bicep b/settings/remarks/microsoft.network/samples/virtualnetworks/main.bicep index ef7bf0a8..18df0706 100644 --- a/settings/remarks/microsoft.network/samples/virtualnetworks/main.bicep +++ b/settings/remarks/microsoft.network/samples/virtualnetworks/main.bicep @@ -5,14 +5,14 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location properties: { - dhcpOptions: { - dnsServers: [] - } - subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' ] } + dhcpOptions: { + dnsServers: [] + } + subnets: [] } } diff --git a/settings/remarks/microsoft.network/samples/virtualnetworks/subnets/withipampool/main.bicep b/settings/remarks/microsoft.network/samples/virtualnetworks/subnets/withipampool/main.bicep index 48946e1f..0cb94bdd 100644 --- a/settings/remarks/microsoft.network/samples/virtualnetworks/subnets/withipampool/main.bicep +++ b/settings/remarks/microsoft.network/samples/virtualnetworks/subnets/withipampool/main.bicep @@ -1,35 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource networkManager 'Microsoft.Network/networkManagers@2024-05-01' = { - name: resourceName - location: location - properties: { - description: '' - networkManagerScopeAccesses: [] - networkManagerScopes: { - subscriptions: [ - '/subscriptions/${subscription()}' - ] - managementGroups: [] - } - } -} - -resource ipamPool 'Microsoft.Network/networkManagers/ipamPools@2024-05-01' = { - name: resourceName - location: location - parent: networkManager - properties: { - addressPrefixes: [ - '10.0.0.0/24' - ] - description: 'Test description.' - displayName: 'testDisplayName' - parentPoolName: '' - } -} - resource vnetWithipam 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: resourceName location: location @@ -37,8 +8,8 @@ resource vnetWithipam 'Microsoft.Network/virtualNetworks@2024-05-01' = { addressSpace: { ipamPoolPrefixAllocations: [ { - pool: {} numberOfIpAddresses: '100' + pool: {} } ] } @@ -59,3 +30,32 @@ resource subnetWithipam 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = ] } } + +resource networkManager 'Microsoft.Network/networkManagers@2024-05-01' = { + name: resourceName + location: location + properties: { + description: '' + networkManagerScopeAccesses: [] + networkManagerScopes: { + managementGroups: [] + subscriptions: [ + '/subscriptions/${subscription().subscriptionId}' + ] + } + } +} + +resource ipamPool 'Microsoft.Network/networkManagers/ipamPools@2024-05-01' = { + name: resourceName + location: location + parent: networkManager + properties: { + addressPrefixes: [ + '10.0.0.0/24' + ] + description: 'Test description.' + displayName: 'testDisplayName' + parentPoolName: '' + } +} diff --git a/settings/remarks/microsoft.network/samples/virtualnetworks/withipampool/main.bicep b/settings/remarks/microsoft.network/samples/virtualnetworks/withipampool/main.bicep index 73add320..27813c9f 100644 --- a/settings/remarks/microsoft.network/samples/virtualnetworks/withipampool/main.bicep +++ b/settings/remarks/microsoft.network/samples/virtualnetworks/withipampool/main.bicep @@ -1,33 +1,18 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource vnetWithipam 'Microsoft.Network/virtualNetworks@2024-05-01' = { - name: resourceName - location: location - properties: { - addressSpace: { - ipamPoolPrefixAllocations: [ - { - numberOfIpAddresses: '100' - pool: {} - } - ] - } - } -} - resource networkManager 'Microsoft.Network/networkManagers@2024-05-01' = { name: resourceName location: location properties: { + description: '' networkManagerScopeAccesses: [] networkManagerScopes: { managementGroups: [] subscriptions: [ - '/subscriptions/${subscription()}' + '/subscriptions/${subscription().subscriptionId}' ] } - description: '' } } @@ -44,3 +29,18 @@ resource ipamPool 'Microsoft.Network/networkManagers/ipamPools@2024-05-01' = { parentPoolName: '' } } + +resource vnetWithipam 'Microsoft.Network/virtualNetworks@2024-05-01' = { + name: resourceName + location: location + properties: { + addressSpace: { + ipamPoolPrefixAllocations: [ + { + numberOfIpAddresses: '100' + pool: {} + } + ] + } + } +} diff --git a/settings/remarks/microsoft.network/samples/virtualwans/main.bicep b/settings/remarks/microsoft.network/samples/virtualwans/main.bicep index 8552f4bf..16696d3d 100644 --- a/settings/remarks/microsoft.network/samples/virtualwans/main.bicep +++ b/settings/remarks/microsoft.network/samples/virtualwans/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { name: resourceName diff --git a/settings/remarks/microsoft.network/samples/vpngateways/main.bicep b/settings/remarks/microsoft.network/samples/vpngateways/main.bicep index 28104c6c..15d48409 100644 --- a/settings/remarks/microsoft.network/samples/vpngateways/main.bicep +++ b/settings/remarks/microsoft.network/samples/vpngateways/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { name: resourceName @@ -18,10 +18,10 @@ resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { name: resourceName location: location properties: { - allowBranchToBranchTraffic: true disableVpnEncryption: false office365LocalBreakoutCategory: 'None' type: 'Standard' + allowBranchToBranchTraffic: true } } @@ -29,11 +29,11 @@ resource vpnGateway 'Microsoft.Network/vpnGateways@2022-07-01' = { name: resourceName location: location properties: { - virtualHub: { - id: virtualHub.id - } vpnGatewayScaleUnit: 1 enableBgpRouteTranslationForNat: false isRoutingPreferenceInternet: false + virtualHub: { + id: virtualHub.id + } } } diff --git a/settings/remarks/microsoft.network/samples/vpngateways/natrules/main.bicep b/settings/remarks/microsoft.network/samples/vpngateways/natrules/main.bicep index e1d45ee8..29384faa 100644 --- a/settings/remarks/microsoft.network/samples/vpngateways/natrules/main.bicep +++ b/settings/remarks/microsoft.network/samples/vpngateways/natrules/main.bicep @@ -5,12 +5,12 @@ resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { name: resourceName location: location properties: { - addressPrefix: '10.0.0.0/24' - hubRoutingPreference: 'ExpressRoute' virtualRouterAutoScaleConfiguration: { minCapacity: 2 } virtualWan: {} + addressPrefix: '10.0.0.0/24' + hubRoutingPreference: 'ExpressRoute' } } @@ -29,12 +29,12 @@ resource vpnGateway 'Microsoft.Network/vpnGateways@2022-07-01' = { name: resourceName location: location properties: { + vpnGatewayScaleUnit: 1 enableBgpRouteTranslationForNat: false isRoutingPreferenceInternet: false virtualHub: { id: virtualHub.id } - vpnGatewayScaleUnit: 1 } } diff --git a/settings/remarks/microsoft.network/samples/vpngateways/vpnconnections/main.bicep b/settings/remarks/microsoft.network/samples/vpngateways/vpnconnections/main.bicep index c781d2c4..d88b0e2f 100644 --- a/settings/remarks/microsoft.network/samples/vpngateways/vpnconnections/main.bicep +++ b/settings/remarks/microsoft.network/samples/vpngateways/vpnconnections/main.bicep @@ -1,16 +1,27 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' + +resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { + name: resourceName + location: location + properties: { + allowBranchToBranchTraffic: true + disableVpnEncryption: false + office365LocalBreakoutCategory: 'None' + type: 'Standard' + } +} resource vpnGateway 'Microsoft.Network/vpnGateways@2022-07-01' = { name: resourceName location: location properties: { + enableBgpRouteTranslationForNat: false isRoutingPreferenceInternet: false virtualHub: { id: virtualHub.id } vpnGatewayScaleUnit: 1 - enableBgpRouteTranslationForNat: false } } @@ -18,6 +29,11 @@ resource vpnSite 'Microsoft.Network/vpnSites@2022-07-01' = { name: resourceName location: location properties: { + addressSpace: { + addressPrefixes: [ + '10.0.1.0/24' + ] + } virtualWan: { id: virtualWan.id } @@ -45,11 +61,6 @@ resource vpnSite 'Microsoft.Network/vpnSites@2022-07-01' = { } } ] - addressSpace: { - addressPrefixes: [ - '10.0.1.0/24' - ] - } } } @@ -65,33 +76,33 @@ resource vpnConnection 'Microsoft.Network/vpnGateways/vpnConnections@2022-07-01' { name: 'link1' properties: { - vpnGatewayCustomBgpAddresses: [] + enableBgp: false + enableRateLimiting: false + useLocalAzureIpAddress: false + vpnConnectionProtocolType: 'IKEv2' + vpnLinkConnectionMode: 'Default' vpnSiteLink: { id: resourceId('Microsoft.Network/vpnSites/vpnSiteLinks', vpnSite.name, 'link1') } - connectionBandwidth: 10 - enableRateLimiting: false routingWeight: 0 - useLocalAzureIpAddress: false usePolicyBasedTrafficSelectors: false - vpnConnectionProtocolType: 'IKEv2' - vpnLinkConnectionMode: 'Default' - enableBgp: false + vpnGatewayCustomBgpAddresses: [] + connectionBandwidth: 10 } } { name: 'link2' properties: { - useLocalAzureIpAddress: false usePolicyBasedTrafficSelectors: false + vpnConnectionProtocolType: 'IKEv2' + connectionBandwidth: 10 + enableBgp: false + useLocalAzureIpAddress: false vpnGatewayCustomBgpAddresses: [] vpnLinkConnectionMode: 'Default' - vpnConnectionProtocolType: 'IKEv2' vpnSiteLink: { id: resourceId('Microsoft.Network/vpnSites/vpnSiteLinks', vpnSite.name, 'link2') } - connectionBandwidth: 10 - enableBgp: false enableRateLimiting: false routingWeight: 0 } @@ -112,14 +123,3 @@ resource virtualHub 'Microsoft.Network/virtualHubs@2022-07-01' = { virtualWan: {} } } - -resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { - name: resourceName - location: location - properties: { - allowBranchToBranchTraffic: true - disableVpnEncryption: false - office365LocalBreakoutCategory: 'None' - type: 'Standard' - } -} diff --git a/settings/remarks/microsoft.network/samples/vpnserverconfigurations/configurationpolicygroups/main.bicep b/settings/remarks/microsoft.network/samples/vpnserverconfigurations/configurationpolicygroups/main.bicep index 5dceeb65..096cbe7b 100644 --- a/settings/remarks/microsoft.network/samples/vpnserverconfigurations/configurationpolicygroups/main.bicep +++ b/settings/remarks/microsoft.network/samples/vpnserverconfigurations/configurationpolicygroups/main.bicep @@ -1,17 +1,22 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' @secure() @description('The RADIUS server secret for VPN authentication') param radiusServerSecret string -param resourceName string = 'acctest0001' -param location string = 'westeurope' resource vpnServerConfiguration 'Microsoft.Network/vpnServerConfigurations@2022-07-01' = { name: resourceName location: location properties: { - vpnProtocols: [ - 'OpenVPN' - 'IkeV2' + radiusClientRootCertificates: [] + radiusServerRootCertificates: [] + vpnAuthenticationTypes: [ + 'Radius' ] + vpnClientIpsecPolicies: [] + vpnClientRevokedCertificates: [] + vpnClientRootCertificates: [] + radiusServerAddress: '' radiusServerSecret: '' radiusServers: [ { @@ -20,15 +25,10 @@ resource vpnServerConfiguration 'Microsoft.Network/vpnServerConfigurations@2022- radiusServerSecret: '${radiusServerSecret}' } ] - vpnAuthenticationTypes: [ - 'Radius' + vpnProtocols: [ + 'OpenVPN' + 'IkeV2' ] - vpnClientRevokedCertificates: [] - vpnClientRootCertificates: [] - radiusClientRootCertificates: [] - radiusServerAddress: '' - radiusServerRootCertificates: [] - vpnClientIpsecPolicies: [] } } @@ -36,7 +36,6 @@ resource configurationPolicyGroup 'Microsoft.Network/vpnServerConfigurations/con name: resourceName parent: vpnServerConfiguration properties: { - isDefault: false policyMembers: [ { attributeType: 'RadiusAzureGroupId' @@ -45,5 +44,6 @@ resource configurationPolicyGroup 'Microsoft.Network/vpnServerConfigurations/con } ] priority: 0 + isDefault: false } } diff --git a/settings/remarks/microsoft.network/samples/vpnserverconfigurations/main.bicep b/settings/remarks/microsoft.network/samples/vpnserverconfigurations/main.bicep index e5f9ae8c..7fa5b263 100644 --- a/settings/remarks/microsoft.network/samples/vpnserverconfigurations/main.bicep +++ b/settings/remarks/microsoft.network/samples/vpnserverconfigurations/main.bicep @@ -1,33 +1,33 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The RADIUS server secret for VPN server configuration') param radiusServerSecret string +param resourceName string = 'acctest0001' resource vpnServerConfiguration 'Microsoft.Network/vpnServerConfigurations@2022-07-01' = { name: resourceName location: location properties: { + vpnAuthenticationTypes: [ + 'Radius' + ] + vpnClientIpsecPolicies: [] + vpnClientRootCertificates: [] radiusClientRootCertificates: [] radiusServerAddress: '' - radiusServerRootCertificates: [] radiusServerSecret: '${radiusServerSecret}' radiusServers: [ { + radiusServerSecret: '${radiusServerSecret}' radiusServerAddress: '10.105.1.1' radiusServerScore: 15 - radiusServerSecret: '${radiusServerSecret}' } ] vpnClientRevokedCertificates: [] - vpnClientRootCertificates: [] vpnProtocols: [ 'OpenVPN' 'IkeV2' ] - vpnAuthenticationTypes: [ - 'Radius' - ] - vpnClientIpsecPolicies: [] + radiusServerRootCertificates: [] } } diff --git a/settings/remarks/microsoft.network/samples/vpnsites/main.bicep b/settings/remarks/microsoft.network/samples/vpnsites/main.bicep index 086fc6ce..04d14573 100644 --- a/settings/remarks/microsoft.network/samples/vpnsites/main.bicep +++ b/settings/remarks/microsoft.network/samples/vpnsites/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource virtualWan 'Microsoft.Network/virtualWans@2022-07-01' = { name: resourceName @@ -28,12 +28,12 @@ resource vpnSite 'Microsoft.Network/vpnSites@2022-07-01' = { { name: 'link1' properties: { + fqdn: '' + ipAddress: '10.0.1.1' linkProperties: { linkProviderName: '' linkSpeedInMbps: 0 } - fqdn: '' - ipAddress: '10.0.1.1' } } { diff --git a/settings/remarks/microsoft.notificationhubs/samples/namespaces/notificationhubs/authorizationrules/main.bicep b/settings/remarks/microsoft.notificationhubs/samples/namespaces/notificationhubs/authorizationrules/main.bicep index e4a0f213..7fd683be 100644 --- a/settings/remarks/microsoft.notificationhubs/samples/namespaces/notificationhubs/authorizationrules/main.bicep +++ b/settings/remarks/microsoft.notificationhubs/samples/namespaces/notificationhubs/authorizationrules/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource namespace 'Microsoft.NotificationHubs/namespaces@2017-04-01' = { name: resourceName @@ -8,9 +8,9 @@ resource namespace 'Microsoft.NotificationHubs/namespaces@2017-04-01' = { name: 'Free' } properties: { - region: 'westeurope' enabled: true namespaceType: 'NotificationHub' + region: 'westeurope' } } diff --git a/settings/remarks/microsoft.notificationhubs/samples/namespaces/notificationhubs/main.bicep b/settings/remarks/microsoft.notificationhubs/samples/namespaces/notificationhubs/main.bicep index d8a3f871..0d72a1af 100644 --- a/settings/remarks/microsoft.notificationhubs/samples/namespaces/notificationhubs/main.bicep +++ b/settings/remarks/microsoft.notificationhubs/samples/namespaces/notificationhubs/main.bicep @@ -8,9 +8,9 @@ resource namespace 'Microsoft.NotificationHubs/namespaces@2017-04-01' = { name: 'Free' } properties: { + region: 'westeurope' enabled: true namespaceType: 'NotificationHub' - region: 'westeurope' } } diff --git a/settings/remarks/microsoft.operationalinsights/samples/clusters/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/clusters/main.bicep index dc137865..1accf041 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/clusters/main.bicep @@ -5,7 +5,7 @@ resource cluster 'Microsoft.OperationalInsights/clusters@2020-08-01' = { name: resourceName location: location sku: { - name: 'CapacityReservation' capacity: 1000 + name: 'CapacityReservation' } } diff --git a/settings/remarks/microsoft.operationalinsights/samples/querypacks/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/querypacks/main.bicep index 329244ea..6000b7c6 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/querypacks/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/querypacks/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource queryPack 'Microsoft.OperationalInsights/queryPacks@2019-09-01' = { name: resourceName diff --git a/settings/remarks/microsoft.operationalinsights/samples/workspaces/dataexports/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/workspaces/dataexports/main.bicep index c2ee418e..99d96df3 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/workspaces/dataexports/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/workspaces/dataexports/main.bicep @@ -9,9 +9,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - allowBlobPublicAccess: true allowSharedKeyAccess: true defaultToOAuthAuthentication: false + isHnsEnabled: false + isSftpEnabled: false + supportsHttpsTrafficOnly: true + allowBlobPublicAccess: true + allowCrossTenantReplication: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -23,17 +27,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false + isNfsV3Enabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' accessTier: 'Hot' - allowCrossTenantReplication: true - isNfsV3Enabled: false - isSftpEnabled: false - supportsHttpsTrafficOnly: true } } @@ -42,8 +42,8 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { location: location properties: { features: { - enableLogAccessUsingOnlyResourcePermissions: true disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true } publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' diff --git a/settings/remarks/microsoft.operationalinsights/samples/workspaces/datasources/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/workspaces/datasources/main.bicep index ba9c7796..da0308a1 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/workspaces/datasources/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/workspaces/datasources/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName diff --git a/settings/remarks/microsoft.operationalinsights/samples/workspaces/linkedservices/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/workspaces/linkedservices/main.bicep index 8eadb32a..8abb009d 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/workspaces/linkedservices/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/workspaces/linkedservices/main.bicep @@ -5,6 +5,11 @@ 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: { @@ -13,11 +18,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { workspaceCapping: { dailyQuotaGb: -1 } - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' } } @@ -33,12 +33,12 @@ resource automationAccount 'Microsoft.Automation/automationAccounts@2021-06-22' name: resourceName location: location properties: { + sku: { + name: 'Basic' + } encryption: { keySource: 'Microsoft.Automation' } publicNetworkAccess: true - sku: { - name: 'Basic' - } } } diff --git a/settings/remarks/microsoft.operationalinsights/samples/workspaces/linkedstorageaccounts/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/workspaces/linkedstorageaccounts/main.bicep index 412fd6ae..7870fe18 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/workspaces/linkedstorageaccounts/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/workspaces/linkedstorageaccounts/main.bicep @@ -1,35 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' - -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 linkedStorageAccount 'Microsoft.OperationalInsights/workspaces/linkedStorageAccounts@2020-08-01' = { - name: 'CustomLogs' - parent: workspace - properties: { - storageAccountIds: [ - storageAccount.id - ] - } -} +param location string = 'westeurope' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName @@ -39,21 +9,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false - networkAcls: { - defaultAction: 'Allow' - } - allowBlobPublicAccess: true - allowCrossTenantReplication: true minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true - accessTier: 'Hot' - allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { + keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -62,7 +22,47 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } - keySource: 'Microsoft.Storage' } + isHnsEnabled: false + isNfsV3Enabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + accessTier: 'Hot' + allowBlobPublicAccess: true + allowCrossTenantReplication: true + allowSharedKeyAccess: true + } +} + +resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { + name: resourceName + location: location + properties: { + sku: { + name: 'PerGB2018' + } + workspaceCapping: { + dailyQuotaGb: -1 + } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + } +} + +resource linkedStorageAccount 'Microsoft.OperationalInsights/workspaces/linkedStorageAccounts@2020-08-01' = { + name: 'CustomLogs' + parent: workspace + properties: { + storageAccountIds: [ + storageAccount.id + ] } } diff --git a/settings/remarks/microsoft.operationalinsights/samples/workspaces/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/workspaces/main.bicep index 1d5054f2..330d23c3 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/workspaces/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/workspaces/main.bicep @@ -5,11 +5,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - publicNetworkAccessForQuery: 'Enabled' - retentionInDays: 30 - sku: { - name: 'PerGB2018' - } workspaceCapping: { dailyQuotaGb: -1 } @@ -18,5 +13,10 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { enableLogAccessUsingOnlyResourcePermissions: true } publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } } } diff --git a/settings/remarks/microsoft.operationalinsights/samples/workspaces/savedsearches/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/workspaces/savedsearches/main.bicep index 4b862a6f..957020e8 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/workspaces/savedsearches/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/workspaces/savedsearches/main.bicep @@ -1,15 +1,10 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - features: { - enableLogAccessUsingOnlyResourcePermissions: true - disableLocalAuth: false - } - publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 sku: { @@ -18,6 +13,11 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { workspaceCapping: { dailyQuotaGb: -1 } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' } } @@ -25,10 +25,10 @@ resource savedSearch 'Microsoft.OperationalInsights/workspaces/savedSearches@202 name: resourceName parent: workspace properties: { - functionAlias: '' query: 'Heartbeat | summarize Count() by Computer | take a' tags: [] category: 'Saved Search Test Category' displayName: 'Create or Update Saved Search Test' + functionAlias: '' } } diff --git a/settings/remarks/microsoft.operationalinsights/samples/workspaces/storageinsightconfigs/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/workspaces/storageinsightconfigs/main.bicep index b7914012..2f5b1a60 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/workspaces/storageinsightconfigs/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/workspaces/storageinsightconfigs/main.bicep @@ -9,30 +9,30 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - accessTier: 'Hot' allowCrossTenantReplication: true + defaultToOAuthAuthentication: false + isHnsEnabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + accessTier: 'Hot' + allowBlobPublicAccess: true allowSharedKeyAccess: true encryption: { - keySource: 'Microsoft.Storage' services: { - queue: { + table: { keyType: 'Service' } - table: { + queue: { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } - isHnsEnabled: false - isSftpEnabled: false + isNfsV3Enabled: false networkAcls: { defaultAction: 'Allow' } - allowBlobPublicAccess: true - defaultToOAuthAuthentication: false - isNfsV3Enabled: false - minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true } } @@ -41,19 +41,19 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - sku: { - name: 'PerGB2018' - } - workspaceCapping: { - dailyQuotaGb: -1 - } features: { - enableLogAccessUsingOnlyResourcePermissions: true disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true } publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 + sku: { + name: 'PerGB2018' + } + workspaceCapping: { + dailyQuotaGb: -1 + } } } @@ -62,8 +62,8 @@ resource storageInsightConfig 'Microsoft.OperationalInsights/workspaces/storageI parent: workspace properties: { storageAccount: { - key: storageAccount.listKeys().keys[0].value id: storageAccount.id + key: storageAccount.listKeys().keys[0].value } } } diff --git a/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/auditlog/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/auditlog/main.bicep index 64c02ead..a757a525 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/auditlog/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/auditlog/main.bicep @@ -1,27 +1,26 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -var auditLogTableName = 'AuditLog_CL' var auditLogColumns = [ { name: 'appId' type: 'string' } { - type: 'string' name: 'correlationId' + type: 'string' } { - type: 'datetime' name: 'TimeGenerated' + type: 'datetime' } ] +var auditLogTableName = 'AuditLog_CL' resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 sku: { @@ -31,9 +30,10 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { dailyQuotaGb: -1 } features: { - enableLogAccessUsingOnlyResourcePermissions: true disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true } + publicNetworkAccessForIngestion: 'Enabled' } } diff --git a/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/basic/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/basic/main.bicep index 76606db7..247e7be1 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/basic/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/basic/main.bicep @@ -4,20 +4,20 @@ param location string = 'westeurope' var sentinelTiAlertsTableName = 'SentinelTIAlerts_CL' var sentinelTiAlertsColumns = [ { - name: 'ConfidenceScore' type: 'int' + name: 'ConfidenceScore' } { - type: 'string' name: 'ExternalIndicatorId' + type: 'string' } { name: 'IndicatorType' type: 'string' } { - type: 'string' name: 'Indicator' + type: 'string' } { name: 'TimeGenerated' @@ -32,8 +32,8 @@ var sentinelTiAlertsColumns = [ type: 'datetime' } { - type: 'dynamic' name: 'Details' + type: 'dynamic' } ] @@ -41,11 +41,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - publicNetworkAccessForQuery: 'Enabled' - retentionInDays: 30 - sku: { - name: 'PerGB2018' - } workspaceCapping: { dailyQuotaGb: -1 } @@ -54,6 +49,11 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { enableLogAccessUsingOnlyResourcePermissions: true } publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } } } diff --git a/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/datacollectionlogs/main.bicep b/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/datacollectionlogs/main.bicep index 2cfb2476..585a8e6e 100644 --- a/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/datacollectionlogs/main.bicep +++ b/settings/remarks/microsoft.operationalinsights/samples/workspaces/tables/datacollectionlogs/main.bicep @@ -4,12 +4,12 @@ param location string = 'westeurope' var dataCollectionLogTableName = 'DataCollectionLog_CL' var dataCollectionLogColumns = [ { - type: 'string' name: 'RawData' + type: 'string' } { - name: 'FilePath' type: 'string' + name: 'FilePath' } { name: 'TimeGenerated' @@ -21,6 +21,12 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { + sku: { + name: 'PerGB2018' + } + workspaceCapping: { + dailyQuotaGb: -1 + } features: { disableLocalAuth: false enableLogAccessUsingOnlyResourcePermissions: true @@ -28,12 +34,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 - sku: { - name: 'PerGB2018' - } - workspaceCapping: { - dailyQuotaGb: -1 - } } } diff --git a/settings/remarks/microsoft.orbital/samples/spacecrafts/main.bicep b/settings/remarks/microsoft.orbital/samples/spacecrafts/main.bicep index a01f3ce3..79222e18 100644 --- a/settings/remarks/microsoft.orbital/samples/spacecrafts/main.bicep +++ b/settings/remarks/microsoft.orbital/samples/spacecrafts/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westus' param resourceName string = 'acctest0001' +param location string = 'westus' resource spacecraft 'Microsoft.Orbital/spacecrafts@2022-11-01' = { name: resourceName diff --git a/settings/remarks/microsoft.policyinsights/samples/remediations/main.bicep b/settings/remarks/microsoft.policyinsights/samples/remediations/main.bicep index 3f20dc2c..ea3168b8 100644 --- a/settings/remarks/microsoft.policyinsights/samples/remediations/main.bicep +++ b/settings/remarks/microsoft.policyinsights/samples/remediations/main.bicep @@ -7,9 +7,6 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' name: resourceName scope: subscription() properties: { - policyDefinitionId: '/providers/Microsoft.Authorization/policyDefinitions/e56962a6-4747-49cd-b67b-bf8b01975c4c' - scope: subscription().id - displayName: '' enforcementMode: 'Default' parameters: { listOfAllowedLocations: { @@ -20,6 +17,9 @@ resource policyAssignment 'Microsoft.Authorization/policyAssignments@2022-06-01' ] } } + policyDefinitionId: '/providers/Microsoft.Authorization/policyDefinitions/e56962a6-4747-49cd-b67b-bf8b01975c4c' + scope: subscription().id + displayName: '' } } @@ -27,11 +27,11 @@ resource remediation 'Microsoft.PolicyInsights/remediations@2021-10-01' = { name: resourceName scope: subscription() properties: { - filters: { - locations: [] - } policyAssignmentId: policyAssignment.id policyDefinitionReferenceId: '' resourceDiscoveryMode: 'ExistingNonCompliant' + filters: { + locations: [] + } } } diff --git a/settings/remarks/microsoft.powerbidedicated/samples/capacities/main.bicep b/settings/remarks/microsoft.powerbidedicated/samples/capacities/main.bicep index 906aa053..a7116244 100644 --- a/settings/remarks/microsoft.powerbidedicated/samples/capacities/main.bicep +++ b/settings/remarks/microsoft.powerbidedicated/samples/capacities/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource capacity 'Microsoft.PowerBIDedicated/capacities@2021-01-01' = { name: resourceName diff --git a/settings/remarks/microsoft.purview/samples/accounts/main.bicep b/settings/remarks/microsoft.purview/samples/accounts/main.bicep index 0f6843fe..3b492717 100644 --- a/settings/remarks/microsoft.purview/samples/accounts/main.bicep +++ b/settings/remarks/microsoft.purview/samples/accounts/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource account 'Microsoft.Purview/accounts@2021-07-01' = { name: resourceName diff --git a/settings/remarks/microsoft.recoveryservices/samples/vaults/backupconfig/main.bicep b/settings/remarks/microsoft.recoveryservices/samples/vaults/backupconfig/main.bicep index e1da8063..5d4b76d7 100644 --- a/settings/remarks/microsoft.recoveryservices/samples/vaults/backupconfig/main.bicep +++ b/settings/remarks/microsoft.recoveryservices/samples/vaults/backupconfig/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource vault 'Microsoft.RecoveryServices/vaults@2024-04-01' = { name: resourceName diff --git a/settings/remarks/microsoft.recoveryservices/samples/vaults/backupfabrics/protectioncontainers/protecteditems/main.bicep b/settings/remarks/microsoft.recoveryservices/samples/vaults/backupfabrics/protectioncontainers/protecteditems/main.bicep index 280231bc..571d7e1a 100644 --- a/settings/remarks/microsoft.recoveryservices/samples/vaults/backupfabrics/protectioncontainers/protecteditems/main.bicep +++ b/settings/remarks/microsoft.recoveryservices/samples/vaults/backupfabrics/protectioncontainers/protecteditems/main.bicep @@ -5,69 +5,59 @@ param location string = 'westus' param adminPassword string var compName = 'resourceName' +var saName = 'saBase' var saBase = 'resourcename' var dnsLabel = 'resourcename' -var saName = 'saBase' -resource disk 'Microsoft.Compute/disks@2023-04-02' = { - name: '${resourceName}-datadisk' +resource vault 'Microsoft.RecoveryServices/vaults@2024-01-01' = { + name: '${resourceName}-rsv' location: location sku: { - name: 'Standard_LRS' + name: 'Standard' } properties: { - diskSizeGB: 1023 - encryption: { - type: 'EncryptionAtRestWithPlatformKey' - } - networkAccessPolicy: 'AllowAll' - optimizedForFrequentAttach: false - osType: null publicNetworkAccess: 'Enabled' - creationData: { - createOption: 'Empty' + redundancySettings: { + crossRegionRestore: 'Disabled' + standardTierStorageRedundancy: 'GeoRedundant' } } } -resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { - name: '${resourceName}-nic' - location: location +resource backupPolicy 'Microsoft.RecoveryServices/vaults/backupPolicies@2024-10-01' = { + name: '${resourceName}-policy' + parent: vault properties: { - enableAcceleratedNetworking: false - enableIPForwarding: false - ipConfigurations: [ - { - name: 'acctestipconfig' - properties: { - primary: true - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - publicIPAddress: {} - subnet: {} + backupManagementType: 'AzureIaasVM' + policyType: 'V1' + retentionPolicy: { + dailySchedule: { + retentionDuration: { + count: 10 + durationType: 'Days' } + retentionTimes: [ + '2025-07-03T23:00:00Z' + ] } - ] - } -} - -resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { - name: '${resourceName}-pip' - location: location - sku: { - name: 'Basic' - tier: 'Regional' - } - properties: { - dnsSettings: { - domainNameLabel: '${dnsLabel}' + retentionPolicyType: 'LongTermRetentionPolicy' } - idleTimeoutInMinutes: 4 - publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Dynamic' - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' + schedulePolicy: { + schedulePolicyType: 'SimpleSchedulePolicy' + scheduleRunDays: [] + scheduleRunFrequency: 'Daily' + scheduleRunTimes: [ + '2025-07-03T23:00:00Z' + ] + } + tieringPolicy: { + ArchivedRP: { + duration: 0 + durationType: 'Invalid' + tieringMode: 'DoNotTier' + } } + timeZone: 'UTC' } } @@ -79,10 +69,24 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } kind: 'StorageV2' properties: { - allowCrossTenantReplication: false + allowBlobPublicAccess: true dnsEndpointType: 'Standard' + networkAcls: { + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + bypass: 'AzureServices' + defaultAction: 'Allow' + } + supportsHttpsTrafficOnly: true + allowCrossTenantReplication: false + defaultToOAuthAuthentication: false isLocalUserEnabled: true + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' accessTier: 'Hot' + isNfsV3Enabled: false + publicNetworkAccess: 'Enabled' allowSharedKeyAccess: true encryption: { keySource: 'Microsoft.Storage' @@ -96,35 +100,6 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - networkAcls: { - bypass: 'AzureServices' - defaultAction: 'Allow' - ipRules: [] - resourceAccessRules: [] - virtualNetworkRules: [] - } - publicNetworkAccess: 'Enabled' - defaultToOAuthAuthentication: false - minimumTlsVersion: 'TLS1_2' - supportsHttpsTrafficOnly: true - allowBlobPublicAccess: true - } -} - -resource vault 'Microsoft.RecoveryServices/vaults@2024-01-01' = { - name: '${resourceName}-rsv' - location: location - sku: { - name: 'Standard' - } - properties: { - publicNetworkAccess: 'Enabled' - redundancySettings: { - crossRegionRestore: 'Disabled' - standardTierStorageRedundancy: 'GeoRedundant' - } } } @@ -160,44 +135,44 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-03-01' = { } } storageProfile: { + imageReference: { + sku: '22_04-lts' + version: 'latest' + offer: '0001-com-ubuntu-server-jammy' + publisher: 'Canonical' + } + osDisk: { + caching: 'ReadWrite' + createOption: 'FromImage' + managedDisk: { + storageAccountType: 'Standard_LRS' + } + name: '${resourceName}-osdisk' + writeAcceleratorEnabled: false + } dataDisks: [ { - writeAcceleratorEnabled: false - createOption: 'Attach' - diskSizeGB: 1023 lun: 0 managedDisk: { id: disk.id storageAccountType: 'Standard_LRS' } name: '${resourceName}-datadisk' + writeAcceleratorEnabled: false + createOption: 'Attach' + diskSizeGB: 1023 } { + name: '${resourceName}-datadisk2' + writeAcceleratorEnabled: false createOption: 'Empty' diskSizeGB: 4 lun: 1 managedDisk: { storageAccountType: 'Standard_LRS' } - name: '${resourceName}-datadisk2' - writeAcceleratorEnabled: false } ] - imageReference: { - publisher: 'Canonical' - sku: '22_04-lts' - version: 'latest' - offer: '0001-com-ubuntu-server-jammy' - } - osDisk: { - caching: 'ReadWrite' - createOption: 'FromImage' - managedDisk: { - storageAccountType: 'Standard_LRS' - } - name: '${resourceName}-osdisk' - writeAcceleratorEnabled: false - } } } } @@ -206,6 +181,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: '${resourceName}-vnet' location: location properties: { + privateEndpointVNetPolicies: 'Disabled' + subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -214,45 +191,6 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { dhcpOptions: { dnsServers: [] } - privateEndpointVNetPolicies: 'Disabled' - subnets: [] - } -} - -resource backupPolicy 'Microsoft.RecoveryServices/vaults/backupPolicies@2024-10-01' = { - name: '${resourceName}-policy' - parent: vault - properties: { - backupManagementType: 'AzureIaasVM' - policyType: 'V1' - retentionPolicy: { - dailySchedule: { - retentionTimes: [ - '2025-07-03T23:00:00Z' - ] - retentionDuration: { - count: 10 - durationType: 'Days' - } - } - retentionPolicyType: 'LongTermRetentionPolicy' - } - schedulePolicy: { - schedulePolicyType: 'SimpleSchedulePolicy' - scheduleRunDays: [] - scheduleRunFrequency: 'Daily' - scheduleRunTimes: [ - '2025-07-03T23:00:00Z' - ] - } - tieringPolicy: { - ArchivedRP: { - duration: 0 - durationType: 'Invalid' - tieringMode: 'DoNotTier' - } - } - timeZone: 'UTC' } } @@ -260,20 +198,19 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: '${resourceName}-subnet' parent: virtualNetwork properties: { - serviceEndpointPolicies: [] - serviceEndpoints: [] addressPrefix: '10.0.10.0/24' defaultOutboundAccess: true delegations: [] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] } } resource protectedItem 'Microsoft.RecoveryServices/vaults/backupFabrics/protectionContainers/protectedItems@2023-02-01' = { name: 'VM;iaasvmcontainerv2;${resourceGroup().name};${virtualMachine.name}' properties: { - sourceResourceId: virtualMachine.id extendedProperties: { diskExclusionProperties: { diskLunList: [ @@ -284,5 +221,68 @@ resource protectedItem 'Microsoft.RecoveryServices/vaults/backupFabrics/protecti } policyId: backupPolicy.id protectedItemType: 'Microsoft.Compute/virtualMachines' + sourceResourceId: virtualMachine.id + } +} + +resource disk 'Microsoft.Compute/disks@2023-04-02' = { + name: '${resourceName}-datadisk' + location: location + sku: { + name: 'Standard_LRS' + } + properties: { + networkAccessPolicy: 'AllowAll' + optimizedForFrequentAttach: false + osType: null + publicNetworkAccess: 'Enabled' + creationData: { + createOption: 'Empty' + } + diskSizeGB: 1023 + encryption: { + type: 'EncryptionAtRestWithPlatformKey' + } + } +} + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: '${resourceName}-nic' + location: location + properties: { + enableAcceleratedNetworking: false + enableIPForwarding: false + ipConfigurations: [ + { + name: 'acctestipconfig' + properties: { + privateIPAllocationMethod: 'Dynamic' + publicIPAddress: {} + subnet: {} + primary: true + privateIPAddressVersion: 'IPv4' + } + } + ] + } +} + +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { + name: '${resourceName}-pip' + location: location + sku: { + name: 'Basic' + tier: 'Regional' + } + properties: { + idleTimeoutInMinutes: 4 + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Dynamic' + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + dnsSettings: { + domainNameLabel: '${dnsLabel}' + } } } diff --git a/settings/remarks/microsoft.recoveryservices/samples/vaults/backuppolicies/main.bicep b/settings/remarks/microsoft.recoveryservices/samples/vaults/backuppolicies/main.bicep index 4abf992f..ff2db301 100644 --- a/settings/remarks/microsoft.recoveryservices/samples/vaults/backuppolicies/main.bicep +++ b/settings/remarks/microsoft.recoveryservices/samples/vaults/backuppolicies/main.bicep @@ -16,6 +16,8 @@ resource backupPolicy 'Microsoft.RecoveryServices/vaults/backupPolicies@2023-02- name: resourceName parent: vault properties: { + timeZone: 'UTC' + workLoadType: 'AzureFileShare' backupManagementType: 'AzureStorage' retentionPolicy: { dailySchedule: { @@ -36,7 +38,5 @@ resource backupPolicy 'Microsoft.RecoveryServices/vaults/backupPolicies@2023-02- '2018-07-30T23:00:00Z' ] } - timeZone: 'UTC' - workLoadType: 'AzureFileShare' } } diff --git a/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/main.bicep b/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/main.bicep index 089d0a7c..46915b90 100644 --- a/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/main.bicep +++ b/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus2' +param resourceName string = 'acctest0001' resource vault 'Microsoft.RecoveryServices/vaults@2022-10-01' = { name: resourceName @@ -17,8 +17,8 @@ resource replicationFabric2 'Microsoft.RecoveryServices/vaults/replicationFabric parent: vault properties: { customDetails: { - location: '${location}' instanceType: 'Azure' + location: '${location}' } } } diff --git a/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationnetworks/replicationnetworkmappings/main.bicep b/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationnetworks/replicationnetworkmappings/main.bicep index cc4df25d..1472c6f1 100644 --- a/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationnetworks/replicationnetworkmappings/main.bicep +++ b/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationnetworks/replicationnetworkmappings/main.bicep @@ -20,6 +20,7 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: '${resourceName}-vnet1' location: location properties: { + subnets: [] addressSpace: { addressPrefixes: [ '192.168.1.0/24' @@ -29,7 +30,6 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { dnsServers: [] } privateEndpointVNetPolicies: 'Disabled' - subnets: [] } } @@ -37,6 +37,7 @@ resource virtualnetwork1 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: '${resourceName}-vnet2' location: 'centralus' properties: { + subnets: [] addressSpace: { addressPrefixes: [ '192.168.2.0/24' @@ -46,7 +47,6 @@ resource virtualnetwork1 'Microsoft.Network/virtualNetworks@2024-05-01' = { dnsServers: [] } privateEndpointVNetPolicies: 'Disabled' - subnets: [] } } @@ -76,8 +76,8 @@ resource replicationNetworkMapping 'Microsoft.RecoveryServices/vaults/replicatio name: '${resourceName}-mapping' properties: { fabricSpecificDetails: { - primaryNetworkId: virtualNetwork.id instanceType: 'AzureToAzure' + primaryNetworkId: virtualNetwork.id } recoveryFabricName: replicationfabric1.name recoveryNetworkId: virtualnetwork1.id diff --git a/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationprotectioncontainers/main.bicep b/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationprotectioncontainers/main.bicep index 6e0a1fde..889bd430 100644 --- a/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationprotectioncontainers/main.bicep +++ b/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationprotectioncontainers/main.bicep @@ -17,8 +17,8 @@ resource replicationFabric 'Microsoft.RecoveryServices/vaults/replicationFabrics parent: vault properties: { customDetails: { - instanceType: 'Azure' location: '${location}' + instanceType: 'Azure' } } } diff --git a/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationprotectioncontainers/replicationprotectioncontainermappings/main.bicep b/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationprotectioncontainers/replicationprotectioncontainermappings/main.bicep index 6e700bb6..c20bb854 100644 --- a/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationprotectioncontainers/replicationprotectioncontainermappings/main.bicep +++ b/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationfabrics/replicationprotectioncontainers/replicationprotectioncontainermappings/main.bicep @@ -10,8 +10,8 @@ resource vault 'Microsoft.RecoveryServices/vaults@2024-01-01' = { properties: { publicNetworkAccess: 'Enabled' redundancySettings: { - crossRegionRestore: 'Disabled' standardTierStorageRedundancy: 'GeoRedundant' + crossRegionRestore: 'Disabled' } } } @@ -27,31 +27,13 @@ resource replicationFabric 'Microsoft.RecoveryServices/vaults/replicationFabrics } } -resource replicationProtectionContainer 'Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers@2024-04-01' = { - name: 'acctest-protection-cont1-250703130022502990' - parent: replicationFabric - properties: {} -} - -resource replicationProtectionContainerMapping 'Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings@2024-04-01' = { - name: 'mapping-250703130022502990' - parent: replicationProtectionContainer - properties: { - policyId: replicationPolicy.id - providerSpecificInput: { - instanceType: 'A2A' - } - targetProtectionContainerId: replicationprotectioncontainer1.id - } -} - resource replicationfabric1 'Microsoft.RecoveryServices/vaults/replicationFabrics@2024-04-01' = { name: 'acctest-fabric2b-250703130022502990' parent: vault properties: { customDetails: { - instanceType: 'Azure' location: 'westus2' + instanceType: 'Azure' } } } @@ -69,8 +51,26 @@ resource replicationPolicy 'Microsoft.RecoveryServices/vaults/replicationPolicie } } +resource replicationProtectionContainer 'Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers@2024-04-01' = { + name: 'acctest-protection-cont1-250703130022502990' + parent: replicationFabric + properties: {} +} + resource replicationprotectioncontainer1 'Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers@2024-04-01' = { name: 'acctest-protection-cont2-250703130022502990' parent: replicationfabric1 properties: {} } + +resource replicationProtectionContainerMapping 'Microsoft.RecoveryServices/vaults/replicationFabrics/replicationProtectionContainers/replicationProtectionContainerMappings@2024-04-01' = { + name: 'mapping-250703130022502990' + parent: replicationProtectionContainer + properties: { + policyId: replicationPolicy.id + providerSpecificInput: { + instanceType: 'A2A' + } + targetProtectionContainerId: replicationprotectioncontainer1.id + } +} diff --git a/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationpolicies/main.bicep b/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationpolicies/main.bicep index 585424c4..540ec4df 100644 --- a/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationpolicies/main.bicep +++ b/settings/remarks/microsoft.recoveryservices/samples/vaults/replicationpolicies/main.bicep @@ -17,11 +17,11 @@ resource replicationPolicy 'Microsoft.RecoveryServices/vaults/replicationPolicie parent: vault properties: { providerSpecificInput: { + recoveryPointHistoryInMinutes: 1440 appConsistentFrequencyInMinutes: 240 crashConsistentFrequencyInMinutes: 10 enableMultiVmSync: 'True' instanceType: 'InMageRcm' - recoveryPointHistoryInMinutes: 1440 } } } diff --git a/settings/remarks/microsoft.relay/samples/namespaces/authorizationrules/main.bicep b/settings/remarks/microsoft.relay/samples/namespaces/authorizationrules/main.bicep index f2edca57..e51e9295 100644 --- a/settings/remarks/microsoft.relay/samples/namespaces/authorizationrules/main.bicep +++ b/settings/remarks/microsoft.relay/samples/namespaces/authorizationrules/main.bicep @@ -5,8 +5,8 @@ resource namespace 'Microsoft.Relay/namespaces@2017-04-01' = { name: resourceName location: location sku: { - name: 'Standard' tier: 'Standard' + name: 'Standard' } properties: {} } diff --git a/settings/remarks/microsoft.relay/samples/namespaces/hybridconnections/main.bicep b/settings/remarks/microsoft.relay/samples/namespaces/hybridconnections/main.bicep index dce2216c..35102894 100644 --- a/settings/remarks/microsoft.relay/samples/namespaces/hybridconnections/main.bicep +++ b/settings/remarks/microsoft.relay/samples/namespaces/hybridconnections/main.bicep @@ -5,8 +5,8 @@ resource namespace 'Microsoft.Relay/namespaces@2017-04-01' = { name: resourceName location: location sku: { - tier: 'Standard' name: 'Standard' + tier: 'Standard' } properties: {} } @@ -15,7 +15,7 @@ resource hybridConnection 'Microsoft.Relay/namespaces/hybridConnections@2017-04- name: resourceName parent: namespace properties: { - userMetadata: 'metadatatest' requiresClientAuthorization: true + userMetadata: 'metadatatest' } } diff --git a/settings/remarks/microsoft.resourceconnector/samples/appliances/main.bicep b/settings/remarks/microsoft.resourceconnector/samples/appliances/main.bicep index c64dd02e..5d152c7a 100644 --- a/settings/remarks/microsoft.resourceconnector/samples/appliances/main.bicep +++ b/settings/remarks/microsoft.resourceconnector/samples/appliances/main.bicep @@ -1,13 +1,13 @@ -param location string = 'westus' param resourceName string = 'acctest0001' +param location string = 'westus' resource appliance 'Microsoft.ResourceConnector/appliances@2022-10-27' = { name: '${resourceName}-appliance' location: location properties: { - distro: 'AKSEdge' infrastructureConfig: { provider: 'VMWare' } + distro: 'AKSEdge' } } diff --git a/settings/remarks/microsoft.resources/remarks.json b/settings/remarks/microsoft.resources/remarks.json index 4b7bc624..f3ed141c 100644 --- a/settings/remarks/microsoft.resources/remarks.json +++ b/settings/remarks/microsoft.resources/remarks.json @@ -2,9 +2,9 @@ "$schema": "../../schemas/remarks.schema.json", "BicepSamples": [ { - "Description": "A basic example of deploying a resource group.", + "ResourceType": "microsoft.resources/resourceGroups", "Path": "samples/resourceGroups/basic.bicep", - "ResourceType": "microsoft.resources/resourceGroups" + "Description": "A basic example of deploying a resource group." }, { "ResourceType": "Microsoft.Resources/deploymentScripts", diff --git a/settings/remarks/microsoft.resources/samples/deployments/main.bicep b/settings/remarks/microsoft.resources/samples/deployments/main.bicep index 51af6e14..33b6ae96 100644 --- a/settings/remarks/microsoft.resources/samples/deployments/main.bicep +++ b/settings/remarks/microsoft.resources/samples/deployments/main.bicep @@ -1,21 +1,38 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource deployment 'Microsoft.Resources/deployments@2020-06-01' = { name: resourceName properties: { template: { + '$schema': 'https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#' + contentVersion: '1.0.0.0' + parameters: { + storageAccountType: { + allowedValues: [ + 'Standard_LRS' + 'Standard_GRS' + 'Standard_ZRS' + ] + defaultValue: 'Standard_LRS' + metadata: { + description: 'Storage Account type' + } + type: 'string' + } + } resources: [ { - apiVersion: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} - location: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} - name: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} properties: { accountType: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } type: 'Microsoft.Storage/storageAccounts' + apiVersion: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + location: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} + name: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } { + apiVersion: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} location: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} name: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} properties: { @@ -25,7 +42,6 @@ resource deployment 'Microsoft.Resources/deployments@2020-06-01' = { publicIPAllocationMethod: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } type: 'Microsoft.Network/publicIPAddresses' - apiVersion: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } ] variables: { @@ -36,22 +52,6 @@ resource deployment 'Microsoft.Resources/deployments@2020-06-01' = { dnsLabelPrefix: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} location: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } - '$schema': 'https://schema.management.azure.com/schemas/2015-01-01/deploymentTemplate.json#' - contentVersion: '1.0.0.0' - parameters: { - storageAccountType: { - allowedValues: [ - 'Standard_LRS' - 'Standard_GRS' - 'Standard_ZRS' - ] - defaultValue: 'Standard_LRS' - metadata: { - description: 'Storage Account type' - } - type: 'string' - } - } } mode: 'Complete' } diff --git a/settings/remarks/microsoft.resources/samples/deploymentscripts/main.bicep b/settings/remarks/microsoft.resources/samples/deploymentscripts/main.bicep index 0435ebae..c5437f1a 100644 --- a/settings/remarks/microsoft.resources/samples/deploymentscripts/main.bicep +++ b/settings/remarks/microsoft.resources/samples/deploymentscripts/main.bicep @@ -1,11 +1,12 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = { name: resourceName location: location kind: 'AzurePowerShell' properties: { + timeout: 'P1D' azPowerShellVersion: '8.3' cleanupPreference: 'Always' environmentVariables: null @@ -16,6 +17,5 @@ resource deploymentScript 'Microsoft.Resources/deploymentScripts@2020-10-01' = { $DeploymentScriptOutputs[''text''] = $output ''' supportingScriptUris: null - timeout: 'P1D' } } diff --git a/settings/remarks/microsoft.resources/samples/resourceGroups/main.bicep b/settings/remarks/microsoft.resources/samples/resourceGroups/main.bicep index e9189e3f..db2a568e 100644 --- a/settings/remarks/microsoft.resources/samples/resourceGroups/main.bicep +++ b/settings/remarks/microsoft.resources/samples/resourceGroups/main.bicep @@ -1,7 +1,7 @@ targetScope = 'subscription' -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { name: resourceName diff --git a/settings/remarks/microsoft.search/samples/searchservices/main.bicep b/settings/remarks/microsoft.search/samples/searchservices/main.bicep index fb11a40c..dc3626f9 100644 --- a/settings/remarks/microsoft.search/samples/searchservices/main.bicep +++ b/settings/remarks/microsoft.search/samples/searchservices/main.bicep @@ -9,19 +9,19 @@ resource searchService 'Microsoft.Search/searchServices@2022-09-01' = { } properties: { disableLocalAuth: false - encryptionWithCmk: { - enforcement: 'Disabled' - } hostingMode: 'default' networkRuleSet: { ipRules: [] } + partitionCount: 1 publicNetworkAccess: 'Enabled' replicaCount: 1 + encryptionWithCmk: { + enforcement: 'Disabled' + } authOptions: { apiKeyOnly: {} } - partitionCount: 1 } tags: { environment: 'staging' diff --git a/settings/remarks/microsoft.search/samples/searchservices/sharedprivatelinkresources/main.bicep b/settings/remarks/microsoft.search/samples/searchservices/sharedprivatelinkresources/main.bicep index 3db374f5..705232f7 100644 --- a/settings/remarks/microsoft.search/samples/searchservices/sharedprivatelinkresources/main.bicep +++ b/settings/remarks/microsoft.search/samples/searchservices/sharedprivatelinkresources/main.bicep @@ -8,20 +8,20 @@ resource searchService 'Microsoft.Search/searchServices@2022-09-01' = { name: 'standard' } properties: { - partitionCount: 1 - authOptions: { - apiKeyOnly: {} - } disableLocalAuth: false + encryptionWithCmk: { + enforcement: 'Disabled' + } + hostingMode: 'default' + partitionCount: 1 + replicaCount: 1 networkRuleSet: { ipRules: [] } publicNetworkAccess: 'Enabled' - replicaCount: 1 - encryptionWithCmk: { - enforcement: 'Disabled' + authOptions: { + apiKeyOnly: {} } - hostingMode: 'default' } tags: { environment: 'staging' @@ -36,6 +36,18 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + accessTier: 'Hot' + allowCrossTenantReplication: true + isNfsV3Enabled: false + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + } + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true + allowBlobPublicAccess: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -47,20 +59,8 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isNfsV3Enabled: false - networkAcls: { - defaultAction: 'Allow' - } - publicNetworkAccess: 'Enabled' - allowSharedKeyAccess: true isHnsEnabled: false - isSftpEnabled: false minimumTlsVersion: 'TLS1_2' - supportsHttpsTrafficOnly: true - accessTier: 'Hot' - allowBlobPublicAccess: true - allowCrossTenantReplication: true - defaultToOAuthAuthentication: false } } diff --git a/settings/remarks/microsoft.security/samples/advancedthreatprotectionsettings/main.bicep b/settings/remarks/microsoft.security/samples/advancedthreatprotectionsettings/main.bicep index 02729ec2..14b9479b 100644 --- a/settings/remarks/microsoft.security/samples/advancedthreatprotectionsettings/main.bicep +++ b/settings/remarks/microsoft.security/samples/advancedthreatprotectionsettings/main.bicep @@ -9,15 +9,13 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + isNfsV3Enabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true + allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false encryption: { - keySource: 'Microsoft.Storage' services: { queue: { keyType: 'Service' @@ -26,14 +24,16 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } - isHnsEnabled: false - isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } + publicNetworkAccess: 'Enabled' accessTier: 'Hot' - allowBlobPublicAccess: true + defaultToOAuthAuthentication: false + isHnsEnabled: false } tags: { environment: 'production' diff --git a/settings/remarks/microsoft.security/samples/assessments/main-rg-module.bicep b/settings/remarks/microsoft.security/samples/assessments/main-rg-module.bicep index e2389111..4501b283 100644 --- a/settings/remarks/microsoft.security/samples/assessments/main-rg-module.bicep +++ b/settings/remarks/microsoft.security/samples/assessments/main-rg-module.bicep @@ -33,34 +33,31 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2024- { name: 'example' properties: { + primary: true + dnsSettings: { + dnsServers: [] + } enableAcceleratedNetworking: false enableIPForwarding: false ipConfigurations: [ { name: 'internal' properties: { + privateIPAddressVersion: 'IPv4' + subnet: {} + applicationGatewayBackendAddressPools: [] applicationSecurityGroups: [] loadBalancerBackendAddressPools: [] loadBalancerInboundNatPools: [] primary: true - privateIPAddressVersion: 'IPv4' - subnet: {} - applicationGatewayBackendAddressPools: [] } } ] - primary: true - dnsSettings: { - dnsServers: [] - } } } ] } osProfile: { - adminPassword: adminPassword - adminUsername: 'adminuser' - allowExtensionOperations: true computerNamePrefix: '${resourceName}-vmss' linuxConfiguration: { disablePasswordAuthentication: false @@ -70,6 +67,9 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2024- } } secrets: [] + adminPassword: adminPassword + adminUsername: 'adminuser' + allowExtensionOperations: true } priority: 'Regular' storageProfile: { @@ -96,22 +96,6 @@ resource virtualMachineScaleSet 'Microsoft.Compute/virtualMachineScaleSets@2024- } } -resource assessment 'Microsoft.Security/assessments@2020-01-01' = { - name: 'fdaaa62c-1d42-45ab-be2f-2af194dd1700' - scope: virtualMachineScaleSet - properties: { - additionalData: {} - resourceDetails: { - source: 'Azure' - } - status: { - cause: '' - code: 'Healthy' - description: '' - } - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: '${resourceName}-vnet' location: location @@ -132,12 +116,28 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: 'internal' parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' - defaultOutboundAccess: true delegations: [] privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + defaultOutboundAccess: true + } +} + +resource assessment 'Microsoft.Security/assessments@2020-01-01' = { + name: 'fdaaa62c-1d42-45ab-be2f-2af194dd1700' + scope: virtualMachineScaleSet + properties: { + additionalData: {} + resourceDetails: { + source: 'Azure' + } + status: { + cause: '' + code: 'Healthy' + description: '' + } } } diff --git a/settings/remarks/microsoft.security/samples/assessments/main.bicep b/settings/remarks/microsoft.security/samples/assessments/main.bicep index 4a2d7fb5..ec5eab5a 100644 --- a/settings/remarks/microsoft.security/samples/assessments/main.bicep +++ b/settings/remarks/microsoft.security/samples/assessments/main.bicep @@ -11,6 +11,15 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { location: location } +resource pricing 'Microsoft.Security/pricings@2023-01-01' = { + name: 'VirtualMachines' + properties: { + extensions: [] + pricingTier: 'Standard' + subPlan: 'P2' + } +} + resource assessmentMetadata 'Microsoft.Security/assessmentMetadata@2021-06-01' = { name: 'fdaaa62c-1d42-45ab-be2f-2af194dd1700' properties: { @@ -21,21 +30,12 @@ resource assessmentMetadata 'Microsoft.Security/assessmentMetadata@2021-06-01' = } } -resource pricing 'Microsoft.Security/pricings@2023-01-01' = { - name: 'VirtualMachines' - properties: { - extensions: [] - pricingTier: 'Standard' - subPlan: 'P2' - } -} - module module1 'main-rg-module.bicep' = { name: 'deploy-rg-resources' scope: resourceGroup params: { - resourceName: resourceName adminPassword: adminPassword + resourceName: resourceName location: location } } diff --git a/settings/remarks/microsoft.security/samples/automations/main.bicep b/settings/remarks/microsoft.security/samples/automations/main.bicep index d9856990..bf6e5162 100644 --- a/settings/remarks/microsoft.security/samples/automations/main.bicep +++ b/settings/remarks/microsoft.security/samples/automations/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource automation 'Microsoft.Security/automations@2019-01-01-preview' = { name: 'ExportToWorkspace' @@ -33,10 +33,10 @@ resource automation 'Microsoft.Security/automations@2019-01-01-preview' = { { rules: [ { - propertyJPath: 'type' - propertyType: 'String' expectedValue: 'Microsoft.Security/assessments' operator: 'Contains' + propertyJPath: 'type' + propertyType: 'String' } ] } @@ -54,40 +54,40 @@ resource automation 'Microsoft.Security/automations@2019-01-01-preview' = { { rules: [ { + propertyJPath: 'Severity' propertyType: 'String' expectedValue: 'low' operator: 'Equals' - propertyJPath: 'Severity' } ] } { rules: [ { + propertyJPath: 'Severity' propertyType: 'String' expectedValue: 'medium' operator: 'Equals' - propertyJPath: 'Severity' } ] } { rules: [ { - operator: 'Equals' propertyJPath: 'Severity' propertyType: 'String' expectedValue: 'high' + operator: 'Equals' } ] } { rules: [ { + expectedValue: 'informational' operator: 'Equals' propertyJPath: 'Severity' propertyType: 'String' - expectedValue: 'informational' } ] } @@ -124,18 +124,18 @@ 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 } + features: { + enableLogAccessUsingOnlyResourcePermissions: true + disableLocalAuth: false + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 } } diff --git a/settings/remarks/microsoft.security/samples/securitycontacts/main.bicep b/settings/remarks/microsoft.security/samples/securitycontacts/main.bicep index 82baf317..131d854f 100644 --- a/settings/remarks/microsoft.security/samples/securitycontacts/main.bicep +++ b/settings/remarks/microsoft.security/samples/securitycontacts/main.bicep @@ -6,9 +6,9 @@ param location string = 'eastus' resource securityContact 'Microsoft.Security/securityContacts@2017-08-01-preview' = { name: resourceName properties: { - phone: '+1-555-555-5555' - alertNotifications: 'On' alertsToAdmins: 'On' email: 'basic@example.com' + phone: '+1-555-555-5555' + alertNotifications: 'On' } } diff --git a/settings/remarks/microsoft.security/samples/workspacesettings/main-rg-module.bicep b/settings/remarks/microsoft.security/samples/workspacesettings/main-rg-module.bicep index 3d1f9ebb..f4ad3357 100644 --- a/settings/remarks/microsoft.security/samples/workspacesettings/main-rg-module.bicep +++ b/settings/remarks/microsoft.security/samples/workspacesettings/main-rg-module.bicep @@ -5,12 +5,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - sku: { - name: 'PerGB2018' - } - workspaceCapping: { - dailyQuotaGb: -1 - } features: { disableLocalAuth: false enableLogAccessUsingOnlyResourcePermissions: true @@ -18,6 +12,12 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 + sku: { + name: 'PerGB2018' + } + workspaceCapping: { + dailyQuotaGb: -1 + } } } diff --git a/settings/remarks/microsoft.security/samples/workspacesettings/main.bicep b/settings/remarks/microsoft.security/samples/workspacesettings/main.bicep index 3c2d456b..b04b898a 100644 --- a/settings/remarks/microsoft.security/samples/workspacesettings/main.bicep +++ b/settings/remarks/microsoft.security/samples/workspacesettings/main.bicep @@ -11,8 +11,8 @@ resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { resource workspaceSetting 'Microsoft.Security/workspaceSettings@2017-08-01-preview' = { name: 'default' properties: { - scope: '/subscriptions/${subscription()}' workspaceId: module1.outputs.workspaceId + scope: '/subscriptions/${subscription().subscriptionId}' } } diff --git a/settings/remarks/microsoft.securityinsights/samples/alertrules/main.bicep b/settings/remarks/microsoft.securityinsights/samples/alertrules/main.bicep index 3d537b51..6b2e9365 100644 --- a/settings/remarks/microsoft.securityinsights/samples/alertrules/main.bicep +++ b/settings/remarks/microsoft.securityinsights/samples/alertrules/main.bicep @@ -5,7 +5,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 sku: { name: 'PerGB2018' @@ -18,6 +17,7 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { enableLogAccessUsingOnlyResourcePermissions: true } publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' } } @@ -37,18 +37,18 @@ resource alertRule 'Microsoft.SecurityInsights/alertRules@2022-10-01-preview' = ] kind: 'NRT' properties: { - suppressionEnabled: false + severity: 'High' + suppressionDuration: 'PT5H' tactics: [] techniques: [] - displayName: 'Some Rule' + description: '' enabled: true + suppressionEnabled: false + displayName: 'Some Rule' query: '''AzureActivity | where OperationName == "Create or Update Virtual Machine" or OperationName =="Create Deployment" | where ActivityStatus == "Succeeded" | make-series dcount(ResourceId) default=0 on EventSubmissionTimestamp in range(ago(7d), now(), 1d) by Caller ''' - severity: 'High' - description: '' - suppressionDuration: 'PT5H' } } diff --git a/settings/remarks/microsoft.securityinsights/samples/automationrules/main.bicep b/settings/remarks/microsoft.securityinsights/samples/automationrules/main.bicep index 715b1f0a..253ec40a 100644 --- a/settings/remarks/microsoft.securityinsights/samples/automationrules/main.bicep +++ b/settings/remarks/microsoft.securityinsights/samples/automationrules/main.bicep @@ -5,12 +5,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 sku: { name: 'PerGB2018' @@ -18,6 +12,12 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { workspaceCapping: { dailyQuotaGb: -1 } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' } } @@ -36,7 +36,6 @@ resource automationRule 'Microsoft.SecurityInsights/automationRules@2022-10-01-p onboardingState ] properties: { - displayName: 'acctest-SentinelAutoRule-230630033910945846' order: 1 triggeringLogic: { isEnabled: true @@ -56,5 +55,6 @@ resource automationRule 'Microsoft.SecurityInsights/automationRules@2022-10-01-p order: 1 } ] + displayName: 'acctest-SentinelAutoRule-230630033910945846' } } diff --git a/settings/remarks/microsoft.securityinsights/samples/dataconnectors/main.bicep b/settings/remarks/microsoft.securityinsights/samples/dataconnectors/main.bicep index 248f0e6d..3fa356ec 100644 --- a/settings/remarks/microsoft.securityinsights/samples/dataconnectors/main.bicep +++ b/settings/remarks/microsoft.securityinsights/samples/dataconnectors/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName @@ -39,14 +39,14 @@ resource dataConnector 'Microsoft.SecurityInsights/dataConnectors@2022-10-01-pre properties: { dataTypes: { bingSafetyPhishingURL: { - state: 'Disabled' lookbackPeriod: '' + state: 'Disabled' } microsoftEmergingThreatFeed: { lookbackPeriod: '1970-01-01T00:00:00Z' state: 'enabled' } } - tenantId: tenant() + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.securityinsights/samples/metadata/main.bicep b/settings/remarks/microsoft.securityinsights/samples/metadata/main.bicep index fed2a077..79dfa4c2 100644 --- a/settings/remarks/microsoft.securityinsights/samples/metadata/main.bicep +++ b/settings/remarks/microsoft.securityinsights/samples/metadata/main.bicep @@ -5,12 +5,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' - retentionInDays: 30 - sku: { - name: 'PerGB2018' - } workspaceCapping: { dailyQuotaGb: -1 } @@ -18,6 +12,12 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { enableLogAccessUsingOnlyResourcePermissions: true disableLocalAuth: false } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' + retentionInDays: 30 + sku: { + name: 'PerGB2018' + } } } @@ -37,18 +37,18 @@ resource alertRule 'Microsoft.SecurityInsights/alertRules@2022-10-01-preview' = ] kind: 'NRT' properties: { - displayName: 'Some Rule' + tactics: [] + techniques: [] enabled: true + severity: 'High' + suppressionEnabled: false + description: '' + displayName: 'Some Rule' query: '''AzureActivity | where OperationName == "Create or Update Virtual Machine" or OperationName =="Create Deployment" | where ActivityStatus == "Succeeded" | make-series dcount(ResourceId) default=0 on EventSubmissionTimestamp in range(ago(7d), now(), 1d) by Caller ''' - severity: 'High' - suppressionEnabled: false - tactics: [] - techniques: [] - description: '' suppressionDuration: 'PT5H' } } diff --git a/settings/remarks/microsoft.securityinsights/samples/onboardingstates/main.bicep b/settings/remarks/microsoft.securityinsights/samples/onboardingstates/main.bicep index d2325ddf..8f6e611d 100644 --- a/settings/remarks/microsoft.securityinsights/samples/onboardingstates/main.bicep +++ b/settings/remarks/microsoft.securityinsights/samples/onboardingstates/main.bicep @@ -5,12 +5,6 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { name: resourceName location: location properties: { - features: { - disableLocalAuth: false - enableLogAccessUsingOnlyResourcePermissions: true - } - publicNetworkAccessForIngestion: 'Enabled' - publicNetworkAccessForQuery: 'Enabled' retentionInDays: 30 sku: { name: 'PerGB2018' @@ -18,6 +12,12 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { workspaceCapping: { dailyQuotaGb: -1 } + features: { + disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true + } + publicNetworkAccessForIngestion: 'Enabled' + publicNetworkAccessForQuery: 'Enabled' } } diff --git a/settings/remarks/microsoft.securityinsights/samples/watchlists/main.bicep b/settings/remarks/microsoft.securityinsights/samples/watchlists/main.bicep index e7492505..b600ba65 100644 --- a/settings/remarks/microsoft.securityinsights/samples/watchlists/main.bicep +++ b/settings/remarks/microsoft.securityinsights/samples/watchlists/main.bicep @@ -6,8 +6,8 @@ resource workspace 'Microsoft.OperationalInsights/workspaces@2022-10-01' = { location: location properties: { features: { - enableLogAccessUsingOnlyResourcePermissions: true disableLocalAuth: false + enableLogAccessUsingOnlyResourcePermissions: true } publicNetworkAccessForIngestion: 'Enabled' publicNetworkAccessForQuery: 'Enabled' diff --git a/settings/remarks/microsoft.securityinsights/samples/watchlists/watchlistitems/main.bicep b/settings/remarks/microsoft.securityinsights/samples/watchlists/watchlistitems/main.bicep index 68b1ed4e..10139a2a 100644 --- a/settings/remarks/microsoft.securityinsights/samples/watchlists/watchlistitems/main.bicep +++ b/settings/remarks/microsoft.securityinsights/samples/watchlists/watchlistitems/main.bicep @@ -36,10 +36,10 @@ resource watchlist 'Microsoft.SecurityInsights/watchlists@2022-11-01' = { onboardingState ] properties: { + displayName: 'test' itemsSearchKey: 'k1' provider: 'Microsoft' source: '' - displayName: 'test' } } diff --git a/settings/remarks/microsoft.servicebus/samples/namespaces/disasterrecoveryconfigs/main-rg-module.bicep b/settings/remarks/microsoft.servicebus/samples/namespaces/disasterrecoveryconfigs/main-rg-module.bicep index e069edfe..3921ef50 100644 --- a/settings/remarks/microsoft.servicebus/samples/namespaces/disasterrecoveryconfigs/main-rg-module.bicep +++ b/settings/remarks/microsoft.servicebus/samples/namespaces/disasterrecoveryconfigs/main-rg-module.bicep @@ -1,28 +1,20 @@ -param resourceName string = 'acctest0001' param location string = 'westus' param secondaryLocation string = 'centralus' +param resourceName string = 'acctest0001' resource namespace 'Microsoft.ServiceBus/namespaces@2022-10-01-preview' = { name: '${resourceName}ns1' location: location sku: { + capacity: 1 name: 'Premium' tier: 'Premium' - capacity: 1 } properties: { + publicNetworkAccess: 'Enabled' disableLocalAuth: false minimumTlsVersion: '1.2' premiumMessagingPartitions: 1 - publicNetworkAccess: 'Enabled' - } -} - -resource disasterRecoveryConfig 'Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs@2021-06-01-preview' = { - name: '${resourceName}alias' - parent: namespace - properties: { - partnerNamespace: namespace1.id } } @@ -30,14 +22,22 @@ resource namespace1 'Microsoft.ServiceBus/namespaces@2022-10-01-preview' = { name: '${resourceName}ns2' location: secondaryLocation sku: { + capacity: 1 name: 'Premium' tier: 'Premium' - capacity: 1 } properties: { - disableLocalAuth: false - minimumTlsVersion: '1.2' premiumMessagingPartitions: 1 publicNetworkAccess: 'Enabled' + disableLocalAuth: false + minimumTlsVersion: '1.2' + } +} + +resource disasterRecoveryConfig 'Microsoft.ServiceBus/namespaces/disasterRecoveryConfigs@2021-06-01-preview' = { + name: '${resourceName}alias' + parent: namespace + properties: { + partnerNamespace: namespace1.id } } diff --git a/settings/remarks/microsoft.servicebus/samples/namespaces/disasterrecoveryconfigs/main.bicep b/settings/remarks/microsoft.servicebus/samples/namespaces/disasterrecoveryconfigs/main.bicep index 1293f27a..e4d15252 100644 --- a/settings/remarks/microsoft.servicebus/samples/namespaces/disasterrecoveryconfigs/main.bicep +++ b/settings/remarks/microsoft.servicebus/samples/namespaces/disasterrecoveryconfigs/main.bicep @@ -4,19 +4,19 @@ param resourceName string = 'acctest0001' param location string = 'westus' param secondaryLocation string = 'centralus' -resource resourcegroup1 'Microsoft.Resources/resourceGroups@2020-06-01' = { - name: '${resourceName}rg2' - location: secondaryLocation -} - resource resourceGroup 'Microsoft.Resources/resourceGroups@2020-06-01' = { name: resourceName location: location } +resource resourcegroup1 'Microsoft.Resources/resourceGroups@2020-06-01' = { + name: '${resourceName}rg2' + location: secondaryLocation +} + module module1 'main-rg-module.bicep' = { name: 'deploy-rg-resources' - scope: resourcegroup1 + scope: resourceGroup params: { resourceName: resourceName location: location diff --git a/settings/remarks/microsoft.servicebus/samples/namespaces/main.bicep b/settings/remarks/microsoft.servicebus/samples/namespaces/main.bicep index f856e282..0764e868 100644 --- a/settings/remarks/microsoft.servicebus/samples/namespaces/main.bicep +++ b/settings/remarks/microsoft.servicebus/samples/namespaces/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { name: resourceName diff --git a/settings/remarks/microsoft.servicebus/samples/namespaces/queues/authorizationrules/main.bicep b/settings/remarks/microsoft.servicebus/samples/namespaces/queues/authorizationrules/main.bicep index 2d02ebfa..262950b7 100644 --- a/settings/remarks/microsoft.servicebus/samples/namespaces/queues/authorizationrules/main.bicep +++ b/settings/remarks/microsoft.servicebus/samples/namespaces/queues/authorizationrules/main.bicep @@ -20,15 +20,15 @@ resource queue 'Microsoft.ServiceBus/namespaces/queues@2021-06-01-preview' = { name: resourceName parent: namespace properties: { - deadLetteringOnMessageExpiration: false - enableBatchedOperations: true - enableExpress: false + enablePartitioning: true maxDeliveryCount: 10 - requiresDuplicateDetection: false requiresSession: false - status: 'Active' - enablePartitioning: true + enableExpress: false maxSizeInMegabytes: 81920 + requiresDuplicateDetection: false + status: 'Active' + deadLetteringOnMessageExpiration: false + enableBatchedOperations: true } } diff --git a/settings/remarks/microsoft.servicebus/samples/namespaces/queues/main.bicep b/settings/remarks/microsoft.servicebus/samples/namespaces/queues/main.bicep index 92f33037..f39443dd 100644 --- a/settings/remarks/microsoft.servicebus/samples/namespaces/queues/main.bicep +++ b/settings/remarks/microsoft.servicebus/samples/namespaces/queues/main.bicep @@ -5,14 +5,14 @@ resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { name: resourceName location: location sku: { - capacity: 0 name: 'Standard' tier: 'Standard' + capacity: 0 } properties: { + disableLocalAuth: false publicNetworkAccess: 'Enabled' zoneRedundant: false - disableLocalAuth: false } } @@ -20,14 +20,14 @@ resource queue 'Microsoft.ServiceBus/namespaces/queues@2021-06-01-preview' = { name: resourceName parent: namespace properties: { - enableBatchedOperations: true + deadLetteringOnMessageExpiration: false enableExpress: false - status: 'Active' - enablePartitioning: true maxDeliveryCount: 10 maxSizeInMegabytes: 81920 - requiresDuplicateDetection: false requiresSession: false - deadLetteringOnMessageExpiration: false + status: 'Active' + enableBatchedOperations: true + enablePartitioning: true + requiresDuplicateDetection: false } } diff --git a/settings/remarks/microsoft.servicebus/samples/namespaces/topics/authorizationrules/main.bicep b/settings/remarks/microsoft.servicebus/samples/namespaces/topics/authorizationrules/main.bicep index f75de6ec..7ca59cce 100644 --- a/settings/remarks/microsoft.servicebus/samples/namespaces/topics/authorizationrules/main.bicep +++ b/settings/remarks/microsoft.servicebus/samples/namespaces/topics/authorizationrules/main.bicep @@ -5,9 +5,9 @@ resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { name: resourceName location: location sku: { + capacity: 0 name: 'Standard' tier: 'Standard' - capacity: 0 } properties: { disableLocalAuth: false @@ -20,13 +20,13 @@ resource topic 'Microsoft.ServiceBus/namespaces/topics@2021-06-01-preview' = { name: resourceName parent: namespace properties: { + enableExpress: false enablePartitioning: false maxSizeInMegabytes: 5120 requiresDuplicateDetection: false status: 'Active' supportOrdering: false enableBatchedOperations: false - enableExpress: false } } diff --git a/settings/remarks/microsoft.servicebus/samples/namespaces/topics/main.bicep b/settings/remarks/microsoft.servicebus/samples/namespaces/topics/main.bicep index 2e9862fe..51274657 100644 --- a/settings/remarks/microsoft.servicebus/samples/namespaces/topics/main.bicep +++ b/settings/remarks/microsoft.servicebus/samples/namespaces/topics/main.bicep @@ -20,12 +20,12 @@ resource topic 'Microsoft.ServiceBus/namespaces/topics@2021-06-01-preview' = { name: resourceName parent: namespace properties: { + enablePartitioning: true maxSizeInMegabytes: 81920 requiresDuplicateDetection: false status: 'Active' supportOrdering: false enableBatchedOperations: false enableExpress: false - enablePartitioning: true } } diff --git a/settings/remarks/microsoft.servicebus/samples/namespaces/topics/subscriptions/main.bicep b/settings/remarks/microsoft.servicebus/samples/namespaces/topics/subscriptions/main.bicep index 751bb817..2edeba99 100644 --- a/settings/remarks/microsoft.servicebus/samples/namespaces/topics/subscriptions/main.bicep +++ b/settings/remarks/microsoft.servicebus/samples/namespaces/topics/subscriptions/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { name: resourceName @@ -34,13 +34,13 @@ resource subscription 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2021 name: resourceName parent: topic properties: { + isClientAffine: false + requiresSession: false clientAffineProperties: {} - deadLetteringOnFilterEvaluationExceptions: true maxDeliveryCount: 10 - requiresSession: false status: 'Active' + deadLetteringOnFilterEvaluationExceptions: true deadLetteringOnMessageExpiration: false enableBatchedOperations: false - isClientAffine: false } } diff --git a/settings/remarks/microsoft.servicebus/samples/namespaces/topics/subscriptions/rules/main.bicep b/settings/remarks/microsoft.servicebus/samples/namespaces/topics/subscriptions/rules/main.bicep index 6b7f614f..f588d34c 100644 --- a/settings/remarks/microsoft.servicebus/samples/namespaces/topics/subscriptions/rules/main.bicep +++ b/settings/remarks/microsoft.servicebus/samples/namespaces/topics/subscriptions/rules/main.bicep @@ -10,9 +10,9 @@ resource namespace 'Microsoft.ServiceBus/namespaces@2022-01-01-preview' = { tier: 'Standard' } properties: { - disableLocalAuth: false publicNetworkAccess: 'Enabled' zoneRedundant: false + disableLocalAuth: false } } @@ -20,13 +20,13 @@ resource topic 'Microsoft.ServiceBus/namespaces/topics@2021-06-01-preview' = { name: resourceName parent: namespace properties: { - enablePartitioning: false - maxSizeInMegabytes: 5120 - requiresDuplicateDetection: false status: 'Active' supportOrdering: false enableBatchedOperations: false enableExpress: false + enablePartitioning: false + maxSizeInMegabytes: 5120 + requiresDuplicateDetection: false } } @@ -35,12 +35,12 @@ resource subscription 'Microsoft.ServiceBus/namespaces/topics/subscriptions@2021 parent: topic properties: { clientAffineProperties: {} + deadLetteringOnFilterEvaluationExceptions: true deadLetteringOnMessageExpiration: false enableBatchedOperations: false - isClientAffine: false maxDeliveryCount: 10 requiresSession: false - deadLetteringOnFilterEvaluationExceptions: true + isClientAffine: false status: 'Active' } } @@ -51,10 +51,10 @@ resource rule 'Microsoft.ServiceBus/namespaces/topics/subscriptions/rules@2021-0 properties: { correlationFilter: { contentType: 'test_content_type' - sessionId: 'test_session_id' correlationId: 'test_correlation_id' - label: 'test_label' messageId: 'test_message_id' + sessionId: 'test_session_id' + label: 'test_label' replyTo: 'test_reply_to' replyToSessionId: 'test_reply_to_session_id' to: 'test_to' diff --git a/settings/remarks/microsoft.servicefabric/samples/clusters/main.bicep b/settings/remarks/microsoft.servicefabric/samples/clusters/main.bicep index a49f5422..4d7f85e3 100644 --- a/settings/remarks/microsoft.servicefabric/samples/clusters/main.bicep +++ b/settings/remarks/microsoft.servicefabric/samples/clusters/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource cluster 'Microsoft.ServiceFabric/clusters@2021-06-01' = { name: resourceName @@ -11,15 +11,15 @@ resource cluster 'Microsoft.ServiceFabric/clusters@2021-06-01' = { nodeTypes: [ { isStateless: false - httpGatewayEndpointPort: 80 - isPrimary: true - multipleAvailabilityZones: false name: 'first' placementProperties: {} vmInstanceCount: 3 - capacities: {} clientConnectionEndpointPort: 2020 + httpGatewayEndpointPort: 80 + multipleAvailabilityZones: false + capacities: {} durabilityLevel: 'Bronze' + isPrimary: true } ] reliabilityLevel: 'Bronze' diff --git a/settings/remarks/microsoft.servicefabric/samples/managedclusters/main.bicep b/settings/remarks/microsoft.servicefabric/samples/managedclusters/main.bicep index ea7d3032..3ef13447 100644 --- a/settings/remarks/microsoft.servicefabric/samples/managedclusters/main.bicep +++ b/settings/remarks/microsoft.servicefabric/samples/managedclusters/main.bicep @@ -13,45 +13,45 @@ resource managedCluster 'Microsoft.ServiceFabric/managedClusters@2021-05-01' = { name: 'Standard' } properties: { - clusterUpgradeCadence: 'Wave0' - dnsName: '${resourceName}' + adminUserName: '${adminUsername}' httpGatewayConnectionPort: 23456 + loadBalancingRules: [ + { + probeProtocol: 'http' + probeRequestPath: '/' + protocol: 'tcp' + backendPort: 8000 + frontendPort: 443 + } + ] networkSecurityRules: [ { access: 'allow' - destinationAddressPrefixes: [ - '0.0.0.0/0' - ] - name: 'rule443-allow-fe' - priority: 1000 destinationPortRanges: [ '443' ] direction: 'inbound' + name: 'rule443-allow-fe' + priority: 1000 protocol: 'tcp' - sourceAddressPrefixes: [ - '0.0.0.0/0' - ] sourcePortRanges: [ '1-65535' ] + destinationAddressPrefixes: [ + '0.0.0.0/0' + ] + sourceAddressPrefixes: [ + '0.0.0.0/0' + ] } ] addonFeatures: [ 'DnsService' ] - adminUserName: '${adminUsername}' - loadBalancingRules: [ - { - backendPort: 8000 - frontendPort: 443 - probeProtocol: 'http' - probeRequestPath: '/' - protocol: 'tcp' - } - ] adminPassword: '${adminPassword}' clientConnectionPort: 12345 + clusterUpgradeCadence: 'Wave0' + dnsName: '${resourceName}' } tags: { Test: 'value' diff --git a/settings/remarks/microsoft.servicefabric/samples/managedclusters/nodetypes/main.bicep b/settings/remarks/microsoft.servicefabric/samples/managedclusters/nodetypes/main.bicep index dbe06f26..863dc899 100644 --- a/settings/remarks/microsoft.servicefabric/samples/managedclusters/nodetypes/main.bicep +++ b/settings/remarks/microsoft.servicefabric/samples/managedclusters/nodetypes/main.bicep @@ -1,10 +1,10 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @description('The administrator username for the Service Fabric managed cluster') param adminUsername string @secure() @description('The administrator password for the Service Fabric managed cluster') param adminPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource managedCluster 'Microsoft.ServiceFabric/managedClusters@2021-05-01' = { name: resourceName @@ -13,45 +13,45 @@ resource managedCluster 'Microsoft.ServiceFabric/managedClusters@2021-05-01' = { name: 'Standard' } properties: { - adminPassword: '${adminPassword}' - adminUserName: '${adminUsername}' clientConnectionPort: 12345 - clusterUpgradeCadence: 'Wave0' - dnsName: '${resourceName}' + httpGatewayConnectionPort: 23456 loadBalancingRules: [ { - protocol: 'tcp' backendPort: 8000 frontendPort: 443 probeProtocol: 'http' probeRequestPath: '/' + protocol: 'tcp' } ] networkSecurityRules: [ { + destinationAddressPrefixes: [ + '0.0.0.0/0' + ] + destinationPortRanges: [ + '443' + ] direction: 'inbound' + name: 'rule443-allow-fe' priority: 1000 protocol: 'tcp' sourcePortRanges: [ '1-65535' ] access: 'allow' - name: 'rule443-allow-fe' sourceAddressPrefixes: [ '0.0.0.0/0' ] - destinationAddressPrefixes: [ - '0.0.0.0/0' - ] - destinationPortRanges: [ - '443' - ] } ] addonFeatures: [ 'DnsService' ] - httpGatewayConnectionPort: 23456 + adminPassword: '${adminPassword}' + adminUserName: '${adminUsername}' + clusterUpgradeCadence: 'Wave0' + dnsName: '${resourceName}' } tags: { Test: 'value' @@ -62,27 +62,27 @@ resource nodeType 'Microsoft.ServiceFabric/managedClusters/nodeTypes@2021-05-01' name: resourceName parent: managedCluster properties: { - vmInstanceCount: 5 - dataDiskSizeGB: 130 + capacities: {} + dataDiskType: 'Standard_LRS' multiplePlacementGroups: false vmImageOffer: 'WindowsServer' - vmImageSku: '2016-Datacenter' - dataDiskType: 'Standard_LRS' + vmImagePublisher: 'MicrosoftWindowsServer' ephemeralPorts: { endPort: 20000 startPort: 10000 } - isStateless: false - vmImagePublisher: 'MicrosoftWindowsServer' + vmInstanceCount: 5 + vmSecrets: [] vmSize: 'Standard_DS2_v2' - vmImageVersion: 'latest' + vmImageSku: '2016-Datacenter' + dataDiskSizeGB: 130 + isPrimary: true + isStateless: false applicationPorts: { endPort: 9000 startPort: 7000 } - capacities: {} - isPrimary: true placementProperties: {} - vmSecrets: [] + vmImageVersion: 'latest' } } diff --git a/settings/remarks/microsoft.servicelinker/samples/linkers/main.bicep b/settings/remarks/microsoft.servicelinker/samples/linkers/main.bicep index 3c5456b8..069735a4 100644 --- a/settings/remarks/microsoft.servicelinker/samples/linkers/main.bicep +++ b/settings/remarks/microsoft.servicelinker/samples/linkers/main.bicep @@ -12,14 +12,49 @@ resource spring 'Microsoft.AppPlatform/Spring@2023-05-01-preview' = { } } +resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { + name: resourceName + location: location + kind: 'GlobalDocumentDB' + properties: { + consistencyPolicy: { + defaultConsistencyLevel: 'BoundedStaleness' + maxIntervalInSeconds: 10 + maxStalenessPrefix: 200 + } + enableFreeTier: false + enableMultipleWriteLocations: false + networkAclBypassResourceIds: [] + databaseAccountOfferType: 'Standard' + defaultIdentity: 'FirstPartyIdentity' + enableAnalyticalStorage: false + enableAutomaticFailover: false + isVirtualNetworkFilterEnabled: false + publicNetworkAccess: 'Enabled' + virtualNetworkRules: [] + capabilities: [] + networkAclBypass: 'None' + locations: [ + { + failoverPriority: 0 + isZoneRedundant: false + locationName: 'West Europe' + } + ] + disableKeyBasedMetadataWriteAccess: false + disableLocalAuth: false + ipRules: [] + } +} + resource app 'Microsoft.AppPlatform/Spring/apps@2023-05-01-preview' = { name: resourceName location: location parent: spring properties: { + customPersistentDisks: [] enableEndToEndTLS: false public: false - customPersistentDisks: [] } } @@ -27,9 +62,9 @@ resource deployment 'Microsoft.AppPlatform/Spring/apps/deployments@2023-05-01-pr name: 'deploy-q4uff' parent: app sku: { - capacity: 1 name: 'S0' tier: 'Standard' + capacity: 1 } properties: { deploymentSettings: { @@ -48,41 +83,6 @@ resource deployment 'Microsoft.AppPlatform/Spring/apps/deployments@2023-05-01-pr } } -resource databaseAccount 'Microsoft.DocumentDB/databaseAccounts@2021-10-15' = { - name: resourceName - location: location - kind: 'GlobalDocumentDB' - properties: { - consistencyPolicy: { - defaultConsistencyLevel: 'BoundedStaleness' - maxIntervalInSeconds: 10 - maxStalenessPrefix: 200 - } - enableAnalyticalStorage: false - isVirtualNetworkFilterEnabled: false - locations: [ - { - failoverPriority: 0 - isZoneRedundant: false - locationName: 'West Europe' - } - ] - defaultIdentity: 'FirstPartyIdentity' - disableKeyBasedMetadataWriteAccess: false - enableAutomaticFailover: false - enableFreeTier: false - ipRules: [] - networkAclBypass: 'None' - networkAclBypassResourceIds: [] - publicNetworkAccess: 'Enabled' - capabilities: [] - enableMultipleWriteLocations: false - databaseAccountOfferType: 'Standard' - disableLocalAuth: false - virtualNetworkRules: [] - } -} - resource linker 'Microsoft.ServiceLinker/linkers@2022-05-01' = { name: resourceName scope: deployment diff --git a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep index 8e75d4bd..5bb12955 100644 --- a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep +++ b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/associations/main.bicep @@ -1,11 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource trafficController 'Microsoft.ServiceNetworking/trafficControllers@2023-11-01' = { - name: '${resourceName}-tc' - location: location -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: '${resourceName}-vnet' location: location @@ -23,33 +18,38 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { } } -resource association 'Microsoft.ServiceNetworking/trafficControllers/associations@2023-11-01' = { - name: '${resourceName}-assoc' - location: location - parent: trafficController - properties: { - associationType: 'subnets' - subnet: {} - } -} - resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: '${resourceName}-subnet' parent: virtualNetwork properties: { + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.1.0/24' defaultOutboundAccess: true delegations: [ { + name: 'delegation' properties: { serviceName: 'Microsoft.ServiceNetworking/trafficControllers' } - name: 'delegation' } ] privateEndpointNetworkPolicies: 'Disabled' - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - addressPrefix: '10.0.1.0/24' + } +} + +resource trafficController 'Microsoft.ServiceNetworking/trafficControllers@2023-11-01' = { + name: '${resourceName}-tc' + location: location +} + +resource association 'Microsoft.ServiceNetworking/trafficControllers/associations@2023-11-01' = { + name: '${resourceName}-assoc' + location: location + parent: trafficController + properties: { + associationType: 'subnets' + subnet: {} } } diff --git a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep index af33f2f6..d1d08bcd 100644 --- a/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep +++ b/settings/remarks/microsoft.servicenetworking/samples/trafficcontrollers/frontends/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westus' +param resourceName string = 'acctest0001' resource trafficController 'Microsoft.ServiceNetworking/trafficControllers@2023-11-01' = { name: resourceName diff --git a/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep b/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep index c12288a2..3b6281c8 100644 --- a/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/signalr/main.bicep @@ -9,26 +9,7 @@ resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { name: 'Standard_S1' } properties: { - resourceLogConfiguration: { - categories: [ - { - enabled: 'false' - name: 'MessagingLogs' - } - { - name: 'ConnectivityLogs' - enabled: 'false' - } - { - name: 'HttpRequestLogs' - enabled: 'false' - } - ] - } - upstream: { - templates: [] - } - cors: {} + disableAadAuth: false features: [ { flag: 'ServiceMode' @@ -43,18 +24,37 @@ resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { value: 'False' } { - flag: 'EnableLiveTrace' value: 'False' + flag: 'EnableLiveTrace' } ] publicNetworkAccess: 'Enabled' serverless: { connectionTimeoutInSeconds: 30 } + cors: {} + disableLocalAuth: false + resourceLogConfiguration: { + categories: [ + { + enabled: 'false' + name: 'MessagingLogs' + } + { + enabled: 'false' + name: 'ConnectivityLogs' + } + { + enabled: 'false' + name: 'HttpRequestLogs' + } + ] + } tls: { clientCertEnabled: false } - disableAadAuth: false - disableLocalAuth: false + upstream: { + templates: [] + } } } diff --git a/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep b/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep index e1f1840d..9f78b002 100644 --- a/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/signalr/sharedprivatelinkresources/main.bicep @@ -9,7 +9,25 @@ resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { name: 'Standard_S1' } properties: { - cors: {} + resourceLogConfiguration: { + categories: [ + { + name: 'MessagingLogs' + enabled: 'false' + } + { + enabled: 'false' + name: 'ConnectivityLogs' + } + { + enabled: 'false' + name: 'HttpRequestLogs' + } + ] + } + tls: { + clientCertEnabled: false + } disableLocalAuth: false features: [ { @@ -29,33 +47,15 @@ resource signalR 'Microsoft.SignalRService/signalR@2023-02-01' = { value: 'False' } ] - publicNetworkAccess: 'Enabled' serverless: { connectionTimeoutInSeconds: 30 } upstream: { templates: [] } + cors: {} disableAadAuth: false - resourceLogConfiguration: { - categories: [ - { - name: 'MessagingLogs' - enabled: 'false' - } - { - enabled: 'false' - name: 'ConnectivityLogs' - } - { - name: 'HttpRequestLogs' - enabled: 'false' - } - ] - } - tls: { - clientCertEnabled: false - } + publicNetworkAccess: 'Enabled' } } @@ -63,11 +63,11 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { - tenantId: tenant() - createMode: 'default' - enabledForDeployment: false - enabledForDiskEncryption: false - softDeleteRetentionInDays: 7 + publicNetworkAccess: 'Enabled' + sku: { + name: 'standard' + family: 'A' + } accessPolicies: [ { objectId: deployer().objectId @@ -83,17 +83,17 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { ] storage: [] } - tenantId: tenant() + tenantId: tenant().tenantId } ] enableRbacAuthorization: false enableSoftDelete: true + enabledForDiskEncryption: false + softDeleteRetentionInDays: 7 + tenantId: tenant().tenantId + createMode: 'default' + enabledForDeployment: false enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' - sku: { - family: 'A' - name: 'standard' - } } } @@ -101,8 +101,8 @@ resource sharedPrivateLinkResource 'Microsoft.SignalRService/signalR/sharedPriva name: resourceName parent: signalR properties: { + privateLinkResourceId: vault.id requestMessage: 'please approve' groupId: 'vault' - privateLinkResourceId: vault.id } } diff --git a/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep b/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep index 377ec535..c2d656bb 100644 --- a/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/webpubsub/hubs/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { name: resourceName @@ -9,12 +9,12 @@ resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { name: 'Standard_S1' } properties: { - disableAadAuth: false - disableLocalAuth: false publicNetworkAccess: 'Enabled' tls: { clientCertEnabled: false } + disableAadAuth: false + disableLocalAuth: false } } diff --git a/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep b/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep index 1a663682..01695541 100644 --- a/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep +++ b/settings/remarks/microsoft.signalrservice/samples/webpubsub/sharedprivatelinkresources/main.bicep @@ -1,25 +1,51 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' +resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { + name: resourceName + location: location + sku: { + capacity: 1 + name: 'Standard_S1' + } + properties: { + disableAadAuth: false + disableLocalAuth: false + publicNetworkAccess: 'Enabled' + tls: { + clientCertEnabled: false + } + } +} + +resource sharedPrivateLinkResource 'Microsoft.SignalRService/webPubSub/sharedPrivateLinkResources@2023-02-01' = { + name: resourceName + parent: webPubSub + properties: { + groupId: 'vault' + privateLinkResourceId: vault.id + } +} + resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { name: resourceName location: location properties: { + createMode: 'default' + enableRbacAuthorization: false enabledForDeployment: false - enabledForDiskEncryption: false - enabledForTemplateDeployment: false - publicNetworkAccess: 'Enabled' sku: { - family: 'A' name: 'standard' + family: 'A' } - tenantId: tenant() - createMode: 'default' - enableRbacAuthorization: false softDeleteRetentionInDays: 7 + enableSoftDelete: true + enabledForDiskEncryption: false + enabledForTemplateDeployment: false + publicNetworkAccess: 'Enabled' + tenantId: tenant().tenantId accessPolicies: [ { - objectId: deployer().objectId permissions: { certificates: [ 'ManageContacts' @@ -32,35 +58,9 @@ resource vault 'Microsoft.KeyVault/vaults@2021-10-01' = { ] storage: [] } - tenantId: tenant() + tenantId: tenant().tenantId + objectId: deployer().objectId } ] - enableSoftDelete: true - } -} - -resource webPubSub 'Microsoft.SignalRService/webPubSub@2023-02-01' = { - name: resourceName - location: location - sku: { - capacity: 1 - name: 'Standard_S1' - } - properties: { - publicNetworkAccess: 'Enabled' - tls: { - clientCertEnabled: false - } - disableAadAuth: false - disableLocalAuth: false - } -} - -resource sharedPrivateLinkResource 'Microsoft.SignalRService/webPubSub/sharedPrivateLinkResources@2023-02-01' = { - name: resourceName - parent: webPubSub - properties: { - groupId: 'vault' - privateLinkResourceId: vault.id } } diff --git a/settings/remarks/microsoft.solutions/samples/applications/main.bicep b/settings/remarks/microsoft.solutions/samples/applications/main.bicep index 1d45ce54..e2ad5e10 100644 --- a/settings/remarks/microsoft.solutions/samples/applications/main.bicep +++ b/settings/remarks/microsoft.solutions/samples/applications/main.bicep @@ -6,8 +6,14 @@ resource application 'Microsoft.Solutions/applications@2021-07-01' = { location: location kind: 'ServiceCatalog' properties: { - managedResourceGroupId: '/subscriptions/${subscription()}/resourceGroups/${resourceName}-infragroup' + managedResourceGroupId: '/subscriptions/${subscription().subscriptionId}/resourceGroups/${resourceName}-infragroup' parameters: { + secureStringParameter: { + value: '' + } + stringParameter: { + value: 'value_1' + } arrayParameter: { value: [ 'value_1' @@ -22,22 +28,16 @@ resource application 'Microsoft.Solutions/applications@2021-07-01' = { } objectParameter: { value: { - nested_bool: true - nested_object: { - key_0: 0 - } nested_array: [ 'value_1' 'value_2' ] + nested_bool: true + nested_object: { + key_0: 0 + } } } - secureStringParameter: { - value: '' - } - stringParameter: { - value: 'value_1' - } } } } @@ -46,17 +46,17 @@ resource applicationDefinition 'Microsoft.Solutions/applicationDefinitions@2021- name: '${resourceName}-appdef' location: location properties: { + description: 'Test Managed App Definition' + displayName: 'TestManagedAppDefinition' + isEnabled: true + lockLevel: 'ReadOnly' + mainTemplate: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} authorizations: [ { - principalId: deployer().objectId roleDefinitionId: 'b24988ac-6180-42a0-ab88-20f7382dd24c' + principalId: deployer().objectId } ] createUiDefinition: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} - description: 'Test Managed App Definition' - displayName: 'TestManagedAppDefinition' - isEnabled: true - lockLevel: 'ReadOnly' - mainTemplate: /* ERROR: Unparsed HCL syntax in LiteralNode */ {} } } diff --git a/settings/remarks/microsoft.sql/samples/instancepools/main.bicep b/settings/remarks/microsoft.sql/samples/instancepools/main.bicep index fc4b7939..266b8053 100644 --- a/settings/remarks/microsoft.sql/samples/instancepools/main.bicep +++ b/settings/remarks/microsoft.sql/samples/instancepools/main.bicep @@ -6,6 +6,46 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2023-04-01' existing parent: virtualNetwork } +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + subnets: [ + { + name: 'Default' + properties: { + addressPrefix: '10.0.0.0/24' + } + } + { + name: resourceName + properties: { + addressPrefix: '10.0.1.0/24' + networkSecurityGroup: { + id: networkSecurityGroup.id + } + routeTable: { + id: routeTable.id + } + delegations: [ + { + name: 'miDelegation' + properties: { + serviceName: 'Microsoft.Sql/managedInstances' + } + } + ] + } + } + ] + } +} + resource instancePool 'Microsoft.Sql/instancePools@2022-05-01-preview' = { name: resourceName location: 'azapi_resource.resourceGroup.location' @@ -27,116 +67,116 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2023-04-0 properties: { securityRules: [ { + name: 'allow_tds_inbound' properties: { + sourceAddressPrefix: 'VirtualNetwork' sourcePortRange: '*' access: 'Allow' description: 'Allow access to data' destinationAddressPrefix: '*' - destinationPortRange: '1433' priority: 1000 + destinationPortRange: '1433' direction: 'Inbound' protocol: 'TCP' - sourceAddressPrefix: 'VirtualNetwork' } - name: 'allow_tds_inbound' } { - name: 'allow_redirect_inbound' properties: { - description: 'Allow inbound redirect traffic to Managed Instance inside the virtual network' - destinationAddressPrefix: '*' - destinationPortRange: '11000-11999' - protocol: 'Tcp' + direction: 'Inbound' sourceAddressPrefix: 'VirtualNetwork' sourcePortRange: '*' access: 'Allow' - direction: 'Inbound' + description: 'Allow inbound redirect traffic to Managed Instance inside the virtual network' + destinationAddressPrefix: '*' + destinationPortRange: '11000-11999' priority: 1100 + protocol: 'Tcp' } + name: 'allow_redirect_inbound' } { name: 'allow_geodr_inbound' properties: { - description: 'Allow inbound geodr traffic inside the virtual network' - priority: 1200 - sourceAddressPrefix: 'VirtualNetwork' - sourcePortRange: '*' destinationAddressPrefix: '*' + description: 'Allow inbound geodr traffic inside the virtual network' destinationPortRange: '5022' direction: 'Inbound' + priority: 1200 protocol: 'Tcp' + sourceAddressPrefix: 'VirtualNetwork' + sourcePortRange: '*' access: 'Allow' } } { name: 'deny_all_inbound' properties: { - protocol: '*' - sourcePortRange: '*' + destinationAddressPrefix: '*' destinationPortRange: '*' direction: 'Inbound' - sourceAddressPrefix: '*' - access: 'Deny' + sourcePortRange: '*' description: 'Deny all other inbound traffic' - destinationAddressPrefix: '*' priority: 4096 + protocol: '*' + sourceAddressPrefix: '*' + access: 'Deny' } } { name: 'allow_linkedserver_outbound' properties: { - destinationAddressPrefix: 'VirtualNetwork' - access: 'Allow' description: 'Allow outbound linkedserver traffic inside the virtual network' + destinationAddressPrefix: 'VirtualNetwork' destinationPortRange: '1433' direction: 'Outbound' + sourcePortRange: '*' priority: 1000 protocol: 'Tcp' sourceAddressPrefix: '*' - sourcePortRange: '*' + access: 'Allow' } } { name: 'allow_redirect_outbound' properties: { + access: 'Allow' + description: 'Allow outbound redirect traffic to Managed Instance inside the virtual network' destinationPortRange: '11000-11999' - direction: 'Outbound' + priority: 1100 protocol: 'Tcp' sourcePortRange: '*' - access: 'Allow' destinationAddressPrefix: 'VirtualNetwork' - priority: 1100 + direction: 'Outbound' sourceAddressPrefix: '*' - description: 'Allow outbound redirect traffic to Managed Instance inside the virtual network' } } { name: 'allow_geodr_outbound' properties: { - destinationAddressPrefix: 'VirtualNetwork' protocol: 'Tcp' - access: 'Allow' + sourcePortRange: '*' description: 'Allow outbound geodr traffic inside the virtual network' + destinationAddressPrefix: 'VirtualNetwork' destinationPortRange: '5022' + sourceAddressPrefix: '*' + access: 'Allow' direction: 'Outbound' priority: 1200 - sourceAddressPrefix: '*' - sourcePortRange: '*' } } { + name: 'deny_all_outbound' properties: { destinationPortRange: '*' - protocol: '*' + sourcePortRange: '*' access: 'Deny' description: 'Deny all other outbound traffic' direction: 'Outbound' priority: 4096 + protocol: '*' sourceAddressPrefix: '*' - sourcePortRange: '*' destinationAddressPrefix: '*' } - name: 'deny_all_outbound' } ] } @@ -149,43 +189,3 @@ resource routeTable 'Microsoft.Network/routeTables@2023-04-01' = { disableBgpRoutePropagation: false } } - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2023-04-01' = { - name: resourceName - location: 'azapi_resource.resourceGroup.location' - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - subnets: [ - { - properties: { - addressPrefix: '10.0.0.0/24' - } - name: 'Default' - } - { - name: resourceName - properties: { - addressPrefix: '10.0.1.0/24' - networkSecurityGroup: { - id: networkSecurityGroup.id - } - routeTable: { - id: routeTable.id - } - delegations: [ - { - name: 'miDelegation' - properties: { - serviceName: 'Microsoft.Sql/managedInstances' - } - } - ] - } - } - ] - } -} diff --git a/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep b/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep index 3a65b0a4..03e838ab 100644 --- a/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/administrators/main.bicep @@ -1,8 +1,8 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string -param resourceName string = 'acctest0001' -param location string = 'westeurope' param clientId string @@ -10,9 +10,9 @@ resource server 'Microsoft.Sql/servers@2015-05-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' administratorLoginPassword: '${administratorLoginPassword}' version: '12.0' + administratorLogin: 'mradministrator' } } @@ -23,6 +23,6 @@ resource administrator 'Microsoft.Sql/servers/administrators@2020-11-01-preview' administratorType: 'ActiveDirectory' login: 'sqladmin' sid: clientId - tenantId: tenant() + tenantId: tenant().tenantId } } diff --git a/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep b/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep index d729f15e..a3fc1bc5 100644 --- a/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/auditingsettings/main.bicep @@ -8,12 +8,12 @@ resource server 'Microsoft.Sql/servers@2022-05-01-preview' = { name: resourceName location: location properties: { - version: '12.0' - administratorLogin: 'mradministrator' - administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' + version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep b/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep index 6fd7f0ce..404097f8 100644 --- a/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/connectionpolicies/main.bicep @@ -10,12 +10,12 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' administratorLogin: '${administratorLogin}' administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep b/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep index 8da3fc3d..dada6c33 100644 --- a/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/databases/main.bicep @@ -22,16 +22,16 @@ resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { location: location parent: server properties: { + isLedgerOn: false + licenseType: 'LicenseIncluded' + maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') + minCapacity: 0 + requestedBackupStorageRedundancy: 'Geo' + elasticPoolId: '' readScale: 'Disabled' zoneRedundant: false autoPauseDelay: 0 createMode: 'Default' highAvailabilityReplicaCount: 0 - isLedgerOn: false - requestedBackupStorageRedundancy: 'Geo' - elasticPoolId: '' - licenseType: 'LicenseIncluded' - maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') - minCapacity: 0 } } diff --git a/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep b/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep index ff2ff6a9..503597a9 100644 --- a/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/databases/securityalertpolicies/main.bicep @@ -1,19 +1,19 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: 'mradministrator' - administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' } } @@ -22,17 +22,17 @@ resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { location: location parent: server properties: { - createMode: 'Default' elasticPoolId: '' highAvailabilityReplicaCount: 0 isLedgerOn: false - requestedBackupStorageRedundancy: 'Geo' - autoPauseDelay: 0 - licenseType: 'LicenseIncluded' maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') + zoneRedundant: false + createMode: 'Default' + licenseType: 'LicenseIncluded' minCapacity: 0 readScale: 'Disabled' - zoneRedundant: false + requestedBackupStorageRedundancy: 'Geo' + autoPauseDelay: 0 } } diff --git a/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep b/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep index a24675da..0936bd3f 100644 --- a/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/databases/transparentdataencryption/main.bicep @@ -8,12 +8,12 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' administratorLogin: 'mradministrator' + administratorLoginPassword: '${administratorLoginPassword}' } } @@ -22,17 +22,17 @@ resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { location: location parent: server properties: { - zoneRedundant: false autoPauseDelay: 0 createMode: 'Default' - highAvailabilityReplicaCount: 0 - licenseType: 'LicenseIncluded' - readScale: 'Disabled' - elasticPoolId: '' isLedgerOn: false maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') - minCapacity: 0 + readScale: 'Disabled' requestedBackupStorageRedundancy: 'Geo' + elasticPoolId: '' + highAvailabilityReplicaCount: 0 + licenseType: 'LicenseIncluded' + minCapacity: 0 + zoneRedundant: false } } diff --git a/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep b/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep index 3921fb87..4065a056 100644 --- a/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/dnsaliases/main.bicep @@ -10,12 +10,12 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: '${administratorLogin}' - administratorLoginPassword: '${administratorLoginPassword}' - minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: '${administratorLogin}' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep b/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep index d4f3fb04..1b5895e2 100644 --- a/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/elasticpools/main.bicep @@ -1,19 +1,19 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' administratorLogin: '4dm1n157r470r' administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' } } @@ -22,10 +22,10 @@ resource elasticPool 'Microsoft.Sql/servers/elasticPools@2020-11-01-preview' = { location: location parent: server sku: { - tier: 'Basic' capacity: 50 family: '' name: 'BasicPool' + tier: 'Basic' } properties: { maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') diff --git a/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep b/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep index eb36c23c..a93bc54b 100644 --- a/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/encryptionprotector/main.bicep @@ -1,19 +1,19 @@ -param resourceName string = 'acctest0001' -param location string = 'westus' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westus' resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: resourceName location: location properties: { + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' administratorLogin: 'mradministrator' - administratorLoginPassword: '${administratorLoginPassword}' } } @@ -21,8 +21,8 @@ resource encryptionProtector 'Microsoft.Sql/servers/encryptionProtector@2023-08- name: 'current' parent: server properties: { + serverKeyType: 'ServiceManaged' autoRotationEnabled: false serverKeyName: '' - serverKeyType: 'ServiceManaged' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep b/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep index d5d0a05b..4eedfe3d 100644 --- a/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/failovergroups/main.bicep @@ -1,20 +1,20 @@ -@secure() -@description('The administrator login password for the SQL server') -param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westus' param secondaryLocation string = 'eastus' +@secure() +@description('The administrator login password for the SQL server') +param administratorLoginPassword string resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-primary' location: location properties: { - minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' administratorLogin: 'mradministrator' administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' } } @@ -22,12 +22,12 @@ resource server1 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-secondary' location: secondaryLocation properties: { - minimalTlsVersion: '1.2' - publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Disabled' version: '12.0' administratorLogin: 'mradministrator' administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: 'Disabled' } } @@ -39,21 +39,21 @@ resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { name: 'S1' } properties: { - createMode: 'Default' - minCapacity: 0 - readScale: 'Disabled' - zoneRedundant: false autoPauseDelay: 0 elasticPoolId: '' + licenseType: '' + readScale: 'Disabled' + requestedBackupStorageRedundancy: 'Geo' + collation: 'SQL_Latin1_General_CP1_CI_AS' + createMode: 'Default' encryptionProtectorAutoRotation: false isLedgerOn: false - secondaryType: '' + zoneRedundant: false + maxSizeBytes: 214748364800 + minCapacity: 0 highAvailabilityReplicaCount: 0 - requestedBackupStorageRedundancy: 'Geo' sampleName: '' - collation: 'SQL_Latin1_General_CP1_CI_AS' - licenseType: '' - maxSizeBytes: 214748364800 + secondaryType: '' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep b/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep index 57f42db0..c710a7de 100644 --- a/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/firewallrules/main.bicep @@ -8,12 +8,12 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' administratorLogin: 'msincredible' administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep index 0eb78bc6..85a254ed 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/credentials/main.bicep @@ -1,3 +1,6 @@ +@secure() +@description('The administrator login password for the SQL server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator username for the SQL server credential') @@ -5,9 +8,6 @@ param sqlAdminUsername string @secure() @description('The administrator password for the SQL server credential') param sqlAdminPassword string -@secure() -@description('The administrator login password for the SQL server') -param administratorLoginPassword string resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName @@ -22,24 +22,6 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { } } -resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { - name: resourceName - location: location - parent: server - properties: { - collation: 'SQL_Latin1_General_CP1_CI_AS' - createMode: 'Default' - elasticPoolId: '' - highAvailabilityReplicaCount: 0 - isLedgerOn: false - requestedBackupStorageRedundancy: 'Geo' - zoneRedundant: false - autoPauseDelay: 0 - minCapacity: 0 - readScale: 'Disabled' - } -} - resource jobAgent 'Microsoft.Sql/servers/jobAgents@2020-11-01-preview' = { name: resourceName location: location @@ -57,3 +39,21 @@ resource credential 'Microsoft.Sql/servers/jobAgents/credentials@2020-11-01-prev username: '${sqlAdminUsername}' } } + +resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { + name: resourceName + location: location + parent: server + properties: { + zoneRedundant: false + collation: 'SQL_Latin1_General_CP1_CI_AS' + isLedgerOn: false + minCapacity: 0 + autoPauseDelay: 0 + createMode: 'Default' + elasticPoolId: '' + highAvailabilityReplicaCount: 0 + readScale: 'Disabled' + requestedBackupStorageRedundancy: 'Geo' + } +} diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep index 13d16f9a..036fecaa 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/main.bicep @@ -1,19 +1,19 @@ +param resourceName string = 'acctest0001' param location string = 'westus' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string -param resourceName string = 'acctest0001' resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-server' location: location properties: { - administratorLoginPassword: '${administratorLoginPassword}' - minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' administratorLogin: '4dm1n157r470r' + administratorLoginPassword: '${administratorLoginPassword}' + minimalTlsVersion: '1.2' } } @@ -25,21 +25,21 @@ resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { name: 'S1' } properties: { - isLedgerOn: false - sampleName: '' - licenseType: '' - maintenanceConfigurationId: '/subscriptions/${subscription()}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' + collation: 'SQL_Latin1_General_CP1_CI_AS' minCapacity: 0 readScale: 'Disabled' - secondaryType: '' - zoneRedundant: false - collation: 'SQL_Latin1_General_CP1_CI_AS' elasticPoolId: '' encryptionProtectorAutoRotation: false highAvailabilityReplicaCount: 0 + isLedgerOn: false + licenseType: '' + maintenanceConfigurationId: '/subscriptions/${subscription().subscriptionId}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' + sampleName: '' + createMode: 'Default' requestedBackupStorageRedundancy: 'Geo' + zoneRedundant: false + secondaryType: '' autoPauseDelay: 0 - createMode: 'Default' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep index 6d8e9b67..36436d40 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/jobs/steps/main.bicep @@ -1,4 +1,3 @@ -param resourceName string = 'acctest0001' param location string = 'westus' @secure() @description('The administrator login password for the SQL server') @@ -6,6 +5,7 @@ param administratorLoginPassword string @secure() @description('The password for the SQL job credential') param jobCredentialPassword string +param resourceName string = 'acctest0001' var maintenanceConfigId = '/subscriptions/${subscription().subscriptionId}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' @@ -13,12 +13,12 @@ resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-server' location: location properties: { - version: '12.0' administratorLogin: '4dm1n157r470r' administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' + version: '12.0' } } @@ -34,11 +34,12 @@ resource jobAgent 'Microsoft.Sql/servers/jobAgents@2023-08-01-preview' = { } } -resource targetGroup 'Microsoft.Sql/servers/jobAgents/targetGroups@2023-08-01-preview' = { - name: '${resourceName}-target-group' +resource credential 'Microsoft.Sql/servers/jobAgents/credentials@2023-08-01-preview' = { + name: '${resourceName}-job-credential' parent: jobAgent properties: { - members: [] + password: '${jobCredentialPassword}' + username: 'testusername' } } @@ -50,18 +51,18 @@ resource job 'Microsoft.Sql/servers/jobAgents/jobs@2023-08-01-preview' = { } } +resource targetGroup 'Microsoft.Sql/servers/jobAgents/targetGroups@2023-08-01-preview' = { + name: '${resourceName}-target-group' + parent: jobAgent + properties: { + members: [] + } +} + resource step 'Microsoft.Sql/servers/jobAgents/jobs/steps@2023-08-01-preview' = { name: '${resourceName}-job-step' parent: job properties: { - credential: credential.id - executionOptions: { - retryAttempts: 10 - retryIntervalBackoffMultiplier: 2 - timeoutSeconds: 43200 - initialRetryIntervalSeconds: 1 - maximumRetryIntervalSeconds: 120 - } stepId: 1 targetGroup: targetGroup.id action: { @@ -72,6 +73,14 @@ resource step 'Microsoft.Sql/servers/jobAgents/jobs/steps@2023-08-01-preview' = ); ''' } + credential: credential.id + executionOptions: { + initialRetryIntervalSeconds: 1 + maximumRetryIntervalSeconds: 120 + retryAttempts: 10 + retryIntervalBackoffMultiplier: 2 + timeoutSeconds: 43200 + } } } @@ -83,17 +92,8 @@ resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { name: 'S1' } properties: { - maintenanceConfigurationId: '${maintenanceConfigId}' collation: 'SQL_Latin1_General_CP1_CI_AS' createMode: 'Default' - } -} - -resource credential 'Microsoft.Sql/servers/jobAgents/credentials@2023-08-01-preview' = { - name: '${resourceName}-job-credential' - parent: jobAgent - properties: { - password: '${jobCredentialPassword}' - username: 'testusername' + maintenanceConfigurationId: '${maintenanceConfigId}' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep index 718b5886..5702babf 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/main.bicep @@ -1,19 +1,19 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @secure() @description('The administrator password for the SQL server') param sqlAdministratorPassword string +param resourceName string = 'acctest0001' resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - administratorLogin: '4dministr4t0r' - administratorLoginPassword: '${sqlAdministratorPassword}' - minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' + administratorLogin: '4dministr4t0r' + administratorLoginPassword: '${sqlAdministratorPassword}' + minimalTlsVersion: '1.2' } } @@ -22,17 +22,17 @@ resource database 'Microsoft.Sql/servers/databases@2021-02-01-preview' = { location: location parent: server properties: { - autoPauseDelay: 0 - collation: 'SQL_Latin1_General_CP1_CI_AS' - createMode: 'Default' - elasticPoolId: '' - highAvailabilityReplicaCount: 0 isLedgerOn: false - minCapacity: 0 maintenanceConfigurationId: resourceId('Microsoft.Maintenance/publicMaintenanceConfigurations', 'SQL_Default') + minCapacity: 0 readScale: 'Disabled' - requestedBackupStorageRedundancy: 'Geo' zoneRedundant: false + collation: 'SQL_Latin1_General_CP1_CI_AS' + createMode: 'Default' + requestedBackupStorageRedundancy: 'Geo' + autoPauseDelay: 0 + elasticPoolId: '' + highAvailabilityReplicaCount: 0 } } diff --git a/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep b/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep index 4839a3bf..380ca882 100644 --- a/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/jobagents/targetgroups/main.bicep @@ -1,11 +1,11 @@ -param resourceName string = 'acctest0001' -param location string = 'centralus' @secure() @description('The administrator login password for the SQL server') param administratorLoginPassword string @secure() @description('The password for the SQL job credential') param jobCredentialPassword string +param resourceName string = 'acctest0001' +param location string = 'centralus' resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { name: '${resourceName}-server' @@ -20,6 +20,32 @@ resource server 'Microsoft.Sql/servers@2023-08-01-preview' = { } } +resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { + name: '${resourceName}-db' + location: location + parent: server + sku: { + name: 'S1' + } + properties: { + createMode: 'Default' + highAvailabilityReplicaCount: 0 + encryptionProtectorAutoRotation: false + zoneRedundant: false + autoPauseDelay: 0 + elasticPoolId: '' + licenseType: '' + readScale: 'Disabled' + requestedBackupStorageRedundancy: 'Geo' + secondaryType: '' + collation: 'SQL_Latin1_General_CP1_CI_AS' + isLedgerOn: false + maintenanceConfigurationId: '/subscriptions/${subscription().subscriptionId}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' + minCapacity: 0 + sampleName: '' + } +} + resource jobAgent 'Microsoft.Sql/servers/jobAgents@2023-08-01-preview' = { name: '${resourceName}-job-agent' location: location @@ -48,29 +74,3 @@ resource targetGroup 'Microsoft.Sql/servers/jobAgents/targetGroups@2023-08-01-pr members: [] } } - -resource database 'Microsoft.Sql/servers/databases@2023-08-01-preview' = { - name: '${resourceName}-db' - location: location - parent: server - sku: { - name: 'S1' - } - properties: { - licenseType: '' - requestedBackupStorageRedundancy: 'Geo' - highAvailabilityReplicaCount: 0 - readScale: 'Disabled' - sampleName: '' - zoneRedundant: false - createMode: 'Default' - minCapacity: 0 - secondaryType: '' - collation: 'SQL_Latin1_General_CP1_CI_AS' - elasticPoolId: '' - encryptionProtectorAutoRotation: false - maintenanceConfigurationId: '/subscriptions/${subscription()}/providers/Microsoft.Maintenance/publicMaintenanceConfigurations/SQL_Default' - autoPauseDelay: 0 - isLedgerOn: false - } -} diff --git a/settings/remarks/microsoft.sql/samples/servers/main.bicep b/settings/remarks/microsoft.sql/samples/servers/main.bicep index b8357cbc..aeaacac6 100644 --- a/settings/remarks/microsoft.sql/samples/servers/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/main.bicep @@ -8,11 +8,11 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - restrictOutboundNetworkAccess: 'Disabled' version: '12.0' administratorLogin: 'mradministrator' administratorLoginPassword: '${sqlAdministratorPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: 'Disabled' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep b/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep index 4eaa7723..ee37e2d7 100644 --- a/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/outboundfirewallrules/main.bicep @@ -8,12 +8,12 @@ resource server 'Microsoft.Sql/servers@2021-02-01-preview' = { name: resourceName location: location properties: { - publicNetworkAccess: 'Enabled' - restrictOutboundNetworkAccess: 'Enabled' - version: '12.0' administratorLogin: 'msincredible' administratorLoginPassword: '${adminPassword}' minimalTlsVersion: '1.2' + publicNetworkAccess: 'Enabled' + restrictOutboundNetworkAccess: 'Enabled' + version: '12.0' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep b/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep index 415f5d94..9923fcb9 100644 --- a/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/securityalertpolicies/main.bicep @@ -1,10 +1,10 @@ +@secure() +@description('The administrator login password for the SQL server') +param administratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The administrator login name for the SQL server') param administratorLogin string -@secure() -@description('The administrator login password for the SQL server') -param administratorLoginPassword string resource server 'Microsoft.Sql/servers@2015-05-01-preview' = { name: resourceName diff --git a/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep b/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep index 212fdf60..8626e2e9 100644 --- a/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/sqlvulnerabilityassessments/main.bicep @@ -8,12 +8,12 @@ resource server 'Microsoft.Sql/servers@2022-05-01-preview' = { name: resourceName location: location properties: { + administratorLoginPassword: '${administratorLoginPassword}' minimalTlsVersion: '1.2' publicNetworkAccess: 'Enabled' restrictOutboundNetworkAccess: 'Disabled' version: '12.0' administratorLogin: 'mradministrator' - administratorLoginPassword: '${administratorLoginPassword}' } } diff --git a/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep b/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep index 7482a201..439eb3d6 100644 --- a/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep +++ b/settings/remarks/microsoft.sql/samples/servers/virtualnetworkrules/main.bicep @@ -24,6 +24,9 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { + delegations: [] + privateEndpointNetworkPolicies: 'Enabled' + privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [ { @@ -31,9 +34,6 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { } ] addressPrefix: '10.7.28.0/25' - delegations: [] - privateEndpointNetworkPolicies: 'Enabled' - privateLinkServiceNetworkPolicies: 'Enabled' } } @@ -54,7 +54,7 @@ resource virtualNetworkRule 'Microsoft.Sql/servers/virtualNetworkRules@2020-11-0 name: resourceName parent: server properties: { - virtualNetworkSubnetId: subnet.id ignoreMissingVnetServiceEndpoint: false + virtualNetworkSubnetId: subnet.id } } diff --git a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep index aa709e80..0622b60e 100644 --- a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep +++ b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachinegroups/main.bicep @@ -8,14 +8,14 @@ resource sqlVirtualMachineGroup 'Microsoft.SqlVirtualMachine/sqlVirtualMachineGr sqlImageOffer: 'SQL2017-WS2016' sqlImageSku: 'Developer' wsfcDomainProfile: { - clusterBootstrapAccount: '' - clusterSubnetType: 'SingleSubnet' - ouPath: '' - storageAccountUrl: '' clusterOperatorAccount: '' domainFqdn: 'testdomain.com' + ouPath: '' sqlServiceAccount: '' storageAccountPrimaryKey: '' + clusterBootstrapAccount: '' + clusterSubnetType: 'SingleSubnet' + storageAccountUrl: '' } } } diff --git a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep index 26e123cf..5746bd35 100644 --- a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep +++ b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/basic/main.bicep @@ -4,16 +4,34 @@ param location string = 'westeurope' @description('The administrator password for the SQL virtual machine') param vmAdminPassword string +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + sku: { + name: 'Basic' + tier: 'Regional' + } + properties: { + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + idleTimeoutInMinutes: 4 + ipTags: [] + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Dynamic' + } +} + resource sqlvirtualMachine 'Microsoft.SqlVirtualMachine/sqlVirtualMachines@2023-10-01' = { name: 'azapi_resource.virtualMachine.name' location: 'azapi_resource.virtualMachine.location' properties: { - sqlImageSku: 'Developer' - sqlManagement: 'Full' sqlServerLicenseType: 'PAYG' enableAutomaticUpgrade: true leastPrivilegeMode: 'Enabled' sqlImageOffer: 'SQL2017-WS2016' + sqlImageSku: 'Developer' + sqlManagement: 'Full' } } @@ -22,39 +40,39 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-07-01' = { location: 'azapi_resource.resourceGroup.location' properties: { osProfile: { + adminUsername: 'testadmin' + adminPassword: vmAdminPassword + allowExtensionOperations: true + computerName: 'winhost01' secrets: [] windowsConfiguration: { timeZone: 'Pacific Standard Time' enableAutomaticUpdates: true patchSettings: { - patchMode: 'AutomaticByOS' assessmentMode: 'ImageDefault' + patchMode: 'AutomaticByOS' } provisionVMAgent: true } - adminUsername: 'testadmin' - adminPassword: vmAdminPassword - allowExtensionOperations: true - computerName: 'winhost01' } storageProfile: { imageReference: { - version: 'latest' offer: 'SQL2017-WS2016' publisher: 'MicrosoftSQLServer' sku: 'SQLDEV' + version: 'latest' } osDisk: { - diskSizeGB: 127 managedDisk: { storageAccountType: 'Premium_LRS' } name: 'acctvm-250116171212663925OSDisk' - osType: 'Windows' writeAcceleratorEnabled: false caching: 'ReadOnly' - deleteOption: 'Detach' createOption: 'FromImage' + diskSizeGB: 127 + osType: 'Windows' + deleteOption: 'Detach' } dataDisks: [] } @@ -90,10 +108,10 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { + addressPrefix: '10.0.0.0/24' networkSecurityGroup: { id: networkSecurityGroup.id } - addressPrefix: '10.0.0.0/24' } } @@ -101,29 +119,29 @@ resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { name: resourceName location: 'azapi_resource.resourceGroup.location' properties: { - enableAcceleratedNetworking: false - nicType: 'Standard' - auxiliaryMode: 'None' - auxiliarySku: 'None' disableTcpStateTracking: false - enableIPForwarding: false + dnsSettings: { + dnsServers: [] + } ipConfigurations: [ { + type: 'Microsoft.Network/networkInterfaces/ipConfigurations' + name: 'testconfiguration1' properties: { - privateIPAddressVersion: 'IPv4' privateIPAllocationMethod: 'Dynamic' publicIPAddress: {} subnet: {} primary: true privateIPAddress: '10.0.0.4' + privateIPAddressVersion: 'IPv4' } - type: 'Microsoft.Network/networkInterfaces/ipConfigurations' - name: 'testconfiguration1' } ] - dnsSettings: { - dnsServers: [] - } + auxiliarySku: 'None' + enableAcceleratedNetworking: false + enableIPForwarding: false + nicType: 'Standard' + auxiliaryMode: 'None' } } @@ -135,38 +153,20 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2024-05-0 { name: 'MSSQLRule' properties: { - access: 'Allow' - destinationAddressPrefix: '*' destinationAddressPrefixes: [] + direction: 'Inbound' + sourceAddressPrefixes: [] + access: 'Allow' destinationPortRange: '1433' destinationPortRanges: [] priority: 1001 - sourceAddressPrefixes: [] - sourcePortRange: '*' - direction: 'Inbound' protocol: 'Tcp' sourceAddressPrefix: '167.220.255.0/25' + sourcePortRange: '*' sourcePortRanges: [] + destinationAddressPrefix: '*' } } ] } } - -resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { - name: resourceName - location: 'azapi_resource.resourceGroup.location' - sku: { - name: 'Basic' - tier: 'Regional' - } - properties: { - publicIPAllocationMethod: 'Dynamic' - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' - } - idleTimeoutInMinutes: 4 - ipTags: [] - publicIPAddressVersion: 'IPv4' - } -} diff --git a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep index d6df0ae2..e1a9fd74 100644 --- a/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep +++ b/settings/remarks/microsoft.sqlvirtualmachine/samples/sqlvirtualmachines/sqlbestpracticesassessment/main.bicep @@ -1,8 +1,38 @@ +param location string = 'westeurope' @secure() @description('The administrator password for the virtual machine') param adminPassword string param resourceName string = 'acctest0001' -param location string = 'westeurope' + +resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { + dnsSettings: { + dnsServers: [] + } + enableAcceleratedNetworking: false + nicType: 'Standard' + auxiliarySku: 'None' + enableIPForwarding: false + ipConfigurations: [ + { + type: 'Microsoft.Network/networkInterfaces/ipConfigurations' + name: 'testconfiguration1' + properties: { + privateIPAddressVersion: 'IPv4' + privateIPAllocationMethod: 'Dynamic' + publicIPAddress: {} + subnet: {} + primary: true + privateIPAddress: '10.0.0.4' + } + } + ] + auxiliaryMode: 'None' + disableTcpStateTracking: false + } +} resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2024-05-01' = { name: resourceName @@ -12,38 +42,46 @@ resource networkSecurityGroup 'Microsoft.Network/networkSecurityGroups@2024-05-0 { name: 'MSSQLRule' properties: { - protocol: 'Tcp' - sourceAddressPrefix: '167.220.255.0/25' + destinationAddressPrefix: '*' + destinationPortRange: '1433' sourcePortRange: '*' sourcePortRanges: [] access: 'Allow' destinationAddressPrefixes: [] - direction: 'Inbound' - sourceAddressPrefixes: [] - destinationAddressPrefix: '*' - destinationPortRange: '1433' destinationPortRanges: [] + direction: 'Inbound' priority: 1001 + protocol: 'Tcp' + sourceAddressPrefix: '167.220.255.0/25' + sourceAddressPrefixes: [] } } ] } } -resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-07-01' = { +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { name: resourceName location: 'azapi_resource.resourceGroup.location' + sku: { + name: 'Basic' + tier: 'Regional' + } properties: { - networkProfile: { - networkInterfaces: [ - { - properties: { - primary: false - } - id: networkInterface.id - } - ] + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' } + idleTimeoutInMinutes: 4 + ipTags: [] + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Dynamic' + } +} + +resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-07-01' = { + name: resourceName + location: 'azapi_resource.resourceGroup.location' + properties: { osProfile: { adminUsername: 'testadmin' adminPassword: adminPassword @@ -63,20 +101,20 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-07-01' = { storageProfile: { dataDisks: [] imageReference: { + offer: 'SQL2017-WS2016' publisher: 'MicrosoftSQLServer' sku: 'SQLDEV' version: 'latest' - offer: 'SQL2017-WS2016' } osDisk: { diskSizeGB: 127 managedDisk: { storageAccountType: 'Premium_LRS' } - name: 'acctvm-250116171212663925OSDisk' osType: 'Windows' - deleteOption: 'Detach' writeAcceleratorEnabled: false + deleteOption: 'Detach' + name: 'acctvm-250116171212663925OSDisk' caching: 'ReadOnly' createOption: 'FromImage' } @@ -84,55 +122,16 @@ resource virtualMachine 'Microsoft.Compute/virtualMachines@2024-07-01' = { hardwareProfile: { vmSize: 'Standard_F2s' } - } -} - -resource dataCollectionRuleAssociation 'Microsoft.Insights/dataCollectionRuleAssociations@2022-06-01' = { - name: 'azapi_resource.workspace.output.properties.customerId_azapi_resource.resourceGroup.location_DCRA_1' - scope: virtualMachine - properties: { - dataCollectionRuleId: dataCollectionRule.id - } -} - -resource extension 'Microsoft.Compute/virtualMachines/extensions@2024-07-01' = { - name: 'AzureMonitorWindowsAgent' - location: 'westeurope' - parent: virtualMachine - properties: { - publisher: 'Microsoft.Azure.Monitor' - suppressFailures: false - type: 'AzureMonitorWindowsAgent' - typeHandlerVersion: '1.0' - autoUpgradeMinorVersion: true - enableAutomaticUpgrade: true - } -} - -resource sqlvirtualMachine 'Microsoft.SqlVirtualMachine/sqlVirtualMachines@2023-10-01' = { - name: 'azapi_resource.virtualMachine.name' - location: 'azapi_resource.virtualMachine.location' - dependsOn: [ - dataCollectionRuleAssociation - extension - ] - properties: { - sqlImageSku: 'Developer' - sqlManagement: 'Full' - assessmentSettings: { - runImmediately: false - schedule: { - dayOfWeek: 'Monday' - enable: true - startTime: '00:00' - weeklyInterval: 1 - } - enable: true + networkProfile: { + networkInterfaces: [ + { + properties: { + primary: false + } + id: networkInterface.id + } + ] } - sqlServerLicenseType: 'PAYG' - enableAutomaticUpgrade: true - leastPrivilegeMode: 'Enabled' - sqlImageOffer: 'SQL2017-WS2016' } } @@ -178,16 +177,6 @@ resource table 'Microsoft.OperationalInsights/workspaces/tables@2023-09-01' = { } } -resource dataCollectionEndpoint 'Microsoft.Insights/dataCollectionEndpoints@2022-06-01' = { - name: '${location}-DCE-1' - location: 'azapi_resource.resourceGroup.location' - properties: { - networkAcls: { - publicNetworkAccess: 'Enabled' - } - } -} - resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' = { name: 'azapi_resource.workspace.output.properties.customerId_azapi_resource.resourceGroup.location_DCR_1' location: 'azapi_resource.resourceGroup.location' @@ -195,6 +184,26 @@ resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' table ] properties: { + dataSources: { + logFiles: [ + { + name: 'Custom-SqlAssessment_CL' + settings: { + text: { + recordStartTimestampFormat: 'ISO 8601' + } + } + streams: [ + 'Custom-SqlAssessment_CL' + ] + filePatterns: [ + 'C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\Microsoft SQL Server IaaS Agent\\Assessment\\*.csv' + ] + format: 'text' + } + ] + } + description: '' destinations: { logAnalytics: [ {} @@ -225,74 +234,55 @@ resource dataCollectionRule 'Microsoft.Insights/dataCollectionRules@2022-06-01' destinations: [] } ] - dataSources: { - logFiles: [ - { - filePatterns: [ - 'C:\\Windows\\System32\\config\\systemprofile\\AppData\\Local\\Microsoft SQL Server IaaS Agent\\Assessment\\*.csv' - ] - format: 'text' - name: 'Custom-SqlAssessment_CL' - settings: { - text: { - recordStartTimestampFormat: 'ISO 8601' - } - } - streams: [ - 'Custom-SqlAssessment_CL' - ] - } - ] - } - description: '' } } -resource networkInterface 'Microsoft.Network/networkInterfaces@2024-05-01' = { - name: resourceName - location: 'azapi_resource.resourceGroup.location' +resource dataCollectionRuleAssociation 'Microsoft.Insights/dataCollectionRuleAssociations@2022-06-01' = { + name: 'azapi_resource.workspace.output.properties.customerId_azapi_resource.resourceGroup.location_DCRA_1' + scope: virtualMachine properties: { - enableIPForwarding: false - nicType: 'Standard' - auxiliaryMode: 'None' - ipConfigurations: [ - { - name: 'testconfiguration1' - properties: { - publicIPAddress: {} - subnet: {} - primary: true - privateIPAddress: '10.0.0.4' - privateIPAddressVersion: 'IPv4' - privateIPAllocationMethod: 'Dynamic' - } - type: 'Microsoft.Network/networkInterfaces/ipConfigurations' - } - ] - auxiliarySku: 'None' - disableTcpStateTracking: false - dnsSettings: { - dnsServers: [] - } - enableAcceleratedNetworking: false + dataCollectionRuleId: dataCollectionRule.id } } -resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { - name: resourceName - location: 'azapi_resource.resourceGroup.location' - sku: { - name: 'Basic' - tier: 'Regional' +resource extension 'Microsoft.Compute/virtualMachines/extensions@2024-07-01' = { + name: 'AzureMonitorWindowsAgent' + location: 'westeurope' + parent: virtualMachine + properties: { + publisher: 'Microsoft.Azure.Monitor' + suppressFailures: false + type: 'AzureMonitorWindowsAgent' + typeHandlerVersion: '1.0' + autoUpgradeMinorVersion: true + enableAutomaticUpgrade: true } +} + +resource sqlvirtualMachine 'Microsoft.SqlVirtualMachine/sqlVirtualMachines@2023-10-01' = { + name: 'azapi_resource.virtualMachine.name' + location: 'azapi_resource.virtualMachine.location' + dependsOn: [ + dataCollectionRuleAssociation + extension + ] properties: { - ipTags: [] - publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Dynamic' - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' + leastPrivilegeMode: 'Enabled' + sqlImageOffer: 'SQL2017-WS2016' + sqlImageSku: 'Developer' + sqlManagement: 'Full' + assessmentSettings: { + schedule: { + enable: true + startTime: '00:00' + weeklyInterval: 1 + dayOfWeek: 'Monday' + } + enable: true + runImmediately: false } - idleTimeoutInMinutes: 4 + sqlServerLicenseType: 'PAYG' + enableAutomaticUpgrade: true } } @@ -318,3 +308,13 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { } } } + +resource dataCollectionEndpoint 'Microsoft.Insights/dataCollectionEndpoints@2022-06-01' = { + name: '${location}-DCE-1' + location: 'azapi_resource.resourceGroup.location' + properties: { + networkAcls: { + publicNetworkAccess: 'Enabled' + } + } +} diff --git a/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep b/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep index 38d639a8..e4fd2c49 100644 --- a/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep +++ b/settings/remarks/microsoft.standbypool/samples/standbycontainergrouppools/basic/main.bicep @@ -5,22 +5,10 @@ resource containerGroupProfile 'Microsoft.ContainerInstance/containerGroupProfil name: '${resourceName}-contianerGroup' location: location properties: { - imageRegistryCredentials: [] - ipAddress: { - ports: [ - { - port: 8000 - protocol: 'TCP' - } - ] - type: 'Public' - } - osType: 'Linux' - sku: 'Standard' containers: [ { + name: 'mycontainergroupprofile' properties: { - command: [] environmentVariables: [] image: 'mcr.microsoft.com/azuredocs/aci-helloworld:latest' ports: [ @@ -30,29 +18,32 @@ resource containerGroupProfile 'Microsoft.ContainerInstance/containerGroupProfil ] resources: { requests: { - cpu: 1 memoryInGB: any('1.5') + cpu: 1 } } + command: [] } - name: 'mycontainergroupprofile' } ] + imageRegistryCredentials: [] + ipAddress: { + ports: [ + { + port: 8000 + protocol: 'TCP' + } + ] + type: 'Public' + } + osType: 'Linux' + sku: 'Standard' } } resource standbyContainerGroupPool 'Microsoft.StandbyPool/standbyContainerGroupPools@2025-03-01' = { name: '${resourceName}-CGPool' properties: { - containerGroupProperties: { - subnetIds: [ - {} - ] - containerGroupProfile: { - id: containerGroupProfile.id - revision: 1 - } - } elasticityProfile: { maxReadyCapacity: 5 refillPolicy: 'always' @@ -62,6 +53,15 @@ resource standbyContainerGroupPool 'Microsoft.StandbyPool/standbyContainerGroupP '2' '3' ] + containerGroupProperties: { + subnetIds: [ + {} + ] + containerGroupProfile: { + id: containerGroupProfile.id + revision: 1 + } + } } } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep index 1d7a7d15..c6c7498d 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/basic/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName @@ -9,8 +9,9 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - allowBlobPublicAccess: true + accessTier: 'Hot' allowCrossTenantReplication: true + allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -23,16 +24,15 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false + allowBlobPublicAccess: true minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' supportsHttpsTrafficOnly: true - accessTier: 'Hot' - allowSharedKeyAccess: true - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false } } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep index d6a97bd0..8bf8ac41 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/containers/immutabilitypolicies/main.bicep @@ -6,15 +6,6 @@ resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' parent: storageAccount } -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - sku: { - name: 'Standard_LRS' - } - properties: {} -} - resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { name: resourceName parent: blobService @@ -33,3 +24,12 @@ resource immutabilityPolicy 'Microsoft.Storage/storageAccounts/blobServices/cont immutabilityPeriodSinceCreationInDays: 4 } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + properties: {} +} diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep index ff84cf09..ef99cb37 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/blobservices/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName @@ -9,31 +9,31 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - allowCrossTenantReplication: true + accessTier: 'Hot' allowSharedKeyAccess: true - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - publicNetworkAccess: 'Enabled' defaultToOAuthAuthentication: false encryption: { - keySource: 'Microsoft.Storage' services: { - table: { + queue: { keyType: 'Service' } - queue: { + table: { keyType: 'Service' } } + keySource: 'Microsoft.Storage' } + isNfsV3Enabled: false + isSftpEnabled: false minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } - supportsHttpsTrafficOnly: true - accessTier: 'Hot' allowBlobPublicAccess: true + allowCrossTenantReplication: true + isHnsEnabled: false + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true } } @@ -41,6 +41,9 @@ resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2021-09-01' name: 'default' parent: storageAccount properties: { + containerDeleteRetentionPolicy: { + enabled: false + } cors: {} deleteRetentionPolicy: { enabled: false @@ -55,8 +58,5 @@ resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2021-09-01' changeFeed: { enabled: true } - containerDeleteRetentionPolicy: { - enabled: false - } } } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep index 877d45b7..c2c57f20 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/encryptionscopes/main.bicep @@ -9,8 +9,10 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } kind: 'StorageV2' properties: { - defaultToOAuthAuthentication: false - dnsEndpointType: 'Standard' + accessTier: 'Hot' + isHnsEnabled: false + isNfsV3Enabled: false + supportsHttpsTrafficOnly: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -22,24 +24,22 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - allowSharedKeyAccess: true + isLocalUserEnabled: true networkAcls: { - resourceAccessRules: [] - virtualNetworkRules: [] bypass: 'AzureServices' defaultAction: 'Allow' ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] } - minimumTlsVersion: 'TLS1_2' + isSftpEnabled: false publicNetworkAccess: 'Enabled' allowBlobPublicAccess: true allowCrossTenantReplication: false - isHnsEnabled: false - isLocalUserEnabled: true - isNfsV3Enabled: false - accessTier: 'Hot' - isSftpEnabled: false - supportsHttpsTrafficOnly: true + allowSharedKeyAccess: true + defaultToOAuthAuthentication: false + dnsEndpointType: 'Standard' + minimumTlsVersion: 'TLS1_2' } } @@ -50,24 +50,19 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { storageAccount ] properties: { - enablePurgeProtection: true enabledForDiskEncryption: false enabledForTemplateDeployment: false sku: { family: 'A' name: 'standard' } - tenantId: tenant() - createMode: 'default' - enableRbacAuthorization: false - enableSoftDelete: true - enabledForDeployment: false - publicNetworkAccess: 'Enabled' + tenantId: tenant().tenantId accessPolicies: [ { - tenantId: tenant() objectId: deployer().objectId permissions: { + secrets: [] + storage: [] certificates: [] keys: [ 'Get' @@ -85,9 +80,8 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { 'Verify' 'GetRotationPolicy' ] - secrets: [] - storage: [] } + tenantId: tenant().tenantId } { objectId: storageAccount.identity.principalId @@ -101,9 +95,15 @@ resource vault 'Microsoft.KeyVault/vaults@2023-02-01' = { secrets: [] storage: [] } - tenantId: tenant() + tenantId: tenant().tenantId } ] + createMode: 'default' + publicNetworkAccess: 'Enabled' + enablePurgeProtection: true + enableRbacAuthorization: false + enableSoftDelete: true + enabledForDeployment: false } } @@ -114,9 +114,9 @@ resource encryptionScope 'Microsoft.Storage/storageAccounts/encryptionScopes@202 vault ] properties: { - keyVaultProperties: {} source: 'Microsoft.KeyVault' state: 'Enabled' + keyVaultProperties: {} } } @@ -124,8 +124,6 @@ resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { name: '${resourceName}-key' parent: vault properties: { - keySize: 2048 - kty: 'RSA' keyOps: [ 'encrypt' 'decrypt' @@ -134,5 +132,7 @@ resource key 'Microsoft.KeyVault/vaults/keys@2023-02-01' = { 'wrapKey' 'unwrapKey' ] + keySize: 2048 + kty: 'RSA' } } diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep index 477c7d7f..2bba7735 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/localusers/basic/main.bicep @@ -9,29 +9,29 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + allowBlobPublicAccess: true allowCrossTenantReplication: true allowSharedKeyAccess: true - defaultToOAuthAuthentication: false isHnsEnabled: false - isNfsV3Enabled: false isSftpEnabled: false networkAcls: { defaultAction: 'Allow' } publicNetworkAccess: 'Enabled' accessTier: 'Hot' - allowBlobPublicAccess: true + defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { - queue: { + table: { keyType: 'Service' } - table: { + queue: { keyType: 'Service' } } } + isNfsV3Enabled: false minimumTlsVersion: 'TLS1_2' supportsHttpsTrafficOnly: true } @@ -44,9 +44,9 @@ resource localUser 'Microsoft.Storage/storageAccounts/localUsers@2021-09-01' = { homeDirectory: 'containername/' permissionScopes: [ { - permissions: 'cwl' resourceName: 'containername' service: 'blob' + permissions: 'cwl' } ] hasSharedKey: true diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep index 370418ed..511f5e34 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/managementpolicies/main.bicep @@ -9,7 +9,8 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'BlobStorage' properties: { - accessTier: 'Hot' + allowCrossTenantReplication: true + allowSharedKeyAccess: true defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' @@ -23,17 +24,16 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } isHnsEnabled: false - minimumTlsVersion: 'TLS1_2' + isNfsV3Enabled: false + isSftpEnabled: false networkAcls: { defaultAction: 'Allow' } - supportsHttpsTrafficOnly: true + accessTier: 'Hot' allowBlobPublicAccess: true - allowCrossTenantReplication: true - allowSharedKeyAccess: true - isNfsV3Enabled: false - isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true } } @@ -46,30 +46,30 @@ resource managementPolicy 'Microsoft.Storage/storageAccounts/managementPolicies@ { definition: { actions: { - snapshot: { - delete: { - daysAfterCreationGreaterThan: 30 - } - } baseBlob: { - tierToCool: { - daysAfterModificationGreaterThan: 10 - } delete: { daysAfterModificationGreaterThan: 100 } tierToArchive: { daysAfterModificationGreaterThan: 50 } + tierToCool: { + daysAfterModificationGreaterThan: 10 + } + } + snapshot: { + delete: { + daysAfterCreationGreaterThan: 30 + } } } filters: { - prefixMatch: [ - 'container1/prefix1' - ] blobTypes: [ 'blockBlob' ] + prefixMatch: [ + 'container1/prefix1' + ] } } enabled: true diff --git a/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep b/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep index cbe8a4e8..72b6812f 100644 --- a/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep +++ b/settings/remarks/microsoft.storage/samples/storageaccounts/queueservices/queues/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource queueService 'Microsoft.Storage/storageAccounts/queueServices@2022-09-01' existing = { name: 'default' diff --git a/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep b/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep index 48df250c..a4915687 100644 --- a/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep +++ b/settings/remarks/microsoft.storagecache/samples/amlfilesystems/main.bicep @@ -9,8 +9,8 @@ resource amlFilesystem 'Microsoft.StorageCache/amlFilesystems@2024-07-01' = { } properties: { maintenanceWindow: { - timeOfDayUTC: '22:00' dayOfWeek: 'Friday' + timeOfDayUTC: '22:00' } storageCapacityTiB: 8 } @@ -37,12 +37,12 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: '${resourceName}-subnet' parent: virtualNetwork properties: { - delegations: [] - privateEndpointNetworkPolicies: 'Disabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] addressPrefix: '10.0.2.0/24' defaultOutboundAccess: true + delegations: [] + privateEndpointNetworkPolicies: 'Disabled' } } diff --git a/settings/remarks/microsoft.storagecache/samples/caches/main.bicep b/settings/remarks/microsoft.storagecache/samples/caches/main.bicep index d2298ea9..cde84303 100644 --- a/settings/remarks/microsoft.storagecache/samples/caches/main.bicep +++ b/settings/remarks/microsoft.storagecache/samples/caches/main.bicep @@ -1,21 +1,6 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource cach 'Microsoft.StorageCache/caches@2023-01-01' = { - name: resourceName - location: location - sku: { - name: 'Standard_2G' - } - properties: { - cacheSizeGB: 3072 - networkSettings: { - mtu: 1500 - ntpServer: 'time.windows.com' - } - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2022-07-01' = { name: resourceName location: location @@ -36,11 +21,26 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2022-07-01' = { name: resourceName parent: virtualNetwork properties: { + privateEndpointNetworkPolicies: 'Enabled' privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] addressPrefix: '10.0.2.0/24' delegations: [] - privateEndpointNetworkPolicies: 'Enabled' + } +} + +resource cach 'Microsoft.StorageCache/caches@2023-01-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_2G' + } + properties: { + cacheSizeGB: 3072 + networkSettings: { + mtu: 1500 + ntpServer: 'time.windows.com' + } } } diff --git a/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep b/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep index 6e20b39e..586d5994 100644 --- a/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep +++ b/settings/remarks/microsoft.storagemover/samples/storagemovers/endpoints/main.bicep @@ -11,9 +11,9 @@ resource endpoint 'Microsoft.StorageMover/storageMovers/endpoints@2023-03-01' = name: resourceName parent: storageMover properties: { - host: '192.168.0.1' - nfsVersion: 'NFSauto' endpointType: 'NfsMount' export: '' + host: '192.168.0.1' + nfsVersion: 'NFSauto' } } diff --git a/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep b/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep index 58772540..3205bffa 100644 --- a/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep +++ b/settings/remarks/microsoft.storagemover/samples/storagemovers/projects/main.bicep @@ -1,5 +1,5 @@ -param location string = 'eastus' param resourceName string = 'acctest0001' +param location string = 'eastus' resource storageMover 'Microsoft.StorageMover/storageMovers@2023-03-01' = { name: resourceName diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep index 3bd60809..4a0356e6 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/functions/main.bicep @@ -5,20 +5,13 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { name: resourceName location: location properties: { - cluster: {} - compatibilityLevel: '1.0' contentStoragePolicy: 'SystemAccount' dataLocale: 'en-GB' eventsLateArrivalMaxDelayInSeconds: 60 - eventsOutOfOrderMaxDelayInSeconds: 50 - eventsOutOfOrderPolicy: 'Adjust' - outputErrorPolicy: 'Drop' - jobType: 'Cloud' sku: { name: 'Standard' } transformation: { - name: 'main' properties: { query: ''' SELECT * INTO [YourOutputAlias] @@ -26,7 +19,14 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { ''' streamingUnits: 3 } + name: 'main' } + cluster: {} + compatibilityLevel: '1.0' + eventsOutOfOrderMaxDelayInSeconds: 50 + eventsOutOfOrderPolicy: 'Adjust' + jobType: 'Cloud' + outputErrorPolicy: 'Drop' } } diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep index 7fe9571a..d9d1b348 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/inputs/main.bicep @@ -5,10 +5,11 @@ resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: resourceName location: location sku: { - name: 'S1' capacity: 1 + name: 'S1' } properties: { + cloudToDevice: {} enableFileUploadNotifications: false messagingEndpoints: {} routing: { @@ -22,7 +23,6 @@ resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { } } storageEndpoints: {} - cloudToDevice: {} } } @@ -30,18 +30,14 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { name: resourceName location: location properties: { - cluster: {} eventsOutOfOrderPolicy: 'Adjust' - outputErrorPolicy: 'Drop' - compatibilityLevel: '1.0' - contentStoragePolicy: 'SystemAccount' - dataLocale: 'en-GB' - eventsLateArrivalMaxDelayInSeconds: 60 - eventsOutOfOrderMaxDelayInSeconds: 50 jobType: 'Cloud' + outputErrorPolicy: 'Drop' sku: { name: 'Standard' } + dataLocale: 'en-GB' + eventsLateArrivalMaxDelayInSeconds: 60 transformation: { name: 'main' properties: { @@ -52,6 +48,10 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { streamingUnits: 3 } } + cluster: {} + compatibilityLevel: '1.0' + contentStoragePolicy: 'SystemAccount' + eventsOutOfOrderMaxDelayInSeconds: 50 } } @@ -59,13 +59,14 @@ resource input 'Microsoft.StreamAnalytics/streamingJobs/inputs@2020-03-01' = { name: resourceName parent: streamingJob properties: { + type: 'Stream' datasource: { properties: { - consumerGroupName: '$Default' - endpoint: 'messages/events' iotHubNamespace: iotHub.name sharedAccessPolicyKey: iotHub.listKeys().value[0].primaryKey sharedAccessPolicyName: 'iothubowner' + consumerGroupName: '$Default' + endpoint: 'messages/events' } type: 'Microsoft.Devices/IotHubs' } @@ -73,6 +74,5 @@ resource input 'Microsoft.StreamAnalytics/streamingJobs/inputs@2020-03-01' = { properties: {} type: 'Avro' } - type: 'Stream' } } diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep index d360808c..a88c6605 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/main.bicep @@ -5,12 +5,6 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { name: resourceName location: location properties: { - cluster: {} - compatibilityLevel: '1.0' - contentStoragePolicy: 'SystemAccount' - sku: { - name: 'Standard' - } transformation: { name: 'main' properties: { @@ -21,11 +15,17 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { streamingUnits: 3 } } - dataLocale: 'en-GB' + cluster: {} + contentStoragePolicy: 'SystemAccount' eventsLateArrivalMaxDelayInSeconds: 60 eventsOutOfOrderMaxDelayInSeconds: 50 eventsOutOfOrderPolicy: 'Adjust' jobType: 'Cloud' outputErrorPolicy: 'Drop' + sku: { + name: 'Standard' + } + compatibilityLevel: '1.0' + dataLocale: 'en-GB' } } diff --git a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep index 62b44850..7db0f5ab 100644 --- a/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep +++ b/settings/remarks/microsoft.streamanalytics/samples/streamingjobs/outputs/main.bicep @@ -9,13 +9,15 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { - accessTier: 'Hot' - allowSharedKeyAccess: true + allowCrossTenantReplication: true defaultToOAuthAuthentication: false + isHnsEnabled: false + isNfsV3Enabled: false + isSftpEnabled: false + minimumTlsVersion: 'TLS1_2' publicNetworkAccess: 'Enabled' - supportsHttpsTrafficOnly: true allowBlobPublicAccess: true - allowCrossTenantReplication: true + allowSharedKeyAccess: true encryption: { keySource: 'Microsoft.Storage' services: { @@ -27,13 +29,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false - isNfsV3Enabled: false - isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' networkAcls: { defaultAction: 'Allow' } + supportsHttpsTrafficOnly: true + accessTier: 'Hot' } } @@ -41,27 +41,27 @@ resource streamingJob 'Microsoft.StreamAnalytics/streamingJobs@2020-03-01' = { name: resourceName location: location properties: { - cluster: {} - contentStoragePolicy: 'SystemAccount' - eventsOutOfOrderMaxDelayInSeconds: 50 - jobType: 'Cloud' sku: { name: 'Standard' } transformation: { name: 'main' properties: { + streamingUnits: 3 query: ''' SELECT * INTO [YourOutputAlias] FROM [YourInputAlias] ''' - streamingUnits: 3 } } - compatibilityLevel: '1.0' + cluster: {} + contentStoragePolicy: 'SystemAccount' dataLocale: 'en-GB' - eventsLateArrivalMaxDelayInSeconds: 60 eventsOutOfOrderPolicy: 'Adjust' + jobType: 'Cloud' + compatibilityLevel: '1.0' + eventsLateArrivalMaxDelayInSeconds: 60 + eventsOutOfOrderMaxDelayInSeconds: 50 outputErrorPolicy: 'Drop' } } diff --git a/settings/remarks/microsoft.synapse/samples/privatelinkhubs/main.bicep b/settings/remarks/microsoft.synapse/samples/privatelinkhubs/main.bicep index 8670b092..551f0479 100644 --- a/settings/remarks/microsoft.synapse/samples/privatelinkhubs/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/privatelinkhubs/main.bicep @@ -1,5 +1,5 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' +param resourceName string = 'acctest0001' resource privateLinkHub 'Microsoft.Synapse/privateLinkHubs@2021-06-01' = { name: resourceName diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep index c16843d0..abc8f9dd 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/azureadonlyauthentications/main.bicep @@ -1,27 +1,37 @@ +@secure() +@description('The SQL administrator login password for the Synapse workspace') +param sqlAdministratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'eastus' @description('The SQL administrator login for the Synapse workspace') param sqlAdministratorLogin string -@secure() -@description('The SQL administrator login password for the Synapse workspace') -param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { name: 'default' parent: storageAccount } +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} + resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } @@ -42,13 +52,3 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } } } - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - sku: { - name: 'Standard_LRS' - } - kind: 'StorageV2' - properties: {} -} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep index b89c15b0..ecce946d 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/bigdatapools/main.bicep @@ -1,16 +1,26 @@ +@secure() +@description('The SQL administrator login password for the Synapse workspace') +param sqlAdministratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The SQL administrator login for the Synapse workspace') param sqlAdministratorLogin string -@secure() -@description('The SQL administrator login password for the Synapse workspace') -param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { name: 'default' parent: storageAccount } +resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { + name: resourceName + parent: blobService + properties: { + metadata: { + key: 'value' + } + } +} + resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -40,35 +50,25 @@ resource bigDataPool 'Microsoft.Synapse/workspaces/bigDataPools@2021-06-01-previ location: location parent: workspace properties: { - defaultSparkLogFolder: '/logs' - dynamicExecutorAllocation: { - enabled: false - maxExecutors: 0 - minExecutors: 0 - } - isComputeIsolationEnabled: false - nodeCount: 3 - nodeSizeFamily: 'MemoryOptimized' - sparkVersion: '2.4' autoPause: { enabled: false } autoScale: { enabled: false } - nodeSize: 'Small' + cacheSize: 0 + defaultSparkLogFolder: '/logs' + isComputeIsolationEnabled: false sessionLevelPackagesEnabled: false sparkEventsFolder: '/events' - cacheSize: 0 - } -} - -resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - name: resourceName - parent: blobService - properties: { - metadata: { - key: 'value' + dynamicExecutorAllocation: { + enabled: false + maxExecutors: 0 + minExecutors: 0 } + nodeCount: 3 + nodeSize: 'Small' + nodeSizeFamily: 'MemoryOptimized' + sparkVersion: '2.4' } } diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep index a1ab0845..3c4c2bf5 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/integrationruntimes/main.bicep @@ -1,10 +1,10 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The SQL administrator login for the Synapse workspace') param sqlAdministratorLogin string @secure() @description('The SQL administrator login password for the Synapse workspace') param sqlAdministratorLoginPassword string +param resourceName string = 'acctest0001' resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { name: 'default' @@ -15,13 +15,13 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs } managedVirtualNetwork: 'default' - publicNetworkAccess: 'Enabled' - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep index 1d8af93e..2d94fb29 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/main.bicep @@ -1,27 +1,37 @@ -param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The SQL administrator login name for the Synapse workspace') param sqlAdministratorLogin string @secure() @description('The SQL administrator login password for the Synapse workspace') param sqlAdministratorLoginPassword string +param resourceName string = 'acctest0001' resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { name: 'default' parent: storageAccount } +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} + resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs } managedVirtualNetwork: '' - publicNetworkAccess: 'Enabled' } } @@ -34,13 +44,3 @@ resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@20 } } } - -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - sku: { - name: 'Standard_LRS' - } - kind: 'StorageV2' - properties: {} -} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep index f6f9875f..4770284a 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/managedidentitysqlcontrolsettings/main.bicep @@ -1,16 +1,26 @@ +@secure() +@description('The SQL administrator login password for the Synapse workspace') +param sqlAdministratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' @description('The SQL administrator login name for the Synapse workspace') param sqlAdministratorLogin string -@secure() -@description('The SQL administrator login password for the Synapse workspace') -param sqlAdministratorLoginPassword string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { name: 'default' parent: storageAccount } +resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { + name: resourceName + parent: blobService + properties: { + metadata: { + key: 'value' + } + } +} + resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -25,13 +35,13 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } @@ -44,13 +54,3 @@ resource managedIdentitySqlControlSetting 'Microsoft.Synapse/workspaces/managedI } } } - -resource container 'Microsoft.Storage/storageAccounts/blobServices/containers@2022-09-01' = { - name: resourceName - parent: blobService - properties: { - metadata: { - key: 'value' - } - } -} diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep index 3d00c458..a2a0b5c9 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/securityalertpolicies/main.bicep @@ -25,13 +25,13 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' + sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs } managedVirtualNetwork: '' - publicNetworkAccess: 'Enabled' - sqlAdministratorLogin: sqlAdministratorLogin - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } @@ -39,9 +39,9 @@ resource securityAlertPolicy 'Microsoft.Synapse/workspaces/securityAlertPolicies name: 'Default' parent: workspace properties: { - state: 'Enabled' storageAccountAccessKey: storageAccount.listKeys().keys[0].value storageEndpoint: storageAccount.properties.primaryEndpoints.blob + state: 'Enabled' } } diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep index bfb38ac5..5419d72f 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/main.bicep @@ -25,13 +25,13 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { - sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin + sqlAdministratorLoginPassword: sqlAdministratorLoginPassword } } diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep index 2adcbb1e..88f0474c 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/vulnerabilityassessments/main.bicep @@ -1,10 +1,10 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @description('The SQL administrator login for the Synapse workspace') param sqlAdministratorLogin string @secure() @description('The SQL administrator login password for the Synapse workspace') param sqlAdministratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { name: 'default' @@ -25,13 +25,13 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { - managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs } + managedVirtualNetwork: '' } } @@ -61,7 +61,7 @@ resource vulnerabilityAssessment 'Microsoft.Synapse/workspaces/sqlPools/vulnerab name: 'default' parent: sqlPool properties: { - storageAccountAccessKey: storageAccount.listKeys().keys[0].value storageContainerPath: 'https://${storageAccount.name}.blob.core.windows.net/${container.name}/' + storageAccountAccessKey: storageAccount.listKeys().keys[0].value } } diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep index e49b01e0..4b7f983f 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/main.bicep @@ -1,10 +1,10 @@ +@description('The SQL administrator login for the Synapse workspace') +param sqlAdministratorLogin string @secure() @description('The SQL administrator login password for the Synapse workspace') param sqlAdministratorLoginPassword string param resourceName string = 'acctest0001' param location string = 'westeurope' -@description('The SQL administrator login for the Synapse workspace') -param sqlAdministratorLogin string resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { name: 'default' @@ -15,13 +15,13 @@ resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { + publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin sqlAdministratorLoginPassword: sqlAdministratorLoginPassword defaultDataLakeStorage: { accountUrl: storageAccount.properties.primaryEndpoints.dfs } managedVirtualNetwork: '' - publicNetworkAccess: 'Enabled' } } @@ -51,11 +51,11 @@ resource workloadGroup 'Microsoft.Synapse/workspaces/sqlPools/workloadGroups@202 name: resourceName parent: sqlPool properties: { - importance: 'normal' - maxResourcePercent: 100 maxResourcePercentPerRequest: 3 minResourcePercent: 0 minResourcePercentPerRequest: 3 + importance: 'normal' + maxResourcePercent: 100 } } diff --git a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep index ba681e3b..b63dc59c 100644 --- a/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep +++ b/settings/remarks/microsoft.synapse/samples/workspaces/sqlpools/workloadgroups/workloadclassifiers/main.bicep @@ -1,37 +1,27 @@ -param resourceName string = 'acctest0001' -param location string = 'westeurope' @description('The SQL administrator login for the Synapse workspace') param sqlAdministratorLogin string @secure() @description('The SQL administrator login password for the Synapse workspace') param sqlAdministratorLoginPassword string +param resourceName string = 'acctest0001' +param location string = 'westeurope' resource blobService 'Microsoft.Storage/storageAccounts/blobServices@2022-09-01' existing = { name: 'default' parent: storageAccount } -resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { - name: resourceName - location: location - sku: { - name: 'Standard_LRS' - } - kind: 'StorageV2' - properties: {} -} - resource workspace 'Microsoft.Synapse/workspaces@2021-06-01' = { name: resourceName location: location properties: { - defaultDataLakeStorage: { - accountUrl: storageAccount.properties.primaryEndpoints.dfs - } managedVirtualNetwork: '' publicNetworkAccess: 'Enabled' sqlAdministratorLogin: sqlAdministratorLogin sqlAdministratorLoginPassword: sqlAdministratorLoginPassword + defaultDataLakeStorage: { + accountUrl: storageAccount.properties.primaryEndpoints.dfs + } } } @@ -76,3 +66,13 @@ resource workloadClassifier 'Microsoft.Synapse/workspaces/sqlPools/workloadGroup memberName: 'dbo' } } + +resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { + name: resourceName + location: location + sku: { + name: 'Standard_LRS' + } + kind: 'StorageV2' + properties: {} +} diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep index 0fd1e511..004c77a4 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/accesspolicies/main.bicep @@ -19,10 +19,10 @@ resource accessPolicy 'Microsoft.TimeSeriesInsights/environments/accessPolicies@ name: resourceName parent: environment properties: { - description: '' - principalObjectId: 'aGUID' roles: [ 'Reader' ] + description: '' + principalObjectId: 'aGUID' } } diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep index 83fc0453..87c9724f 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/eventsources/main.bicep @@ -1,5 +1,41 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' + +resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { + name: resourceName + location: location + sku: { + name: 'L1' + capacity: 1 + } + kind: 'Gen2' + properties: { + storageConfiguration: { + managementKey: storageAccount.listKeys().keys[0].value + } + timeSeriesIdProperties: [ + { + name: 'id' + type: 'String' + } + ] + } +} + +resource eventSource 'Microsoft.TimeSeriesInsights/environments/eventSources@2020-05-15' = { + name: resourceName + location: location + parent: environment + kind: 'Microsoft.IoTHub' + properties: { + timestampPropertyName: '' + consumerGroupName: 'test' + eventSourceResourceId: iotHub.id + iotHubName: iotHub.name + keyName: 'iothubowner' + sharedAccessKey: iotHub.listKeys().value[0].primaryKey + } +} resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: resourceName @@ -9,6 +45,7 @@ resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { name: 'B1' } properties: { + storageEndpoints: {} cloudToDevice: {} enableFileUploadNotifications: false messagingEndpoints: {} @@ -22,34 +59,12 @@ resource iotHub 'Microsoft.Devices/IotHubs@2022-04-30-preview' = { source: 'DeviceMessages' } } - storageEndpoints: {} } tags: { purpose: 'testing' } } -resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { - name: resourceName - location: location - sku: { - capacity: 1 - name: 'L1' - } - kind: 'Gen2' - properties: { - storageConfiguration: { - managementKey: storageAccount.listKeys().keys[0].value - } - timeSeriesIdProperties: [ - { - name: 'id' - type: 'String' - } - ] - } -} - resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { name: resourceName location: location @@ -58,9 +73,14 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } kind: 'StorageV2' properties: { + isNfsV3Enabled: false + minimumTlsVersion: 'TLS1_2' + publicNetworkAccess: 'Enabled' + supportsHttpsTrafficOnly: true accessTier: 'Hot' - allowCrossTenantReplication: true + allowBlobPublicAccess: true allowSharedKeyAccess: true + defaultToOAuthAuthentication: false encryption: { keySource: 'Microsoft.Storage' services: { @@ -72,31 +92,11 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2021-09-01' = { } } } - isHnsEnabled: false isSftpEnabled: false - minimumTlsVersion: 'TLS1_2' - publicNetworkAccess: 'Enabled' - allowBlobPublicAccess: true - defaultToOAuthAuthentication: false - isNfsV3Enabled: false networkAcls: { defaultAction: 'Allow' } - supportsHttpsTrafficOnly: true - } -} - -resource eventSource 'Microsoft.TimeSeriesInsights/environments/eventSources@2020-05-15' = { - name: resourceName - location: location - parent: environment - kind: 'Microsoft.IoTHub' - properties: { - eventSourceResourceId: iotHub.id - iotHubName: iotHub.name - keyName: 'iothubowner' - sharedAccessKey: iotHub.listKeys().value[0].primaryKey - timestampPropertyName: '' - consumerGroupName: 'test' + allowCrossTenantReplication: true + isHnsEnabled: false } } diff --git a/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep b/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep index f26ed8e5..95106c51 100644 --- a/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep +++ b/settings/remarks/microsoft.timeseriesinsights/samples/environments/referencedatasets/main.bicep @@ -1,17 +1,17 @@ -param location string = 'westeurope' param resourceName string = 'acctest0001' +param location string = 'westeurope' resource environment 'Microsoft.TimeSeriesInsights/environments@2020-05-15' = { name: resourceName location: location sku: { - capacity: 1 name: 'S1' + capacity: 1 } kind: 'Gen1' properties: { - storageLimitExceededBehavior: 'PurgeOldData' dataRetentionTime: 'P30D' + storageLimitExceededBehavior: 'PurgeOldData' } } @@ -23,8 +23,8 @@ resource referenceDataSet 'Microsoft.TimeSeriesInsights/environments/referenceDa dataStringComparisonBehavior: 'Ordinal' keyProperties: [ { - type: 'String' name: 'keyProperty1' + type: 'String' } ] } diff --git a/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep b/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep index b1d530c1..fbff1ca8 100644 --- a/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep +++ b/settings/remarks/microsoft.videoindexer/samples/accounts/main.bicep @@ -19,16 +19,24 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } kind: 'StorageV2' properties: { - publicNetworkAccess: 'Enabled' - defaultToOAuthAuthentication: false - isSftpEnabled: false - supportsHttpsTrafficOnly: true accessTier: 'Hot' - isNfsV3Enabled: false - minimumTlsVersion: 'TLS1_2' allowBlobPublicAccess: true allowCrossTenantReplication: false + isHnsEnabled: false + isNfsV3Enabled: false allowSharedKeyAccess: true + defaultToOAuthAuthentication: false + isLocalUserEnabled: true + isSftpEnabled: false + networkAcls: { + defaultAction: 'Allow' + ipRules: [] + resourceAccessRules: [] + virtualNetworkRules: [] + bypass: 'AzureServices' + } + minimumTlsVersion: 'TLS1_2' + supportsHttpsTrafficOnly: true dnsEndpointType: 'Standard' encryption: { keySource: 'Microsoft.Storage' @@ -41,15 +49,7 @@ resource storageAccount 'Microsoft.Storage/storageAccounts@2023-05-01' = { } } } - networkAcls: { - bypass: 'AzureServices' - defaultAction: 'Allow' - ipRules: [] - resourceAccessRules: [] - virtualNetworkRules: [] - } - isHnsEnabled: false - isLocalUserEnabled: true + publicNetworkAccess: 'Enabled' } } diff --git a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep index 4ba3bdca..016b933b 100644 --- a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep +++ b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/main.bicep @@ -1,10 +1,17 @@ -param resourceName string = 'acctest0001' param location string = 'eastus2euap' +param resourceName string = 'acctest0001' resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2023-01-31' = { name: resourceName location: location properties: { + teamsVoicemailPilotNumber: '1234567890' + autoGeneratedDomainNameLabelScope: 'NoReuse' + codecs: [ + 'PCMA' + ] + connectivity: 'PublicAddress' + e911Type: 'Standard' platforms: [ 'OperatorConnect' ] @@ -26,24 +33,17 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 { name: 'useast2' primaryRegionProperties: { - allowedSignalingSourceAddressPrefixes: [ - '10.2.1.0/24' - ] operatorAddresses: [ '198.51.100.2' ] allowedMediaSourceAddressPrefixes: [ '10.2.2.0/24' ] + allowedSignalingSourceAddressPrefixes: [ + '10.2.1.0/24' + ] } } ] - teamsVoicemailPilotNumber: '1234567890' - autoGeneratedDomainNameLabelScope: 'NoReuse' - codecs: [ - 'PCMA' - ] - connectivity: 'PublicAddress' - e911Type: 'Standard' } } diff --git a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep index 634c672f..bb3bb382 100644 --- a/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep +++ b/settings/remarks/microsoft.voiceservices/samples/communicationsgateways/testlines/main.bicep @@ -5,6 +5,11 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 name: resourceName location: location properties: { + autoGeneratedDomainNameLabelScope: 'NoReuse' + codecs: [ + 'PCMA' + ] + connectivity: 'PublicAddress' e911Type: 'Standard' platforms: [ 'OperatorConnect' @@ -27,24 +32,19 @@ resource communicationsGateway 'Microsoft.VoiceServices/communicationsGateways@2 { name: 'useast2' primaryRegionProperties: { - operatorAddresses: [ - '198.51.100.2' - ] allowedMediaSourceAddressPrefixes: [ '10.2.2.0/24' ] allowedSignalingSourceAddressPrefixes: [ '10.2.1.0/24' ] + operatorAddresses: [ + '198.51.100.2' + ] } } ] teamsVoicemailPilotNumber: '1234567890' - autoGeneratedDomainNameLabelScope: 'NoReuse' - codecs: [ - 'PCMA' - ] - connectivity: 'PublicAddress' } } diff --git a/settings/remarks/microsoft.web/samples/sites/config/main.bicep b/settings/remarks/microsoft.web/samples/sites/config/main.bicep index 686e0702..f2917a10 100644 --- a/settings/remarks/microsoft.web/samples/sites/config/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/config/main.bicep @@ -19,33 +19,33 @@ resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceName location: location properties: { + serverFarmId: serverfarm.id vnetRouteAllEnabled: false - httpsOnly: false + clientAffinityEnabled: false + clientCertMode: 'Required' + publicNetworkAccess: 'Enabled' siteConfig: { - remoteDebuggingEnabled: false + scmIpSecurityRestrictionsUseMain: false use32BitWorkerProcess: true - windowsFxVersion: '' - loadBalancing: 'LeastRequests' - vnetRouteAllEnabled: false webSocketsEnabled: false - localMySqlEnabled: false - ftpsState: 'Disabled' - managedPipelineMode: 'Integrated' + alwaysOn: true minTlsVersion: '1.2' - scmIpSecurityRestrictionsUseMain: false - scmMinTlsVersion: '1.2' acrUseManagedIdentityCreds: false - alwaysOn: true + localMySqlEnabled: false + remoteDebuggingEnabled: false + scmMinTlsVersion: '1.2' + vnetRouteAllEnabled: false + windowsFxVersion: '' autoHealEnabled: false + ftpsState: 'Disabled' http20Enabled: false + loadBalancing: 'LeastRequests' + managedPipelineMode: 'Integrated' publicNetworkAccess: 'Enabled' } - clientAffinityEnabled: false clientCertEnabled: false - clientCertMode: 'Required' enabled: true - publicNetworkAccess: 'Enabled' - serverFarmId: serverfarm.id + httpsOnly: false } } diff --git a/settings/remarks/microsoft.web/samples/sites/main.bicep b/settings/remarks/microsoft.web/samples/sites/main.bicep index 6108cb98..9252f7f6 100644 --- a/settings/remarks/microsoft.web/samples/sites/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/main.bicep @@ -1,50 +1,50 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { - name: resourceName - location: location - sku: { - name: 'S1' - } - properties: { - hyperV: false - perSiteScaling: false - reserved: false - zoneRedundant: false - } -} - resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceName location: location properties: { clientAffinityEnabled: false - enabled: true - httpsOnly: false - vnetRouteAllEnabled: false clientCertEnabled: false clientCertMode: 'Required' + enabled: true + httpsOnly: false publicNetworkAccess: 'Enabled' serverFarmId: serverfarm.id siteConfig: { - acrUseManagedIdentityCreds: false alwaysOn: true - use32BitWorkerProcess: true - remoteDebuggingEnabled: false + managedPipelineMode: 'Integrated' scmMinTlsVersion: '1.2' + acrUseManagedIdentityCreds: false autoHealEnabled: false - ftpsState: 'Disabled' http20Enabled: false loadBalancing: 'LeastRequests' - localMySqlEnabled: false + minTlsVersion: '1.2' publicNetworkAccess: 'Enabled' + remoteDebuggingEnabled: false + localMySqlEnabled: false + use32BitWorkerProcess: true + vnetRouteAllEnabled: false webSocketsEnabled: false - windowsFxVersion: '' - managedPipelineMode: 'Integrated' - minTlsVersion: '1.2' scmIpSecurityRestrictionsUseMain: false - vnetRouteAllEnabled: false + ftpsState: 'Disabled' + windowsFxVersion: '' } + vnetRouteAllEnabled: false + } +} + +resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { + name: resourceName + location: location + sku: { + name: 'S1' + } + properties: { + perSiteScaling: false + reserved: false + zoneRedundant: false + hyperV: false } } diff --git a/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep b/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep index c1bd1e0b..33906e04 100644 --- a/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/publiccertificates/main.bicep @@ -1,31 +1,16 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = { - name: resourceName - location: location - sku: { - capacity: 1 - name: 'S1' - size: 'S1' - tier: 'Standard' - } - kind: 'Windows' - properties: { - isXenon: false - } -} - resource site 'Microsoft.Web/sites@2021-02-01' = { name: resourceName location: location properties: { - clientAffinityEnabled: false clientCertEnabled: false enabled: true httpsOnly: false serverFarmId: serverfarm.id siteConfig: {} + clientAffinityEnabled: false } } @@ -37,3 +22,18 @@ resource publicCertificate 'Microsoft.Web/sites/publicCertificates@2022-09-01' = publicCertificateLocation: 'Unknown' } } + +resource serverfarm 'Microsoft.Web/serverfarms@2021-02-01' = { + name: resourceName + location: location + sku: { + size: 'S1' + tier: 'Standard' + capacity: 1 + name: 'S1' + } + kind: 'Windows' + properties: { + isXenon: false + } +} diff --git a/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep b/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep index 442f7110..fb34e4e3 100644 --- a/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/siteextensions/main.bicep @@ -2,51 +2,37 @@ param resourceName string = 'acctest0001' param resourceSiteName string = 'acctestsite0001' param location string = 'westeurope' -resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { - name: resourceName - location: location - sku: { - name: 'S1' - } - properties: { - hyperV: false - perSiteScaling: false - reserved: false - zoneRedundant: false - } -} - resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceSiteName location: location properties: { + clientAffinityEnabled: false + enabled: true + publicNetworkAccess: 'Enabled' + serverFarmId: serverfarm.id + vnetRouteAllEnabled: false + clientCertEnabled: false clientCertMode: 'Required' httpsOnly: false - publicNetworkAccess: 'Enabled' siteConfig: { - managedPipelineMode: 'Integrated' - minTlsVersion: '1.2' - scmMinTlsVersion: '1.2' acrUseManagedIdentityCreds: false + ftpsState: 'Disabled' http20Enabled: false localMySqlEnabled: false + minTlsVersion: '1.2' + webSocketsEnabled: false + windowsFxVersion: '' + alwaysOn: true remoteDebuggingEnabled: false use32BitWorkerProcess: true - alwaysOn: true - ftpsState: 'Disabled' + loadBalancing: 'LeastRequests' scmIpSecurityRestrictionsUseMain: false + scmMinTlsVersion: '1.2' vnetRouteAllEnabled: false - windowsFxVersion: '' autoHealEnabled: false - loadBalancing: 'LeastRequests' + managedPipelineMode: 'Integrated' publicNetworkAccess: 'Enabled' - webSocketsEnabled: false } - vnetRouteAllEnabled: false - clientAffinityEnabled: false - clientCertEnabled: false - enabled: true - serverFarmId: serverfarm.id } } @@ -55,3 +41,17 @@ resource dynatraceSiteExtension 'Microsoft.Web/sites/siteextensions@2022-09-01' location: location parent: site } + +resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { + name: resourceName + location: location + sku: { + name: 'S1' + } + properties: { + hyperV: false + perSiteScaling: false + reserved: false + zoneRedundant: false + } +} diff --git a/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep b/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep index f1fd862a..cca58125 100644 --- a/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/slots/config/main.bicep @@ -1,50 +1,36 @@ param resourceName string = 'acctest0001' param location string = 'westeurope' -resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { - name: resourceName - location: location - sku: { - name: 'S1' - } - properties: { - hyperV: false - perSiteScaling: false - reserved: false - zoneRedundant: false - } -} - resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceName location: location properties: { - clientAffinityEnabled: false clientCertEnabled: false + clientCertMode: 'Required' enabled: true + httpsOnly: false publicNetworkAccess: 'Enabled' serverFarmId: serverfarm.id vnetRouteAllEnabled: false - clientCertMode: 'Required' - httpsOnly: false + clientAffinityEnabled: false siteConfig: { + acrUseManagedIdentityCreds: false + publicNetworkAccess: 'Enabled' + alwaysOn: true remoteDebuggingEnabled: false - scmIpSecurityRestrictionsUseMain: false - use32BitWorkerProcess: true - vnetRouteAllEnabled: false - http20Enabled: false scmMinTlsVersion: '1.2' webSocketsEnabled: false - acrUseManagedIdentityCreds: false - alwaysOn: true - ftpsState: 'Disabled' + loadBalancing: 'LeastRequests' + localMySqlEnabled: false managedPipelineMode: 'Integrated' - publicNetworkAccess: 'Enabled' + scmIpSecurityRestrictionsUseMain: false windowsFxVersion: '' autoHealEnabled: false - loadBalancing: 'LeastRequests' - localMySqlEnabled: false + ftpsState: 'Disabled' + http20Enabled: false minTlsVersion: '1.2' + use32BitWorkerProcess: true + vnetRouteAllEnabled: false } } } @@ -54,32 +40,32 @@ resource slot 'Microsoft.Web/sites/slots@2022-09-01' = { location: location parent: site properties: { - clientAffinityEnabled: false - clientCertEnabled: false - httpsOnly: false siteConfig: { + publicNetworkAccess: 'Enabled' + vnetRouteAllEnabled: false + alwaysOn: true + localMySqlEnabled: false + managedPipelineMode: 'Integrated' remoteDebuggingEnabled: false - webSocketsEnabled: false - acrUseManagedIdentityCreds: false ftpsState: 'Disabled' - loadBalancing: 'LeastRequests' - localMySqlEnabled: false - publicNetworkAccess: 'Enabled' scmIpSecurityRestrictionsUseMain: false - autoHealEnabled: false - managedPipelineMode: 'Integrated' - scmMinTlsVersion: '1.2' use32BitWorkerProcess: false - alwaysOn: true + webSocketsEnabled: false http20Enabled: false + loadBalancing: 'LeastRequests' minTlsVersion: '1.2' - vnetRouteAllEnabled: false + scmMinTlsVersion: '1.2' windowsFxVersion: '' + acrUseManagedIdentityCreds: false + autoHealEnabled: false } + clientAffinityEnabled: false + clientCertEnabled: false + clientCertMode: 'Required' vnetRouteAllEnabled: false clientCertExclusionPaths: '' - clientCertMode: 'Required' enabled: true + httpsOnly: false publicNetworkAccess: 'Enabled' serverFarmId: serverfarm.id } @@ -90,3 +76,17 @@ resource config 'Microsoft.Web/sites/slots/config@2022-09-01' = { parent: slot properties: {} } + +resource serverfarm 'Microsoft.Web/serverfarms@2022-09-01' = { + name: resourceName + location: location + sku: { + name: 'S1' + } + properties: { + reserved: false + zoneRedundant: false + hyperV: false + perSiteScaling: false + } +} diff --git a/settings/remarks/microsoft.web/samples/sites/slots/main.bicep b/settings/remarks/microsoft.web/samples/sites/slots/main.bicep index 7425c65b..e3698097 100644 --- a/settings/remarks/microsoft.web/samples/sites/slots/main.bicep +++ b/settings/remarks/microsoft.web/samples/sites/slots/main.bicep @@ -19,33 +19,33 @@ resource site 'Microsoft.Web/sites@2022-09-01' = { name: resourceName location: location properties: { - clientCertMode: 'Required' + clientAffinityEnabled: false + clientCertEnabled: false enabled: true httpsOnly: false siteConfig: { - use32BitWorkerProcess: true - acrUseManagedIdentityCreds: false - http20Enabled: false localMySqlEnabled: false - scmMinTlsVersion: '1.2' - vnetRouteAllEnabled: false + managedPipelineMode: 'Integrated' + remoteDebuggingEnabled: false + use32BitWorkerProcess: true ftpsState: 'Disabled' + loadBalancing: 'LeastRequests' publicNetworkAccess: 'Enabled' - remoteDebuggingEnabled: false scmIpSecurityRestrictionsUseMain: false + windowsFxVersion: '' + http20Enabled: false + webSocketsEnabled: false alwaysOn: true autoHealEnabled: false - webSocketsEnabled: false - windowsFxVersion: '' - loadBalancing: 'LeastRequests' - managedPipelineMode: 'Integrated' minTlsVersion: '1.2' + scmMinTlsVersion: '1.2' + vnetRouteAllEnabled: false + acrUseManagedIdentityCreds: false } - clientCertEnabled: false + vnetRouteAllEnabled: false + clientCertMode: 'Required' publicNetworkAccess: 'Enabled' serverFarmId: serverfarm.id - vnetRouteAllEnabled: false - clientAffinityEnabled: false } } @@ -56,31 +56,31 @@ resource slot 'Microsoft.Web/sites/slots@2022-09-01' = { properties: { clientAffinityEnabled: false clientCertExclusionPaths: '' + clientCertMode: 'Required' + enabled: true + httpsOnly: false publicNetworkAccess: 'Enabled' + vnetRouteAllEnabled: false + clientCertEnabled: false + serverFarmId: serverfarm.id siteConfig: { - autoHealEnabled: false - ftpsState: 'Disabled' - managedPipelineMode: 'Integrated' - scmMinTlsVersion: '1.2' - use32BitWorkerProcess: false - alwaysOn: true http20Enabled: false loadBalancing: 'LeastRequests' localMySqlEnabled: false - publicNetworkAccess: 'Enabled' - remoteDebuggingEnabled: false - scmIpSecurityRestrictionsUseMain: false - webSocketsEnabled: false + use32BitWorkerProcess: false acrUseManagedIdentityCreds: false + autoHealEnabled: false + ftpsState: 'Disabled' + publicNetworkAccess: 'Enabled' + managedPipelineMode: 'Integrated' minTlsVersion: '1.2' + scmIpSecurityRestrictionsUseMain: false vnetRouteAllEnabled: false + webSocketsEnabled: false windowsFxVersion: '' + alwaysOn: true + remoteDebuggingEnabled: false + scmMinTlsVersion: '1.2' } - vnetRouteAllEnabled: false - clientCertEnabled: false - clientCertMode: 'Required' - enabled: true - httpsOnly: false - serverFarmId: serverfarm.id } } diff --git a/settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep b/settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep index 95ad1e16..b37533e9 100644 --- a/settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep +++ b/settings/remarks/microsoft.web/samples/sourcecontrols/main.bicep @@ -1,18 +1,18 @@ targetScope = 'tenant' -@secure() -@description('The GitHub token secret for source control integration') -param githubTokenSecret string param resourceName string = 'acctest0001' param location string = 'eastus' @secure() @description('The GitHub access token for source control integration') param githubToken string +@secure() +@description('The GitHub token secret for source control integration') +param githubTokenSecret string resource sourcecontrol 'Microsoft.Web/sourcecontrols@2021-02-01' = { name: 'GitHub' properties: { - tokenSecret: '${githubTokenSecret}' token: '${githubToken}' + tokenSecret: '${githubTokenSecret}' } } diff --git a/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep b/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep index e30ea138..0f5b6540 100644 --- a/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep +++ b/settings/remarks/microsoft.web/samples/staticsites/customdomains/main.bicep @@ -1,5 +1,5 @@ -param location string = 'westus' param resourceName string = 'acctest0001' +param location string = 'westus' resource staticSite 'Microsoft.Web/staticSites@2021-02-01' = { name: resourceName diff --git a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep index 7c593069..b1f166ec 100644 --- a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep +++ b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/configurations/main.bicep @@ -1,6 +1,23 @@ param resourceName string = 'acctest0001' param location string = 'westus' +resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { + name: '${resourceName}-vnet' + location: location + properties: { + addressSpace: { + addressPrefixes: [ + '10.0.0.0/16' + ] + } + dhcpOptions: { + dnsServers: [] + } + privateEndpointVNetPolicies: 'Disabled' + subnets: [] + } +} + resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = { name: '${resourceName}-nginx' location: location @@ -26,44 +43,10 @@ resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = } } -resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { - name: '${resourceName}-pip' - location: location - sku: { - name: 'Standard' - } - properties: { - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' - } - idleTimeoutInMinutes: 4 - publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Static' - } -} - -resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { - name: '${resourceName}-vnet' - location: location - properties: { - addressSpace: { - addressPrefixes: [ - '10.0.0.0/16' - ] - } - dhcpOptions: { - dnsServers: [] - } - privateEndpointVNetPolicies: 'Disabled' - subnets: [] - } -} - resource configuration 'Nginx.NginxPlus/nginxDeployments/configurations@2024-11-01-preview' = { name: 'default' parent: nginxDeployment properties: { - rootFile: '/etc/nginx/nginx.conf' files: [ { content: 'aHR0cCB7CiAgICBzZXJ2ZXIgewogICAgICAgIGxpc3RlbiA4MDsKICAgICAgICBsb2NhdGlvbiAvIHsKICAgICAgICAgICAgYXV0aF9iYXNpYyAiUHJvdGVjdGVkIEFyZWEiOwogICAgICAgICAgICBhdXRoX2Jhc2ljX3VzZXJfZmlsZSAvb3B0Ly5odHBhc3N3ZDsKICAgICAgICAgICAgZGVmYXVsdF90eXBlIHRleHQvaHRtbDsKICAgICAgICAgICAgcmV0dXJuIDIwMCAnPCFkb2N0eXBlIGh0bWw+PGh0bWwgbGFuZz0iZW4iPjxoZWFkPjwvaGVhZD48Ym9keT4KICAgICAgICAgICAgICAgIDxkaXY+dGhpcyBvbmUgd2lsbCBiZSB1cGRhdGVkPC9kaXY+CiAgICAgICAgICAgICAgICA8ZGl2PmF0IDEwOjM4IGFtPC9kaXY+CiAgICAgICAgICAgIDwvYm9keT48L2h0bWw+JzsKICAgICAgICB9CiAgICAgICAgaW5jbHVkZSBzaXRlLyouY29uZjsKICAgIH0KfQo=' @@ -76,6 +59,7 @@ resource configuration 'Nginx.NginxPlus/nginxDeployments/configurations@2024-11- virtualPath: '/opt/.htpasswd' } ] + rootFile: '/etc/nginx/nginx.conf' } } @@ -83,8 +67,6 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: '${resourceName}-subnet' parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' - defaultOutboundAccess: true delegations: [ { name: 'delegation' @@ -97,5 +79,23 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' + defaultOutboundAccess: true + } +} + +resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { + name: '${resourceName}-pip' + location: location + sku: { + name: 'Standard' + } + properties: { + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + idleTimeoutInMinutes: 4 + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Static' } } diff --git a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep index 2e854149..40ada1e7 100644 --- a/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep +++ b/settings/remarks/nginx.nginxplus/samples/nginxdeployments/main.bicep @@ -1,29 +1,10 @@ param resourceName string = 'acctest0001' param location string = 'westus' -resource publicipaddress1 'Microsoft.Network/publicIPAddresses@2024-05-01' = { - name: '${resourceName}-pip2' - location: location - sku: { - name: 'Standard' - tier: 'Regional' - } - properties: { - idleTimeoutInMinutes: 4 - publicIPAddressVersion: 'IPv4' - publicIPAllocationMethod: 'Static' - ddosSettings: { - protectionMode: 'VirtualNetworkInherited' - } - } -} - resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: '${resourceName}-vnet' location: location properties: { - privateEndpointVNetPolicies: 'Disabled' - subnets: [] addressSpace: { addressPrefixes: [ '10.0.0.0/16' @@ -32,6 +13,8 @@ resource virtualNetwork 'Microsoft.Network/virtualNetworks@2024-05-01' = { dhcpOptions: { dnsServers: [] } + privateEndpointVNetPolicies: 'Disabled' + subnets: [] } } @@ -39,7 +22,6 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: '${resourceName}-subnet' parent: virtualNetwork properties: { - addressPrefix: '10.0.2.0/24' defaultOutboundAccess: true delegations: [ { @@ -53,6 +35,7 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { privateLinkServiceNetworkPolicies: 'Enabled' serviceEndpointPolicies: [] serviceEndpoints: [] + addressPrefix: '10.0.2.0/24' } } @@ -60,20 +43,20 @@ resource subnet1 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { name: '${resourceName}-subnet2' parent: virtualNetwork properties: { - privateLinkServiceNetworkPolicies: 'Enabled' - serviceEndpointPolicies: [] - serviceEndpoints: [] - addressPrefix: '10.0.3.0/24' defaultOutboundAccess: true delegations: [ { - name: 'delegation' properties: { serviceName: 'NGINX.NGINXPLUS/nginxDeployments' } + name: 'delegation' } ] privateEndpointNetworkPolicies: 'Disabled' + privateLinkServiceNetworkPolicies: 'Enabled' + serviceEndpointPolicies: [] + serviceEndpoints: [] + addressPrefix: '10.0.3.0/24' } } @@ -84,9 +67,6 @@ resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = name: 'standardv2_Monthly' } properties: { - autoUpgradeProfile: { - upgradeChannel: 'stable' - } enableDiagnosticsSupport: false networkProfile: { frontEndIPConfiguration: { @@ -101,8 +81,8 @@ resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = profiles: [ { capacity: { - max: 30 min: 10 + max: 30 } name: 'test' } @@ -112,6 +92,9 @@ resource nginxDeployment 'Nginx.NginxPlus/nginxDeployments@2024-11-01-preview' = userProfile: { preferredEmail: 'test@test.com' } + autoUpgradeProfile: { + upgradeChannel: 'stable' + } } } @@ -122,6 +105,23 @@ resource publicIPAddress 'Microsoft.Network/publicIPAddresses@2024-05-01' = { name: 'Standard' tier: 'Regional' } + properties: { + idleTimeoutInMinutes: 4 + publicIPAddressVersion: 'IPv4' + publicIPAllocationMethod: 'Static' + ddosSettings: { + protectionMode: 'VirtualNetworkInherited' + } + } +} + +resource publicipaddress1 'Microsoft.Network/publicIPAddresses@2024-05-01' = { + name: '${resourceName}-pip2' + location: location + sku: { + name: 'Standard' + tier: 'Regional' + } properties: { ddosSettings: { protectionMode: 'VirtualNetworkInherited' diff --git a/settings/remarks/qumulo.storage/samples/filesystems/main.bicep b/settings/remarks/qumulo.storage/samples/filesystems/main.bicep index 98f9aff0..195568f7 100644 --- a/settings/remarks/qumulo.storage/samples/filesystems/main.bicep +++ b/settings/remarks/qumulo.storage/samples/filesystems/main.bicep @@ -1,8 +1,8 @@ +param resourceName string = 'acctest0001' +param location string = 'westeurope' @secure() @description('The administrative password for the Qumulo file system') param qumuloPassword string -param resourceName string = 'acctest0001' -param location string = 'westeurope' resource vnet 'Microsoft.Network/virtualNetworks@2024-05-01' = { name: resourceName @@ -23,21 +23,21 @@ resource subnet 'Microsoft.Network/virtualNetworks/subnets@2024-05-01' = { location: location parent: vnet properties: { + privateLinkServiceNetworkPolicies: 'Enabled' addressPrefix: '10.0.1.0/24' defaultOutboundAccess: true delegations: [ { name: 'delegation' properties: { - serviceName: 'Qumulo.Storage/fileSystems' actions: [ 'Microsoft.Network/virtualNetworks/subnets/join/action' ] + serviceName: 'Qumulo.Storage/fileSystems' } } ] privateEndpointNetworkPolicies: 'Disabled' - privateLinkServiceNetworkPolicies: 'Enabled' } }