Merge branch 'main' into macos-arm64-pipx

Author: v-sergei-pyshnoi

.github/workflows/create_sbom_report.yml

@@ -55,7 +55,7 @@ jobs:
           }
       - name: Install SYFT tool on Windows
         if: ${{ runner.os == 'Windows' }}
-        run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft v0.100.0
+        run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft
       - name: Install SYFT tool on Ubuntu or macOS
         if: ${{ runner.os != 'Windows' }}
         run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin v0.100.0
@@ -74,7 +74,7 @@ jobs:
       - name: Compress SBOM file
         run: Compress-Archive sbom.json sbom.json.zip
       #Upload artifact action
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: sbom-${{ github.event.client_payload.agentSpec }}-${{ github.event.client_payload.imageVersion }}
           path: sbom.json.zip

helpers/software-report-base/SoftwareReport.BaseNodes.psm1

@@ -13,15 +13,15 @@ class BaseNode {
     }
 
     [String] ToMarkdown([Int32] $Level) {
-        throw "Abtract method 'ToMarkdown(level)' is not implemented for '$($this.GetType().Name)'"
+        throw "Abstract method 'ToMarkdown(level)' is not implemented for '$($this.GetType().Name)'"
     }
 
     [Boolean] IsSimilarTo([BaseNode] $OtherNode) {
-        throw "Abtract method 'IsSimilarTo' is not implemented for '$($this.GetType().Name)'"
+        throw "Abstract method 'IsSimilarTo' is not implemented for '$($this.GetType().Name)'"
     }
 
     [Boolean] IsIdenticalTo([BaseNode] $OtherNode) {
-        throw "Abtract method 'IsIdenticalTo' is not implemented for '$($this.GetType().Name)'"
+        throw "Abstract method 'IsIdenticalTo' is not implemented for '$($this.GetType().Name)'"
     }
 }
 
@@ -39,7 +39,7 @@ class BaseToolNode: BaseNode {
     }
 
     [String] GetValue() {
-        throw "Abtract method 'GetValue' is not implemented for '$($this.GetType().Name)'"
+        throw "Abstract method 'GetValue' is not implemented for '$($this.GetType().Name)'"
     }
 
     [Boolean] IsSimilarTo([BaseNode] $OtherNode) {
@@ -53,4 +53,4 @@ class BaseToolNode: BaseNode {
     [Boolean] IsIdenticalTo([BaseNode] $OtherNode) {
         return $this.IsSimilarTo($OtherNode) -and ($this.GetValue() -eq $OtherNode.GetValue())
     }
-}
+}

images.CI/macos/anka/Anka.Helpers.psm1

@@ -13,7 +13,7 @@ function Push-AnkaTemplateToRegistry {
         [string] $TemplateName
     )
 
