Skip to content

Commit ec1a5e4

Browse files
courtzcdevorekristenianjensenismedependabot[bot]HadwaAbdelhalem
authored
Cross link of the CAIRA repository (#327)
* Cross linked the CAIRA repository * Bump the terraform-provider versions (#347) * chore(deps): bump the terraform-providers group across 2 directories with 2 updates Bumps the terraform-providers group with 2 updates in the /infra directory: [hashicorp/azurerm](https://github.com/hashicorp/terraform-provider-azurerm) and [microsoft/power-platform](https://github.com/microsoft/terraform-provider-power-platform). Bumps the terraform-providers group with 2 updates in the /infra/modules/copilot_studio directory: [hashicorp/azurerm](https://github.com/hashicorp/terraform-provider-azurerm) and [microsoft/power-platform](https://github.com/microsoft/terraform-provider-power-platform). Updates `hashicorp/azurerm` from 4.55.0 to 4.56.0 - [Release notes](https://github.com/hashicorp/terraform-provider-azurerm/releases) - [Changelog](https://github.com/hashicorp/terraform-provider-azurerm/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-provider-azurerm@v4.55.0...v4.56.0) Updates `microsoft/power-platform` from 3.9.1 to 4.0.0 - [Release notes](https://github.com/microsoft/terraform-provider-power-platform/releases) - [Changelog](https://github.com/microsoft/terraform-provider-power-platform/blob/main/CHANGELOG.md) - [Commits](microsoft/terraform-provider-power-platform@v3.9.1...v4.0.0) Updates `hashicorp/azurerm` from 4.55.0 to 4.56.0 - [Release notes](https://github.com/hashicorp/terraform-provider-azurerm/releases) - [Changelog](https://github.com/hashicorp/terraform-provider-azurerm/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-provider-azurerm@v4.55.0...v4.56.0) Updates `microsoft/power-platform` from 3.9.1 to 4.0.0 - [Release notes](https://github.com/microsoft/terraform-provider-power-platform/releases) - [Changelog](https://github.com/microsoft/terraform-provider-power-platform/blob/main/CHANGELOG.md) - [Commits](microsoft/terraform-provider-power-platform@v3.9.1...v4.0.0) Updates `hashicorp/azurerm` from 4.55.0 to 4.56.0 - [Release notes](https://github.com/hashicorp/terraform-provider-azurerm/releases) - [Changelog](https://github.com/hashicorp/terraform-provider-azurerm/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-provider-azurerm@v4.55.0...v4.56.0) Updates `microsoft/power-platform` from 3.9.1 to 4.0.0 - [Release notes](https://github.com/microsoft/terraform-provider-power-platform/releases) - [Changelog](https://github.com/microsoft/terraform-provider-power-platform/blob/main/CHANGELOG.md) - [Commits](microsoft/terraform-provider-power-platform@v3.9.1...v4.0.0) Updates `hashicorp/azurerm` from 4.55.0 to 4.56.0 - [Release notes](https://github.com/hashicorp/terraform-provider-azurerm/releases) - [Changelog](https://github.com/hashicorp/terraform-provider-azurerm/blob/main/CHANGELOG.md) - [Commits](hashicorp/terraform-provider-azurerm@v4.55.0...v4.56.0) Updates `microsoft/power-platform` from 3.9.1 to 4.0.0 - [Release notes](https://github.com/microsoft/terraform-provider-power-platform/releases) - [Changelog](https://github.com/microsoft/terraform-provider-power-platform/blob/main/CHANGELOG.md) - [Commits](microsoft/terraform-provider-power-platform@v3.9.1...v4.0.0) --- updated-dependencies: - dependency-name: hashicorp/azurerm dependency-version: 4.56.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: terraform-providers - dependency-name: microsoft/power-platform dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: terraform-providers - dependency-name: hashicorp/azurerm dependency-version: 4.56.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: terraform-providers - dependency-name: microsoft/power-platform dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: terraform-providers - dependency-name: hashicorp/azurerm dependency-version: 4.56.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: terraform-providers - dependency-name: microsoft/power-platform dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: terraform-providers - dependency-name: hashicorp/azurerm dependency-version: 4.56.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: terraform-providers - dependency-name: microsoft/power-platform dependency-version: 4.0.0 dependency-type: direct:production update-type: version-update:semver-major dependency-group: terraform-providers ... Signed-off-by: dependabot[bot] <[email protected]> * chore(deps): remove no longer supported "maker onboarding" related variables from power platform managed environment as platform provider version upgrade to v4.0.0 * readd missing description for power_platform_managed_environment variable --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hadwa Gaber <[email protected]> * chore(ci): update paths-ignore for main and pull_request triggers in azure-dev.yml (#348) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Kristen DeVore <[email protected]> Co-authored-by: Ian Jensen <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Hadwa Gaber <[email protected]>
1 parent bcb64ff commit ec1a5e4

File tree

7 files changed

+30
-22
lines changed

7 files changed

+30
-22
lines changed

.github/workflows/azure-dev.yml

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,20 @@ on:
2020
# Set this to the mainline branch you are using
2121
branches:
2222
- main
23+
paths-ignore:
24+
- 'docs/**'
25+
- 'decision-log/**'
26+
- 'cicd/**'
27+
- '*.md'
2328
pull_request:
2429
# Run when pull requests are opened or updated
2530
branches:
2631
- main
32+
paths-ignore:
33+
- 'docs/**'
34+
- 'decision-log/**'
35+
- 'cicd/**'
36+
- '*.md'
2737

2838
# GitHub Actions workflow to deploy to Azure using azd
2939
# Ensure only one deployment runs at a time to prevent conflicts
@@ -47,17 +57,17 @@ jobs:
4757

4858
steps:
4959
- name: Checkout code
50-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
60+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
5161
with:
5262
persist-credentials: false
5363

5464
- name: Install azd
55-
uses: Azure/setup-azd@c495e71ba59e44bfaaac10a32c8ee90d191ca4a3 # v2.2.1
65+
uses: Azure/setup-azd@c495e71ba59e44bfaaac10a32c8ee90d191ca4a3 # v2.2.1
5666
with:
5767
version: '1.20.0' # Specify your desired azd version here
5868

5969
- name: Setup Node.js
60-
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
70+
uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f # v6.1.0
6171
with:
6272
node-version: '18.x'
6373

@@ -67,7 +77,7 @@ jobs:
6777
terraform_version: 1.13.3
6878

6979
- name: Install TFLint
70-
uses: terraform-linters/setup-tflint@4cb9feea73331a35b422df102992a03a44a3bb33 # v6.2.1
80+
uses: terraform-linters/setup-tflint@4cb9feea73331a35b422df102992a03a44a3bb33 # v6.2.1
7181
with:
7282
tflint_version: v0.58.1
7383
github_token: ${{ secrets.GITHUB_TOKEN }} # Used to avoid rate
@@ -121,7 +131,7 @@ jobs:
121131
pac help
122132
123133
- name: Set Up Python
124-
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # 6.1.0
134+
uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # 6.1.0
125135
with:
126136
python-version: "3.x"
127137

@@ -182,7 +192,7 @@ jobs:
182192
183193
azd provision --no-prompt
184194
185-
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
195+
- uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
186196
if: success() || failure()
187197
with:
188198
name: sarif-reports
@@ -253,4 +263,4 @@ jobs:
253263
--name "$OPENAI_RESOURCE_NAME" || echo "Resource may not be in soft-delete state or already purged"
254264
else
255265
echo "OpenAI resource information not found in environment outputs. Skipping purge."
256-
fi
266+
fi

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,14 @@ network security.
4747
- Pre-configured backend setup for remote state storage.
4848
- Documentation and examples for quick onboarding and usage.
4949

50+
## CAIRA Assets
51+
This is one of several acceleration assets within the CAIRA (Composable AI Reference Architectures) suite.
52+
53+
| Asset | Purpose | What it offers | Link |
54+
|-------|---------------|----------------|------------|
55+
| **AI Foundry Acceleration** | For organizations building modern AI solutions in the cloud | • Faster time to value: Deploy enterprise AI solutions with minimal upfront investment using reliable accelerator components<br>• Enterprise-grade security and observability acceleration: Baseline configurations with private networking, security controls, and compliance patterns<br>• Infrastructure as Code: Repeatable, version-controlled deployments with composable Terraform modules for Azure AI Foundry and supporting infrastructure<br>• Agentic acceleration: Deploy and configure through natural language, with seamless agent communication | [aka.ms/CAIRA](https://github.com/microsoft/CAIRA) |
56+
| **Copilot Studio + Azure AI Search Acceleration** | For customers building enterprise solutions involving the low-code platform Copilot Studio (Power Platform) | • Rapid provisioning: Deploy a full Copilot Studio + Azure AI Search environment<br>• Enterprise-ready baseline: Preconfigured networking (VNets, private endpoints) and secure authentication patterns<br>• CI/CD friendly: Modular Terraform templates for repeatable, automated deployments<br>• Faster time-to-value: Move from proof-of-concept to production quickly and confidently<br>• Extensible architecture: Supports bring-your-own networking and ALM patterns for dev/test/prod environments | This repository |
57+
5058
## Architecture
5159

5260
This enterprise-ready architecture demonstrates how to securely connect Copilot Studio with Azure AI Search through a private virtual network infrastructure. The solution focuses on data security, network isolation, and compliance with enterprise governance policies.

infra/modules/copilot_studio/power_platform_core.tf

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,5 @@ resource "powerplatform_managed_environment" "this" {
7474
max_limit_user_sharing = var.power_platform_managed_environment.max_limit_user_sharing
7575
solution_checker_mode = var.power_platform_managed_environment.solution_checker_mode
7676
suppress_validation_emails = var.power_platform_managed_environment.suppress_validation_emails
77-
maker_onboarding_markdown = var.power_platform_managed_environment.maker_onboarding_markdown
78-
maker_onboarding_url = var.power_platform_managed_environment.maker_onboarding_url
7977
}
8078

infra/modules/copilot_studio/terraform.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ terraform {
1010
}
1111
azurerm = {
1212
source = "hashicorp/azurerm"
13-
version = "4.55.0"
13+
version = "4.56.0"
1414
}
1515
modtm = {
1616
source = "Azure/modtm"
1717
version = "0.3.5"
1818
}
1919
powerplatform = {
2020
source = "microsoft/power-platform"
21-
version = "3.9.1"
21+
version = "4.0.0"
2222
}
2323
random = {
2424
source = "hashicorp/random"

infra/modules/copilot_studio/variables.tf

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ variable "power_platform_managed_environment" {
5757
max_limit_user_sharing = number
5858
solution_checker_mode = string
5959
suppress_validation_emails = bool
60-
maker_onboarding_markdown = string
61-
maker_onboarding_url = string
6260
})
6361
description = <<DESCRIPTION
6462
- `is_usage_insights_disabled`: Whether usage insights are disabled for the Power Platform managed environment.
@@ -67,9 +65,7 @@ variable "power_platform_managed_environment" {
6765
- `max_limit_user_sharing`: The maximum limit for user sharing in the Power Platform managed environment.
6866
- `solution_checker_mode`: The solution checker mode for the Power Platform managed environment.
6967
- `suppress_validation_emails`: Whether validation emails are suppressed for the Power Platform managed environment.
70-
- `maker_onboarding_markdown`: The onboarding markdown for makers in the Power Platform managed environment.
71-
- `maker_onboarding_url`: The onboarding URL for makers in the Power Platform managed environment.
72-
DESCRIPTION
68+
DESCRIPTION
7369
}
7470

7571
variable "primary_subnet_id" {

infra/provider.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ terraform {
2020
}
2121
azurerm = {
2222
source = "hashicorp/azurerm"
23-
version = "4.55.0"
23+
version = "4.56.0"
2424
}
2525
modtm = {
2626
source = "Azure/modtm"
2727
version = "~> 0.3.2"
2828
}
2929
powerplatform = {
3030
source = "microsoft/power-platform"
31-
version = "3.9.1"
31+
version = "4.0.0"
3232
}
3333
random = {
3434
source = "hashicorp/random"

infra/variables.tf

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,6 @@ variable "power_platform_managed_environment" {
360360
max_limit_user_sharing = number
361361
solution_checker_mode = string
362362
suppress_validation_emails = bool
363-
maker_onboarding_markdown = string
364-
maker_onboarding_url = string
365363
})
366364
default = {
367365
id = "" # Optional. If provided, the module will attempt to use the existing managed environment. If left blank, a new environment will be created.
@@ -371,8 +369,6 @@ variable "power_platform_managed_environment" {
371369
max_limit_user_sharing = 0
372370
solution_checker_mode = "None"
373371
suppress_validation_emails = false
374-
maker_onboarding_markdown = ""
375-
maker_onboarding_url = ""
376372
}
377373
description = "Configuration for the Power Platform managed environment"
378374
}

0 commit comments

Comments
 (0)