Skip to content
Closed
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
14 changes: 8 additions & 6 deletions x-pack/functionbeat/magefile.go
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
30 changes: 23 additions & 7 deletions x-pack/functionbeat/scripts/mage/providers.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,37 @@ import (
"strings"
)

type functionbeatProvider struct {
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",
availableProviders = []functionbeatProvider{
{Name: "aws", GOOS: "linux", GOARCH: "amd64"},
}
)

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

return strings.Split(providers, ",")
providers := make([]functionbeatProvider, 0)

for _, name := range strings.Split(providersList, ",") {
for _, provider := range availableProviders {
if provider.Name == name {
providers = append(providers, provider)
break
}
}
}

return providers
}