-    # if registry uuid doesn't match than delete an image in registry
+    # if registry uuid doesn't match then delete an image in registry
     $AnkaCaCrtPath="$HOME/.config/anka/certs/anka-ca-crt.pem"
     $images = anka --machine-readable registry --cacert $AnkaCaCrtPath --registry-path $RegistryUrl list | ConvertFrom-Json | ForEach-Object body
     $images | Where-Object name -eq $TemplateName | ForEach-Object {

images.CI/macos/anka/CreateCleanAnkaTemplate.ps1

@@ -76,7 +76,7 @@ function Invoke-SoftwareUpdate {
     $ipAddress = Get-AnkaVMIPAddress -VMName $TemplateName
 
     # Unenroll Seed
-    Write-Host "`t[*] Reseting the seed before requesting stable versions"
+    Write-Host "`t[*] Resetting the seed before requesting stable versions"
     Remove-CurrentBetaSeed -HostName $ipAddress | Show-StringWithFormat
 
     # Install Software Updates

images.CI/macos/anka/Service.Helpers.psm1

@@ -171,11 +171,11 @@ function Get-MacOSInstaller {
         Write-Host "`t[*] Beta Version requested. Enrolling machine to DeveloperSeed"
         sudo $seedutil enroll DeveloperSeed | Out-Null
     } else {
-        Write-Host "`t[*] Reseting the seed before requesting stable versions"
+        Write-Host "`t[*] Resetting the seed before requesting stable versions"
         sudo $seedutil unenroll | Out-Null
     }
 
-    # Validate there is no softwareupdate at the moment
+    # Validate there is no software update at the moment
     Test-SoftwareUpdate
 
     # Validate availability OSVersion

images/macos/scripts/build/install-android-sdk.sh

@@ -6,13 +6,13 @@
 
 source ~/utils/utils.sh
 
-add_filtered_instalaltion_components() {
+add_filtered_installation_components() {
     local minimum_version=$1
     shift
     local tools_array=("$@")
 
     for item in ${tools_array[@]}; do
-        # take the last argument after spliting string by ';'' and '-''
+        # take the last argument after splitting string by ';'' and '-''
         version=$(echo "${item##*[-;]}")
         if [[ "$(printf "${minimum_version}\n${version}\n" | sort -V | head -n1)" == "$minimum_version" ]]; then
             components+=($item)
@@ -96,11 +96,11 @@ echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc"
 echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc"
 
 availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-[0-9]" | cut -d"|" -f 1 | sort -u))
-add_filtered_instalaltion_components $android_platform "${availablePlatforms[@]}"
+add_filtered_installation_components $android_platform "${availablePlatforms[@]}"
 
 allBuildTools=($($SDKMANAGER --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u))
 availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/})
-add_filtered_instalaltion_components $android_build_tool "${availableBuildTools[@]}"
+add_filtered_installation_components $android_build_tool "${availableBuildTools[@]}"
 
 echo "y" | $SDKMANAGER ${components[@]}
 

images/macos/scripts/build/install-aws-tools.sh

@@ -10,9 +10,11 @@ echo "Installing aws..."
 awscliv2_pkg_path=$(download_with_retry "https://awscli.amazonaws.com/AWSCLIV2.pkg")
 sudo installer -pkg "$awscliv2_pkg_path" -target /
 
-echo "Installing aws sam cli..."
-brew tap aws/tap
-brew_smart_install aws-sam-cli
+if ! is_BigSur; then
+    echo "Installing aws sam cli..."
+    brew tap aws/tap
+    brew_smart_install aws-sam-cli
+fi
 
 echo "Install aws cli session manager"
 brew install --cask session-manager-plugin

images/macos/scripts/build/install-common-utils.sh

@@ -95,8 +95,10 @@ if is_Monterey; then
     echo "export PARALLELS_DMG_URL=$url" >> ${HOME}/.bashrc
 fi
 
-# Install Azure DevOps extension for Azure Command Line Interface
-az extension add -n azure-devops
+if ! is_BigSur; then
+    # Install Azure DevOps extension for Azure Command Line Interface
+    az extension add -n azure-devops
+fi
 
 # Invoke tests for all basic tools
 invoke_tests "BasicTools"

images/macos/scripts/build/install-git.sh

@@ -11,13 +11,16 @@ brew_smart_install "git"
 
 git config --global --add safe.directory "*"
 
-echo "Installing Git LFS"
-brew_smart_install "git-lfs"
 
-# Update global git config
-git lfs install
-# Update system git config
-sudo git lfs install --system
+if ! is_BigSur; then
+    echo "Installing Git LFS"
+    brew_smart_install "git-lfs"
+
+    # Update global git config
+    git lfs install
+    # Update system git config
+    sudo git lfs install --system
+fi
 
 echo "Disable all the Git help messages..."
 git config --global advice.pushUpdateRejected false

images/macos/scripts/build/install-openssl.sh

@@ -18,7 +18,7 @@ else
 fi
 
 if ! is_Arm64; then
-  # Most of buildsystems and scripts look up ssl here
+  # Most of build systems and scripts look up ssl here
   ln -sf $(brew --cellar openssl@1.1)/1.1* /usr/local/opt/openssl
 fi