Skip to content

Add FOCUS 1.4 schema tests and changelog entries#2136

Draft
flanakin wants to merge 23 commits into
flanakin/focus14from
flanakin/focus14-phase7-tests-changelog
Draft

Add FOCUS 1.4 schema tests and changelog entries#2136
flanakin wants to merge 23 commits into
flanakin/focus14from
flanakin/focus14-phase7-tests-changelog

Conversation

@flanakin
Copy link
Copy Markdown
Collaborator

@flanakin flanakin commented May 6, 2026 •
edited
Loading

Summary

  • Updates HubsFocusSchemas.Tests.ps1 Pester tests to validate v1_4 schema files (removes all v1_3 references)
  • Removes the IngestionSetup_v1_3.kql and HubSetup_v1_3.kql test contexts (those files no longer exist)
  • Corrects HubSetup_Latest.kql alias assertions to expect _v1_4() instead of _v1_3()
  • Removes the "preview must be opt-in" test (v1_4 is GA)
  • Updates changelog to describe FOCUS 1.4 as GA (removes "preview" language and "v1_3" references)

Test plan

  • pwsh -Command Invoke-Pester -Output Detailed -Path ./src/powershell/Tests/Unit/HubsFocusSchemas.Tests.ps1 passes with all tests green
  • No v1_3 references remain in the test file
  • Changelog entries correctly describe FOCUS 1.4 GA

🤖 Generated with Claude Code

