fix: adjust changes for make

Author: pkoutsovasilis

.buildkite/pipeline.package.mbp.yml

@@ -47,40 +47,6 @@ steps:
     plugins:
       - *oidc_plugin
 
-<<<<<<< HEAD
-=======
-  - label: "Package FIPS x86_64 snapshot"
-    if: "build.env('VERSION_QUALIFIER') == null"
-    key: "package-fips-x86-64-snapshot"
-    command: ".buildkite/scripts/package.sh snapshot"
-    env:
-      FIPS: "true"
-    agents:
-      provider: "gcp"
-      image: "${IMAGE_UBUNTU_X86_64}"
-      machineType: "c2-standard-16"
-    artifact_paths:
-      - build/distributions/**
-    plugins:
-      - *oidc_plugin
-
-  - label: "Package FIPS x86_64 staging"
-    key: "package-fips-x86-64-staging"
-    command: |
-      source .buildkite/scripts/version_qualifier.sh
-      .buildkite/scripts/package.sh staging
-    env:
-      FIPS: "true"
-    agents:
-      provider: "gcp"
-      image: "${IMAGE_UBUNTU_X86_64}"
-      machineType: "c2-standard-16"
-    artifact_paths:
-      - build/distributions/**
-    plugins:
-      - *oidc_plugin
-
->>>>>>> 7da3f69 (fix: package fleet-server using golang-crossbuild  (#5392))
   - label: "Package aarch64 snapshot"
     if: "build.env('VERSION_QUALIFIER') == null"
     key: "package-arm-snapshot"
@@ -108,40 +74,6 @@ steps:
     plugins:
       - *oidc_plugin
 
-<<<<<<< HEAD
-=======
-  - label: "Package FIPS aarch64 snapshot"
-    if: "build.env('VERSION_QUALIFIER') == null"
-    key: "package-fips-arm-snapshot"
-    command: ".buildkite/scripts/package.sh snapshot"
-    env:
-      FIPS: "true"
-    agents:
-      provider: "aws"
-      imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
-      instanceType: "t4g.2xlarge"
-    artifact_paths:
-      - build/distributions/**
-    plugins:
-      - *oidc_plugin
-
-  - label: "Package FIPS aarch64 staging"
-    key: "package-fips-arm-staging"
-    command: |
-      source .buildkite/scripts/version_qualifier.sh
-      .buildkite/scripts/package.sh staging
-    env:
-      FIPS: "true"
-    agents:
-      provider: "aws"
-      imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
-      instanceType: "t4g.2xlarge"
-    artifact_paths:
-      - build/distributions/**
-    plugins:
-      - *oidc_plugin
-
->>>>>>> 7da3f69 (fix: package fleet-server using golang-crossbuild  (#5392))
   - label: "DRA snapshot"
     if: "${FILE_EXISTS_IN_REPO} && build.env('VERSION_QUALIFIER') == null"
     key: "dra-snapshot"

.buildkite/pipeline.yml

@@ -9,37 +9,19 @@ env:
   DOCKER_IMAGE_GIT_TAG: "${BUILDKITE_BRANCH}" # needs to rename for rollback
   GO_AGENT_IMAGE: "golang:${GO_VERSION}"
   TERRAFORM_VERSION: "1.6.4"
-<<<<<<< HEAD
-=======
   IMAGE_UBUNTU_X86_64: "family/core-ubuntu-2204"
   IMAGE_UBUNTU_ARM_64: "core-ubuntu-2204-aarch64"
-  IMAGE_UBUNTU_X86_64_FIPS: "platform-ingest-fleet-server-ubuntu-2204-fips"
 
 # This section is used to define the plugins that will be used in the pipeline.
 # See https://buildkite.com/docs/pipelines/integrations/plugins/using#using-yaml-anchors-with-plugins
 common:
-  - test_collector_plugin: &test_collector_plugin
-      test-collector#v1.11.0:
-        files: "build/test-*.xml"
-        format: "junit"
-        branches: "main"
-        debug: true
-  - bk_analytics_token_plugin: &bk_analytics_token_plugin
-      elastic/vault-secrets#v0.1.0:
-        path: "kv/ci-shared/platform-ingest/buildkite_analytics_token"
-        field: "token"
-        env_var: "BUILDKITE_ANALYTICS_TOKEN"
-  - docker_elastic_login_plugin: &docker_elastic_login_plugin
-      elastic/vault-docker-login#v0.6.0:
-        secret_path: 'kv/ci-shared/platform-ingest/elastic_docker_registry'
   # See https://github.com/elastic/oblt-infra/blob/main/conf/resources/repos/fleet-server/01-gcp-buildkite-oidc.tf
   # This plugin authenticates to Google Cloud using the OIDC token.
   - oidc_plugin: &oidc_plugin
       elastic/oblt-google-auth#v1.2.0:
         lifetime: 10800 # seconds
         project-id: "elastic-observability-ci"
         project-number: "911195782929"
->>>>>>> 7da3f69 (fix: package fleet-server using golang-crossbuild  (#5392))
 
 steps:
   - group: "Check and build"
@@ -53,35 +35,10 @@ steps:
           cpu: "8"
           memory: "4G"
 
-<<<<<<< HEAD
-      - label: ":building_construction: Run local build"
-        key: make-local
-        command: "make local"
-        agents:
-          image: "${GO_AGENT_IMAGE}"
-          cpu: "8"
-          memory: "4G"
-=======
       - label: "Package x86_64"
         key: "package-x86-64-pr"
         env:
-          PLATFORMS: "linux/amd64,darwin/amd64,windows/amd64"
-        command: ".buildkite/scripts/release_test.sh"
-        artifact_paths:
-          - build/distributions/**
-        agents:
-          provider: "gcp"
-          image: "${IMAGE_UBUNTU_X86_64}"
-          machineType: "c2-standard-16"
-        plugins:
-          - *oidc_plugin
->>>>>>> 7da3f69 (fix: package fleet-server using golang-crossbuild  (#5392))
-
-      - label: "Package x86_64 FIPS"
-        key: "package-fips-x86-64-pr"
-        env:
-          FIPS: "true"
-          PLATFORMS: "linux/amd64"
+          PLATFORMS: "linux/amd64 darwin/amd64 windows/amd64"
         command: ".buildkite/scripts/release_test.sh"
         artifact_paths:
           - build/distributions/**
@@ -95,22 +52,7 @@ steps:
       - label: "Package aarch64"
         key: "package-arm64-pr"
         env:
-          PLATFORMS: "linux/arm64,darwin/arm64"
-        command: ".buildkite/scripts/release_test.sh"
-        artifact_paths:
-          - build/distributions/**
-        agents:
-          provider: "aws"
-          imagePrefix: "${IMAGE_UBUNTU_ARM_64}"
-          instanceType: "t4g.2xlarge"
-        plugins:
-          - *oidc_plugin
-
-      - label: "Package aarch64 FIPS"
-        key: "package-fips-arm64-pr"
-        env:
-          FIPS: "true"
-          PLATFORMS: "linux/arm64"
+          PLATFORMS: "linux/arm64 darwin/arm64"
         command: ".buildkite/scripts/release_test.sh"
         artifact_paths:
           - build/distributions/**

.buildkite/scripts/package.sh

@@ -27,17 +27,10 @@ with_mage
 case "${TYPE}" in
     "snapshot")
         export SNAPSHOT=true
-<<<<<<< HEAD
-        make release
+        make docker-release
         ;;
     "staging")
-        make release
-=======
-        mage docker:release
-        ;;
-    "staging")
-        mage docker:release
->>>>>>> 7da3f69 (fix: package fleet-server using golang-crossbuild  (#5392))
+        make docker-release
         ;;
     *)
     echo "The option is unsupported yet"

.buildkite/scripts/test-release.sh

@@ -3,11 +3,26 @@
 set -euo pipefail
 
 FLEET_SERVER_VERSION=${1:?"Fleet Server version is needed"}
+PLATFORMS=${PLATFORMS:-"darwin/amd64 darwin/arm64 linux/amd64 linux/arm64 windows/amd64"}
 
-PLATFORM_FILES=(darwin-aarch64.tar.gz darwin-x86_64.tar.gz linux-arm64.tar.gz linux-x86_64.tar.gz windows-x86_64.zip)
-if [ "$FIPS" = "true" ] ; then
-    PLATFORM_FILES=(linux-arm64-fips.tar.gz linux-x86_64-fips.tar.gz)
-fi
+PLATFORM_FILES=()
+for p in $PLATFORMS; do
+  os="${p%%/*}"
+  arch="${p##*/}"
+
+  case "$os/$arch" in
+    darwin/arm64) arch="aarch64" ;;
+    */amd64) arch="x86_64" ;;
+  esac
+
+  case "$os" in
+    windows) ext="zip" ;;
+    *) ext="tar.gz" ;;
+  esac
+
+  file="${os}-${arch}.${ext}"
+  PLATFORM_FILES+=("$file")
+done
 
 #make release
 
