Skip to content

Fix tests around pipelines with custom dataset #1437

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

Merged
merged 2 commits into from
Sep 11, 2023
Merged

Fix tests around pipelines with custom dataset #1437

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
32ff8aa
Fix tests around pipelines with custom dataset
ruflin Sep 8, 2023
e6c7d4f
update awsfirehose package dataset to test this change
ruflin Sep 11, 2023
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
7 changes: 6 additions & 1 deletion internal/packages/assets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,14 @@ func loadElasticsearchAssets(pkgRootPath string) ([]Asset, error) {
continue // ingest pipeline is not defined
}

// If no dataset value is set in the manifest, it falls back to {packageName}.{dirName}
if dsManifest.Dataset == "" {
dsManifest.Dataset = fmt.Sprintf("%s.%s", pkgManifest.Name, dsManifest.Name)
}

ingestPipelineName := dsManifest.GetPipelineNameOrDefault()
if ingestPipelineName == defaultPipelineName {
ingestPipelineName = fmt.Sprintf("%s-%s.%s-%s", dsManifest.Type, pkgManifest.Name, dsManifest.Name, pkgManifest.Version)
ingestPipelineName = fmt.Sprintf("%s-%s-%s", dsManifest.Type, dsManifest.Dataset, pkgManifest.Version)
}
asset = Asset{
ID: ingestPipelineName,
Expand Down
2 changes: 1 addition & 1 deletion test/packages/parallel/awsfirehose/data_stream/log/manifest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
title: Logs from Amazon Kinesis Data Firehose
type: logs
dataset: awsfirehose.log
dataset: awsfirehose
# Ensures agents have permissions to write data to `logs-*-*`
elasticsearch:
dynamic_dataset: true
Expand Down