flanakin and others added 7 commits May 6, 2026 08:07
@flanakin @claude
Add FOCUS 1.3 ingestion (#2124)
77a75b1 
Adds IngestionSetup_v1_3.kql with Costs/Prices/CommitmentDiscountUsage/
Recommendations/Transactions transforms and final tables renamed for
FOCUS 1.3. Cost and Usage gains 8 new FOCUS 1.3 columns:
AllocatedMethodId/Details/ResourceId/ResourceName/Tags (data-generator
split cost allocation), ContractApplied (per-row contract commitment
application), ServiceProviderName + HostProviderName (replacing the
deprecated ProviderName/PublisherName, with empty-fallback for back
compat).

Costs_raw now carries the new columns so downstream v1_2 transforms
keep working and v1_3 transforms can read them directly. The v1_3
file is wired into the Bicep deployment alongside v1_0 and v1_2.

The unversioned Costs() function still aliases to v1_2 — phase 2
adds Costs_v1_3() and retargets Latest.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@flanakin @claude
Add FOCUS 1.3 hub functions (#2127)
f70c43d 
Adds HubSetup_v1_3.kql with Costs_v1_3, Prices_v1_3,
CommitmentDiscountUsage_v1_3, Recommendations_v1_3, and
Transactions_v1_3 that union the new Costs_final_v1_3 with the
existing Costs_final_v1_2 and Costs_final_v1_0 tables.

For v1_2 data unioned into the v1_3 view, the 8 new FOCUS 1.3 columns
default to null/empty and ServiceProviderName/HostProviderName are
populated from the deprecated ProviderName/PublisherName for back
compat. The same defaults apply to the v1_0 union arm on top of the
existing v1_0 -> v1_2 conversion.

HubSetup_Latest.kql aliases now point to *_v1_3 functions so the
unversioned Costs(), Prices(), etc. return the latest schema.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@flanakin @claude
Add ContractCommitment dataset (#2129)
2bfa611 
Adds the FOCUS 1.3 Contract Commitment supplemental dataset:
- ContractCommitment_raw table in IngestionSetup_RawTables.kql with
  the 14 mandatory FOCUS 1.3 columns plus standard hubs source
  metadata.
- ContractCommitment_transform_v1_3 + ContractCommitment_final_v1_3
  in IngestionSetup_v1_3.kql, with update policy mapping raw to final.
- ContractCommitment_v1_3 hub function in HubSetup_v1_3.kql that
  reads the final table directly (no older versions to union).
- Unversioned ContractCommitment alias in HubSetup_Latest.kql.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@flanakin @claude
Add FOCUS 1.4-preview ingestion (#2131)
e489389 
Adds IngestionSetup_v1_4.kql as a preview schema for FOCUS 1.4
working_draft. Cost and Usage drops the deprecated ProviderName
and PublisherName columns (removed in 1.4 per spec). Contract
Commitment expands by 14 new columns: BenefitCategory,
ContractCommitmentApplicability (JSON), Created, DiscountPercentage,
DurationType, FulfillmentInterval, LastUpdated, LifecycleStatus,
Model, OfferCategory, PaymentInterval, PaymentModel,
PaymentUpfrontPercentage, PricingCurrencyContractCommitmentCost.

The internal ProviderName/PublisherName fix-up logic in the Costs
transform stays so HostProviderName / ServiceProviderName can fall
back to those values when source data does not yet supply them.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@flanakin @claude
Add FOCUS 1.4-preview hub functions (#2133)
3a68afd 
Adds HubSetup_v1_4.kql with the v1_4-preview-shaped hub functions.
Costs_v1_4 unions Costs_final_v1_4, Costs_final_v1_3,
Costs_final_v1_2, and Costs_final_v1_0; ProviderName and
PublisherName are dropped from the v1_4 project list (removed in
1.4 per spec).

ContractCommitment_v1_4 unions ContractCommitment_final_v1_4 with
ContractCommitment_final_v1_3 and extends v1_3 data with empty/null
defaults for the 14 new FOCUS 1.4 columns.

HubSetup_Latest.kql is intentionally NOT retargeted to v1_4. Per
the preview convention in data-model.md, unversioned aliases stay
pinned to the latest GA schema (v1_3) until v1_4 promotes from
preview to GA.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@flanakin @claude
Refresh Claude Code plugin skill files for FOCUS 1.3 / 1.4 (#2119)
657aa7d 
Updates plugin skill files so plugin guidance reflects the new
hub schemas and FOCUS columns added in this milestone:

- finops-hubs.md: lists the full set of unversioned functions
  (CommitmentDiscountUsage, ContractCommitment included), notes
  the v1_0 / v1_2 / v1_3 / v1_4-preview versioned variants, and
  enumerates the FOCUS 1.3 column additions plus the 1.4
  ProviderName / PublisherName removal.
- finops-hubs-deployment.md: extends the supported FOCUS export
  versions to 1.0r2 / 1.2 / 1.2-preview (current Cost Management)
  and notes that hubs can also ingest 1.3 / 1.4-preview when
  Cost Management ships those exports.
- ftk-database-query.md: expands from four to six analytic
  functions, adds CommitmentDiscountUsage and ContractCommitment
  sections, and surfaces the FOCUS 1.3 columns on the Costs()
  reference table.
- ftk-output-style.md: adds FOCUS 1.3+ terminology preferences
  for ServiceProviderName, HostProviderName, and ContractApplied.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
@flanakin @claude
Add FOCUS schema tests and changelog entries (#2120)
f090461 
- HubsFocusSchemas.Tests.ps1: 108 Pester tests asserting the
  FOCUS 1.3 and 1.4-preview schema additions land where expected:
  Costs_raw additions, ContractCommitment_raw definition with
  both 1.3 and 1.4 columns, presence of versioned transforms
  and final tables in IngestionSetup_v1_3 / v1_4, presence of
  versioned hub functions in HubSetup_v1_3 / v1_4, the union
  arms in Costs_v1_3 and Costs_v1_4, the Latest aliases pinned
  to v1_3 (not preview v1_4), and the Bicep / build-config
  wiring.
- changelog.md: adds v15.0.0 hub entries describing the FOCUS
  1.3 GA and 1.4-preview schema additions, the new
  ContractCommitment dataset, the unversioned alias retarget,
  and the upgrade-procedure refresh. Adds a plugin entry for
  #2119. Updates ms.date to today.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Copilot AI review requested due to automatic review settings May 6, 2026 18:13
@flanakin flanakin requested a review from MSBrett as a code owner May 6, 2026 18:13
@microsoft-github-policy-service microsoft-github-policy-service Bot added the Needs: Review 👀 PR that is ready to be reviewed label May 6, 2026
@flanakin flanakin changed the base branch from flanakin/focus14-phase6-plugin to flanakin/focus14 May 6, 2026 23:00
@flanakin flanakin marked this pull request as draft May 6, 2026 23:16
@flanakin flanakin added this to the v15 milestone May 15, 2026
flanakin and others added 5 commits May 17, 2026 13:24
@flanakin @claude
Add FOCUS 1.4 ingestion (IngestionSetup_v1_4.kql)
c56b616 
Consolidates FOCUS 1.3 and 1.4 column additions into a single v1_4 ingestion
setup file. Removes the intermediate v1_3 file, adds ContractCommitment_raw
table definition, and updates app.bicep and .build.config to reference v1_4.

Co-Authored-By: Claude <noreply@anthropic.com>
@flanakin
Merge branch 'flanakin/focus14-phase1-ingestion-1.3' into flanakin/fo…
7d9d295 
…cus14-phase2-hubs-1.3
@flanakin @claude
Add FOCUS 1.4 hub functions (HubSetup_v1_4.kql)
8a01133 
Renames HubSetup_v1_3.kql to HubSetup_v1_4.kql, consolidating all hub
functions (including ContractCommitment) for FOCUS 1.4 GA. Updates
HubSetup_Latest.kql to alias all unversioned functions to v1_4. Updates
app.bicep and .build.config to reference v1_4.

Co-Authored-By: Claude <noreply@anthropic.com>
@flanakin @claude
Refresh Claude Code plugin skill files for FOCUS 1.4
58f50cd 
Updates all FOCUS version references from 1.3/1.4-preview to v1_4 GA.
Removes intermediate v1_3 function references. Marks ContractCommitment
as FOCUS 1.4+ (not 1.3+). Removes preview designations for v1_4.

Co-Authored-By: Claude <noreply@anthropic.com>
@flanakin @claude
Add FOCUS 1.4 schema tests and changelog entries
eba731f 
Updates Pester tests to validate v1_4 (not v1_3) schema files, removes
tests for the eliminated intermediate v1_3 schema, and corrects
HubSetup_Latest assertions to expect _v1_4() aliases. Updates changelog
to reflect FOCUS 1.4 GA release without preview designation.

Co-Authored-By: Claude <noreply@anthropic.com>
@flanakin flanakin changed the title Add FOCUS schema tests and changelog entries Add FOCUS 1.4 schema tests and changelog entries May 17, 2026
@flanakin @claude
Address PR #2126 feedback
f8495a5 
- Pluralize ContractCommitments_raw / _transform_v1_4 / _final_v1_4 / mapping / update policy
- Add BillingPeriods_raw + IngestionSetup_v1_4 transforms/finals/policies (FOCUS 1.4 supplemental dataset)
- Add InvoiceDetails_raw + IngestionSetup_v1_4 transforms/finals/policies (FOCUS 1.4 supplemental dataset)
- Add 12 ContractCommitment* per-row columns + CommitmentProgramEligibilityDetails + InvoiceDetailId to Costs_raw, Costs_final_v1_4, and Costs_transform_v1_4
- Fix x_Source* annotations on ContractCommitments_raw to Hubs v1_4+
- Update Costs_raw ProviderName/PublisherName annotations to FOCUS 0.5-1.3 (removed in 1.4; kept for back compat)
- Update Costs_raw Region annotation: deprecated -> removed
- File #2159 for the FOCUS 1.4 native-columns architecture research

🤖 Generated with [Claude Code](https://claude.ai/claude-code)

Co-Authored-By: Michael Flanakin <flanakin@users.noreply.github.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@flanakin flanakin mentioned this pull request May 26, 2026
Draft
3 tasks
flanakin and others added 4 commits May 26, 2026 00:22
@flanakin
Merge branch 'flanakin/focus14-phase1-ingestion-1.3' into flanakin/fo…
6f2ec90 
…cus14-phase2-hubs-1.3
@flanakin @claude
Cascade PR #2126 feedback to hub functions
56f9b30 
- Rename ContractCommitment_v1_4() -> ContractCommitments_v1_4() (and update folder label)
- Add BillingPeriods_v1_4() and InvoiceDetails_v1_4() hub functions
- Add BillingPeriods(), ContractCommitments() (renamed), and InvoiceDetails() unversioned aliases in HubSetup_Latest.kql
- Add CommitmentProgramEligibilityDetails + 12 ContractCommitment* + InvoiceDetailId column defaults to Costs_final_v1_0 and Costs_final_v1_2 union arms (back-compat shims) and add them to the project list

🤖 Generated with [Claude Code](https://claude.ai/claude-code)

Co-Authored-By: Michael Flanakin <flanakin@users.noreply.github.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@flanakin
Merge branch 'flanakin/focus14-phase2-hubs-1.3' into flanakin/focus14…
676da5e 
…-phase6-plugin

# Conflicts:
#	src/templates/finops-hub/.build.config
#	src/templates/finops-hub/modules/Microsoft.FinOpsHubs/Analytics/app.bicep
#	src/templates/finops-hub/modules/Microsoft.FinOpsHubs/Analytics/scripts/HubSetup_v1_4.kql
#	src/templates/finops-hub/modules/Microsoft.FinOpsHubs/Analytics/scripts/IngestionSetup_RawTables.kql
#	src/templates/finops-hub/modules/Microsoft.FinOpsHubs/Analytics/scripts/IngestionSetup_v1_4.kql
@flanakin @claude
Cascade PR #2126 feedback to plugin docs
cb93641 
- Rename ContractCommitment() -> ContractCommitments() in skill references and agent docs
- Add BillingPeriods() and InvoiceDetails() to the function list and dedicated agent doc sections
- Mention the new FOCUS 1.4 per-row columns (CommitmentProgramEligibilityDetails, 12 ContractCommitment* columns, InvoiceDetailId)
- Update output-style guidance to reference all three supplemental datasets

🤖 Generated with [Claude Code](https://claude.ai/claude-code)

Co-Authored-By: Michael Flanakin <flanakin@users.noreply.github.com>
Co-Authored-By: Claude <noreply@anthropic.com>
flanakin and others added 4 commits May 26, 2026 00:31
@flanakin
Merge branch 'flanakin/focus14-phase6-plugin' into flanakin/focus14-p…
f9aa923 
…hase7-tests-changelog
@flanakin @claude
Remove leftover singular ContractCommitment() alias
3ebb967 
A merge artifact from rebasing on the v1_3 ancestry left a singular
ContractCommitment() function referencing ContractCommitment_v1_3() in
HubSetup_Latest.kql. v1_3 was eliminated and the dataset was pluralized
to ContractCommitments_v1_4(); the orphan would fail to load on hub
deployment. Remove it.

Co-Authored-By: Michael Flanakin <flanakin@users.noreply.github.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@flanakin
Merge branch 'flanakin/focus14-phase6-plugin' into flanakin/focus14-p…
07a8850 
…hase7-tests-changelog
@flanakin @claude
Cascade PR #2126 feedback to tests + changelog
362de44 
Tests:
- Pluralize ContractCommitments_raw / _final_v1_4 / _v1_4 assertions
- Assert new BillingPeriods_raw + InvoiceDetails_raw datasets exist with their FOCUS 1.4 columns
- Assert new BillingPeriods_v1_4(), InvoiceDetails_v1_4(), ContractCommitments_v1_4() hub functions
- Assert HubSetup_Latest aliases for BillingPeriods(), ContractCommitments(), InvoiceDetails()
- Assert Costs_raw and Costs_final_v1_4 include the 14 new FOCUS 1.4 columns
- Assert NO singular ContractCommitment_raw / ContractCommitment_v1_4 / ContractCommitment() exists
- Assert Costs_raw keeps removed ProviderName/PublisherName/Region for back compat

Changelog:
- Expand v15.0.0 entry with the 14 new FOCUS 1.4 columns and the three new supplemental datasets (ContractCommitments, BillingPeriods, InvoiceDetails)
- Update plugin entry to list ContractCommitments() / BillingPeriods() / InvoiceDetails()

🤖 Generated with [Claude Code](https://claude.ai/claude-code)

Co-Authored-By: Michael Flanakin <flanakin@users.noreply.github.com>
Co-Authored-By: Claude <noreply@anthropic.com>
@flanakin
Copy link
Copy Markdown
Collaborator Author

flanakin commented May 27, 2026

🤖 [AI][Claude Code] PR Update Summary

Cascade of PR #2126 review feedback (tests + changelog):

  • ✅ Pester tests now cover the pluralized ContractCommitments naming and the new BillingPeriods + InvoiceDetails datasets — 152 assertions, all green
  • ✅ Tests guard against regressions: singular ContractCommitment must not appear; deprecated ProviderName/PublisherName/Region must stay in Costs_raw for back compat
  • ✅ Changelog v15.0.0 entry expanded with the 14 new FOCUS 1.4 cost columns and three new supplemental datasets

Depends on PRs #2126, #2128, and #2135.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot Awaiting requested review from Copilot

@MSBrett MSBrett Awaiting requested review from MSBrett MSBrett is a code owner

@RolandKrummenacher RolandKrummenacher Awaiting requested review from RolandKrummenacher RolandKrummenacher is a code owner

Assignees

@flanakin flanakin

@MSBrett MSBrett

Labels

Needs: Review 👀 PR that is ready to be reviewed

Projects

None yet

Milestone

v15

Development

Successfully merging this pull request may close these issues.

2 participants

@flanakin @MSBrett