Prepare for support of multiple, independent package types

code/go/internal/spec_test.go

@@ -12,8 +12,8 @@ import (
 	spec "github.com/elastic/package-spec"
 )
 
-func TestBundledSpecs(t *testing.T) {
+func TestBundledSpecsForIntegration(t *testing.T) {
 	fs := spec.FS()
-	_, err := fs.Open("1/spec.yml")
+	_, err := fs.Open("1/integration/spec.yml")
 	require.NoError(t, err)
 }

code/go/internal/validator/package.go

@@ -18,6 +18,7 @@ import (
 // Package represents an Elastic Package Registry package
 type Package struct {
 	Name        string
+	Type        string
 	SpecVersion *semver.Version
 
 	fs       fs.FS
@@ -64,12 +65,17 @@ func NewPackageFromFS(location string, fsys fs.FS) (*Package, error) {
 
 	var manifest struct {
 		Name        string `yaml:"name"`
+		Type        string `yaml:"type"`
 		SpecVersion string `yaml:"format_version"`
 	}
 	if err := yaml.Unmarshal(data, &manifest); err != nil {
 		return nil, errors.Wrapf(err, "could not parse package manifest file [%v]", pkgManifestPath)
 	}
 
+	if manifest.Type == "" {
+		return nil, errors.New("package type undefined in the package manifest file")
+	}
+
 	specVersion, err := semver.NewVersion(manifest.SpecVersion)
 	if err != nil {
 		return nil, errors.Wrapf(err, "could not read specification version from package manifest file [%v]", pkgManifestPath)
@@ -78,6 +84,7 @@ func NewPackageFromFS(location string, fsys fs.FS) (*Package, error) {
 	// Instantiate Package object and return it
 	p := Package{
 		Name:        manifest.Name,
+		Type:        manifest.Type,
 		SpecVersion: specVersion,
 		fs:          fsys,
 

code/go/internal/validator/spec.go

@@ -51,7 +51,7 @@ func (s Spec) ValidatePackage(pkg Package) ve.ValidationErrors {
 	var errs ve.ValidationErrors
 
 	var rootSpec folderSpec
-	rootSpecPath := path.Join(s.specPath, "spec.yml")
+	rootSpecPath := path.Join(s.specPath, pkg.Type, "spec.yml")
 	err := rootSpec.load(s.fs, rootSpecPath)
 	if err != nil {
 		errs = append(errs, errors.Wrap(err, "could not read root folder spec file"))

code/go/pkg/validator/testdata/limits/manifest.yml

@@ -3,6 +3,7 @@ name: good
 title: Good package
 description: This package is good.
 version: 1.0.0
+type: integration
 conditions:
   kibana.version: '^7.9.0'
 policy_templates:

spec.go

@@ -9,7 +9,7 @@ import (
 	"io/fs"
 )
 
-//go:embed versions/1 versions/1/_dev versions/1/data_stream/_dev
+//go:embed versions/1 versions/1/integration/_dev versions/1/integration/data_stream/_dev
 var content embed.FS
 
 // FS returns an io/fs.FS for accessing the "package-spec/version" contents.

test/packages/bad_deploy_variants/manifest.yml

@@ -3,6 +3,7 @@ name: bad_deploy_variants
 title: Bad Deploy Variants
 description: This package contains a bad _dev/deploy folder.
 version: 0.1.2
+type: integration
 release: beta
 owner:
   github: elastic/foobar

test/packages/bad_kibana_ids/manifest.yml

@@ -3,6 +3,7 @@ name: bad_kibana_ids
 title: Bad Kibana IDs
 description: This package contains Kibana object files with non-matching IDs
 version: 0.1.2
+type: integration
 release: beta
 owner:
   github: elastic/foobar

test/packages/deploy_docker/manifest.yml

@@ -3,6 +3,7 @@ name: bad_deploy_variants
 title: Bad Deploy Variants
 description: This package contains a bad _dev/deploy folder.
 version: 0.1.2
+type: integration
 release: beta
 owner:
   github: elastic/foobar

test/packages/deploy_terraform/manifest.yml

@@ -3,6 +3,7 @@ name: bad_deploy_variants
 title: Bad Deploy Variants
 description: This package contains a bad _dev/deploy folder.
 version: 0.1.2
+type: integration
 release: beta
 owner:
   github: elastic/foobar

test/packages/docs_extra_files/manifest.yml

@@ -3,6 +3,7 @@ name: docs_extra_files
 title: Extra files in docs
 description: This package is bad.
 version: 0.1.2
+type: integration
 release: beta
 conditions:
   kibana.version: '^7.9.0'

test/packages/good/manifest.yml

@@ -3,6 +3,7 @@ name: good
 title: Good package
 description: This package is good.
 version: 1.0.0
+type: integration
 conditions:
   kibana.version: '^7.9.0'
 policy_templates:

test/packages/input_template/manifest.yml

@@ -3,6 +3,7 @@ name: integration
 title: integration
 description: integration, really
 version: 0.1.2
+type: integration
 release: beta
 conditions:
   kibana.version: '^7.9.0'

test/packages/missing_data_stream/manifest.yml

@@ -3,6 +3,7 @@ name: good
 title: GOOD
 description: This package is good.
 version: 0.1.2
+type: integration
 release: beta
 conditions:
   kibana.version: '^7.9.0'

test/packages/missing_image_files/manifest.yml

@@ -3,6 +3,7 @@ name: missing_image_files
 title: Missing Image Files
 description: This package is bad.
 version: 0.1.2
+type: integration
 release: beta
 conditions:
   kibana.version: '^7.9.0'

test/packages/missing_pipeline_dashes/manifest.yml

@@ -3,6 +3,7 @@ name: good
 title: GOOD
 description: This package is good.
 version: 0.1.2
+type: integration
 release: beta
 conditions:
   kibana.version: '^7.9.0'

test/packages/missing_required_fields/manifest.yml

@@ -3,6 +3,7 @@ name: missing_required_fields
 title: Package without required fields
 description: This package doesn't have expected fields
 version: 1.0.0
+type: integration
 conditions:
   kibana.version: '^8.0.0'
 policy_templates:

test/packages/no_spec_version/manifest.yml

@@ -1,2 +1,3 @@
 # no format_version in this file
-name: mypackage
+name: mypackage
+type: integration

test/packages/wrong_kibana_filename/manifest.yml

@@ -3,6 +3,7 @@ name: bad
 title: BAD
 description: This package is bad.
 version: 0.1.2
+type: integration
 release: beta
 conditions:
   kibana.version: '^7.9.0'

versions/1/changelog.yml

@@ -10,6 +10,9 @@
   - description: Add Kibana/osquery-saved-query
     type: enhancement
     link: https://github.com/elastic/package-spec/pull/321
+  - description: Prepare for support of multiple, independent package types. Require "type" to be present in manifest.
+    type: enhancement
+    link: https://github.com/elastic/package-spec/pull/323
 - version: 1.7.0
   changes:
   - description: Add kibana/osquery-pack-asset