Merge dev into features/hubs-recs by flanakin · Pull Request #2066 · microsoft/finops-toolkit

flanakin · 2026-03-21T12:44:17Z

🛠️ Description

Merge latest dev into features/hubs-recs to resolve merge conflicts before merging to dev.

Conflict resolutions:

configure-scopes.md: Kept newer date (03/14)
ftktag.txt (2 files): Took dev's released v14 tag
Update-Version.ps1: Took dev's consistent $releaseTag formatting (keeps v prefix)

📋 Checklist

🔬 How did you test this change?

🤏 Lint tests

🤞 PS -WhatIf / az validate

👍 Manually deployed + verified

💪 Unit tests

🙌 Integration tests

🙋‍♀️ Do any of the following that apply?

🚨 This is a breaking change.

🤏 The change is less than 20 lines of code.

📑 Did you update `docs/changelog.md`?

✅ Updated changelog (required for dev PRs)

➡️ Will add log in a future PR (feature branch PRs only)

❎ Log not needed (small/internal change)

📖 Did you update documentation?

✅ Public docs in docs (required for dev)

✅ Public docs in docs-mslearn (required for dev)

✅ Internal dev docs in docs-wiki (required for dev)

✅ Internal dev docs in src (required for dev)

➡️ Will add docs in a future PR (feature branch PRs only)

❎ Docs not needed (small/internal change)

Co-authored-by: Claude <[email protected]>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: RolandKrummenacher <[email protected]>

# Conflicts: # docs-mslearn/toolkit/hubs/configure-scopes.md # docs/_includes/ftktag.txt # src/scripts/Update-Version.ps1 # src/templates/finops-hub/modules/fx/ftktag.txt

Copilot

Pull request overview

Merges the latest dev branch into features/hubs-recs, resolving conflicts and aligning version/tag handling and FinOps hub deployment scripts/docs with the current dev state.

Changes:

Updates FinOps hub template logic for Data Factory RBAC and makes several hub-app outputs conditional when optional components aren’t deployed.
Aligns version/tag handling to the released v14 tag across templates/docs and updates changelog formatting/links.
Expands local deployment tooling/docs (Deploy-Hub) with additional parameters and examples (PR naming, scope/exports options).

Reviewed changes

Copilot reviewed 9 out of 9 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
src/templates/finops-hub/modules/fx/hub-app.bicep	Refines ADF RBAC role assignment behavior and makes outputs safe when optional resources aren’t deployed.
src/templates/finops-hub/modules/fx/ftktag.txt	Updates template tag to released `v14`.
src/scripts/Update-Version.ps1	Adjusts changelog section/tag parsing to consistently use `v`-prefixed tags and correct compare links.
src/scripts/README.md	Updates Deploy-Hub parameter documentation and adds examples for PR naming and exports scenarios.
src/scripts/Get-Version.ps1	Ensures `-AsTag` returns a stable released tag by stripping prerelease suffixes.
src/scripts/Deploy-Hub.ps1	Adds new deployment options (PR naming, recommendations, scope/exports flow) and post-deploy export configuration logic.
docs/_includes/ftktag.txt	Updates docs include tag to `v14`.
docs-mslearn/toolkit/hubs/configure-scopes.md	Clarifies required role assignment (Cost Management Contributor) for managed exports scopes.
docs-mslearn/toolkit/changelog.md	Adds v14 release header metadata/links and corrects v13 release date formatting.

Copilot · 2026-03-21T12:50:06Z

src/scripts/Deploy-Hub.ps1

+# Hub name — use "{pr}{name}{initials}" when -PR or -Name is specified, otherwise "hub"
 if ($HubName) { $params.hubName = $HubName }
