From 2cbf4a7f93fb107c5a5e12af353466e490a42bae Mon Sep 17 00:00:00 2001
From: Vasilii Polikarpov
 <126792224+vpolikarpov-akvelon@users.noreply.github.com>
Date: Tue, 26 Sep 2023 09:32:02 +0200
Subject: [PATCH] [Mac OS] Remove hub utility (#8364)

---
 images/macos/provision/core/git.sh                        | 3 ---
 images/macos/software-report/SoftwareReport.Common.psm1   | 7 +------
 images/macos/software-report/SoftwareReport.Generator.ps1 | 1 -
 images/macos/tests/Git.Tests.ps1                          | 5 -----
 4 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/images/macos/provision/core/git.sh b/images/macos/provision/core/git.sh
index 3a62d85e1..5721d6275 100644
--- a/images/macos/provision/core/git.sh
+++ b/images/macos/provision/core/git.sh
@@ -14,9 +14,6 @@ git lfs install
 # Update system git config
 sudo git lfs install --system
 
-echo Installing Hub
-brew_smart_install "hub"
-
 echo Disable all the Git help messages...
 git config --global advice.pushUpdateRejected false
 git config --global advice.pushNonFFCurrent false
diff --git a/images/macos/software-report/SoftwareReport.Common.psm1 b/images/macos/software-report/SoftwareReport.Common.psm1
index c060f453e..55ea6d4b8 100644
--- a/images/macos/software-report/SoftwareReport.Common.psm1
+++ b/images/macos/software-report/SoftwareReport.Common.psm1
@@ -302,11 +302,6 @@ function Get-GitHubCLIVersion {
     return $ghVersion
 }
 
-function Get-HubVersion {
-    $hubVersion = Run-Command "brew list --versions hub" | Take-Part -Part 1
-    return $hubVersion
-}
-
 function Get-WgetVersion {
     $wgetVersion = Run-Command "wget --version" | Select-String "GNU Wget" | Take-Part -Part 2
     return $wgetVersion
@@ -634,4 +629,4 @@ function Get-ColimaVersion {
 function Get-PKGConfigVersion {
     $pkgconfigVersion = Run-Command "pkg-config --version"
     return $pkgconfigVersion
-}
\ No newline at end of file
+}
diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index f75ec124b..83ba5ff9f 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -123,7 +123,6 @@ if ($os.IsBigSur) {
     $utilities.AddToolVersion("helm", $(Get-HelmVersion))
 }
 if ((-not $os.IsVentura) -and (-not $os.IsVenturaArm64)) {
-    $utilities.AddToolVersion("Hub CLI", $(Get-HubVersion))
     $utilities.AddToolVersion("ImageMagick", $(Get-ImageMagickVersion))
 }
 $utilities.AddToolVersion("jq", $(Get-JqVersion))
diff --git a/images/macos/tests/Git.Tests.ps1 b/images/macos/tests/Git.Tests.ps1
index 0122c9fa3..2a9f731e4 100644
--- a/images/macos/tests/Git.Tests.ps1
+++ b/images/macos/tests/Git.Tests.ps1
@@ -8,8 +8,3 @@ Describe "Git" {
         "git lfs version" | Should -ReturnZeroExitCode
     }
 }
-Describe "hub CLI" -Skip:($os.IsVentura -or $os.IsVenturaArm64) {
-    It "hub CLI is installed" {
-        "hub --version" | Should -ReturnZeroExitCode
-    }
-}
\ No newline at end of file