Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
hundredacres committed Oct 21, 2024
2 parents 3d10236 + ccfb9c4 commit 97341c4
Show file tree
Hide file tree
Showing 189 changed files with 35,659 additions and 6,013 deletions.
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
/avm/ptn/azd/ml-hub-dependencies/ @Azure/avm-ptn-azd-mlhubdependencies-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/azd/ml-project/ @Azure/avm-ptn-azd-mlproject-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/azd/monitoring/ @Azure/avm-ptn-azd-monitoring-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/data/private-analytical-workspace/ @Azure/avm-ptn-data-privateanalyticalworkspace-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/deployment-script/import-image-to-acr/ @Azure/avm-ptn-deploymentscript-importimagetoacr-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/dev-ops/cicd-agents-and-runners/ @Azure/avm-ptn-devops-cicdagentsandrunners-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/ptn/finops-toolkit/finops-hub/ @Azure/avm-ptn-finopstoolkit-finopshub-module-owners-bicep @Azure/avm-module-reviewers-bicep
Expand Down Expand Up @@ -171,4 +172,5 @@
/avm/res/web/serverfarm/ @Azure/avm-res-web-serverfarm-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/web/site/ @Azure/avm-res-web-site-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/res/web/static-site/ @Azure/avm-res-web-staticsite-module-owners-bicep @Azure/avm-module-reviewers-bicep
/avm/utl/types/avm-common-types/ @Azure/avm-utl-types-avmcommontypes-module-owners-bicep @Azure/avm-module-reviewers-bicep
*avm.core.team.tests.ps1 @Azure/avm-core-team-technical-bicep
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/avm_module_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ body:
- "avm/ptn/azd/ml-hub-dependencies"
- "avm/ptn/azd/ml-project"
- "avm/ptn/azd/monitoring"
- "avm/ptn/data/private-analytical-workspace"
- "avm/ptn/deployment-script/import-image-to-acr"
- "avm/ptn/dev-ops/cicd-agents-and-runners"
- "avm/ptn/finops-toolkit/finops-hub"
Expand Down Expand Up @@ -206,6 +207,7 @@ body:
- "avm/res/web/serverfarm"
- "avm/res/web/site"
- "avm/res/web/static-site"
- "avm/utl/types/avm-common-types"
validations:
required: true
- type: input
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ runs:
Write-Output ('{0}={1}' -f 'deploymentNames', ($res.deploymentNames | ConvertTo-Json -Compress)) >> $env:GITHUB_OUTPUT
# Populate further outputs
$deploymentOutput = $res.deploymentOutput | ConvertTo-Json -Depth 99 -Compress
$deploymentOutput = ($res.deploymentOutput | ConvertTo-Json -Depth 99 -Compress) -replace "'", "''" # Escaping single quotes for resilient access in subsequent steps
Write-Output ('{0}={1}' -f 'deploymentOutput', $deploymentOutput) >> $env:GITHUB_OUTPUT
Write-Verbose "Deployment output: $deploymentOutput" -Verbose
Expand Down
88 changes: 88 additions & 0 deletions .github/workflows/avm.ptn.data.private-analytical-workspace.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: "avm.ptn.data.private-analytical-workspace"

on:
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.ptn.data.private-analytical-workspace.yml"
- "avm/ptn/data/private-analytical-workspace/**"
- "avm/utilities/pipelines/**"
- "!avm/utilities/pipelines/platform/**"
- "!*/**/README.md"

env:
modulePath: "avm/ptn/data/private-analytical-workspace"
workflowPath: ".github/workflows/avm.ptn.data.private-analytical-workspace.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
88 changes: 88 additions & 0 deletions .github/workflows/avm.utl.types.avm-common-types.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
name: "avm.utl.types.avm-common-types"

on:
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.utl.types.avm-common-types.yml"
- "avm/utl/types/avm-common-types/**"
- "avm/utilities/pipelines/**"
- "!avm/utilities/pipelines/platform/**"
- "!*/**/README.md"

