From 370986d0f0b09213b34b42c7e51f433e734eea55 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Mon, 14 Sep 2020 10:09:05 +0300
Subject: [PATCH] rename Take-Part -> Take-OutputPart

---
 .../SoftwareReport.Browsers.psm1              |  6 +-
 .../SoftwareReport.CachedTools.psm1           |  5 +-
 .../SoftwareReport/SoftwareReport.Common.psm1 | 38 ++++-----
 .../SoftwareReport.Databases.psm1             | 22 ++++-
 .../SoftwareReport.Generator.ps1              | 10 +--
 .../SoftwareReport.Helpers.psm1               |  2 +-
 .../SoftwareReport/SoftwareReport.Tools.psm1  | 84 +++++++++----------
 7 files changed, 87 insertions(+), 80 deletions(-)

diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1
index 96d05ee08..d65eb5536 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Browsers.psm1
@@ -1,10 +1,10 @@
 function Get-ChromeVersion {
-    $googleChromeVersion = google-chrome --version | Take-Part -Part 2
+    $googleChromeVersion = google-chrome --version | Take-OutputPart -Part 2
     return "Google Chrome $googleChromeVersion"
 }
 
 function Get-ChromeDriverVersion {
-    $chromeDriverVersion = chromedriver --version | Take-Part -Part 1
+    $chromeDriverVersion = chromedriver --version | Take-OutputPart -Part 1
     return "ChromeDriver $chromeDriverVersion"
 }
 
@@ -14,6 +14,6 @@ function Get-FirefoxVersion {
 }
 
 function Get-GeckodriverVersion {
-    $geckodriverVersion = geckodriver --version | Select-Object -First 1 | Take-Part -Part 1
+    $geckodriverVersion = geckodriver --version | Select-Object -First 1 | Take-OutputPart -Part 1
     return "Geckodriver $geckodriverVersion"
 }
\ No newline at end of file
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1
index 536b31255..24283ba64 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.CachedTools.psm1
@@ -36,7 +36,7 @@ function Get-ToolcacheBoostVersions {
     return Get-ChildItem $toolcachePath -Name | Sort-Object { [Version]$_ }
 }
 