+elseif ($PR -or $PSBoundParameters.ContainsKey('Name'))
+{
+    $explicitName = if ($PSBoundParameters.ContainsKey('Name')) { $Name } else { $null }
+    $hubParts = @($PR, $explicitName, $initials) | Where-Object { $_ }


When -PR is used, $initials is set to "pr-$PR", but later the default hub name is built from @($PR, $explicitName, $initials), which repeats the PR value and produces unexpected names (for example 123adxpr123). Consider keeping user initials separate from the PR prefix and deriving hubName from a single canonical value (for example based on $fullName) to avoid surprising resource naming.

Suggested change

# Hub name — use "{pr}{name}{initials}" when -PR or -Name is specified, otherwise "hub"

if ($HubName) { $params.hubName = $HubName }

elseif ($PR -or $PSBoundParameters.ContainsKey('Name'))

{

$explicitName = if ($PSBoundParameters.ContainsKey('Name')) { $Name } else { $null }

$hubParts = @($PR, $explicitName, $initials) | Where-Object { $_ }

# Hub name — when -PR or -Name is specified, derive from the explicit name and initials; otherwise use "hub"

if ($HubName) { $params.hubName = $HubName }

elseif ($PR -or $PSBoundParameters.ContainsKey('Name'))

{

$explicitName = if ($PSBoundParameters.ContainsKey('Name')) { $Name } else { $null }

# Build hub name parts without duplicating the PR value (initials may already include a PR prefix)

$hubParts = @($explicitName, $initials) | Where-Object { $_ }

🤖 [AI][Claude] ✅ Implemented

Good catch. Removed $PR from the hub name array since $initials already includes it (as pr-{number}). The array is now @($explicitName, $initials) which avoids duplicating the PR number.

Copilot · 2026-03-21T12:50:06Z

src/scripts/Deploy-Hub.ps1

+            New-FinOpsCostExport -Name "ftk-focuscost" `
+                -Scope $Scope `
+                -Dataset "FocusCost" `
+                -StorageAccountId $storageAccountId `
+                -StorageContainer "msexports" `
+                -DoNotOverwrite `
+                -Execute


Manual export creation uses a constant export name (ftk-focuscost). New-FinOpsCostExport updates an existing export when the name already exists in the same scope, so reusing this script across environments/scopes can inadvertently modify an unrelated export. Consider incorporating the hub name (or $fullName) into the export name to avoid collisions.

🤖 [AI][Claude] 🤔 Needs discussion

The constant export name ftk-focuscost is intentional. We want to consistently manage the same export across deployments to the same scope, rather than creating duplicate exports per environment. The -DoNotOverwrite flag prevents accidental modification of existing exports.

Copilot · 2026-03-21T12:50:07Z

src/scripts/README.md

+| Parameter          | Description                                                                                                                                                                          |
+| ------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `‑Name`            | Optional. First positional parameter. Suffix for `{initials}-{name}` convention. Default: `adx`.                                                                                     |
+| `‑HubName`         | Optional. Name of the hub instance. Default: `hub`.                                                                                                                                  |
+| `‑ADX`             | Optional. Name of the Azure Data Explorer cluster. Overrides the `{initials}-{name}` convention.                                                                                     |
+| `‑ResourceGroup`   | Optional. Name of the resource group. Overrides the `{initials}-{name}` convention.                                                                                                  |
+| `‑Fabric`          | Optional. Deploy with Microsoft Fabric. Provide the eventhouse query URI.                                                                                                            |
+| `‑StorageOnly`     | Optional. Deploy a storage-only hub (no Azure Data Explorer or Fabric).                                                                                                              |
+| `‑Remove`          | Optional. Remove test environments. With a name, deletes the target RG. Alone, lists all `{initials}-*`.                                                                             |
+| `‑PR`              | Optional. PR number for CI deployments. Resources are named `pr-{number}` or `pr-{number}-{name}` when `-Name` is also specified.                                                    |
+| `‑Scope`           | Optional. Azure scope ID for cost data exports (e.g., `/subscriptions/{id}`). With `-ManagedExports`, enables managed exports. Without it, creates exports manually.                 |
+| `‑ManagedExports`  | Optional. Use managed exports instead of manual exports. Requires `-Scope`. Passes `scopesToMonitor` to the template and grants the hub identity required roles.                     |
+| `‑Location`        | Optional. Azure location. Default: `westus`.                                                                                                                                         |


Deploy-Hub.ps1 now includes a -Recommendations switch, but the Deploy-Hub parameter table does not list it. Update this table (and ideally add a short example) so readers can discover and understand the new flag.

🤖 [AI][Claude] ✅ Implemented

Added -Recommendations to the README parameter table.

Copilot · 2026-03-21T12:50:07Z

src/scripts/Deploy-Hub.ps1

    [Parameter(Position = 0)]
    [string]$Name,
+    [string]$PR,
    [string]$HubName,
    [string]$ADX,


Deploy-Hub.ps1 declares the PR parameter twice in the param(...) block ([string]$PR and later [int]$PR). PowerShell does not allow duplicate parameter names, so the script will fail to parse. Remove one declaration and keep a single, consistently-typed PR parameter.

🤖 [AI][Claude] ✅ Implemented

Already fixed in PR #2062. Merged latest dev into this branch which includes the fix (single [int]$PR declaration).

Copilot · 2026-03-21T12:50:07Z

src/scripts/Deploy-Hub.ps1

+    .PARAMETER PR
+    Optional. PR number for CI deployments. Resources are named "pr-{number}" or "pr-{number}-{name}" when -Name is also specified.
+


The comment-based help documents .PARAMETER PR twice with different descriptions. Consolidate this into a single .PARAMETER PR entry and ensure the description matches the actual naming behavior implemented in the script.

🤖 [AI][Claude] ✅ Implemented

Already fixed in PR #2062. Merged latest dev into this branch which includes the consolidated .PARAMETER PR help block.

…RunHistory (#2062) Co-authored-by: Roland Krummenacher <[email protected]> Co-authored-by: Michael Flanakin <[email protected]>

Co-authored-by: Roland Krummenacher <[email protected]> Co-authored-by: Claude Opus 4.6 <[email protected]>

Co-authored-by: Roland Krummenacher <[email protected]> Co-authored-by: Claude Opus 4.6 <[email protected]> Co-authored-by: Michael Flanakin <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

…hubs-recs-2 # Conflicts: # docs-mslearn/toolkit/changelog.md # docs-mslearn/toolkit/hubs/data-processing.md # docs-mslearn/toolkit/open-data.md

- Fix hub name PR number duplication: remove $PR from hub name array since $initials already includes it as "pr-{number}" - Add -Recommendations parameter to README Deploy-Hub table 🤖 Generated with [Claude Code](https://claude.ai/claude-code) Co-Authored-By: copilot-pull-request-reviewer <[email protected]> Co-Authored-By: Claude <[email protected]>

flanakin · 2026-03-27T05:22:48Z

🤖 [AI][Claude] PR Update Summary

Addressed: 5 thread(s)

✅ Implemented: 4
🤔 Needs discussion: 1

Changes:

Fixed hub name PR number duplication (@($PR, $explicitName, $initials) → @($explicitName, $initials))
Added -Recommendations to README parameter table
Threads 4 & 5 (duplicate $PR param/help) resolved by merging latest dev which includes PR Fix exports Bicep build, Deploy-Hub params, and Get-FinOpsCostExport RunHistory #2062 fixes
Thread 2 (export name): intentionally constant for consistent export management

flanakin and others added 4 commits March 14, 2026 13:22

Prep branch for v14 (#2041)

7924c9f

Co-authored-by: Claude <[email protected]>

[DevOps] PR Builds: Add PR deployment support to Deploy-Hub (#2030)

458fae1

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: RolandKrummenacher <[email protected]>

[Hubs] Fix hub-app conditional outputs and Deploy-Hub bugs (#2054)

045067e

Merge remote-tracking branch 'origin/dev' into features/hubs-recs

50c500a

# Conflicts: # docs-mslearn/toolkit/hubs/configure-scopes.md # docs/_includes/ftktag.txt # src/scripts/Update-Version.ps1 # src/templates/finops-hub/modules/fx/ftktag.txt

Copilot AI review requested due to automatic review settings March 21, 2026 12:44

flanakin requested review from MSBrett and RolandKrummenacher as code owners March 21, 2026 12:44

Copilot started reviewing on behalf of flanakin March 21, 2026 12:44 View session

chore: Update ms.date in docs-mslearn files

df93774

microsoft-github-policy-service bot added Micro PR 🔬 Very small PR that should be especially easy for newcomers Needs: Review 👀 PR that is ready to be reviewed labels Mar 21, 2026

microsoft-github-policy-service bot assigned MSBrett and flanakin Mar 21, 2026

flanakin mentioned this pull request Mar 21, 2026

[Hubs] Recommendations app #2065

Draft

Copilot AI reviewed Mar 21, 2026

View reviewed changes

RolandKrummenacher approved these changes Mar 23, 2026

View reviewed changes

RolandKrummenacher and others added 5 commits March 23, 2026 11:26

Fix exports Bicep build, Deploy-Hub params, and Get-FinOpsCostExport …

aa1912d

…RunHistory (#2062) Co-authored-by: Roland Krummenacher <[email protected]> Co-authored-by: Michael Flanakin <[email protected]>

Add environment section to bug report template (#2060)

d6f77c6

Co-authored-by: Roland Krummenacher <[email protected]> Co-authored-by: Claude Opus 4.6 <[email protected]>

Merge remote-tracking branch 'origin/dev' into flanakin/merge-dev-to-…

f2c429a

…hubs-recs-2 # Conflicts: # docs-mslearn/toolkit/changelog.md # docs-mslearn/toolkit/hubs/data-processing.md # docs-mslearn/toolkit/open-data.md

chore: Update ms.date in docs-mslearn files

6f1775e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge dev into features/hubs-recs#2066

Merge dev into features/hubs-recs#2066
flanakin wants to merge 11 commits intofeatures/hubs-recsfrom
flanakin/merge-dev-to-hubs-recs-2

flanakin commented Mar 21, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 21, 2026

Uh oh!

flanakin Mar 26, 2026

Uh oh!

Copilot AI Mar 21, 2026

Uh oh!

flanakin Mar 26, 2026

Uh oh!

Copilot AI Mar 21, 2026

Uh oh!

flanakin Mar 26, 2026

Uh oh!

Copilot AI Mar 21, 2026

Uh oh!

flanakin Mar 26, 2026

Uh oh!

Copilot AI Mar 21, 2026

Uh oh!

flanakin Mar 26, 2026

Uh oh!

flanakin commented Mar 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

		.PARAMETER PR
		Optional. PR number for CI deployments. Resources are named "pr-{number}" or "pr-{number}-{name}" when -Name is also specified.

Conversation

flanakin commented Mar 21, 2026

🛠️ Description

📋 Checklist

🔬 How did you test this change?

🙋‍♀️ Do any of the following that apply?

📑 Did you update docs/changelog.md?

📖 Did you update documentation?

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

flanakin Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

flanakin Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

flanakin Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

flanakin Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 21, 2026

Choose a reason for hiding this comment

Uh oh!

flanakin Mar 26, 2026

Choose a reason for hiding this comment

Uh oh!

flanakin commented Mar 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

📑 Did you update `docs/changelog.md`?