Fix functionbeat

kvch · kvch · commit 6d38569c326b · 2020-10-26T16:56:29.000+01:00
diff --git a/libbeat/cfgfile/cfgfile.go b/libbeat/cfgfile/cfgfile.go
@@ -205,6 +205,10 @@ func LoadList(file string) ([]*common.Config, error) {
 	return c, nil
 }
 
+func SetConfigPath(path string) {
+	*configPath = path
+}
+
 // GetPathConfig returns ${path.config}. If ${path.config} is not set, ${path.home} is returned.
 func GetPathConfig() string {
 	if *configPath != "" {
diff --git a/x-pack/functionbeat/provider/gcp/pubsub/pubsub.go b/x-pack/functionbeat/provider/gcp/pubsub/pubsub.go
@@ -29,6 +29,7 @@ func RunPubSub(ctx context.Context, m gpubsub.Message) error {
 		ConfigOverrides: config.FunctionOverrides,
 	}
 
+	cfgfile.SetConfigPath("/srv/src/pubsub")
 	cfgfile.ChangeDefaultCfgfileFlag(settings.Name)
 
 	return instance.Run(settings, initFunctionbeat(ctx, m))
diff --git a/x-pack/functionbeat/provider/gcp/storage/storage.go b/x-pack/functionbeat/provider/gcp/storage/storage.go
@@ -27,6 +27,7 @@ func RunCloudStorage(ctx context.Context, e gcp.StorageEvent) error {
 		ConfigOverrides: config.FunctionOverrides,
 	}
 
+	cfgfile.SetConfigPath("/srv/src/storage")
 	cfgfile.ChangeDefaultCfgfileFlag(settings.Name)
 
 	return instance.Run(settings, initFunctionbeat(ctx, e))
diff --git a/x-pack/functionbeat/scripts/mage/update.go b/x-pack/functionbeat/scripts/mage/update.go
@@ -74,6 +74,9 @@ func (Update) VendorBeats() error {
 				Exclude: []string{
 					".*_test.go$",
 					".*.yml",
+					// XXX GCP function metadata lib must be removed to avoid build failures
+					// GH issue: https://github.com/googleapis/google-cloud-go/issues/1947
+					".*cloud.google.com/go.*/functions/metadata.*",
 				},
 			}
 			err = cp.Execute()

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ func RunPubSub(ctx context.Context, m gpubsub.Message) error {`
`29`	`29`	`ConfigOverrides: config.FunctionOverrides,`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ cfgfile.SetConfigPath("/srv/src/pubsub")`
`32`	`33`	`cfgfile.ChangeDefaultCfgfileFlag(settings.Name)`
`33`	`34`
`34`	`35`	`return instance.Run(settings, initFunctionbeat(ctx, m))`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ func RunCloudStorage(ctx context.Context, e gcp.StorageEvent) error {`
`27`	`27`	`ConfigOverrides: config.FunctionOverrides,`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ cfgfile.SetConfigPath("/srv/src/storage")`
`30`	`31`	`cfgfile.ChangeDefaultCfgfileFlag(settings.Name)`
`31`	`32`
`32`	`33`	`return instance.Run(settings, initFunctionbeat(ctx, e))`