@@ -23,17 +38,17 @@ for PLATFORM_FILE in "${PLATFORM_FILES[@]}"
 do
     file="${FILE_PREFIX}${PLATFORM_FILE}"
     if [ ! -f "${file}" ]; then
-        echo -e "${RED}!! ${PLATFORM_FILE}: The file was not created.${NO_COLOR}"
+        echo -e "${RED}!! ${file}: The file was not created.${NO_COLOR}"
         exit 1
     else
-        echo -e "- ${PLATFORM_FILE} ${GREEN}OK${NO_COLOR}"
+        echo -e "- ${file} ${GREEN}OK${NO_COLOR}"
     fi
 
     fileSha512="${file}.sha512"
     if [ ! -f "${fileSha512}" ]; then
         echo -e "${RED}!! ${fileSha512}: The file was not created.${NO_COLOR}"
         exit 1
     else
-        echo -e "- ${PLATFORM_FILE}.sha512 ${GREEN}OK${NO_COLOR}"
+        echo -e "- ${file}.sha512 ${GREEN}OK${NO_COLOR}"
     fi
 done

Dockerfile.fips

@@ -16,22 +16,7 @@ RUN go mod download && go mod verify
 ENTRYPOINT [ "make" ]
 CMD [ "release" ]
 
-<<<<<<< HEAD
 FROM base AS builder
