diff --git a/src/architecture.md b/src/architecture.md index 325a7fb1..f4f31f3c 100644 --- a/src/architecture.md +++ b/src/architecture.md @@ -1,16 +1,18 @@ # 🏗️ Architecture -| Name | Description | -| -------------------------------------------------- | -------------------------------- | -| [docs](../docs) | Public-facing toolkit docs. | -| ├─ [deploy](../docs/deploy) | How to deploy the toolkit. | -| ├─ [reports](../docs/reports) | About Power BI reports. | -| └─ [templates](../docs/templates) | About ARM deployment templates. | -|       └─ [modules](../docs/modules) | About Bicep modules. | -| [src](../src) | Source code and internal docs. | -| ├─ [bicep-registry](../src/bicep-registry) | Bicep registry module templates. | -| ├─ [modules](../src/modules) | Bicep modules. | -| └─ [templates](../src/templates) | ARM deployment templates. | +| Name | Description | +| ----------------------------------------------------------------- | -------------------------------- | +| [docs](../docs) | Public-facing toolkit docs. | +| ├─ [bicep-registry](../docs/bicep-registry) | Bicep registry module docs. | +| ├─ [deploy](../docs/deploy) | How to deploy the toolkit. | +| ├─ [finops-hub](../docs/finops-hub) | FinOps hub docs. | +| │    ├─ [modules](../docs/finops-hub/modules) | FinOps hub Bicep modules. | +| │    └─ [reports](../docs/finops-hub/reports) | FinOps hub Power BI reports. | +| └─ [optimization-workbook](../docs/optimization-workbook) | Cost optimization workbook docs. | +| [src](../src) | Source code and dev docs. | +| ├─ [bicep-registry](../src/bicep-registry) | Bicep registry modules. | +| └─ [templates](../src/templates) | ARM deployment templates. | +|       └─ [finops-hub](../src/templates/finops-hub) | FinOps hub template. | Files and folders should use kebab casing (e.g., `this-is-my-folder`). The only exception is for RP namespaces in module paths. diff --git a/src/templates/finops-hub/main.bicep b/src/templates/finops-hub/main.bicep index 31eb0f72..b1b52829 100644 --- a/src/templates/finops-hub/main.bicep +++ b/src/templates/finops-hub/main.bicep @@ -27,7 +27,7 @@ param exportScopes array = [] * Resources */ -module hub '../../modules/hub.bicep' = { +module hub 'modules/hub.bicep' = { name: 'hub' params: { hubName: hubName diff --git a/src/modules/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/.bicep/nested_roleAssignments.bicep diff --git a/src/modules/Microsoft.DataFactory/factories/deploy.bicep b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/deploy.bicep similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/deploy.bicep rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/deploy.bicep diff --git a/src/modules/Microsoft.DataFactory/factories/integrationRuntimes/deploy.bicep b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/integrationRuntimes/deploy.bicep similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/integrationRuntimes/deploy.bicep rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/integrationRuntimes/deploy.bicep diff --git a/src/modules/Microsoft.DataFactory/factories/integrationRuntimes/readme.md b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/integrationRuntimes/readme.md similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/integrationRuntimes/readme.md rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/integrationRuntimes/readme.md diff --git a/src/modules/Microsoft.DataFactory/factories/integrationRuntimes/version.json b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/integrationRuntimes/version.json similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/integrationRuntimes/version.json rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/integrationRuntimes/version.json diff --git a/src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/deploy.bicep b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/deploy.bicep similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/deploy.bicep rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/deploy.bicep diff --git a/src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/deploy.bicep b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/deploy.bicep similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/deploy.bicep rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/deploy.bicep diff --git a/src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/readme.md b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/readme.md similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/readme.md rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/readme.md diff --git a/src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/managedPrivateEndpoints/version.json diff --git a/src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/readme.md b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/readme.md similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/readme.md rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/readme.md diff --git a/src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/version.json b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/version.json similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/version.json rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/managedVirtualNetworks/version.json diff --git a/src/modules/Microsoft.DataFactory/factories/readme.md b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/readme.md similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/readme.md rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/readme.md diff --git a/src/modules/Microsoft.DataFactory/factories/version.json b/src/templates/finops-hub/modules/Microsoft.DataFactory/factories/version.json similarity index 100% rename from src/modules/Microsoft.DataFactory/factories/version.json rename to src/templates/finops-hub/modules/Microsoft.DataFactory/factories/version.json diff --git a/src/modules/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/.bicep/nested_roleAssignments.bicep diff --git a/src/modules/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/accessPolicies/deploy.bicep diff --git a/src/modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/accessPolicies/readme.md diff --git a/src/modules/Microsoft.KeyVault/vaults/accessPolicies/version.json b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/accessPolicies/version.json similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/accessPolicies/version.json rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/accessPolicies/version.json diff --git a/src/modules/Microsoft.KeyVault/vaults/deploy.bicep b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/deploy.bicep similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/deploy.bicep rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/deploy.bicep diff --git a/src/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/keys/.bicep/nested_roleAssignments.bicep diff --git a/src/modules/Microsoft.KeyVault/vaults/keys/deploy.bicep b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/keys/deploy.bicep similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/keys/deploy.bicep rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/keys/deploy.bicep diff --git a/src/modules/Microsoft.KeyVault/vaults/keys/readme.md b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/keys/readme.md similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/keys/readme.md rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/keys/readme.md diff --git a/src/modules/Microsoft.KeyVault/vaults/keys/version.json b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/keys/version.json similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/keys/version.json rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/keys/version.json diff --git a/src/modules/Microsoft.KeyVault/vaults/readme.md b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/readme.md similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/readme.md rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/readme.md diff --git a/src/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/secrets/.bicep/nested_roleAssignments.bicep diff --git a/src/modules/Microsoft.KeyVault/vaults/secrets/deploy.bicep b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/secrets/deploy.bicep similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/secrets/deploy.bicep rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/secrets/deploy.bicep diff --git a/src/modules/Microsoft.KeyVault/vaults/secrets/readme.md b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/secrets/readme.md similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/secrets/readme.md rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/secrets/readme.md diff --git a/src/modules/Microsoft.KeyVault/vaults/secrets/version.json b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/secrets/version.json similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/secrets/version.json rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/secrets/version.json diff --git a/src/modules/Microsoft.KeyVault/vaults/version.json b/src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/version.json similarity index 100% rename from src/modules/Microsoft.KeyVault/vaults/version.json rename to src/templates/finops-hub/modules/Microsoft.KeyVault/vaults/version.json diff --git a/src/modules/Microsoft.Resources/deploymentScripts/deploy.bicep b/src/templates/finops-hub/modules/Microsoft.Resources/deploymentScripts/deploy.bicep similarity index 100% rename from src/modules/Microsoft.Resources/deploymentScripts/deploy.bicep rename to src/templates/finops-hub/modules/Microsoft.Resources/deploymentScripts/deploy.bicep diff --git a/src/modules/Microsoft.Resources/deploymentScripts/readme.md b/src/templates/finops-hub/modules/Microsoft.Resources/deploymentScripts/readme.md similarity index 100% rename from src/modules/Microsoft.Resources/deploymentScripts/readme.md rename to src/templates/finops-hub/modules/Microsoft.Resources/deploymentScripts/readme.md diff --git a/src/modules/README.md b/src/templates/finops-hub/modules/README.md similarity index 97% rename from src/modules/README.md rename to src/templates/finops-hub/modules/README.md index 9a517ef2..4534d126 100644 --- a/src/modules/README.md +++ b/src/templates/finops-hub/modules/README.md @@ -1,6 +1,6 @@ # 📦 FinOps toolkit modules -All FinOps toolkit module source is available at the root of this directory. For summary details, see [public docs](../../docs/templates/modules). +All FinOps toolkit module source is available at the root of this directory. For summary details, see [public docs](../../../../docs/finops-hub/modules). Modules: diff --git a/src/modules/datasets/adlsv2.bicep b/src/templates/finops-hub/modules/datasets/adlsv2.bicep similarity index 100% rename from src/modules/datasets/adlsv2.bicep rename to src/templates/finops-hub/modules/datasets/adlsv2.bicep diff --git a/src/modules/hub.bicep b/src/templates/finops-hub/modules/hub.bicep similarity index 100% rename from src/modules/hub.bicep rename to src/templates/finops-hub/modules/hub.bicep diff --git a/src/modules/linkedservices/linkedservice.bicep b/src/templates/finops-hub/modules/linkedservices/linkedservice.bicep similarity index 100% rename from src/modules/linkedservices/linkedservice.bicep rename to src/templates/finops-hub/modules/linkedservices/linkedservice.bicep diff --git a/src/modules/pipelines/msexports_extract.bicep b/src/templates/finops-hub/modules/pipelines/msexports_extract.bicep similarity index 100% rename from src/modules/pipelines/msexports_extract.bicep rename to src/templates/finops-hub/modules/pipelines/msexports_extract.bicep diff --git a/src/modules/pipelines/msexports_transform.bicep b/src/templates/finops-hub/modules/pipelines/msexports_transform.bicep similarity index 100% rename from src/modules/pipelines/msexports_transform.bicep rename to src/templates/finops-hub/modules/pipelines/msexports_transform.bicep diff --git a/src/modules/scripts/Copy-FileToAzureBlob.ps1 b/src/templates/finops-hub/modules/scripts/Copy-FileToAzureBlob.ps1 similarity index 100% rename from src/modules/scripts/Copy-FileToAzureBlob.ps1 rename to src/templates/finops-hub/modules/scripts/Copy-FileToAzureBlob.ps1 diff --git a/src/modules/secrets/storageaccountsecret.bicep b/src/templates/finops-hub/modules/secrets/storageaccountsecret.bicep similarity index 100% rename from src/modules/secrets/storageaccountsecret.bicep rename to src/templates/finops-hub/modules/secrets/storageaccountsecret.bicep diff --git a/src/modules/triggers/adlsv2.bicep b/src/templates/finops-hub/modules/triggers/adlsv2.bicep similarity index 100% rename from src/modules/triggers/adlsv2.bicep rename to src/templates/finops-hub/modules/triggers/adlsv2.bicep diff --git a/src/reports/CommitmentDiscounts.pbix b/src/templates/finops-hub/reports/CommitmentDiscounts.pbix similarity index 100% rename from src/reports/CommitmentDiscounts.pbix rename to src/templates/finops-hub/reports/CommitmentDiscounts.pbix diff --git a/src/reports/CostSummary.pbix b/src/templates/finops-hub/reports/CostSummary.pbix similarity index 100% rename from src/reports/CostSummary.pbix rename to src/templates/finops-hub/reports/CostSummary.pbix diff --git a/src/reports/README.md b/src/templates/finops-hub/reports/README.md similarity index 100% rename from src/reports/README.md rename to src/templates/finops-hub/reports/README.md