Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[7.17](backport #32251) automate the ironbank docker context generation #32419

Merged
merged 5 commits into from
Jul 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .ci/packaging.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,8 @@ def release(){
]) {
dockerLogin(secret: "${DOCKERELASTIC_SECRET}", registry: "${DOCKER_REGISTRY}")
dir("${env.BEATS_FOLDER}") {
sh(label: "Release ${env.BEATS_FOLDER} ${env.PLATFORMS}", script: 'mage package')
sh(label: "mage package ${env.BEATS_FOLDER} ${env.PLATFORMS}", script: 'mage package')
sh(label: "mage ironbank ${env.BEATS_FOLDER} ${env.PLATFORMS}", script: 'mage ironbank')
def folder = getBeatsName(env.BEATS_FOLDER)
uploadPackagesToGoogleBucket(
credentialsId: env.JOB_GCS_EXT_CREDENTIALS,
Expand Down
8 changes: 8 additions & 0 deletions auditbeat/magefile.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ func Package() {
mg.SerialDeps(devtools.Package, TestPackages)
}

// Package packages the Beat for IronBank distribution.
//
// Use SNAPSHOT=true to build snapshots.
func Ironbank() error {
fmt.Println(">> Ironbank: this module is not subscribed to the IronBank releases.")
return nil
}

// TestPackages tests the generated packages (i.e. file modes, owners, groups).
func TestPackages() error {
return devtools.TestPackages()
Expand Down
19 changes: 17 additions & 2 deletions dev-tools/mage/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,9 @@ func unzip(sourceFile, destinationDir string) error {
return nil
}

// Tar compress a directory using tar + gzip algorithms
func Tar(src string, targetFile string) error {
// Tar compress a directory using tar + gzip algorithms but without adding
// the directory
func TarWithOptions(src string, targetFile string, trimSource bool) error {
fmt.Printf(">> creating TAR file from directory: %s, target: %s\n", src, targetFile)

f, err := os.Create(targetFile)
Expand Down Expand Up @@ -390,6 +391,15 @@ func Tar(src string, targetFile string) error {
// must provide real name
// (see https://golang.org/src/archive/tar/common.go?#L626)
header.Name = filepath.ToSlash(file)
// Replace the source folder in the files to be compressed
if trimSource {
header.Name = strings.ReplaceAll(filepath.ToSlash(file), filepath.ToSlash(src), "")
header.Name = strings.TrimPrefix(header.Name, "/")
if header.Name == "" {
fmt.Print(">> skipping root directory\n")
return nil
}
}

// write header
if err := tw.WriteHeader(header); err != nil {
Expand Down Expand Up @@ -422,6 +432,11 @@ func Tar(src string, targetFile string) error {
return nil
}

// Tar compress a directory using tar + gzip algorithms
func Tar(src string, targetFile string) error {
return TarWithOptions(src, targetFile, false)
}

func untar(sourceFile, destinationDir string) error {
file, err := os.Open(sourceFile)
if err != nil {
Expand Down
10 changes: 10 additions & 0 deletions dev-tools/mage/copy.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,16 @@ func Copy(src, dest string) error {
return copy.Execute()
}

// Copy copies a file and preserves the permissions.
func CopyFile(src, dest string) error {
copy := &CopyTask{Source: src, Dest: dest}
info, err := os.Stat(src)
if err != nil {
return errors.Wrapf(err, "copy failed: cannot stat source file %v", src)
}
return copy.fileCopy(src, dest, info)
}

// CopyTask copies a file or directory (recursively) and preserves the permissions.
type CopyTask struct {
Source string // Source directory or file.
Expand Down
109 changes: 109 additions & 0 deletions dev-tools/mage/pkg.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (
"path/filepath"
"runtime"
"strconv"
"strings"

"github.com/magefile/mage/mg"
"github.com/magefile/mage/sh"
Expand Down Expand Up @@ -117,6 +118,114 @@ func Package() error {
return nil
}

// Package packages the Beat for IronBank distribution.
//
// Use SNAPSHOT=true to build snapshots.
func Ironbank() error {
if runtime.GOARCH != "amd64" {
fmt.Printf(">> IronBank images are only supported for amd64 arch (%s is not supported)\n", runtime.GOARCH)
return nil
}
if err := prepareIronbankBuild(); err != nil {
return fmt.Errorf("failed to prepare the IronBank context: %w", err)
}
if err := saveIronbank(); err != nil {
return fmt.Errorf("failed to save the IronBank context: %w", err)
}
return nil
}

func getIronbankContextName() string {
version, _ := BeatQualifiedVersion()
ironbankBinaryName := "{{.Name}}-ironbank-{{.Version}}{{if .Snapshot}}-SNAPSHOT{{end}}-docker-build-context"
// TODO: get the name of the project
outputDir, _ := Expand(ironbankBinaryName, map[string]interface{}{
"Name": BeatName,
"Version": version,
})
return outputDir
}

func prepareIronbankBuild() error {
fmt.Println(">> prepareIronbankBuild: prepare the IronBank container context.")
buildDir := filepath.Join("build", getIronbankContextName())
beatsDir, err := ElasticBeatsDir()
if err != nil {
return fmt.Errorf("could not get the base dir: %w", err)
}

templatesDir := filepath.Join(beatsDir, "dev-tools", "packaging", "templates", "ironbank", BeatName)

data := map[string]interface{}{
"MajorMinor": BeatMajorMinorVersion(),
}

err = filepath.Walk(templatesDir, func(path string, info os.FileInfo, _ error) error {
if !info.IsDir() {
target := strings.TrimSuffix(
filepath.Join(buildDir, filepath.Base(path)),
".tmpl",
)

err := ExpandFile(path, target, data)
if err != nil {
return fmt.Errorf("expanding template '%s' to '%s': %w", path, target, err)
}
}
return nil
})

if err != nil {
return fmt.Errorf("cannot create templates for the IronBank: %w", err)
}

// copy license
sourceLicense := filepath.Join(beatsDir, "dev-tools", "packaging", "files", "ironbank", "LICENSE")
targetLicense := filepath.Join(buildDir, "LICENSE")
if err := CopyFile(sourceLicense, targetLicense); err != nil {
return fmt.Errorf("cannot copy LICENSE file for the IronBank: %w", err)
}

// copy specific files for the given beat
sourceBeatPath := filepath.Join(beatsDir, "dev-tools", "packaging", "files", "ironbank", BeatName)
if _, err := os.Stat(sourceBeatPath); !os.IsNotExist(err) {
if err := Copy(sourceBeatPath, buildDir); err != nil {
return fmt.Errorf("cannot create files for the IronBank: %w", err)
}
}

return nil
}

func saveIronbank() error {
fmt.Println(">> saveIronbank: save the IronBank container context.")

ironbank := getIronbankContextName()
buildDir := filepath.Join("build", ironbank)
if _, err := os.Stat(buildDir); os.IsNotExist(err) {
return fmt.Errorf("cannot find the folder with the ironbank context: %+v", err)
}

distributionsDir := "build/distributions"
if _, err := os.Stat(distributionsDir); os.IsNotExist(err) {
err := os.MkdirAll(distributionsDir, 0750)
if err != nil {
return fmt.Errorf("cannot create folder for docker artifacts: %+v", err)
}
}
tarGzFile := filepath.Join(distributionsDir, ironbank+".tar.gz")

// Save the build context as tar.gz artifact
err := TarWithOptions(buildDir, tarGzFile, true)
if err != nil {
return fmt.Errorf("cannot compress the tar.gz file: %+v", err)
}

return errors.Wrap(CreateSHA512File(tarGzFile), "failed to create .sha512 file")
}

// isPackageTypeSelected returns true if SelectedPackageTypes is empty or if
// pkgType is present on SelectedPackageTypes. It returns false otherwise.
func isPackageTypeSelected(pkgType PackageType) bool {
if SelectedPackageTypes != nil {
selected := false
Expand Down
8 changes: 8 additions & 0 deletions dev-tools/mage/settings.go
Original file line number Diff line number Diff line change
Expand Up @@ -359,6 +359,14 @@ func BeatQualifiedVersion() (string, error) {
return version + "-" + versionQualifier, nil
}

func BeatMajorMinorVersion() string {
if v, _ := BeatQualifiedVersion(); v != "" {
parts := strings.SplitN(v, ".", 3)
return parts[0] + "." + parts[1]
}
return ""
}

// BeatVersion returns the Beat's version. The value can be overridden by
// setting BEAT_VERSION in the environment.
func beatVersion() (string, error) {
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/make/mage.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ help:

.PHONY: release
release: mage
mage package
mage package ironbank

stop-environment:

Expand Down
Loading