-=======
-# FIPS docker image defined below
-# Does not use base as the lowest layer so we don't have to deal with user/ownership issues when building the image.
-ARG GO_VERSION
-# Suffix should be main-debian11-fips or base-arm-debian11-fips
-ARG SUFFIX
-FROM docker.elastic.co/beats-dev/golang-crossbuild:${GO_VERSION}-${SUFFIX} AS builder
-
-WORKDIR /fleet-server
-ENV PATH="$PATH:/go/bin"
-COPY go.mod go.sum ./
-RUN go mod download && go mod verify
-RUN go install github.com/magefile/mage # uses version in go.mod
->>>>>>> 7da3f69 (fix: package fleet-server using golang-crossbuild  (#5392))
 
 COPY . .
 

Makefile

@@ -12,11 +12,6 @@ DEFAULT_VERSION=$(shell awk '/const DefaultVersion/{print $$NF}' version/version
 TARGET_ARCH_amd64=x86_64
 TARGET_ARCH_arm64=arm64
 PLATFORMS ?= darwin/amd64 darwin/arm64 linux/amd64 linux/arm64 windows/amd64
-BUILDMODE_linux_amd64=-buildmode=pie
-BUILDMODE_linux_arm64=-buildmode=pie
-BUILDMODE_windows_amd64=-buildmode=pie
-BUILDMODE_darwin_amd64=-buildmode=pie
-BUILDMODE_darwin_arm64=-buildmode=pie
 
 CROSSBUILD_SUFFIX=main-debian11
 CROSSBUILD_ARM_SUFFIX=base-arm-debian9
@@ -65,6 +60,10 @@ ifeq "${FIPS}" "true"
 DOCKER_IMAGE_TAG:=${DOCKER_IMAGE_TAG}-fips
 endif
 endif
+CGO_ENABLED?=0
+ifeq "${FIPS}" "true"
+CGO_ENABLED=1
+endif
 DOCKER_IMAGE?=docker.elastic.co/fleet-server/fleet-server
 
 PLATFORM_TARGETS=$(addprefix release-, $(PLATFORMS))
@@ -138,7 +137,7 @@ list-platforms: ## - Show the possible PLATFORMS
 .PHONY: local
 local: ## - Build local binary for local environment (bin/fleet-server)
 	@printf "${CMD_COLOR_ON} Build binaries using local go installation\n${CMD_COLOR_OFF}"
-	${GOFIPSEXPERIMENT} go build -tags=${GOBUILDTAGS} -gcflags="${GCFLAGS}" -ldflags="${LDFLAGS}" -o ./bin/fleet-server .
+	CGO_ENABLED=${CGO_ENABLED} ${GOFIPSEXPERIMENT} go build -tags=${GOBUILDTAGS} -gcflags="${GCFLAGS}" -ldflags="${LDFLAGS}" -o ./bin/fleet-server .
 	@printf "${CMD_COLOR_ON} Binaries in ./bin/\n${CMD_COLOR_OFF}"
 
 .PHONY: $(COVER_TARGETS)
@@ -147,8 +146,7 @@ $(COVER_TARGETS): cover-%: ## - Build a binary with the -cover flag for integrat
 	$(eval $@_OS := $(firstword $(subst /, ,$(lastword $(subst cover-, ,$@)))))
 	$(eval $@_GO_ARCH := $(lastword $(subst /, ,$(lastword $(subst cover-, ,$@)))))
 	$(eval $@_ARCH := $(TARGET_ARCH_$($@_GO_ARCH)))
-	$(eval $@_BUILDMODE:= $(BUILDMODE_$($@_OS)_$($@_GO_ARCH)))
-	GOOS=$($@_OS) GOARCH=$($@_GO_ARCH) ${GOFIPSEXPERIMENT} go build -tags=${GOBUILDTAGS} -cover -coverpkg=./... -gcflags="${GCFLAGS}" -ldflags="${LDFLAGS}" $($@_BUILDMODE) -o build/cover/fleet-server-$(VERSION)-$($@_OS)-$($@_ARCH)$(FIPSSUFFIX)/fleet-server$(if $(filter windows,$($@_OS)),.exe,) .
+	CGO_ENABLED=${CGO_ENABLED} GOOS=$($@_OS) GOARCH=$($@_GO_ARCH) ${GOFIPSEXPERIMENT} go build -tags=${GOBUILDTAGS} -cover -coverpkg=./... -gcflags="${GCFLAGS}" -ldflags="${LDFLAGS}" -o build/cover/fleet-server-$(VERSION)-$($@_OS)-$($@_ARCH)$(FIPSSUFFIX)/fleet-server$(if $(filter windows,$($@_OS)),.exe,) .
 
 .PHONY: clean
 clean: ## - Clean up build artifacts
@@ -269,8 +267,7 @@ $(PLATFORM_TARGETS): release-%:
 	$(eval $@_OS := $(firstword $(subst /, ,$(lastword $(subst release-, ,$@)))))
 	$(eval $@_GO_ARCH := $(lastword $(subst /, ,$(lastword $(subst release-, ,$@)))))
 	$(eval $@_ARCH := $(TARGET_ARCH_$($@_GO_ARCH)))
-	$(eval $@_BUILDMODE:= $(BUILDMODE_$($@_OS)_$($@_GO_ARCH)))
-	GOOS=$($@_OS) GOARCH=$($@_GO_ARCH) ${GOFIPSEXPERIMENT} go build -tags=${GOBUILDTAGS} -gcflags="${GCFLAGS}" -ldflags="${LDFLAGS}" $($@_BUILDMODE) -o build/binaries/fleet-server-$(VERSION)-$($@_OS)-$($@_ARCH)$(FIPSSUFFIX)/fleet-server .
+	CGO_ENABLED=${CGO_ENABLED} GOOS=$($@_OS) GOARCH=$($@_GO_ARCH) ${GOFIPSEXPERIMENT} go build -tags=${GOBUILDTAGS} -gcflags="${GCFLAGS}" -ldflags="${LDFLAGS}" -o build/binaries/fleet-server-$(VERSION)-$($@_OS)-$($@_ARCH)$(FIPSSUFFIX)/fleet-server .
 	@$(MAKE) OS=$($@_OS) ARCH=$($@_ARCH) package-target
 
 .PHONY: build-docker
@@ -321,6 +318,8 @@ endif
 build-releaser: ## - Build a Docker image to run make package including all build tools
 ifeq ($(shell uname -p),arm)
 	$(eval SUFFIX := ${CROSSBUILD_ARM_SUFFIX})
+else ifeq ($(shell uname -p),aarch64)
+	$(eval SUFFIX := ${CROSSBUILD_ARM_SUFFIX})
 else
 	$(eval SUFFIX := ${CROSSBUILD_SUFFIX})
 endif
@@ -332,16 +331,16 @@ endif
 
 .PHONY: docker-release
 docker-release: build-releaser ## - Builds a release for all platforms in a dockerised environment
-	docker run --rm -u $(shell id -u):$(shell id -g) --env=GOCACHE=/go/cache --volume $(PWD):/go/src/github.com/elastic/fleet-server $(BUILDER_IMAGE) release
+	docker run --rm -u $(shell id -u):$(shell id -g) --env=GOCACHE=/go/cache --env='PLATFORMS=${PLATFORMS}' --volume $(PWD):/go/src/github.com/elastic/fleet-server $(BUILDER_IMAGE) release
 
 .PHONY: docker-cover-e2e-binaries
 docker-cover-e2e-binaries: build-releaser
 ifeq "${FIPS}" "true"
 	## non-linux is currently unsupported for FIPS
-	docker run --rm -u $(shell id -u):$(shell id -g) --env=GOCACHE=/go/cache --volume $(PWD):/go/src/github.com/elastic/fleet-server -e SNAPSHOT=true -e DEV=$(DEV) -e FIPS=$(FIPS) $(BUILDER_IMAGE) cover-linux/$(shell go env GOARCH)
+	docker run --rm -u $(shell id -u):$(shell id -g) --env=GOCACHE=/go/cache --env='PLATFORMS=${PLATFORMS}' --volume $(PWD):/go/src/github.com/elastic/fleet-server -e SNAPSHOT=true -e DEV=$(DEV) -e FIPS=$(FIPS) $(BUILDER_IMAGE) cover-linux/$(shell go env GOARCH)
 else
 	## Build for local architecture and for linux/$ARCH for docker images.
-	docker run --rm -u $(shell id -u):$(shell id -g) --env=GOCACHE=/go/cache --volume $(PWD):/go/src/github.com/elastic/fleet-server -e SNAPSHOT=true -e DEV=$(DEV) -e FIPS=$(FIPS) $(BUILDER_IMAGE) cover-linux/$(shell go env GOARCH) cover-$(shell go env GOOS)/$(shell go env GOARCH)
+	docker run --rm -u $(shell id -u):$(shell id -g) --env=GOCACHE=/go/cache --env='PLATFORMS=${PLATFORMS}' --volume $(PWD):/go/src/github.com/elastic/fleet-server -e SNAPSHOT=true -e DEV=$(DEV) -e FIPS=$(FIPS) $(BUILDER_IMAGE) cover-linux/$(shell go env GOARCH) cover-$(shell go env GOOS)/$(shell go env GOARCH)
 endif
 
 .PHONY: release