Merge branch 'dev' of https://github.com/microsoft/cloud-hubs

.github/policies/pull-requests.yml

@@ -1,21 +1,18 @@
-name: PR needs review
-description: Assign Needs Review label to new/updated PRs
+name: PR lifecycle
+description: Pull request lifecycle
 resource: repository
 
-# Cheat sheet: https://github.com/microsoft/cloud-hubs/tree/main/.github/README.md#fabricbot-policies-cheat-sheet
-# spell-checker:disable
 configuration:
   fabricBotConfiguration:
     eventResponderTasks:
-      # PR lifecycle: (New) > #Review > #Attenton > #Review > Close
-
-      # 1. (New) > #Review when opened
       - if:
           - payloadType: Pull_Request
           - and:
-              - targetsBranch:
-                  branch: main
-              - isOpen
+              - or:
+                  - targetsBranch:
+                      branch: dev
+                  - targetsBranch:
+                      branch: features/*
               - or:
                   - isAction:
                       action: Opened
@@ -26,39 +23,28 @@ configuration:
               label: 'Needs: Review 👀'
           - assignTo:
               user: ankur-ms
-          - assignTo:
-              user: tsilvers-ms
           - assignTo:
               user: flanakin
+          - assignTo:
+              user: sreenav
+          - assignTo:
+              user: tsilvers-ms
           - requestReview:
               reviewer: ankur-ms
-          - requestReview:
-              reviewer: tsilvers-ms
           - requestReview:
               reviewer: flanakin
-
-      # 2. #Review > #Attention when changes are requested
-      # - if:
-      #     - payloadType: Pull_Request_Review
-      #     - and:
-      #         - targetsBranch:
-      #             branch: main
-      #         - isAction:
-      #             action: Submitted
-      #         - isReviewState:
-      #             state: Changes_requested
-      #         - hasLabel:
-      #             label: 'Needs: Review 👀'
-      #   then:
-      #     - removeLabel:
-      #         label: 'Needs: Review 👀'
-      #     - addLabel:
-      #         label: 'Needs: Attention 👋'
-
-      # 3a. #Attenton > #Review when PR updated
+          - requestReview:
+              reviewer: sreenav
+          - requestReview:
+              reviewer: tsilvers-ms
       - if:
           - payloadType: Pull_Request
           - and:
+              - or:
+                  - targetsBranch:
+                      branch: dev
+                  - targetsBranch:
+                      branch: features/*
               - isActivitySender:
                   issueAuthor: true
               - isAction:
@@ -70,37 +56,3 @@ configuration:
               label: 'Needs: Attention 👋'
           - addLabel:
               label: 'Needs: Review 👀'
-
-      # 3b. #Attenton > #Review when PR review dismissed
-      # - if:
-      #     - payloadType: Pull_Request_Review
-      #     - and:
-      #         - isActivitySender:
-      #             issueAuthor: true
-      #         - isAction:
-      #             action: Dismissed
-      #         - hasLabel:
-      #             label: 'Needs: Attention 👋'
-      #   then:
-      #     - removeLabel:
-      #         label: 'Needs: Attention 👋'
-      #     - addLabel:
-      #         label: 'Needs: Review 👀'
-
-      # 3c. #Attenton > #Review when PR comment updated
-      - if:
-          - payloadType: Pull_Request_Review_Comment
-          - and:
-              - isActivitySender:
-                  issueAuthor: true
-              - isAction:
-                  action: Updated
-              - hasLabel:
-                  label: 'Needs: Attention 👋'
-        then:
-          - removeLabel:
-              label: 'Needs: Attention 👋'
-          - addLabel:
-              label: 'Needs: Review 👀'
-
-      # 4. #Review > Close

.vscode/launch.json

@@ -0,0 +1,18 @@
+{
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Deploy Hub",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "./Deploy-Toolkit finops-hub -Build",
+            "cwd": "${workspaceFolder}/src/scripts",
+            "presentation": {
+                "hidden": false,
+                "group": "",
+                "order": 1,
+            },
+        },
+    ],
+}

.vscode/settings.json

@@ -13,6 +13,7 @@
     "quickstarts",
     "Roadmap",
     "startswith",
+    "templating",
     "triaging",
     "Unhide"
   ],

.vscode/tasks.json

@@ -0,0 +1,28 @@
+{
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "Build Toolkit",
+            "type": "shell",
+            "command": "./Build-Toolkit",
+            "options": {
+                "cwd": "${workspaceFolder}/src/scripts",
+            },
+            "problemMatcher": [],
+            "group": {
+                "kind": "build",
+                "isDefault": true,
+            },
+            "isBackground": false,
+            "presentation": {
+                "echo": true,
+                "reveal": "always",
+                "focus": false,
+                "panel": "shared",
+                "showReuseMessage": true,
+                "clear": false,
+            },
+        }
+    ]
+}

CONTRIBUTING.md

@@ -1,4 +1,4 @@
-# Contributing to the FinOps toolkit
+# 🛠️ Contributing to the FinOps toolkit
 
 Welcome, and thank you for your interest in contributing to the FinOps toolkit! Your time and effort is greatly appreciated, no matter how big or small the contribution is.
 
@@ -8,20 +8,20 @@ There are many ways in which you can contribute, beyond writing code. The goal o
 
 On this page:
 
-- [Asking questions](#asking-questions)
-- [Suggesting features and reporting bugs](#suggesting-features-and-reporting-bugs)
-- [Reviewing code changes](#reviewing-code-changes)
-- [Making code changes](#making-code-changes)
+- [🙋‍♀️ Asking questions](#️-asking-questions)
+- [ℹ️ Suggesting features and reporting bugs](#ℹ️-suggesting-features-and-reporting-bugs)
+- [👀 Reviewing code changes](#-reviewing-code-changes)
+- [👩‍💻 Making code changes](#-making-code-changes)
 
 ---
 
-## Asking questions
+## 🙋‍♀️ Asking questions
 
 Have a question? Please ask in [Discussions](../../discussions). Avoid asking questions in issues to keep issues clean and focused on product improvements. If not sure, start a discussion and create an issue based on that discussion later, if needed.
 
 <br>
 
-## Suggesting features and reporting bugs
+## ℹ️ Suggesting features and reporting bugs
 
 If you have an idea or notice a bug, [search open issues](../../issues) to see if an issue already exists.
 
@@ -31,7 +31,7 @@ If you don't find your issue, [create a new issue](../../issues/new/choose) per
 
 <br>
 
-## Reviewing code changes
+## 👀 Reviewing code changes
 
 If you want to help out with code, but aren't quite ready to jump in yet, start by reviewing [pull requests](../../pulls). Please don't sign off unless you've reviewed, understand, and agree with every change. If you'd like to contribute PR feedback without signing off, add comments without approving. These reviews are just as valuable as sign-off reviews because they help improve the overall quality!
 
@@ -41,7 +41,7 @@ When possible, try to suggest code changes using **Add a suggestion** to streaml
 
 <br>
 
-## Making code changes
+## 👩‍💻 Making code changes
 
 If you want to contribute code changes, but aren't sure where to start, scan through [existing issues](../../issues?q=is%3Aissue+is%3Aopen+sort%3Areactions-%2B1-desc) to find one that interests you. Use `labels` to narrow down your search.
 
@@ -53,7 +53,7 @@ For details about contributing code changes and submitting pull requests, see [H
 
 <br>
 
-# Thank you! <!-- markdownlint-disable-line single-h1 -->
+# 🙏 Thank you! <!-- markdownlint-disable-line single-h1 -->
 
 Your contributions to open source, large or small, make projects like this possible. Thank you for taking the time to contribute.
 

README.md

@@ -1,8 +1,14 @@
-# 🛠️ Microsoft Cloud FinOps toolkit
+# 🧰 FinOps toolkit
 
-<sup> ℹ️ _This project is in the early concept phase. If interested, please contact micflan@microsoft.com._</sup>
+<sup> ℹ️ _This project is in the early concept phase. If interested, please let us know in [discussions](https://github.com/microsoft/cloud-hubs/discussions/categories/general)._</sup>
 
-The FinOps toolkit is a collection of customizable ARM templates used to build and deploy various cost management and optimization solutions. The main focus of the FinOps toolkit is to build a reliable, trustworthy platform for cost analytics, insights, and optimization, which we call **FinOps hubs**.
+The FinOps toolkit is a collection of customizable ARM templates used to build and deploy various FinOps solutions that automate and extend native Microsoft Cost Management capabilities. The toolkit aims to include:
+
+- Starter kits that help you get started with Cost Management.
+- Automation scripts to streamline cost configuration and management at scale.
+- Advanced solutions to facilitate building custom solutions.
+
+While you will find numerous ARM templates within this repository, our main focus is to build a reliable, trustworthy platform for cost analytics, insights, and optimization, which we call **FinOps hubs**.
 
 FinOps hubs are **virtual command centers** for leaders throughout the organization to report on, monitor, and optimize cost based on their organizational needs. FinOps hubs focus on 3 core design principles:
 
@@ -18,7 +24,7 @@ Looking to learn more about FinOps toolkit and how to get started? See [FinOps t
 
 <br>
 
-## 👨‍💻 Contributing
+## 👩‍💻 Contributing
 
 There are many ways to participate. From reporting bugs and requesting features to reviewing or even making code changes. See the [contribution guide ➡️](./CONTRIBUTING.md)
 
@@ -38,7 +44,7 @@ This project has adopted the [Microsoft Open Source Code of Conduct](https://ope
 
 Usage of FinOps toolkit templates and modules is tracked by using a `defaultTelemetry` deployment. Microsoft may use this information to improve our products and services. You may turn off the telemetry by using the `enableDefaultTelemetry` parameter on any Bicep module. If you use these features, you must comply with applicable law, including providing appropriate notices to users of your applications together with a copy of Microsoft's privacy statement. Our privacy statement is located at https://go.microsoft.com/fwlink/?LinkID=824704. You can learn more about data collection and use in the help documentation and our privacy statement. Your use of the software operates as your consent to these practices.
 
-> \_**NOTE:** You can review what is included in this telemetry in the Azure portal by viewing the details for any `pid-00f1n0b5-*` deployments under the Deployments section of the corresponding scope (e.g., resource group, subscription).
+> _**NOTE:** You can review what is included in this telemetry in the Azure portal by viewing the details for any `pid-00f1n0b5-*` deployments under the Deployments section of the corresponding scope (e.g., resource group, subscription)._
 
 ### Trademarks