-function Build-CachedToolsSection { 
+function Build-CachedToolsSection {
     $output = ""
 
     $output += New-MDHeader "Ruby" -Level 4
@@ -44,7 +44,7 @@ function Build-CachedToolsSection {
 
     $output += New-MDHeader "Python" -Level 4
     $output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered
-    
+
     $output += New-MDHeader "PyPy" -Level 4
     $output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered
 
@@ -59,7 +59,6 @@ function Build-CachedToolsSection {
         $output += New-MDHeader "Boost" -Level 4
         $output += New-MDList -Lines $boostVersions -Style Unordered
     }
-    
 
     return $output
 }
\ No newline at end of file
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
index 1d96f5550..5fafca0f1 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1
@@ -40,7 +40,7 @@ function Get-ErlangVersion {
 }
 
 function Get-MonoVersion {
-    $monoVersion = $(mono --version) | Out-String | Take-Part -Part 4
+    $monoVersion = $(mono --version) | Out-String | Take-OutputPart -Part 4
     return "Mono $monoVersion"
 }
 
@@ -51,13 +51,13 @@ function Get-NodeVersion {
 
 function Get-PythonVersion {
     $result = Get-CommandResult "python --version"
-    $version = $result.Output | Take-Part -Part 1
+    $version = $result.Output | Take-OutputPart -Part 1
     return "Python $version"
 }
 
 function Get-Python3Version {
     $result = Get-CommandResult "python3 --version"
-    $version = $result.Output | Take-Part -Part 1
+    $version = $result.Output | Take-OutputPart -Part 1
     return "Python3 $version"
 }
 
@@ -66,17 +66,17 @@ function Get-PowershellVersion {
 }
 
 function Get-RubyVersion {
-    $rubyVersion = $(ruby --version) | Out-String | Take-Part -Part 1
+    $rubyVersion = $(ruby --version) | Out-String | Take-OutputPart -Part 1
     return "Ruby $rubyVersion"
 }
 
 function Get-SwiftVersion {
-    $swiftVersion = $(swift --version) | Out-String | Take-Part -Part 2
+    $swiftVersion = $(swift --version) | Out-String | Take-OutputPart -Part 2
     return "Swift $swiftVersion"
 }
 
 function Get-JuliaVersion {
-    $juliaVersion = $(julia --version) | Out-String | Take-Part -Part 2
+    $juliaVersion = $(julia --version) | Out-String | Take-OutputPart -Part 2
     return "Julia $juliaVersion"
 }
 
@@ -195,7 +195,7 @@ function Build-PHPTable {
         [PSCustomObject] @{
             "Tool" = $_.Tool
             "Version" = $_.Version
-        } 
+        }
     }
 }
 
@@ -218,52 +218,52 @@ function Get-StackVersion {
 }
 
 function Get-RustVersion {
-    $rustVersion = $(rustc --version) | Take-Part -Part 1
+    $rustVersion = $(rustc --version) | Take-OutputPart -Part 1
     return "Rust $rustVersion"
 }
 
 function Get-BindgenVersion {
-    $bindgenVersion = $(bindgen --version) | Take-Part -Part 1
+    $bindgenVersion = $(bindgen --version) | Take-OutputPart -Part 1
     return "Bindgen $bindgenVersion"
 }
 
 function Get-CargoVersion {
-    $cargoVersion = $(cargo --version) | Take-Part -Part 1
+    $cargoVersion = $(cargo --version) | Take-OutputPart -Part 1
     return "Cargo $cargoVersion"
 }
 
 function Get-CargoAuditVersion {
-    $cargoAuditVersion = $(cargo audit --version) | Take-Part -Part 1
+    $cargoAuditVersion = $(cargo audit --version) | Take-OutputPart -Part 1
     return "Cargo audit $cargoAuditVersion"
 }
 
 function Get-CargoOutdatedVersion {
-    $cargoOutdatedVersion = $(cargo outdated --version) | Take-Part -Part 1 -Delimiter "v"
+    $cargoOutdatedVersion = $(cargo outdated --version) | Take-OutputPart -Part 1 -Delimiter "v"
     return "Cargo outdated $cargoOutdatedVersion"
 }
 
 function Get-CargoClippyVersion {
-    $cargoClippyVersion = $(cargo-clippy --version) | Take-Part -Part 1
+    $cargoClippyVersion = $(cargo-clippy --version) | Take-OutputPart -Part 1
     return "Cargo clippy $cargoClippyVersion"
 }
 
 function Get-CbindgenVersion {
-    $cbindgenVersion = $(cbindgen --version) | Take-Part -Part 1
+    $cbindgenVersion = $(cbindgen --version) | Take-OutputPart -Part 1
     return "Cbindgen $cbindgenVersion"
 }
 
 function Get-RustupVersion {
-    $rustupVersion = $(rustup --version) | Take-Part -Part 1
+    $rustupVersion = $(rustup --version) | Take-OutputPart -Part 1
     return "Rustup $rustupVersion"
 }
 
 function Get-RustdocVersion {
-    $rustdocVersion = $(rustdoc --version) | Take-Part -Part 1
+    $rustdocVersion = $(rustdoc --version) | Take-OutputPart -Part 1
     return "Rustdoc $rustdocVersion"
 }
 
 function Get-RustfmtVersion {
-    $rustfmtVersion = $(rustfmt --version) | Take-Part -Part 1 | Take-Part -Part 0 -Delimiter "-"
+    $rustfmtVersion = $(rustfmt --version) | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-"
     return "Rustfmt $rustfmtVersion"
 }
 
@@ -271,13 +271,13 @@ function Get-AzModuleVersions {
     $azModuleVersions = Get-ChildItem /usr/share | Where-Object { $_ -match "az_\d+" } | Foreach-Object {
         $_.Name.Split("_")[1]
     }
-    
+
     $azModuleVersions = $azModuleVersions -join " "
     return $azModuleVersions
 }
 
 function Get-DotNetCoreSdkVersions {
-    $unsortedDotNetCoreSdkVersion = dotnet --list-sdks list | ForEach-Object { $_ | Take-Part -Part 0 }
+    $unsortedDotNetCoreSdkVersion = dotnet --list-sdks list | ForEach-Object { $_ | Take-OutputPart -Part 0 }
     $dotNetCoreSdkVersion = $unsortedDotNetCoreSdkVersion -join " "
     return $dotNetCoreSdkVersion
 }
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1
index 6c274184e..e6c14381e 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Databases.psm1
@@ -1,19 +1,35 @@
 function Get-PostgreSqlVersion {
-    $postgreSQLVersion = psql --version | Take-Part -Part 2
+    $postgreSQLVersion = psql --version | Take-OutputPart -Part 2
     return "Postgre SQL $postgreSQLVersion"
 }
 
 function Get-MongoDbVersion {
-    $mongoDBVersion = mongod --version | Select-Object -First 1 | Take-Part -Part 2 -Delimiter "v"
+    $mongoDBVersion = mongod --version | Select-Object -First 1 | Take-OutputPart -Part 2 -Delimiter "v"
     return "MongoDB $mongoDBVersion"
 }
 
 function Get-SqliteVersion {
-    $sqliteVersion = sqlite3 --version | Take-Part -Part 0
+    $sqliteVersion = sqlite3 --version | Take-OutputPart -Part 0
     return "sqlite3 $sqliteVersion"
 }
 
 function Get-MySqlVersion {
     $mySqlVersion = (mysql --version).Split("/usr/bin/")[1]
     return "MySQL ($mySqlVersion)"
+}
+
+function Build-MySQLSection {
+    $output = ""
+
+    $output += New-MDHeader "MySQL" -Level 4
+    $output += New-MDList -Style Unordered -Lines @(
+        (Get-MySqlVersion),
+        "MySQL Server (user:root password:root)",
+        "MS SQL Server Client Tools"
+    )
+    $output += New-MDCode -Lines @(
+        "MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service'"
+    )
+
+    return $output
 }
\ No newline at end of file
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
index e63f3719a..6a252f407 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1
@@ -195,15 +195,7 @@ $markdown += New-MDList -Style Unordered -Lines @(
     (Get-SqliteVersion)
 )
 
-$markdown += New-MDHeader "MySQL" -Level 4
-$markdown += New-MDList -Style Unordered -Lines @(
-    (Get-MySqlVersion),
-    "MySQL Server (user:root password:root)",
-    "MS SQL Server Client Tools"
-)
-$markdown += New-MDCode -Lines @(
-    "MySQL service is disabled by default. Use the following command as a part of your job to start the service: 'sudo systemctl start mysql.service'"
-)
+$markdown += Build-MySQLSection
 
 $markdown += New-MDHeader "Cached Tools" -Level 3
 $markdown += Build-CachedToolsSection
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Helpers.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Helpers.psm1
index 6f2701c92..4bad753bd 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Helpers.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Helpers.psm1
@@ -13,7 +13,7 @@ function Get-CommandResult {
     }
 }
 