env:
modulePath: "avm/utl/types/avm-common-types"
workflowPath: ".github/workflows/avm.utl.types.avm-common-types.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
19 changes: 10 additions & 9 deletions avm/ptn/azd/ml-ai-environment/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Create Azure Machine Learning workspaces of type 'Hub' and 'Project' and their r
| `microsoft.insights/components/linkedStorageAccounts` | [2020-03-01-preview](https://learn.microsoft.com/en-us/azure/templates/microsoft.insights/2020-03-01-preview/components/linkedStorageAccounts) |
| `Microsoft.Insights/diagnosticSettings` | [2021-05-01-preview](https://learn.microsoft.com/en-us/azure/templates/Microsoft.Insights/2021-05-01-preview/diagnosticSettings) |
| `Microsoft.KeyVault/vaults` | [2022-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2022-07-01/vaults) |
| `Microsoft.KeyVault/vaults/accessPolicies` | [2023-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2023-07-01/vaults/accessPolicies) |
| `Microsoft.KeyVault/vaults/accessPolicies` | [2022-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2022-07-01/vaults/accessPolicies) |
| `Microsoft.KeyVault/vaults/keys` | [2022-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2022-07-01/vaults/keys) |
| `Microsoft.KeyVault/vaults/secrets` | [2022-07-01](https://learn.microsoft.com/en-us/azure/templates/Microsoft.KeyVault/2022-07-01/vaults/secrets) |
Expand Down Expand Up @@ -95,7 +96,7 @@ module mlAiEnvironment 'br/public:avm/ptn/azd/ml-ai-environment:<version>' = {
// Required parameters
cognitiveServicesName: 'maemincs001'
hubName: 'maeminhub001'
keyVaultName: 'maeminkv00'
keyVaultName: 'maeminkv01'
openAiConnectionName: 'maeminai001-connection'
projectName: 'maeminpro001'
searchConnectionName: 'maeminsearch001-connection'
Expand Down Expand Up @@ -127,7 +128,7 @@ module mlAiEnvironment 'br/public:avm/ptn/azd/ml-ai-environment:<version>' = {
"value": "maeminhub001"
},
"keyVaultName": {
"value": "maeminkv00"
"value": "maeminkv01"
},
"openAiConnectionName": {
"value": "maeminai001-connection"
Expand Down Expand Up @@ -165,7 +166,7 @@ using 'br/public:avm/ptn/azd/ml-ai-environment:<version>'
// Required parameters
param cognitiveServicesName = 'maemincs001'
param hubName = 'maeminhub001'
param keyVaultName = 'maeminkv00'
param keyVaultName = 'maeminkv01'
param openAiConnectionName = 'maeminai001-connection'
param projectName = 'maeminpro001'
param searchConnectionName = 'maeminsearch001-connection'
Expand Down Expand Up @@ -194,7 +195,7 @@ module mlAiEnvironment 'br/public:avm/ptn/azd/ml-ai-environment:<version>' = {
// Required parameters
cognitiveServicesName: 'maemaxcs001'
hubName: 'maemaxhub001'
keyVaultName: 'maemaxkv001'
keyVaultName: 'maemaxkv002'
openAiConnectionName: 'maemaxai001-connection'
projectName: 'maemaxpro001'
searchConnectionName: 'maemaxsearch001-connection'
Expand Down Expand Up @@ -244,7 +245,7 @@ module mlAiEnvironment 'br/public:avm/ptn/azd/ml-ai-environment:<version>' = {
"value": "maemaxhub001"
},
"keyVaultName": {
"value": "maemaxkv001"
"value": "maemaxkv002"
},
"openAiConnectionName": {
"value": "maemaxai001-connection"
Expand Down Expand Up @@ -310,7 +311,7 @@ using 'br/public:avm/ptn/azd/ml-ai-environment:<version>'
// Required parameters
param cognitiveServicesName = 'maemaxcs001'
param hubName = 'maemaxhub001'
param keyVaultName = 'maemaxkv001'
param keyVaultName = 'maemaxkv002'
param openAiConnectionName = 'maemaxai001-connection'
param projectName = 'maemaxpro001'
param searchConnectionName = 'maemaxsearch001-connection'
Expand Down Expand Up @@ -364,7 +365,7 @@ param searchServiceName = 'maemaxsearch001'
| [`location`](#parameter-location) | string | Location for all Resources. |
| [`logAnalyticsName`](#parameter-loganalyticsname) | string | The Log Analytics resource name. |
| [`openAiConnectionName`](#parameter-openaiconnectionname) | string | The Open AI connection name. |
| [`replicaCount`](#parameter-replicacount) | int | The number of replicas in the search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs or between 1 and 3 inclusive for basic SKU. |
| [`replicaCount`](#parameter-replicacount) | int | The number of replicas in the search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs, or between 1 and 3 inclusive for basic SKU. |
| [`searchConnectionName`](#parameter-searchconnectionname) | string | The Azure Search connection name. |
| [`tags`](#parameter-tags) | object | Tags of the resource. |
| [`userAssignedtName`](#parameter-userassignedtname) | string | The User Assigned Identity resource name. |
Expand Down Expand Up @@ -467,7 +468,7 @@ The Open AI connection name.

### Parameter: `replicaCount`

The number of replicas in the search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs or between 1 and 3 inclusive for basic SKU.
The number of replicas in the search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs, or between 1 and 3 inclusive for basic SKU.

- Required: No
- Type: int
Expand Down Expand Up @@ -537,7 +538,7 @@ This section gives you an overview of all local-referenced module files (i.e., o
| Reference | Type |
| :-- | :-- |
| `br/public:avm/ptn/azd/ml-hub-dependencies:0.1.0` | Remote reference |
| `br/public:avm/ptn/azd/ml-project:0.1.0` | Remote reference |
| `br/public:avm/ptn/azd/ml-project:0.1.1` | Remote reference |
| `br/public:avm/res/machine-learning-services/workspace:0.8.1` | Remote reference |

## Data Collection
Expand Down
4 changes: 2 additions & 2 deletions avm/ptn/azd/ml-ai-environment/main.bicep
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ param searchConnectionName string
@description('Optional. The User Assigned Identity resource name.')
param userAssignedtName string

@description('Optional. The number of replicas in the search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs or between 1 and 3 inclusive for basic SKU.')
@description('Optional. The number of replicas in the search service. If specified, it must be a value between 1 and 12 inclusive for standard SKUs, or between 1 and 3 inclusive for basic SKU.')
@minValue(1)
@maxValue(12)
param replicaCount int = 1
Expand Down Expand Up @@ -123,7 +123,7 @@ module hub './modules/hub.bicep' = {
}
}

module project 'br/public:avm/ptn/azd/ml-project:0.1.0' = {
module project 'br/public:avm/ptn/azd/ml-project:0.1.1' = {
name: '${uniqueString(deployment().name, location)}-project'
params: {
name: projectName
Expand Down
Loading

0 comments on commit 97341c4

Please sign in to comment.