[macOS] Refactor Common.Helpers (#8924)

* [macOS] Refactor Common.Helpers

* Update readme file

* Remove unnecessary double quotes

---------

Co-authored-by: Alexey Ayupov <“alexey.ayupov@akvelon.com”>

images/macos/scripts/helpers/Common.Helpers.psm1

@@ -7,6 +7,7 @@ function Get-CommandResult {
     # Bash trick to suppress and show error output because some commands write to stderr (for example, "python --version")
     $stdout = & bash -c "$Command 2>&1"
     $exitCode = $LASTEXITCODE
+
     return @{
         Output = If ($Multiline -eq $true) { $stdout } else { [string]$stdout }
         ExitCode = $exitCode
@@ -14,21 +15,16 @@ function Get-CommandResult {
 }
 
 # Gets path to the tool, analogue of 'which tool'
-function Get-WhichTool($tool) {
+function Get-ToolPath($tool) {
     return (Get-Command $tool).Path
 }
 
-# Gets value of environment variable by the name
-function Get-EnvironmentVariable($variable) {
-    return [System.Environment]::GetEnvironmentVariable($variable)
-}
-
 # Returns the object with information about current OS
 # It can be used for OS-specific tests
 function Get-OSVersion {
     $osVersion = [Environment]::OSVersion
-    $osVersionMajorMinor = $osVersion.Version.ToString(2)
     $processorArchitecture = arch
+
     return [PSCustomObject]@{
         Version        = $osVersion.Version
         Platform       = $osVersion.Platform
@@ -44,85 +40,11 @@ function Get-OSVersion {
     }
 }
 
-function Get-ChildItemWithoutSymlinks {
-    param (
-        [Parameter(Mandatory)]
-        [string] $Path,
-        [string] $Filter
-    )
-
-    $files = Get-ChildItem -Path $Path -Filter $Filter
-    $files = $files | Where-Object { !$_.LinkType } # cut symlinks
-    return $files
-}
-
-# Get the value of specific toolset node
-# Example, invoke `Get-ToolsetValue "xamarin.bundles"` to get value of `$toolsetJson.xamarin.bundles`
-function Get-ToolsetValue {
-    param (
-        [Parameter(Mandatory = $true)]
-        [string] $KeyPath
-    )
+# Get the value of the toolset
+function Get-ToolsetContent {
     $toolsetPath = Join-Path $env:HOME "image-generation" "toolset.json"
-    $jsonNode = Get-Content -Raw $toolsetPath | ConvertFrom-Json
-
-    $pathParts = $KeyPath.Split(".")
-    # try to walk through all arguments consequentially to resolve specific json node
-    $pathParts | ForEach-Object {
-        $jsonNode = $jsonNode.$_
-    }
-    return $jsonNode
-}
-
-function Get-ToolcachePackages {
-    $toolcachePath = Join-Path $env:HOME "image-generation" "toolcache.json"
-    return Get-Content -Raw $toolcachePath | ConvertFrom-Json
-}
-
-function Invoke-RestMethodWithRetry {
-    param (
-        [Parameter()]
-        [string]
-        $Url
-    )
-    Invoke-RestMethod $Url -MaximumRetryCount 10 -RetryIntervalSec 30
-}
-
-function Invoke-ValidateCommand {
-    param(
-        [Parameter(Mandatory)]
-        [string]$Command,
-        [Uint] $Timeout = 0
-    )
-
-    if ($Timeout -eq 0)
-    {
-        $output = Invoke-Expression -Command $Command
-        if ($LASTEXITCODE -ne 0) {
-            throw "Command '$Command' has finished with exit code $LASTEXITCODE"
-        }
-        return $output
-    }
-    else
-    {
-        $job = $command | Start-Job -ScriptBlock {
-            $output = Invoke-Expression -Command $input
-            if ($LASTEXITCODE -ne 0) {
-                  throw 'Command failed'
-            }
-            return $output
-        }
-        $waitObject = $job | Wait-Job -Timeout $Timeout
-        if(-not $waitObject)
-        {
-             throw "Command '$Command' has timed out"
-        }
-        if($waitObject.State -eq 'Failed')
-        {
-             throw "Command '$Command' has failed"
-        }
-        Receive-Job -Job $job
-    }
+    $toolsetJson = Get-Content -Path $toolsetPath -Raw
+    ConvertFrom-Json -InputObject $toolsetJson
 }
 
 function Invoke-DownloadWithRetry {
@@ -161,7 +83,7 @@ function Invoke-DownloadWithRetry {
             Write-Warning "Package download failed in $attemptSeconds seconds"
             Write-Warning $_.Exception.Message
         }
-            
+
         if ($retries -eq 0) {
             $totalSeconds = [math]::Round(($(Get-Date) - $downloadStartTime).TotalSeconds, 2)
             throw "Package download failed after $totalSeconds seconds"
@@ -174,37 +96,15 @@ function Invoke-DownloadWithRetry {
     return $Path
 }
 
-function Add-EnvironmentVariable {
-    param
-    (
-        [Parameter(Mandatory)] [string] $Name,
-        [Parameter(Mandatory)] [string] $Value,
-        [string] $FilePath = "${env:HOME}/.bashrc"
-    )
-
-    $envVar = "export {0}={1}" -f $Name, $Value
-    Add-Content -Path $FilePath -Value $envVar
-}
-
 function isVeertu {
     return (Test-Path -Path "/Library/Application Support/Veertu")
 }
 
 function Get-Architecture {
     $arch = arch
-    if ($arch -ne "arm64")
-    {
+    if ($arch -ne "arm64") {
         $arch = "x64"
     }
 
     return $arch
 }
-
-function Test-CommandExists {
-    param
-    (
-        [Parameter(Mandatory)] [string] $Command
-    )
-
-    [boolean] (Get-Command $Command  -ErrorAction 'SilentlyContinue')
-}