Billing Cmdlets Optimized (#389)

* added billing cmdlet

* added getting all orgs and user profile cmdlet

* added tests for vsteambillingtoken

* added documentation for cmdlets

* added unit tests
corrected minor bugs

* making included parameters help to working on linux

* corrected syntax

* fixed unit test

* Apply suggestions from code review

Changed some minor docs mistakes, style and typos

* fixed url in test

* fixing docs file

* fixed unit tests and compressed json output

* added version 7.2.0 to changelog

* - renamed files to only cover pipeline billing
- fixed bugs
- removed Switch for bearer token in _callAPI again

* I changed Get-VSTeamAccounts to not use URL.
It now uses the parts to build the path.

* Formatting and typos corrected.

* - added  new cmdlet for getting account billing
- simplified pipeline billing
- added a parameter to be able to call urls without account
- added unit tests and sample data

* updated documentation

* updated documentation

* updated changelog

* falsy merged duplicate line

* fixing unit tests and cmdlet for biling jobs

* Synopsis & 1st line of description were the same

* Updated Set-VSTeamPipelineBilling docs

* Formatting changes

* Added a billing version

* Removed hardcoded version for billing calls

* Throws when billing is not supported

* Updating module version

* Windows build keeps failing

* Fixed spelling error.

* Forced dotnet restore.

* trying to force restore

* This might fix the build on windows!

Co-authored-by: Donovan Brown <dbrown@microsoft.com>

Author: SebastianSchuetze

.build/unitTests.yml

@@ -10,9 +10,9 @@ steps:
     pwsh: true
     targetType: 'inline'
     ${{ if eq(parameters.buildHelp, 'false') }}:
-      script: '.\Build-Module.ps1 -installDep -configuration Release'
+      script: '.\Build-Module.ps1 -installDep -configuration Release -ci'
     ${{ if eq(parameters.buildHelp, 'true') }}:
-      script: '.\Build-Module.ps1 -installDep -buildHelp -configuration Release'
+      script: '.\Build-Module.ps1 -installDep -buildHelp -configuration Release -ci'
 
 - ${{ if eq(parameters.os, 'Windows') }}:
   - task: DotNetCoreCLI@2
@@ -51,7 +51,7 @@ steps:
         $pesterArgs.Output.Verbosity = "Normal"
         $pesterArgs.TestResult.Enabled = $true
         $pesterArgs.TestResult.OutputPath = 'test-results.xml'
-   
+
         Invoke-Pester -Configuration $pesterArgs
       workingDirectory: '$(System.DefaultWorkingDirectory)'
 
@@ -72,7 +72,7 @@ steps:
         $pesterArgs.Output.Verbosity = "Normal"
         $pesterArgs.TestResult.Enabled = $true
         $pesterArgs.TestResult.OutputPath = 'test-results.xml'
-   
+
         Invoke-Pester -Configuration $pesterArgs
       workingDirectory: '$(System.DefaultWorkingDirectory)'
     condition: and(succeededOrFailed(), eq(variables['System.PullRequest.IsFork'], true))
@@ -97,7 +97,7 @@ steps:
         $pesterArgs.CodeCoverage.OutputFormat = 'JaCoCo'
         $pesterArgs.CodeCoverage.OutputPath = "coverage.xml"
         $pesterArgs.CodeCoverage.Path = ".\dist\*.ps*1"
-   
+
         Invoke-Pester -Configuration $pesterArgs
       workingDirectory: '$(System.DefaultWorkingDirectory)'
     condition: and(succeededOrFailed(), eq(variables['System.PullRequest.IsFork'], false))

.docs/Get-VSTeamAccountBilling.md

@@ -0,0 +1,45 @@
+<!-- #include "./common/header.md" -->
+
+# Get-VSTeamAccountBilling
+
+## SYNOPSIS
+
+<!-- #include "./synopsis/Get-VSTeamAccountBilling.md" -->
+
+## SYNTAX
+
+## DESCRIPTION
+
+<!-- #include "./synopsis/Get-VSTeamAccountBilling.md" --> This includes what subscription the organization is connected. It also shows when the organization is not connected to a subscription.
+
+## EXAMPLES
+
+### Example 1: Set Microsoft hosted pipeline jobs
+
+```powershell
+Get-VSTeamAccountBilling
+```
+
+Gets the current organization billing setup.
+
+## PARAMETERS
+
+## INPUTS
+
+## OUTPUTS
+
+## NOTES
+
+Beware that these operations are potentially producing costs. This is why you need to confirm or force the command.
+
+<!-- #include "./common/prerequisites.md" -->
+
+## RELATED LINKS
+
+<!-- #include "./common/related.md" -->
+
+[Get-VSTeamUserProfile](Get-VSTeamUserProfile.md)
+
+[Get-VSTeamUserProfile](Get-VSTeamAccounts.md)
+
+[Set-VSTeamPipelineBilling](Set-VSTeamPipelineBilling.md)

.docs/Set-VSTeamPipelineBilling.md

@@ -10,7 +10,7 @@
 
 ## DESCRIPTION
 
-<!-- #include "./synopsis/Set-VSTeamPipelineBilling.md" --> This cmdlet covers what can be bought on the billing tab on organization level. At least owner or project collection administrator permissions are needed to trigger billing actions.
+<!-- #include "./synopsis/Set-VSTeamPipelineBilling.md" --> A minimum of owner or project collection administrator permissions are required to trigger billing actions.
 
 ## EXAMPLES
 
@@ -19,25 +19,33 @@
 ```powershell
 $myProfile = Get-VSTeamUserProfile -MyProfile
 $orgs = Get-VSTeamAccounts -MemberId $myProfile.id
-Set-VSTeamPipelineBilling -Type HostedPipeline -Quantity 1 -OrganizationId $orgs[0].accountId -SubscriptionId ebd42dd8-e50e-4608-aa5d-cf0c28e9aeef
+Set-VSTeamPipelineBilling -Type HostedPipeline -Quantity 1 -OrganizationId $orgs[0].accountId
 ```
 
-Sets the concurrent jobs on organization `$orgs[0].accountId` and subscription `ebd42dd8-e50e-4608-aa5d-cf0c28e9aeef` for hosted pipelines to 1. This means depending on what was configured before either the number has been reduced or new concurrent jobs have been bought.
-The cmdlet needs the organization id and the connected subscription for the organization. To get the id you can use `Get-VSTeamAccounts` and `Get-VSTeamUserProfile` to get the required data.
+Sets the concurrent jobs on organization `$orgs[0].accountId` for hosted pipelines to 1. Depending on the original value either the number has been reduced or new concurrent jobs have been purchased.
+The organization id and the connected subscription for the organization are required. To get the id you can use `Get-VSTeamAccounts` and `Get-VSTeamUserProfile`.
 
 ### Example 2: Set private hosted pipeline jobs
 
 ```powershell
-Set-VSTeamPipelineBilling -Type PrivatePipeline -Quantity 1 -OrganizationId 9de24e7c-2e01-496c-bde5-71f92195ae2c -SubscriptionId ebd42dd8-e50e-4608-aa5d-cf0c28e9aeef
+Set-VSTeamPipelineBilling -Type PrivatePipeline -Quantity 1 -OrganizationId 9de24e7c-2e01-496c-bde5-71f92195ae2c
 ```
 
-Sets the concurrent jobs for private agents on organization `9de24e7c-2e01-496c-bde5-71f92195ae2c` and subscription `ebd42dd8-e50e-4608-aa5d-cf0c28e9aeef` for hosted pipelines to 1. This means depending on what was configured before either the number has ben reduced of new concurrent jobs have been bought.
+Sets the concurrent jobs for private agents on organization `9de24e7c-2e01-496c-bde5-71f92195ae2c` for hosted pipelines to 1. Depending on the original value either the number has been reduced or new concurrent jobs have been purchased.
+
+### Example 3: Set private hosted pipeline jobs with current organization
+
+```powershell
+Set-VSTeamPipelineBilling -Type PrivatePipeline -Quantity 1
+```
+
+Sets the concurrent jobs for private agents on the current set organization for hosted pipelines to 1. Depending on the original value either the number has been reduced or new concurrent jobs have been purchased.
 
 ## PARAMETERS
 
 ### -Type
 
-The type of billing that is supposed to be set.
+The type of billing to be set.
 
 ```yaml
 Type: string
@@ -47,16 +55,7 @@ Required: true
 
 ### -OrganizationId
 
-The organization where the billing should be set.
-
-```yaml
-Type: string
-Required: true
-```
-
-### -SubscriptionId
-
-The subscription id which the organization is using.
+The organization to be billed.
 
 ```yaml
 Type: string
@@ -89,3 +88,5 @@ Beware that these operations are potentially producing costs. This is why you ne
 [Get-VSTeamUserProfile](Get-VSTeamUserProfile.md)
 
 [Get-VSTeamUserProfile](Get-VSTeamAccounts.md)
+
+[Get-VSTeamAccountBilling](Get-VSTeamAccountBilling.md)

.docs/synopsis/Get-VSTeamAccountBilling.md

@@ -0,0 +1 @@
+Gets the current account billing setup.

.docs/synopsis/Set-VSTeamPipelineBilling.md

@@ -1 +1 @@
-Sets billing operations on the organization level.
+Purchases private and Microsoft hosted concurrent jobs for pipelines.

Build-Module.ps1

@@ -53,7 +53,9 @@ param(
    [string]$configuration = "LibOnly",
 
    [ValidateSet('Diagnostic', 'Detailed', 'Normal', 'Minimal', 'None', 'ErrorsOnly')]
-   [string]$testOutputLevel = "ErrorsOnly"
+   [string]$testOutputLevel = "ErrorsOnly",
+
+   [switch]$ci
 )
 
 function Import-Pester {
@@ -154,14 +156,16 @@ if (-not $skipLibBuild.IsPresent) {
       New-Item -Path $output\bin -ItemType Directory | Out-Null
    }
 
-   $buildOutput = dotnet build --nologo --verbosity quiet --configuration $configuration | Out-String
-
-   Copy-Item -Destination "$output\bin\vsteam-lib.dll" -Path ".\Source\Classes\bin\$configuration\netstandard2.0\vsteam-lib.dll" -Force
-   Copy-Item -Destination "$output\bin\Trackyon.System.Management.Automation.Abstractions.dll" -Path ".\Source\Classes\bin\$configuration\netstandard2.0\Trackyon.System.Management.Automation.Abstractions.dll" -Force
+   # Once build machines were updated to .NET 5.0 builds started failing.
+   $buildOutput = dotnet restore --no-cache --ignore-failed-sources --force --force-evaluate | Out-String
+   $buildOutput += dotnet build --nologo --configuration $configuration | Out-String
 
-   if (-not ($buildOutput | Select-String -Pattern 'succeeded')) {
+   if (-not ($buildOutput | Select-String -Pattern 'succeeded') -or $ci.IsPresent) {
       Write-Output $buildOutput
    }
+
+   Copy-Item -Destination "$output\bin\vsteam-lib.dll" -Path ".\Source\Classes\bin\$configuration\netstandard2.0\vsteam-lib.dll" -Force
+   Copy-Item -Destination "$output\bin\Trackyon.System.Management.Automation.Abstractions.dll" -Path ".\Source\Classes\bin\$configuration\netstandard2.0\Trackyon.System.Management.Automation.Abstractions.dll" -Force
 }
 
 Write-Output "Publishing: Complete to $output"

CHANGELOG.md

@@ -2,12 +2,15 @@
 
 ## 7.2.0
 
-Merged [Pull Request](https://github.com/DarqueWarrior/vsteam/pull/371) from [Sebastian Schütze](https://github.com/SebastianSchuetze) which included the following:
+Merged [Pull Request](https://github.com/DarqueWarrior/vsteam/pull/371) and (https://github.com/DarqueWarrior/vsteam/pull/389) from [Sebastian Schütze](https://github.com/SebastianSchuetze) which included the following:
 
 - Added Set-VSTeamPipelineBilling to buy or release Microsoft-hosted and self-hosted agents
 - Added Get-VSTeamAccounts to get the organizations where the user has access. Where the given user is either a member or an owner
 - Added Get-VSTeamUserProfile that gets the users profile of an account.
+- Added Get-VSTeamBillingAccount to get information whether the account is connected to a subscription or not.
 - fixed filenames of files to work on linux (casing)
+- added the possibility to call _callApi with a custom bearer token
+- added the possibility to call _callApi without the account name in the url
 
 ## 7.1.4
 

Source/Classes/Versions.cs

@@ -7,7 +7,7 @@ public enum APIs
       Build, Release, Core, Git, DistributedTask, DistributedTaskReleased,
       VariableGroups, Tfvc, Packaging, MemberEntitlementManagement,
       ExtensionsManagement, ServiceEndpoints, Graph, TaskGroups, Policy,
-      Processes, Version, HierarchyQuery, Pipelines
+      Processes, Version, HierarchyQuery, Pipelines, Billing
    }
 
    public static class Versions
@@ -16,6 +16,9 @@ public static void SetApiVersion(APIs service, string version)
       {
          switch (service)
          {
+            case APIs.Billing:
+               Billing = version;
+               break;
             case APIs.HierarchyQuery:
                HierarchyQuery = version;
                break;
@@ -77,6 +80,8 @@ public static string GetApiVersion(APIs service)
       {
          switch (service)
          {
+            case APIs.Billing:
+               return Billing;
             case APIs.HierarchyQuery:
                return HierarchyQuery;
             case APIs.Build:
@@ -135,6 +140,7 @@ public static string GetApiVersion(APIs service)
       public static string Core { get; set; } = "3.0";
       public static string Build { get; set; } = "3.0";
       public static string HierarchyQuery { get; set; } = "";
+      public static string Billing { get; set; } = "";
       public static string Release { get; set; } = "3.0-preview";
       public static string DistributedTask { get; set; } = "3.0-preview";
       public static string DistributedTaskReleased { get; set; } = "";