Skip to content

Functionbeat providers compilation with specific GOOS and GOARCH #15399

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.

Sign up for GitHub

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

Closed
rvillablanca wants to merge 4 commits into from
Closed

Functionbeat providers compilation with specific GOOS and GOARCH #15399

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7dee3e0
functionbeat providers compilation with GOOS and GOARCH
rvillablanca Jan 8, 2020
931ead0
FunctionbeatProvider is unexported
rvillablanca Jan 8, 2020
d52069f
Selecting providers by searching in PROVIDERS environment var
rvillablanca Jan 9, 2020
b93e4df
Break for
rvillablanca Jan 9, 2020
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
14 changes: 8 additions & 6 deletions x-pack/functionbeat/magefile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,12 @@ func Build() error {

// Building functions to deploy
for _, provider := range functionbeat.SelectedProviders {
inputFiles := filepath.Join("provider", provider, "main.go")
inputFiles := filepath.Join("provider", provider.Name, "main.go")
params.InputFiles = []string{inputFiles}
params.Name = devtools.BeatName + "-" + provider
params.OutputDir = filepath.Join("provider", provider)
params.Name = devtools.BeatName + "-" + provider.Name
params.OutputDir = filepath.Join("provider", provider.Name)
params.Env = map[string]string{"GOOS": provider.GOOS, "GOARCH": provider.GOARCH}

err := devtools.Build(params)
if err != nil {
return err
Expand Down Expand Up @@ -78,7 +80,7 @@ func CrossBuild() error {

// Building functions to deploy
for _, provider := range functionbeat.SelectedProviders {
err := devtools.CrossBuild(devtools.AddPlatforms("linux/amd64"), devtools.InDir("x-pack", "functionbeat", "provider", provider))
err := devtools.CrossBuild(devtools.AddPlatforms("linux/amd64"), devtools.InDir("x-pack", "functionbeat", "provider", provider.Name))
if err != nil {
return err
}
Expand Down Expand Up @@ -138,10 +140,10 @@ func BuildSystemTestBinary() error {

params := devtools.DefaultTestBinaryArgs()
for _, provider := range functionbeat.SelectedProviders {
params.Name = filepath.Join("provider", provider, devtools.BeatName+"-"+provider)
params.Name = filepath.Join("provider", provider.Name, devtools.BeatName+"-"+provider.Name)
inputFiles := make([]string, 0)
for _, inputFileName := range []string{"main.go", "main_test.go"} {
inputFiles = append(inputFiles, filepath.Join("provider", provider, inputFileName))
inputFiles = append(inputFiles, filepath.Join("provider", provider.Name, inputFileName))
}
params.InputFiles = inputFiles
err := devtools.BuildSystemTestGoBinary(params)
Expand Down
25 changes: 7 additions & 18 deletions x-pack/functionbeat/scripts/mage/providers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,15 @@

package mage

import (
"os"
"strings"
)
type FunctionbeatProvider struct {
Comment thread
rvillablanca marked this conversation as resolved.
Outdated
Name string
GOOS string
GOARCH string
}

var (
// SelectedProviders is the list of selected providers
// Can be configured by setting PROVIDERS enviroment variable.
SelectedProviders = getConfiguredProviders()

availableProviders = []string{
"aws",
SelectedProviders = []FunctionbeatProvider{
{Name: "aws", GOOS: "darwin", GOARCH: "amd64"},
}
)

func getConfiguredProviders() []string {
providers := os.Getenv("PROVIDERS")
if len(providers) == 0 {
return availableProviders
}

return strings.Split(providers, ",")
}