-function Take-Part {
+function Take-OutputPart {
     param (
         [Parameter(ValueFromPipeline)]
         [string] $toolOutput,
diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
index f66f2e4fc..05032cfb6 100644
--- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
+++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1
@@ -1,85 +1,85 @@
 function Get-7zipVersion {
-    $7zVersion = 7z i | Select-String "7-Zip" | Take-Part -Part 2
+    $7zVersion = 7z i | Select-String "7-Zip" | Take-OutputPart -Part 2
     return "7-Zip $7zVersion"
 }
 
 function Get-AnsibleVersion {
-    $ansibleVersion = ansible --version | Select-Object -First 1 | Take-Part -Part 1
+    $ansibleVersion = ansible --version | Select-Object -First 1 | Take-OutputPart -Part 1
     return "Ansible $ansibleVersion"
 }
 
 function Get-AzCopy7Version {
-    $azcopy7Version = azcopy --version | Take-Part -Part 1 | Take-Part -Part 0 -Delimiter "-"
+    $azcopy7Version = azcopy --version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "-"
     return "AzCopy7 (available by azcopy alias) $azcopy7Version"
 }
 
 function Get-AzCopy10Version {
-    $azcopy10Version = azcopy10 --version | Take-Part -Part 2
+    $azcopy10Version = azcopy10 --version | Take-OutputPart -Part 2
     return "AzCopy10 (available by azcopy10 alias) $azcopy10Version"
 }
 
 function Get-BazelVersion {
-    $bazelVersion = bazel --version | Select-String "bazel" | Take-Part -Part 1
+    $bazelVersion = bazel --version | Select-String "bazel" | Take-OutputPart -Part 1
     return "Bazel $bazelVersion"
 }
 
 function Get-BazeliskVersion {
-    $bazeliskVersion = bazelisk version 2>&1 | Select-String "Bazelisk version:" | Take-Part -Part 2 | Take-Part -Part 0 -Delimiter "v"
+    $bazeliskVersion = bazelisk version 2>&1 | Select-String "Bazelisk version:" | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "v"
     return "Bazelisk $bazeliskVersion"
 }
 
 function Get-PodManVersion {
-    $podmanVersion = podman --version | Take-Part -Part 2
+    $podmanVersion = podman --version | Take-OutputPart -Part 2
     return "Podman $podmanVersion"
 }
 
 function Get-BuildahVersion {
-    $buildahVersion = buildah --version | Take-Part -Part 2
+    $buildahVersion = buildah --version | Take-OutputPart -Part 2
     return "Buildah $buildahVersion"
 }
 
 function Get-SkopeoVersion {
-    $skopeoVersion = skopeo --version | Take-Part -Part 2
+    $skopeoVersion = skopeo --version | Take-OutputPart -Part 2
     return "Skopeo $skopeoVersion"
 }
 
 function Get-CMakeVersion {
-    $cmakeVersion = cmake --version | Select-Object -First 1 | Take-Part -Part 2
+    $cmakeVersion = cmake --version | Select-Object -First 1 | Take-OutputPart -Part 2
     return "CMake $cmakeVersion"
 }
 
 function Get-CurlVersion {
-    $curlVersion = curl --version | Select-Object -First 1 | Take-Part -Part 0,1
+    $curlVersion = curl --version | Select-Object -First 1 | Take-OutputPart -Part 0,1
     return $curlVersion
 }
 
 function Get-DockerComposeVersion {
-    $composeVersion = docker-compose -v | Take-Part -Part 2 | Take-Part -Part 0 -Delimiter ","
+    $composeVersion = docker-compose -v | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter ","
     return "Docker Compose $composeVersion"
 }
 
 function Get-DockerMobyVersion {
-    $dockerVersion = docker -v | Take-Part -Part 2 | Take-Part -Part 0 -Delimiter "+"
+    $dockerVersion = docker -v | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "+"
     return "Docker-Moby $dockerVersion"
 }
 
 function Get-DockerBuildxVersion {
-    $buildxVersion = docker buildx version  | Take-Part -Part 1 | Take-Part -Part 0 -Delimiter "+"
+    $buildxVersion = docker buildx version  | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "+"
     return "Docker-Buildx $buildxVersion"
 }
 
 function Get-GitVersion {
-    $gitVersion = git --version 2>&1 | Take-Part -Part 2
+    $gitVersion = git --version 2>&1 | Take-OutputPart -Part 2
     return "Git $gitVersion"
 }
 
 function Get-GitLFSVersion {
-    $gitlfsversion = git-lfs --version 2>&1 | Take-Part -Part 0 | Take-Part -Part 1 -Delimiter "/"
+    $gitlfsversion = git-lfs --version 2>&1 | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/"
     return "Git LFS $gitlfsversion"
 }
 
 function Get-GitFTPVersion {
-    $gitftpVersion = git-ftp --version | Take-Part -Part 2
+    $gitftpVersion = git-ftp --version | Take-OutputPart -Part 2
     return "Git-ftp $gitftpVersion"
 }
 
@@ -88,57 +88,57 @@ function Get-GoogleCloudSDKVersion {
 }
 
 function Get-HavegedVersion {
-    $havegedVersion = dpkg-query --showformat='${Version}' --show haveged | Take-Part -Part 0 -Delimiter "-"
+    $havegedVersion = dpkg-query --showformat='${Version}' --show haveged | Take-OutputPart -Part 0 -Delimiter "-"
     return "Haveged $havegedVersion"
 }
 
 function Get-HerokuVersion {
-    $herokuVersion = heroku version | Take-Part -Part 0 | Take-Part -Part 1 -Delimiter "/"
+    $herokuVersion = heroku version | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/"
     return "Heroku $herokuVersion"
 }
 
 function Get-HHVMVersion {
-    $hhvmVersion = hhvm --version | Select-Object -First 1 | Take-Part -Part 2
+    $hhvmVersion = hhvm --version | Select-Object -First 1 | Take-OutputPart -Part 2
     return "HHVM (HipHop VM) $hhvmVersion"
 }
 
 function Get-SVNVersion {
-    $svnVersion = svn --version | Select-Object -First 1 | Take-Part -Part 2
+    $svnVersion = svn --version | Select-Object -First 1 | Take-OutputPart -Part 2
     return "SVN $svnVersion"
 }
 
 function Get-KustomizeVersion {
-    $kustomizeVersion = kustomize version --short | Take-Part -Part 0 | Take-Part -Part 1 -Delimiter "v"
+    $kustomizeVersion = kustomize version --short | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "v"
     return "Kustomize $kustomizeVersion"
 }
 
 function Get-KindVersion {
-    $kindVersion = kind version | Take-Part -Part 1 | Take-Part -Part 0 -Delimiter "v"
+    $kindVersion = kind version | Take-OutputPart -Part 1 | Take-OutputPart -Part 0 -Delimiter "v"
     return "Kind $kindVersion"
 }
 
 function Get-KubectlVersion {
-    $kubectlVersion = kubectl version --client --short | Take-Part -Part 2 | Take-Part -Part 0 -Delimiter "v"
+    $kubectlVersion = kubectl version --client --short | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "v"
     return "Kubectl $kubectlVersion"
 }
 
 function Get-MinikubeVersion {
-    $minikubeVersion = minikube version --short | Take-Part -Part 2 | Take-Part -Part 0 -Delimiter "v"
+    $minikubeVersion = minikube version --short | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "v"
     return "Minikube $minikubeVersion"
 }
 
 function Get-HGVersion {
-    $hgVersion = hg --version | Select-Object -First 1 | Take-Part -Part -1 | Take-Part -Part 0 -Delimiter ")"
+    $hgVersion = hg --version | Select-Object -First 1 | Take-OutputPart -Part -1 | Take-OutputPart -Part 0 -Delimiter ")"
     return "Mercurial $hgVersion"
 }
 
 function Get-M4Version {
-    $m4Version = m4 --version | Select-Object -First 1 | Take-Part -Part -1
+    $m4Version = m4 --version | Select-Object -First 1 | Take-OutputPart -Part -1
     return "m4 $m4Version"
 }
 
 function Get-LeiningenVersion {
-    return "$(lein -v | Take-Part -Part 0,1)"
+    return "$(lein -v | Take-OutputPart -Part 0,1)"
 }
 
 function Get-NewmanVersion {
@@ -159,7 +159,7 @@ function Get-PhantomJSVersion {
 }
 
 function Get-SwigVersion {
-    $swigVersion = swig -version | Select-String "SWIG Version" | Take-Part -Part 2
+    $swigVersion = swig -version | Select-String "SWIG Version" | Take-OutputPart -Part 2
     return "Swig $swigVersion"
 }
 
@@ -168,17 +168,17 @@ function Get-TerraformVersion {
 }
 
 function Get-UnZipVersion {
-    $unzipVersion = unzip -v | Select-Object -First 1 | Take-Part -Part 1
+    $unzipVersion = unzip -v | Select-Object -First 1 | Take-OutputPart -Part 1
     return "unzip $unzipVersion"
 }
 
 function Get-WgetVersion {
-    $wgetVersion = wget --version | Select-Object -First 1 | Take-Part -Part 2
+    $wgetVersion = wget --version | Select-Object -First 1 | Take-OutputPart -Part 2
     return "wget $wgetVersion"
 }
 
 function Get-ZipVersion {
-    $zipVersion = zip -v | Select-String "This is Zip" | Take-Part -Part 3
+    $zipVersion = zip -v | Select-String "This is Zip" | Take-OutputPart -Part 3
     return "zip $zipVersion"
 }
 
@@ -188,17 +188,17 @@ function Get-ZstdVersion {
 }
 
 function Get-JqVersion {
-    $jqVersion = jq --version | Take-Part -Part 1 -Delimiter "-"
+    $jqVersion = jq --version | Take-OutputPart -Part 1 -Delimiter "-"
     return "jq $jqVersion"
 }
 
 function Get-AzureCliVersion {
-    $azcliVersion = az -v | Select-String "azure-cli" | Take-Part -Part -1
+    $azcliVersion = az -v | Select-String "azure-cli" | Take-OutputPart -Part -1
     return "Azure CLI (azure-cli) $azcliVersion"
 }
 
 function Get-AzureDevopsVersion {
-    $azdevopsVersion = az -v | Select-String "azure-devops" | Take-Part -Part -1
+    $azdevopsVersion = az -v | Select-String "azure-devops" | Take-OutputPart -Part -1
     return "Azure CLI (azure-devops) $azdevopsVersion"
 }
 
@@ -207,7 +207,7 @@ function Get-AlibabaCloudCliVersion {
 }
 
 function Get-AWSCliVersion {
-    $awsVersion = aws --version 2>&1 | Take-Part -Part 0 | Take-Part -Part 1 -Delimiter "/"
+    $awsVersion = aws --version 2>&1 | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/"
     return "AWS CLI $awsVersion"
 }
 
@@ -216,31 +216,31 @@ function Get-AWSCliSessionManagerPluginVersion {
 }
 
 function Get-AWSSAMVersion {
-    return "AWS SAM CLI $(sam --version | Take-Part -Part -1)"
+    return "AWS SAM CLI $(sam --version | Take-OutputPart -Part -1)"
 }
 
 function Get-HubCliVersion {
-    $hubVersion = hub --version | Select-String "hub version" | Take-Part -Part 2
+    $hubVersion = hub --version | Select-String "hub version" | Take-OutputPart -Part 2
     return "Hub CLI $hubVersion"
 }
 
 function Get-GitHubCliVersion {
-    $ghVersion = gh --version | Select-String "gh version" | Take-Part -Part 2
+    $ghVersion = gh --version | Select-String "gh version" | Take-OutputPart -Part 2
     return "GitHub CLI $ghVersion"
 }
 
 function Get-NetlifyCliVersion {
-    $netlifyVersion = netlify --version | Take-Part -Part 0 | Take-Part -Part 1 -Delimiter "/"
+    $netlifyVersion = netlify --version | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/"
     return "Netlify CLI $netlifyVersion"
 }
 
 function Get-OCCliVersion {
-    $ocVersion = oc version | Take-Part -Part 2 | Take-Part -Part 0 -Delimiter "-"
+    $ocVersion = oc version | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "-"
     return "oc CLI $ocVersion"
 }
 
 function Get-ORASCliVersion {
-    $orasVersion = oras version | Select-String "^Version:" | Take-Part -Part 1
+    $orasVersion = oras version | Select-String "^Version:" | Take-OutputPart -Part 1
     return "ORAS CLI $orasVersion"
 }