Skip to content

Commit 79def21

Browse files
authored
Fix test for creating input packages (#1430)
1 parent 9be83fe commit 79def21

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

internal/packages/archetype/data_stream_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,23 @@ import (
1616

1717
func TestDataStream(t *testing.T) {
1818
t.Run("valid-logs", func(t *testing.T) {
19-
pd := createPackageDescriptorForTest("integration")
19+
pd := createPackageDescriptorForTest("integration", "^7.13.0")
2020
dd := createDataStreamDescriptorForTest()
2121
dd.Manifest.Type = "logs"
2222

2323
err := createAndCheckDataStream(t, pd, dd)
2424
require.NoError(t, err)
2525
})
2626
t.Run("valid-metrics", func(t *testing.T) {
27-
pd := createPackageDescriptorForTest("integration")
27+
pd := createPackageDescriptorForTest("integration", "^7.13.0")
2828
dd := createDataStreamDescriptorForTest()
2929
dd.Manifest.Type = "metrics"
3030

3131
err := createAndCheckDataStream(t, pd, dd)
3232
require.NoError(t, err)
3333
})
3434
t.Run("missing-type", func(t *testing.T) {
35-
pd := createPackageDescriptorForTest("integration")
35+
pd := createPackageDescriptorForTest("integration", "^7.13.0")
3636
dd := createDataStreamDescriptorForTest()
3737
dd.Manifest.Type = ""
3838

internal/packages/archetype/package_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,23 @@ import (
1919

2020
func TestPackage(t *testing.T) {
2121
t.Run("valid", func(t *testing.T) {
22-
pd := createPackageDescriptorForTest("integration")
22+
pd := createPackageDescriptorForTest("integration", "^7.13.0")
2323

2424
err := createAndCheckPackage(t, pd)
2525
require.NoError(t, err)
2626
})
2727
t.Run("missing-version", func(t *testing.T) {
28-
pd := createPackageDescriptorForTest("integration")
28+
pd := createPackageDescriptorForTest("integration", "^7.13.0")
2929
pd.Manifest.Version = ""
3030

3131
err := createAndCheckPackage(t, pd)
3232
require.Error(t, err)
3333
})
34-
t.Run("input-pacakge", func(t *testing.T) {
35-
pd := createPackageDescriptorForTest("input")
34+
t.Run("input-package", func(t *testing.T) {
35+
pd := createPackageDescriptorForTest("input", "^8.9.0")
3636

3737
err := createAndCheckPackage(t, pd)
38-
require.Error(t, err)
38+
require.NoError(t, err)
3939
})
4040
}
4141

@@ -59,7 +59,7 @@ func createAndCheckPackage(t require.TestingT, pd PackageDescriptor) error {
5959
return err
6060
}
6161

62-
func createPackageDescriptorForTest(packageType string) PackageDescriptor {
62+
func createPackageDescriptorForTest(packageType, kibanaVersion string) PackageDescriptor {
6363
inputDataStreamType := ""
6464
if packageType == "input" {
6565
inputDataStreamType = "logs"
@@ -72,7 +72,7 @@ func createPackageDescriptorForTest(packageType string) PackageDescriptor {
7272
Version: "1.2.3",
7373
Conditions: packages.Conditions{
7474
Kibana: packages.KibanaConditions{
75-
Version: "^7.13.0",
75+
Version: kibanaVersion,
7676
},
7777
Elastic: packages.ElasticConditions{
7878
Subscription: "basic",

0 commit comments

Comments
 (0)