From 59d8cdeaf4b630bb04bc6a59f4b42aa8e0bb4093 Mon Sep 17 00:00:00 2001
From: Olga Naidjonoka <olga_naidjonoka@epam.com>
Date: Tue, 19 Mar 2024 12:57:14 +0200
Subject: [PATCH] updated pr according to comments

---
 .../auditbeat/scripts/unit-tests-win.ps1      | 51 -------------
 .buildkite/env-scripts/util.sh                |  2 +-
 .../filebeat/scripts/unit-tests-win.ps1       | 51 -------------
 .../heartbeat/scripts/unit-tests-win.ps1      | 51 -------------
 .buildkite/scripts/packaging/package-util.sh  |  8 ---
 .buildkite/scripts/packaging/package.sh       | 72 +++++++++----------
 6 files changed, 37 insertions(+), 198 deletions(-)
 delete mode 100644 .buildkite/auditbeat/scripts/unit-tests-win.ps1
 delete mode 100644 .buildkite/filebeat/scripts/unit-tests-win.ps1
 delete mode 100644 .buildkite/heartbeat/scripts/unit-tests-win.ps1

diff --git a/.buildkite/auditbeat/scripts/unit-tests-win.ps1 b/.buildkite/auditbeat/scripts/unit-tests-win.ps1
deleted file mode 100644
index 200627d518f0..000000000000
--- a/.buildkite/auditbeat/scripts/unit-tests-win.ps1
+++ /dev/null
@@ -1,51 +0,0 @@
-$ErrorActionPreference = "Stop" # set -e
-$GoVersion = $env:GOLANG_VERSION # If Choco doesn't have the version specified in .go-version file, should be changed manually
-
-# Forcing to checkout again all the files with a correct autocrlf.
-# Doing this here because we cannot set git clone options before.
-function fixCRLF() {
-    Write-Host "--- Fixing CRLF in git checkout --"
-    git config core.autocrlf false
-    git rm --quiet --cached -r .
-    git reset --quiet --hard
-}
-
-function withGolang() {
-    Write-Host "--- Install golang $GoVersion --"
-    choco install golang -y --version $GoVersion
-
-    $choco = Convert-Path "$((Get-Command choco).Path)\..\.."
-    Import-Module "$choco\helpers\chocolateyProfile.psm1"
-    refreshenv
-    go version
-    go env
-}
-
-function installGoDependencies() {
-    $installPackages = @(
-        "github.com/magefile/mage"
-        "github.com/elastic/go-licenser"
-        "golang.org/x/tools/cmd/goimports"
-        "github.com/jstemmer/go-junit-report"
-        "github.com/tebeka/go2xunit"
-    )
-    foreach ($pkg in $installPackages) {
-        go install "$pkg"
-    }
-}
-
-fixCRLF
-
-$ErrorActionPreference = "Continue" # set +e
-
-Set-Location -Path auditbeat
-New-Item -ItemType Directory -Force -Path "build"
-withGolang
-installGoDependencies
-
-mage build unitTest
-
-$EXITCODE=$LASTEXITCODE
-$ErrorActionPreference = "Stop"
-
-Exit $EXITCODE
diff --git a/.buildkite/env-scripts/util.sh b/.buildkite/env-scripts/util.sh
index 8df36296aa25..68fd08a75dfd 100644
--- a/.buildkite/env-scripts/util.sh
+++ b/.buildkite/env-scripts/util.sh
@@ -9,7 +9,7 @@ add_bin_path() {
 }
 
 with_go() {
-    local go_version="${GOLANG_VERSION}"
+    local go_version="${GO_VERSION}"
     echo "Setting up the Go environment..."
     create_bin
     check_platform_architecture
diff --git a/.buildkite/filebeat/scripts/unit-tests-win.ps1 b/.buildkite/filebeat/scripts/unit-tests-win.ps1
deleted file mode 100644
index 8990eb30a093..000000000000
--- a/.buildkite/filebeat/scripts/unit-tests-win.ps1
+++ /dev/null
@@ -1,51 +0,0 @@
-$ErrorActionPreference = "Stop" # set -e
-$GoVersion = $env:GOLANG_VERSION # If Choco doesn't have the version specified in .go-version file, should be changed manually
-
-# Forcing to checkout again all the files with a correct autocrlf.
-# Doing this here because we cannot set git clone options before.
-function fixCRLF() {
-    Write-Host "-- Fixing CRLF in git checkout --"
-    git config core.autocrlf false
-    git rm --quiet --cached -r .
-    git reset --quiet --hard
-}
-
-function withGolang() {
-    Write-Host "-- Install golang $GoVersion --"
-    choco install golang -y --version $GoVersion
-
-    $choco = Convert-Path "$((Get-Command choco).Path)\..\.."
-    Import-Module "$choco\helpers\chocolateyProfile.psm1"
-    refreshenv
-    go version
-    go env
-}
-
-function installGoDependencies() {
-    $installPackages = @(
-        "github.com/magefile/mage"
-        "github.com/elastic/go-licenser"
-        "golang.org/x/tools/cmd/goimports"
-        "github.com/jstemmer/go-junit-report"
-        "github.com/tebeka/go2xunit"
-    )
-    foreach ($pkg in $installPackages) {
-        go install "$pkg"
-    }
-}
-
-fixCRLF
-
-$ErrorActionPreference = "Continue" # set +e
-
-Set-Location -Path filebeat
-New-Item -ItemType Directory -Force -Path "build"
-withGolang
-installGoDependencies
-
-mage build unitTest
-
-$EXITCODE=$LASTEXITCODE
-$ErrorActionPreference = "Stop"
-
-Exit $EXITCODE
diff --git a/.buildkite/heartbeat/scripts/unit-tests-win.ps1 b/.buildkite/heartbeat/scripts/unit-tests-win.ps1
deleted file mode 100644
index 17282813e13c..000000000000
--- a/.buildkite/heartbeat/scripts/unit-tests-win.ps1
+++ /dev/null
@@ -1,51 +0,0 @@
-$ErrorActionPreference = "Stop" # set -e
-$GoVersion = $env:GOLANG_VERSION # If Choco doesn't have the version specified in .go-version file, should be changed manually
-
-# Forcing to checkout again all the files with a correct autocrlf.
-# Doing this here because we cannot set git clone options before.
-function fixCRLF() {
-    Write-Host "--- Fixing CRLF in git checkout --"
-    git config core.autocrlf false
-    git rm --quiet --cached -r .
-    git reset --quiet --hard
-}
-
-function withGolang() {
-    Write-Host "--- Install golang $GoVersion --"
-    choco install golang -y --version $GoVersion
-
-    $choco = Convert-Path "$((Get-Command choco).Path)\..\.."
-    Import-Module "$choco\helpers\chocolateyProfile.psm1"
-    refreshenv
-    go version
-    go env
-}
-
-function installGoDependencies() {
-    $installPackages = @(
-        "github.com/magefile/mage"
-        "github.com/elastic/go-licenser"
-        "golang.org/x/tools/cmd/goimports"
-        "github.com/jstemmer/go-junit-report"
-        "github.com/tebeka/go2xunit"
-    )
-    foreach ($pkg in $installPackages) {
-        go install "$pkg"
-    }
-}
-
-fixCRLF
-
-$ErrorActionPreference = "Continue" # set +e
-
-Set-Location -Path heartbeat
-New-Item -ItemType Directory -Force -Path "build"
-withGolang
-installGoDependencies
-
-mage build unitTest
-
-$EXITCODE=$LASTEXITCODE
-$ErrorActionPreference = "Stop"
-
-Exit $EXITCODE
diff --git a/.buildkite/scripts/packaging/package-util.sh b/.buildkite/scripts/packaging/package-util.sh
index 6b91fd557594..4a50457cc9c5 100755
--- a/.buildkite/scripts/packaging/package-util.sh
+++ b/.buildkite/scripts/packaging/package-util.sh
@@ -20,11 +20,3 @@ define_tags() {
     tags+=("${SOURCE_TAG}" "${aliasVersion}")
   fi
 }
-
-check_is_arm() {
-  if [[ ${HW_TYPE} == "aarch64" || ${HW_TYPE} == "arm64" ]]; then
-    is_arm="-arm64"
-  else
-    is_arm=""
-  fi
-}
diff --git a/.buildkite/scripts/packaging/package.sh b/.buildkite/scripts/packaging/package.sh
index 9318d1001713..6aaadb744e09 100755
--- a/.buildkite/scripts/packaging/package.sh
+++ b/.buildkite/scripts/packaging/package.sh
@@ -2,7 +2,7 @@
 
 set -euo pipefail
 
-#source .buildkite/scripts/packaging/package-util.sh
+source .buildkite/scripts/packaging/package-util.sh
 
 IMG_POSTFIX="-SNAPSHOT"
 VARIANTS=("" "-ubi" "-oss")
@@ -13,38 +13,38 @@ TARGET="observability-ci/${BEATS_PROJECT_NAME}"
 echo "--- Creating package"
 mage -d "${BEATS_PROJECT_NAME}" package
 
-#echo "--- Distribution list"
-#dir="${BEATS_PROJECT_NAME}/build/distributions"
-#buildkite-agent artifact upload "$dir/*.tar.gz;$dir/*.tar.gz.sha512"
-#
-#echo "--- Docker image list"
-#docker images
-#
-#define_tags
-#
-#targetSuffix=""
-#if [[ ${HW_TYPE} == "aarch64" || ${HW_TYPE} == "arm64" ]]; then
-#  targetSuffix="-arm64"
-#fi
-#
-#for variant in "${VARIANTS[@]}"; do
-#  source="beats/${BEATS_PROJECT_NAME}${variant}"
-#
-#  for tag in "${tags[@]}"; do
-#    targetTag=$tag${targetSuffix}
-#
-#    sourceName="${DOCKER_REGISTRY}/${source}:${SOURCE_TAG}"
-#    targetName="${DOCKER_REGISTRY}/${TARGET}:${targetTag}"
-#    # Remove following line once beats fully migrated
-#    targetName="${targetName}-buildkite"
-#
-#    if docker image inspect "${sourceName}" &>/dev/null; then
-#      echo "--- Tag & Push with target: $targetName"
-#      echo "Source name: $sourceName"
-#      docker tag "$sourceName" "$targetName"
-#      docker push "$targetName"
-#    else
-#      echo "Docker image ${sourceName} does not exist"
-#    fi
-#  done
-#done
+echo "--- Distribution list"
+dir="${BEATS_PROJECT_NAME}/build/distributions"
+buildkite-agent artifact upload "$dir/*.tar.gz;$dir/*.tar.gz.sha512"
+
+echo "--- Docker image list"
+docker images
+
+define_tags
+
+targetSuffix=""
+if [[ ${HW_TYPE} == "aarch64" || ${HW_TYPE} == "arm64" ]]; then
+  targetSuffix="-arm64"
+fi
+
+for variant in "${VARIANTS[@]}"; do
+  source="beats/${BEATS_PROJECT_NAME}${variant}"
+
+  for tag in "${tags[@]}"; do
+    targetTag=$tag${targetSuffix}
+
+    sourceName="${DOCKER_REGISTRY}/${source}:${SOURCE_TAG}"
+    targetName="${DOCKER_REGISTRY}/${TARGET}:${targetTag}"
+    # Remove following line once beats fully migrated
+    targetName="${targetName}-buildkite"
+
+    if docker image inspect "${sourceName}" &>/dev/null; then
+      echo "--- Tag & Push with target: $targetName"
+      echo "Source name: $sourceName"
+      docker tag "$sourceName" "$targetName"
+      docker push "$targetName"
+    else
+      echo "Docker image ${sourceName} does not exist"
+    fi
+  done
+done