Merge pull request #49 from Conjur-Enterprise/build-fix-pt2

CNJR-0000: Update arm64 artifact name in release

Author: gl-johnson

bin/check_golang_security

@@ -38,12 +38,14 @@ if [[ ! -v BRANCH_NAME ]]; then
       "
 else
   # Running in Jenkins
-  excluded_directories="$(pwd)/test,$(pwd)/third_party/go-mssqldb"
+  # For some reason the third_party directory is not being excluded properly on main branch builds. It appears in two forms:
+  # /home/jenkins/agent/workspace/secretless-broker-main-full_main/third_party/go-mssqldb
+  # /home/jenkins/agent/workspace/secretless-broker-main-full_main/secretless-broker-main-full_main/third_party/go-mssqldb
+  # To accomodate the second case, we duplicate the name of the working directory to build the full path
+  third_party_import_dir="$(pwd)/$(basename "$(pwd)")/third_party/go-mssqldb"
+  excluded_directories="$(pwd)/test,$(pwd)/third_party/go-mssqldb,$third_party_import_dir"
   echo "Excluding directories: ${excluded_directories}"
-  # TODO: Somehow this still fails to exclude them.
-  # Excluding directories: /home/jenkins/agent/workspace/secretless-broker-main-full_main/test,/home/jenkins/agent/workspace/secretless-broker-main-full_main/third_party/go-mssqldb
-  # later...
-  # Import directory: /home/jenkins/agent/workspace/secretless-broker-main-full_main/secretless-broker-main-full_main/third_party/go-mssqldb/examples/tsql
+
   go install github.com/securego/gosec/v2/cmd/gosec@latest
   git config --global --add safe.directory "${WORKSPACE}"
   ./bin/run_gosec -c "${confidence}" -s "${severity}" -b "${current_branch}" -e "${excluded_directories}"

bin/copy_release_assets

@@ -57,7 +57,7 @@ goreleaser_assets() {
         *.deb
         secretless-broker-linux_amd64_v1
         secretless-broker-darwin_amd64_v1
-        secretless-broker-darwin_arm64
+        secretless-broker-darwin_arm64_v8.0
     )
     local complete_assets
 
@@ -96,6 +96,9 @@ function main() {
 # Goreleaser's release section would remove _v1 from packages
 # during a release but is disabled in favor of the automated
 # release process.
+#
+# A similar process should be done for the arm64 packages now, as it appends
+# the suffix `v8.0` to the filename. See: https://pkg.go.dev/cmd/go#hdr-Environment_variables
 ###################################
 function rename_assets() {
     # Find all assets ending with _v1
@@ -104,6 +107,13 @@ function rename_assets() {
         echo "RENAMING ${file} to ${file/_v1/}"
         mv "$file" "${file/_v1/}"
     done
+
+    # Find all assets ending with v8.0
+    for file in "${asset_dir}"/*_v8.0; do
+        # Rename file, removing v8.0 from asset
+        echo "RENAMING ${file} to ${file/_v8.0/}"
+        mv "$file" "${file/_v8.0/}"
+    done
 }
 
 main