Provide npcap distribution internally

.gitignore

@@ -8,3 +8,4 @@ Dockerfile
 .status.*
 *.bck
 CHANGELOG.md
+npcap/lib/*.exe

Jenkinsfile

@@ -101,6 +101,7 @@ pipeline {
                 withGithubNotify(context: "Build ${GO_FOLDER} ${MAKEFILE} ${PLATFORM}") {
                   deleteDir()
                   unstash 'source'
+                  prepareNcap()
                   buildImages()
                 }
               }
@@ -115,6 +116,7 @@ pipeline {
                 withGithubNotify(context: "Staging ${GO_FOLDER} ${MAKEFILE} ${PLATFORM}") {
                   // It will use the already cached docker images that were created in the
                   // Build stage. But it's required to retag them with the staging repo.
+                  prepareNcap()
                   buildImages()
                   publishImages()
                 }
@@ -156,6 +158,23 @@ pipeline {
   }
 }
 
+def prepareNcap() {
+  if (PLATFORM?.trim().equals('arm')) {
+    log(level: 'INFO', text: "prepareNcap is not supported for ${PLATFORM}")
+    return
+  }
+  log(level: 'INFO', text: "prepareNcap for ${PLATFORM}")
+  withGoEnv(){
+    withGCPEnv(secret: 'secret/observability-team/ci/elastic-observability-account-auth'){
+      dir("${env.BASE_DIR}"){
+        retryWithSleep(retries: 3, seconds: 15, backoff: true) {
+          sh "make copy-npcap"
+        }
+      }
+    }
+  }
+}
+
 def buildImages(){
   log(level: 'INFO', text: "buildImages ${GO_FOLDER} with ${MAKEFILE} for ${PLATFORM}")
   withGoEnv(){

Makefile

@@ -1,6 +1,19 @@
+include Makefile.common
+
 TARGETS=go1.16 go1.17
 ARM_TARGETS=go1.16 go1.17
 
+# Requires login at google storage.
+copy-npcap: status=".status.copy-npcap"
+copy-npcap:
+ifeq ($(CI),true)
+	@echo '0' > ${status}
+	$(foreach var,$(TARGETS), \
+		gsutil cp gs://obs-ci-cache/private/$(NPCAP_FILE) $(var)/npcap/lib/$(NPCAP_FILE) || echo '1' > ${status})
+else
+	@echo 'Only available if running in the CI'
+endif
+
 build: status=".status.build"
 build:
 	@echo '0' > ${status}

Makefile.common

@@ -3,14 +3,29 @@ VCS_REF       := $(shell git rev-parse HEAD)
 VCS_URL       := https://github.com/elastic/golang-crossbuild
 BUILD_DATE    := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
 .DEFAULT_GOAL := build
+NPCAP_VERSION := 1.60
+# TODO: to be replaced once we validate it works as expected
+#NPCAP_FILE   := npcap-$(NPCAP_VERSION)-oem.exe
+NPCAP_FILE    := test.txt
+SUFFIX_NPCAP_VERSION := -npcap-$(NPCAP_VERSION)
+NPCAP_REPOSITORY := docker.elastic.co/observability-ci
 
-# Requires login at https://docker.elastic.co:7000/.
 push:
-	echo ">> Pushing $(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
+	@[ "$(SUFFIX)" = "$(SUFFIX_NPCAP_VERSION)" ] \
+	&& ( \
+		[ "$(REPOSITORY)" = "$(NPCAP_REPOSITORY)" ] \
+		&& $(MAKE) atomic-push \
+		|| echo "NOTE: $(SUFFIX) can only be published in $(NPCAP_REPOSITORY)" \
+	   ) \
+	|| $(MAKE) atomic-push
+
+# Requires login at https://docker.elastic.co:7000/.
+atomic-push:
+	@echo ">> Pushing $(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
 	@docker push "$(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
 
 push-arm:
-	echo ">> Pushing $(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
+	@echo ">> Pushing $(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
 	@docker push "$(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
 
 .PHONY: push push-arm

NPCAP.md

@@ -0,0 +1,9 @@
+# NPCAP
+
+If you'd like to bump the npcap version please follow the below steps:
+
+1) Update `NPCAP_VERSION` value in the `Makefile`.
+2) Download the new artifact.
+3) Upload the artifact to `gs://obs-ci-cache/private`.
+
+Credentials to the artifact service can be found in the APM-Shared folder in the password management tool.

go1.16/Makefile

@@ -1,4 +1,4 @@
-IMAGES := base main darwin arm armhf armel mips mips32 ppc s390x
+IMAGES := base main darwin arm armhf armel mips mips32 ppc s390x npcap
 ARM_IMAGES := base-arm
 
 build:

go1.16/Makefile.common

@@ -4,11 +4,17 @@ include $(SELF_DIR)/../Makefile.common
 NAME           := golang-crossbuild
 VERSION        := 1.16.9
 DEBIAN_VERSION ?= 9
-SUFFIX         := -$(shell basename $(CURDIR))
+FOLDER         := -$(shell basename $(CURDIR))
 TAG_EXTENSION  ?=
 
 export DEBIAN_VERSION TAG_EXTENSION
 
+ifeq ($(FOLDER),-npcap)
+SUFFIX = $(SUFFIX_NPCAP_VERSION)
+else
+SUFFIX = $(FOLDER)
+endif
+
 build:
 	@echo ">> Building $(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
 	@go run $(SELF_DIR)/../template.go -t Dockerfile.tmpl -o Dockerfile

go1.16/Makefile.debian10

@@ -1,8 +1,9 @@
-IMAGES         := base main darwin arm armhf armel mips mips32 ppc s390x darwin-arm64
+IMAGES         := base main darwin arm armhf armel mips mips32 ppc s390x darwin-arm64 npcap
 DEBIAN_VERSION := 10
 TAG_EXTENSION  := -debian10
+NPCAP_VERSION  ?=
 
-export DEBIAN_VERSION TAG_EXTENSION
+export DEBIAN_VERSION NPCAP_VERSION TAG_EXTENSION
 
 build:
 	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;)

go1.16/Makefile.debian8

@@ -1,8 +1,9 @@
-IMAGES         :=  base main darwin
+IMAGES         := base main darwin npcap
 DEBIAN_VERSION := 8
 TAG_EXTENSION  := -debian8
+NPCAP_VERSION  ?=
 
-export DEBIAN_VERSION TAG_EXTENSION
+export DEBIAN_VERSION NPCAP_VERSION TAG_EXTENSION
 
 build:
 	export |grep TAG_EXTENSION

go1.16/Makefile.debian9

@@ -1,9 +1,10 @@
-IMAGES         := base main darwin arm armhf armel mips mips32 ppc s390x
+IMAGES         := base main darwin arm armhf armel mips mips32 ppc s390x npcap
 ARM_IMAGES     := base-arm
 DEBIAN_VERSION := 9
 TAG_EXTENSION  := -debian9
+NPCAP_VERSION  ?=
 
-export DEBIAN_VERSION TAG_EXTENSION
+export DEBIAN_VERSION NPCAP_VERSION TAG_EXTENSION
 
 build:
 	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;)

go1.16/npcap/.dockerignore

@@ -0,0 +1 @@
+Makefile

go1.16/npcap/Dockerfile.tmpl

@@ -0,0 +1,17 @@
+ARG REPOSITORY
+ARG VERSION
+ARG TAG_EXTENSION=''
+FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-main${TAG_EXTENSION}
+
+COPY lib /installer
+
+# Build-time metadata as defined at http://label-schema.org.
+ARG BUILD_DATE
+ARG IMAGE
+ARG VCS_REF
+ARG VCS_URL
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name=$IMAGE \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url=$VCS_URL \
+      org.label-schema.schema-version="1.0"

go1.16/npcap/Makefile

@@ -0,0 +1 @@
+include ../Makefile.common

go1.17/Makefile

@@ -1,4 +1,4 @@
-IMAGES := base main darwin arm armhf armel mips mips32 ppc s390x
+IMAGES := base main darwin arm armhf armel mips mips32 ppc s390x npcap
 ARM_IMAGES := base-arm
 
 build:

go1.17/Makefile.common

@@ -4,11 +4,17 @@ include $(SELF_DIR)/../Makefile.common
 NAME           := golang-crossbuild
 VERSION        := 1.17.6
 DEBIAN_VERSION ?= 9
-SUFFIX         := -$(shell basename $(CURDIR))
+FOLDER         := -$(shell basename $(CURDIR))
 TAG_EXTENSION  ?=
 
 export DEBIAN_VERSION TAG_EXTENSION
 
+ifeq ($(FOLDER),-npcap)
+SUFFIX = $(SUFFIX_NPCAP_VERSION)
+else
+SUFFIX = $(FOLDER)
+endif
+
 build:
 	@echo ">> Building $(REPOSITORY)/$(NAME):$(VERSION)$(SUFFIX)$(TAG_EXTENSION)"
 	@go run $(SELF_DIR)/../template.go -t Dockerfile.tmpl -o Dockerfile

go1.17/Makefile.debian10

@@ -1,8 +1,9 @@
-IMAGES         := base main darwin arm armhf armel mips mips32 ppc s390x darwin-arm64
+IMAGES         := base main darwin arm armhf armel mips mips32 ppc s390x darwin-arm64 npcap
 DEBIAN_VERSION := 10
 TAG_EXTENSION  := -debian10
+NPCAP_VERSION  ?=
 
-export DEBIAN_VERSION TAG_EXTENSION
+export DEBIAN_VERSION NPCAP_VERSION TAG_EXTENSION
 
 build:
 	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;)

go1.17/Makefile.debian8

@@ -1,8 +1,9 @@
-IMAGES         :=  base main darwin
+IMAGES         := base main darwin npcap
 DEBIAN_VERSION := 8
 TAG_EXTENSION  := -debian8
+NPCAP_VERSION  ?=
 
-export DEBIAN_VERSION TAG_EXTENSION
+export DEBIAN_VERSION NPCAP_VERSION TAG_EXTENSION
 
 build:
 	export |grep TAG_EXTENSION

go1.17/Makefile.debian9

@@ -1,9 +1,10 @@
-IMAGES         := base main darwin arm armhf armel mips mips32 ppc s390x
+IMAGES         := base main darwin arm armhf armel mips mips32 ppc s390x npcap
 ARM_IMAGES     := base-arm
 DEBIAN_VERSION := 9
 TAG_EXTENSION  := -debian9
+NPCAP_VERSION  ?=
 
-export DEBIAN_VERSION TAG_EXTENSION
+export DEBIAN_VERSION NPCAP_VERSION TAG_EXTENSION
 
 build:
 	@$(foreach var,$(IMAGES),$(MAKE) -C $(var) build || exit 1;)

go1.17/npcap/.dockerignore

@@ -0,0 +1 @@
+Makefile

go1.17/npcap/Dockerfile.tmpl

@@ -0,0 +1,17 @@
+ARG REPOSITORY
+ARG VERSION
+ARG TAG_EXTENSION=''
+FROM ${REPOSITORY}/golang-crossbuild:${VERSION}-main${TAG_EXTENSION}
+
+COPY lib /installer
+
+# Build-time metadata as defined at http://label-schema.org.
+ARG BUILD_DATE
+ARG IMAGE
+ARG VCS_REF
+ARG VCS_URL
+LABEL org.label-schema.build-date=$BUILD_DATE \
+      org.label-schema.name=$IMAGE \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url=$VCS_URL \
+      org.label-schema.schema-version="1.0"

go1.17/npcap/Makefile

@@ -0,0 +1 @@
+include ../Makefile.common