Skip to content

Commit

Permalink
Merge branch 'Azure:main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
hundredacres authored Jun 24, 2024
2 parents 6add63b + b5badc9 commit 3e307bd
Show file tree
Hide file tree
Showing 77 changed files with 5,027 additions and 524 deletions.
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
/avm/res/event-hub/namespace/ @Azure/avm-res-eventhub-namespace-module-owners-bicep @Azure/avm-core-team-technical-bicep
/avm/res/health-bot/health-bot/ @Azure/avm-res-healthbot-healthbot-module-owners-bicep @Azure/avm-core-team-technical-bicep
/avm/res/healthcare-apis/workspace/ @Azure/avm-res-healthcareapis-workspace-module-owners-bicep @Azure/avm-core-team-technical-bicep
/avm/res/hybrid-compute/machine/ @Azure/avm-res-hybridcompute-machine-module-owners-bicep @Azure/avm-core-team-technical-bicep
/avm/res/insights/action-group/ @Azure/avm-res-insights-actiongroup-module-owners-bicep @Azure/avm-core-team-technical-bicep
/avm/res/insights/activity-log-alert/ @Azure/avm-res-insights-activitylogalert-module-owners-bicep @Azure/avm-core-team-technical-bicep
/avm/res/insights/component/ @Azure/avm-res-insights-component-module-owners-bicep @Azure/avm-core-team-technical-bicep
Expand Down
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/avm_module_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ body:
- "avm/res/event-hub/namespace"
- "avm/res/health-bot/health-bot"
- "avm/res/healthcare-apis/workspace"
- "avm/res/hybrid-compute/machine"
- "avm/res/insights/action-group"
- "avm/res/insights/activity-log-alert"
- "avm/res/insights/component"
Expand Down
16 changes: 16 additions & 0 deletions .github/policies/eventResponder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -192,3 +192,19 @@ configuration:
then:
- addLabel:
label: "Type: Security Bug :lock:"

- description: "ITA25 - If a new PR is opened, inform module owners about the usage of the Needs Core Team label"
if:
- or:
- payloadType: Pull_Request
- isAction:
action: Opened
then:
- addReply:
reply: |
> [!IMPORTANT]
> If this is a module-related PR, being submitted by the sole owner of the module, the AVM core team must review and approve it (as module owners can't approve their own PRs).
>
> **To indicate this PR needs the core team''s attention, apply the "Needs: Core Team 🧞" label!**
>
> The core team will only review and approve PRs that have this label applied!
90 changes: 90 additions & 0 deletions .github/workflows/avm.res.hybrid-compute.machine.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
name: "avm.res.hybrid-compute.machine"

on:
schedule:
- cron: "0 12 1/15 * *" # Bi-Weekly Test (on 1st & 15th of month)
workflow_dispatch:
inputs:
staticValidation:
type: boolean
description: "Execute static validation"
required: false
default: true
deploymentValidation:
type: boolean
description: "Execute deployment validation"
required: false
default: true
removeDeployment:
type: boolean
description: "Remove deployed module"
required: false
default: true
customLocation:
type: string
description: "Default location overwrite (e.g., eastus)"
required: false
push:
branches:
- main
paths:
- ".github/actions/templates/avm-**"
- ".github/workflows/avm.template.module.yml"
- ".github/workflows/avm.res.hybrid-compute.machine.yml"
- "avm/res/hybrid-compute/machine/**"
- "avm/utilities/pipelines/**"
- "!avm/utilities/pipelines/platform/**"
- "!*/**/README.md"

env:
modulePath: "avm/res/hybrid-compute/machine"
workflowPath: ".github/workflows/avm.res.hybrid-compute.machine.yml"

concurrency:
group: ${{ github.workflow }}

jobs:
###########################
# Initialize pipeline #
###########################
job_initialize_pipeline:
runs-on: ubuntu-latest
name: "Initialize pipeline"
steps:
- name: "Checkout"
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: "Set input parameters to output variables"
id: get-workflow-param
uses: ./.github/actions/templates/avm-getWorkflowInput
with:
workflowPath: "${{ env.workflowPath}}"
- name: "Get module test file paths"
id: get-module-test-file-paths
uses: ./.github/actions/templates/avm-getModuleTestFiles
with:
modulePath: "${{ env.modulePath }}"
outputs:
workflowInput: ${{ steps.get-workflow-param.outputs.workflowInput }}
moduleTestFilePaths: ${{ steps.get-module-test-file-paths.outputs.moduleTestFilePaths }}
psRuleModuleTestFilePaths: ${{ steps.get-module-test-file-paths.outputs.psRuleModuleTestFilePaths }}
modulePath: "${{ env.modulePath }}"

##############################
# Call reusable workflow #
##############################
call-workflow-passing-data:
name: "Run"
permissions:
id-token: write # For OIDC
contents: write # For release tags
needs:
- job_initialize_pipeline
uses: ./.github/workflows/avm.template.module.yml
with:
workflowInput: "${{ needs.job_initialize_pipeline.outputs.workflowInput }}"
moduleTestFilePaths: "${{ needs.job_initialize_pipeline.outputs.moduleTestFilePaths }}"
psRuleModuleTestFilePaths: "${{ needs.job_initialize_pipeline.outputs.psRuleModuleTestFilePaths }}"
modulePath: "${{ needs.job_initialize_pipeline.outputs.modulePath}}"
secrets: inherit
2 changes: 0 additions & 2 deletions .github/workflows/avm.res.kusto.cluster.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: "avm.res.kusto.cluster"

on:
schedule:
- cron: "0 12 1/15 * *" # Bi-Weekly Test (on 1st & 15th of month)
workflow_dispatch:
inputs:
staticValidation:
Expand Down
73 changes: 73 additions & 0 deletions .github/workflows/platform.ossf-scorecard.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
# This workflow uses actions that are not certified by GitHub. They are provided
# by a third-party and are governed by separate terms of service, privacy
# policy, and support documentation.

name: .Platform - OSSF Scorecard supply-chain security
on:
# For Branch-Protection check. Only the default branch is supported. See
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
branch_protection_rule:
# To guarantee Maintained check is occasionally updated. See
# https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
schedule:
- cron: '17 17 * * 1'
push:
branches: [ "main" ]

# Declare default permissions as read only.
permissions: read-all

jobs:
analysis:
name: Scorecard analysis
runs-on: ubuntu-latest
permissions:
# Needed to upload the results to code-scanning dashboard.
security-events: write
# Needed to publish results and get a badge (see publish_results below).
id-token: write
# Uncomment the permissions below if installing in a private repository.
# contents: read
# actions: read

steps:
- name: "Checkout code"
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
persist-credentials: false

- name: "Run analysis"
uses: ossf/scorecard-action@0864cf19026789058feabb7e87baa5f140aac736 # v2.3.1
with:
results_file: results.sarif
results_format: sarif
# (Optional) "write" PAT token. Uncomment the `repo_token` line below if:
# - you want to enable the Branch-Protection check on a *public* repository, or
# - you are installing Scorecard on a *private* repository
# To create the PAT, follow the steps in https://github.com/ossf/scorecard-action?tab=readme-ov-file#authentication-with-fine-grained-pat-optional.
repo_token: ${{ secrets.SCORECARD_TOKEN }}

# Public repositories:
# - Publish results to OpenSSF REST API for easy access by consumers
# - Allows the repository to include the Scorecard badge.
# - See https://github.com/ossf/scorecard-action#publishing-results.
# For private repositories:
# - `publish_results` will always be set to `false`, regardless
# of the value entered here.
publish_results: true

# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
# format to the repository Actions tab.
- name: "Upload artifact"
uses: actions/upload-artifact@97a0fba1372883ab732affbe8f94b823f91727db # v3.pre.node20
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard (optional).
# Commenting out will disable upload of results to your repo's Code Scanning dashboard
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@1b1aada464948af03b950897e5eb522f92603cc2 # v3.24.9
with:
sarif_file: results.sarif
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
[![OpenSSF Scorecard](https://api.scorecard.dev/projects/github.com/Azure/bicep-registry-modules/badge)](https://scorecard.dev/viewer/?uri=github.com/Azure/bicep-registry-modules)

<h1 style="color: steelblue;">⚠️ New standard for Bicep modules - AVM ⚠️</h1>

To provide our customers with a unified experience, Azure Verified Modules ([AVM](https://aka.ms/AVM)) is now the single Microsoft standard for Bicep modules, published to the Public Bicep Registry, via this repository.
Expand Down
18 changes: 18 additions & 0 deletions avm/res/aad/domain-service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,11 @@ The domain name specific to the Azure ADDS service.

- Required: Yes
- Type: string
- Example:
```Bicep
- 'contoso.onmicrosoft.com'
- 'aaddscontoso.com'
```

### Parameter: `pfxCertificate`

Expand All @@ -260,6 +265,11 @@ The email recipient value to receive alerts.
- Required: No
- Type: array
- Default: `[]`
- Example:
```Bicep
- ['[email protected]']
- ['[email protected]','[email protected]']
```

### Parameter: `diagnosticSettings`

Expand Down Expand Up @@ -629,6 +639,7 @@ The id of the subnet that Domain Services will be deployed on. The subnet has so

- Required: Yes
- Type: string
- Example: `/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/<resourceGroup>/providers/Microsoft.Network/virtualNetworks/<vnetName>/subnets/<subnetName>`

### Parameter: `roleAssignments`

Expand Down Expand Up @@ -771,6 +782,13 @@ Tags of the resource.

- Required: No
- Type: object
- Example:
```Bicep
{
"key1": "value1",
"key2": "value2"
}
```

### Parameter: `tlsV1`

Expand Down
14 changes: 7 additions & 7 deletions avm/res/api-management/service/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ module service 'br/public:avm/res/api-management/service:<version>' = {
apiDiagnostics: [
{
apiName: 'echo-api'
diagnosticName: 'applicationinsights'
loggerName: 'logger'
metrics: true
name: 'applicationinsights'
}
]
apis: [
Expand Down Expand Up @@ -369,9 +369,9 @@ module service 'br/public:avm/res/api-management/service:<version>' = {
"value": [
{
"apiName": "echo-api",
"diagnosticName": "applicationinsights",
"loggerName": "logger",
"metrics": true
"metrics": true,
"name": "applicationinsights"
}
]
},
Expand Down Expand Up @@ -1146,8 +1146,8 @@ module service 'br/public:avm/res/api-management/service:<version>' = {
| [`publicIpAddressResourceId`](#parameter-publicipaddressresourceid) | string | Public Standard SKU IP V4 based IP address to be associated with Virtual Network deployed service in the region. Supported only for Developer and Premium SKU being deployed in Virtual Network. |
| [`restore`](#parameter-restore) | bool | Undelete API Management Service if it was previously soft-deleted. If this flag is specified and set to True all other properties will be ignored. |
| [`roleAssignments`](#parameter-roleassignments) | array | Array of role assignments to create. |
| [`sku`](#parameter-sku) | string | The pricing tier of this API Management service. Default is Premium. |
| [`skuCount`](#parameter-skucount) | int | The instance size of this API Management service. Default is 2. Not supported with V2 SKUs. If using Consumption, sku should = 0. |
| [`sku`](#parameter-sku) | string | The pricing tier of this API Management service. |
| [`skuCount`](#parameter-skucount) | int | The instance size of this API Management service. Not supported with V2 SKUs. If using Consumption, sku should = 0. |
| [`subnetResourceId`](#parameter-subnetresourceid) | string | The full resource ID of a subnet in a virtual network to deploy the API Management service in. |
| [`subscriptions`](#parameter-subscriptions) | array | Subscriptions. |
| [`tags`](#parameter-tags) | object | Tags of the resource. |
Expand Down Expand Up @@ -1686,7 +1686,7 @@ The principal type of the assigned principal ID.

### Parameter: `sku`

The pricing tier of this API Management service. Default is Premium.
The pricing tier of this API Management service.

- Required: No
- Type: string
Expand All @@ -1706,7 +1706,7 @@ The pricing tier of this API Management service. Default is Premium.

### Parameter: `skuCount`

The instance size of this API Management service. Default is 2. Not supported with V2 SKUs. If using Consumption, sku should = 0.
The instance size of this API Management service. Not supported with V2 SKUs. If using Consumption, sku should = 0.

- Required: No
- Type: int
Expand Down
Loading

0 comments on commit 3e307bd

Please sign in to comment.