diff --git a/code/go/internal/spec_test.go b/code/go/internal/spec_test.go index f9413c037..69146f819 100644 --- a/code/go/internal/spec_test.go +++ b/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) } diff --git a/code/go/internal/validator/package.go b/code/go/internal/validator/package.go index 9b9ce49ca..ecc07aca6 100644 --- a/code/go/internal/validator/package.go +++ b/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, diff --git a/code/go/internal/validator/spec.go b/code/go/internal/validator/spec.go index ce3f6f98b..aac6c3483 100644 --- a/code/go/internal/validator/spec.go +++ b/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")) diff --git a/code/go/pkg/validator/testdata/limits/manifest.yml b/code/go/pkg/validator/testdata/limits/manifest.yml index 07d605118..31bdd761b 100644 --- a/code/go/pkg/validator/testdata/limits/manifest.yml +++ b/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: diff --git a/spec.go b/spec.go index 9a90bc7c3..262773f1e 100644 --- a/spec.go +++ b/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. diff --git a/test/packages/bad_deploy_variants/manifest.yml b/test/packages/bad_deploy_variants/manifest.yml index 321978cd1..caf6ad0a2 100644 --- a/test/packages/bad_deploy_variants/manifest.yml +++ b/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 \ No newline at end of file diff --git a/test/packages/bad_kibana_ids/manifest.yml b/test/packages/bad_kibana_ids/manifest.yml index 6341731f0..6d964e9f5 100644 --- a/test/packages/bad_kibana_ids/manifest.yml +++ b/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 \ No newline at end of file diff --git a/test/packages/deploy_docker/manifest.yml b/test/packages/deploy_docker/manifest.yml index 321978cd1..caf6ad0a2 100644 --- a/test/packages/deploy_docker/manifest.yml +++ b/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 \ No newline at end of file diff --git a/test/packages/deploy_terraform/manifest.yml b/test/packages/deploy_terraform/manifest.yml index 321978cd1..caf6ad0a2 100644 --- a/test/packages/deploy_terraform/manifest.yml +++ b/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 \ No newline at end of file diff --git a/test/packages/docs_extra_files/manifest.yml b/test/packages/docs_extra_files/manifest.yml index 6a5321b0c..6e08c3786 100644 --- a/test/packages/docs_extra_files/manifest.yml +++ b/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' diff --git a/test/packages/good/manifest.yml b/test/packages/good/manifest.yml index b89ce232c..54c7b7bb2 100644 --- a/test/packages/good/manifest.yml +++ b/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: diff --git a/test/packages/input_template/manifest.yml b/test/packages/input_template/manifest.yml index 91eacff71..162c71e4e 100644 --- a/test/packages/input_template/manifest.yml +++ b/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' diff --git a/test/packages/missing_data_stream/manifest.yml b/test/packages/missing_data_stream/manifest.yml index dfa4c5a9b..73d805122 100644 --- a/test/packages/missing_data_stream/manifest.yml +++ b/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' diff --git a/test/packages/missing_image_files/manifest.yml b/test/packages/missing_image_files/manifest.yml index b84f22255..87c0b5ed9 100644 --- a/test/packages/missing_image_files/manifest.yml +++ b/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' diff --git a/test/packages/missing_pipeline_dashes/manifest.yml b/test/packages/missing_pipeline_dashes/manifest.yml index dfa4c5a9b..73d805122 100644 --- a/test/packages/missing_pipeline_dashes/manifest.yml +++ b/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' diff --git a/test/packages/missing_required_fields/manifest.yml b/test/packages/missing_required_fields/manifest.yml index 960c6954a..39fa9ce04 100644 --- a/test/packages/missing_required_fields/manifest.yml +++ b/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: diff --git a/test/packages/no_spec_version/manifest.yml b/test/packages/no_spec_version/manifest.yml index b20212f0e..519d6788c 100644 --- a/test/packages/no_spec_version/manifest.yml +++ b/test/packages/no_spec_version/manifest.yml @@ -1,2 +1,3 @@ # no format_version in this file -name: mypackage \ No newline at end of file +name: mypackage +type: integration \ No newline at end of file diff --git a/test/packages/wrong_kibana_filename/manifest.yml b/test/packages/wrong_kibana_filename/manifest.yml index 1d5968214..e1a678ce2 100644 --- a/test/packages/wrong_kibana_filename/manifest.yml +++ b/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' diff --git a/versions/1/changelog.yml b/versions/1/changelog.yml index 1c5b293ab..704050c3c 100644 --- a/versions/1/changelog.yml +++ b/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 diff --git a/versions/1/_dev/build/build.spec.yml b/versions/1/integration/_dev/build/build.spec.yml similarity index 100% rename from versions/1/_dev/build/build.spec.yml rename to versions/1/integration/_dev/build/build.spec.yml diff --git a/versions/1/_dev/build/docs/spec.yml b/versions/1/integration/_dev/build/docs/spec.yml similarity index 100% rename from versions/1/_dev/build/docs/spec.yml rename to versions/1/integration/_dev/build/docs/spec.yml diff --git a/versions/1/_dev/build/spec.yml b/versions/1/integration/_dev/build/spec.yml similarity index 100% rename from versions/1/_dev/build/spec.yml rename to versions/1/integration/_dev/build/spec.yml diff --git a/versions/1/_dev/deploy/docker/spec.yml b/versions/1/integration/_dev/deploy/docker/spec.yml similarity index 100% rename from versions/1/_dev/deploy/docker/spec.yml rename to versions/1/integration/_dev/deploy/docker/spec.yml diff --git a/versions/1/_dev/deploy/k8s/spec.yml b/versions/1/integration/_dev/deploy/k8s/spec.yml similarity index 100% rename from versions/1/_dev/deploy/k8s/spec.yml rename to versions/1/integration/_dev/deploy/k8s/spec.yml diff --git a/versions/1/_dev/deploy/spec.yml b/versions/1/integration/_dev/deploy/spec.yml similarity index 100% rename from versions/1/_dev/deploy/spec.yml rename to versions/1/integration/_dev/deploy/spec.yml diff --git a/versions/1/_dev/deploy/tf/env.spec.yml b/versions/1/integration/_dev/deploy/tf/env.spec.yml similarity index 100% rename from versions/1/_dev/deploy/tf/env.spec.yml rename to versions/1/integration/_dev/deploy/tf/env.spec.yml diff --git a/versions/1/_dev/deploy/tf/spec.yml b/versions/1/integration/_dev/deploy/tf/spec.yml similarity index 100% rename from versions/1/_dev/deploy/tf/spec.yml rename to versions/1/integration/_dev/deploy/tf/spec.yml diff --git a/versions/1/_dev/deploy/variants.spec.yml b/versions/1/integration/_dev/deploy/variants.spec.yml similarity index 100% rename from versions/1/_dev/deploy/variants.spec.yml rename to versions/1/integration/_dev/deploy/variants.spec.yml diff --git a/versions/1/_dev/spec.yml b/versions/1/integration/_dev/spec.yml similarity index 100% rename from versions/1/_dev/spec.yml rename to versions/1/integration/_dev/spec.yml diff --git a/versions/1/agent/spec.yml b/versions/1/integration/agent/spec.yml similarity index 100% rename from versions/1/agent/spec.yml rename to versions/1/integration/agent/spec.yml diff --git a/versions/1/changelog.spec.yml b/versions/1/integration/changelog.spec.yml similarity index 100% rename from versions/1/changelog.spec.yml rename to versions/1/integration/changelog.spec.yml diff --git a/versions/1/integration/changelog.yml b/versions/1/integration/changelog.yml new file mode 100644 index 000000000..1c5b293ab --- /dev/null +++ b/versions/1/integration/changelog.yml @@ -0,0 +1,254 @@ +## +## This file documents changes in the package specification. It is NOT a package specification file. +## Newer entries go at the bottom. +## +- version: 1.7.1-next + changes: + - description: Validate that fields are only defined once per data stream. + type: enhancement + link: https://github.com/elastic/package-spec/pull/309 + - description: Add Kibana/osquery-saved-query + type: enhancement + link: https://github.com/elastic/package-spec/pull/321 +- version: 1.7.0 + changes: + - description: Add kibana/osquery-pack-asset + type: enhancement + link: https://github.com/elastic/package-spec/pull/299 +- version: 1.6.0 + changes: + - description: Validate required fields + type: enhancement + link: https://github.com/elastic/package-spec/pull/291 + - description: Increase fields limit from 1024 to 2048. + type: enhancement + link: https://github.com/elastic/package-spec/pull/294 +- version: 1.5.0 + changes: + - description: Add kibana/csp-rule-template asset + type: enhancement + link: https://github.com/elastic/package-spec/pull/276 + - description: Fix validation of dimension fields inside objects + type: bugfix + link: https://github.com/elastic/package-spec/pull/279 + - description: Add support for match_only_text field type + type: enhancement + link: https://github.com/elastic/package-spec/issues/284 + - description: Add limits to file sizes and number of files + type: enhancement + link: https://github.com/elastic/package-spec/pull/278 +- version: 1.4.1 + changes: + - description: ML model file name now matches the id of the model. + type: enhancement + link: https://github.com/elastic/package-spec/pull/268 + - description: Support auxiliary files in terraform deploy spec + type: enhancement + link: https://github.com/elastic/package-spec/pull/272 + - description: Add `developmentFolder` flag to mark directories with files intended for development. + type: enhancement + link: https://github.com/elastic/package-spec/pull/270 + - description: Allow directory names with hyphens inside _dev directories. + type: bugfix + link: https://github.com/elastic/package-spec/pull/270 +- version: 1.4.0 + changes: + - description: Report error when a directory name inside a package contains hyphens (-). + type: enhancement + link: https://github.com/elastic/package-spec/pull/259 + - description: Deprecate the release attribute, make it optional and set to ga by default. + type: enhancement + link: https://github.com/elastic/package-spec/pull/256 + - description: Restrict the allowed prerelease labels in sematic versions. + type: breaking-change + link: https://github.com/elastic/package-spec/pull/256 +- version: 1.3.0 + changes: + - description: Support wait-for-data timeout + type: enhancement + link: https://github.com/elastic/package-spec/pull/237 + - description: Add support for dimension fields. + type: enhancement + link: https://github.com/elastic/package-spec/pull/236 + - description: Add email, time_zone and url config types. + type: enhancement + link: https://github.com/elastic/package-spec/pull/241 + - description: Add support for dimension fields from external sources. + type: enhancement + link: https://github.com/elastic/package-spec/pull/248 +- version: 1.2.0 + changes: + - description: Add tag support for elastic export + type: bugfix + link: https://github.com/elastic/package-spec/pull/223 + - description: Add "elasticsearch.privileges.cluster" to package manifest + type: enhancement + link: https://github.com/elastic/package-spec/pull/226 + - description: Support ML model Elasticsearch type. + type: enhancement + link: https://github.com/elastic/package-spec/pull/204 +- version: 1.1 + changes: + - description: Prepare for 1.0.1 + type: enhancement + link: https://github.com/elastic/package-spec/pull/208 + - description: Revert "dynamic_template" field property + type: bugfix + link: https://github.com/elastic/package-spec/pull/212 + - description: Add "elasticsearch.privileges.indices" to data stream manifest + type: enhancement + link: https://github.com/elastic/package-spec/pull/211 + - description: Release v1.1 + type: enhancement + link: https://github.com/elastic/package-spec/pull/218 +- version: 1.0.0 + changes: + - description: Release as GA + type: enhancement + link: https://github.com/elastic/package-spec/pull/207 +- version: 1.0.0-alpha1 + changes: + - description: Initial version of the Elastic Package specifiction. + type: enhancement + link: https://github.com/elastic/package-spec/pull/1 + - description: Adding the histogram field as a valid ES field type. + type: enhancement + link: https://github.com/elastic/package-spec/pull/52 + - description: Add `metric_type` and `unit` to fields.yml. + type: enhancement + link: https://github.com/elastic/package-spec/pull/73 + - description: Adding "traces" as a valid data stream type. + type: enhancement + link: https://github.com/elastic/package-spec/pull/78 + - description: Add "agent/input" folder for top level configuration. + type: enhancement + link: https://github.com/elastic/package-spec/pull/79 + - description: Allow `condition` under inputs. + type: enhancement + link: https://github.com/elastic/package-spec/pull/87 + - description: Add `ilm_policy` to data stream manifest.yml + type: enhancement + link: https://github.com/elastic/package-spec/pull/90 + - description: Add `hidden` fields to data stream manifest file. + type: enhancement + link: https://github.com/elastic/package-spec/pull/91 + - description: 'Revert: Allow `condition` under inputs.' + type: bugfix + link: https://github.com/elastic/package-spec/pull/93 + - description: Support `lens` Kibana type. + type: enhancement + link: https://github.com/elastic/package-spec/pull/94 + - description: Add numeric_keyword_fields option for pipeline tests. + type: enhancement + link: https://github.com/elastic/package-spec/pull/95 + - description: Support multiple test cases in system tests. + type: enhancement + link: https://github.com/elastic/package-spec/pull/101 + - description: Support unsigned_long Elasticsearch type. + type: enhancement + link: https://github.com/elastic/package-spec/pull/103 + - description: Clean up go.mod and go.sum and add go mod tidy command. + type: enhancement + link: https://github.com/elastic/package-spec/pull/104 + - description: Add field for skipping tests. + type: enhancement + link: https://github.com/elastic/package-spec/pull/105 + - description: Add fields for matching datasets dynamically + type: enhancement + link: https://github.com/elastic/package-spec/pull/102 + - description: Make data_stream folder optional in the package + type: enhancement + link: https://github.com/elastic/package-spec/pull/113 + - description: Enforce README.md file + type: enhancement + link: https://github.com/elastic/package-spec/pull/116 + - description: Support Terraform deployment files. Enable "deploy" definitions for data stream + type: enhancement + link: https://github.com/elastic/package-spec/pull/111 + - description: Add "synthetics" to data stream type enum in manifest spec + type: enhancement + link: https://github.com/elastic/package-spec/pull/119 + - description: "Terraform service deployer: support user-defined environment variables" + type: enhancement + link: https://github.com/elastic/package-spec/pull/123 + - description: Add `alias` type to fields spec. + type: enhancement + link: https://github.com/elastic/package-spec/pull/120 + - description: Support Kubernetes service deployer + type: enhancement + link: https://github.com/elastic/package-spec/pull/130 + - description: Add specification for package CHANGELOG files. + type: enhancement + link: https://github.com/elastic/package-spec/pull/131 + - description: Deprecate JSON-formatted pipeline test configs in favor of YAML-formatted ones + type: enhancement + link: https://github.com/elastic/package-spec/pull/139 + - description: Support static tests + type: enhancement + link: https://github.com/elastic/package-spec/pull/141 + - description: Add policy groups + type: enhancement + link: https://github.com/elastic/package-spec/pull/137 + - description: Add multi property to inputs + type: enhancement + link: https://github.com/elastic/package-spec/pull/110 + - description: Ensure integrity between input groups and data streams + type: enhancement + link: https://github.com/elastic/package-spec/pull/143 + - description: Pipeline test results can be optional + type: enhancement + link: https://github.com/elastic/package-spec/pull/147 + - description: Remove deprecated JSON-formatted pipeline test configs + type: breaking-change + link: https://github.com/elastic/package-spec/pull/150 + - description: Add optional NOTICE.txt file to a package + type: enhancement + link: https://github.com/elastic/package-spec/pull/151 + - description: Add kibana/security-rule asset + type: enhancement + link: https://github.com/elastic/package-spec/pull/142 + - description: Support `ML module` Kibana type. + type: enhancement + link: https://github.com/elastic/package-spec/pull/152 + - description: Make input groups language consistent. + type: bugfix + link: https://github.com/elastic/package-spec/pull/157 + - description: Predefine input groups + type: breaking-change + link: https://github.com/elastic/package-spec/pull/158 + - description: Define Github owner field pattern + type: enhancement + link: https://github.com/elastic/package-spec/pull/164 + - description: Ensure version consistency between manifest and changelog + type: enhancement + link: https://github.com/elastic/package-spec/pull/172 + - description: Improve version consistency in case of missing/undefined version + type: enhancement + link: https://github.com/elastic/package-spec/pull/174 + - description: Fix security_rule format + type: bugfix + link: https://github.com/elastic/package-spec/pull/175 + - description: Define common test config for pipeline tests + type: enhancement + link: https://github.com/elastic/package-spec/pull/176 + - description: Validate if field groups don't have units and metric types defined + type: enhancement + link: https://github.com/elastic/package-spec/pull/183 + - description: Introduce "reference" property for fields + type: enhancement + link: https://github.com/elastic/package-spec/pull/179 + - description: Define build-time dependencies + type: enhancement + link: https://github.com/elastic/package-spec/pull/181 + - description: Introduce "dynamic_template" property for fields + type: enhancement + link: https://github.com/elastic/package-spec/pull/188 + - description: Relax ECS dependency in the build manifest + type: enhancement + link: https://github.com/elastic/package-spec/pull/191 + - description: Improve semantic versioning for version integrity + type: enhancement + link: https://github.com/elastic/package-spec/pull/193 + - description: Introduce "value" property for constant_keyword fields + type: enhancement + link: https://github.com/elastic/package-spec/pull/194 diff --git a/versions/1/data_stream/_dev/spec.yml b/versions/1/integration/data_stream/_dev/spec.yml similarity index 100% rename from versions/1/data_stream/_dev/spec.yml rename to versions/1/integration/data_stream/_dev/spec.yml diff --git a/versions/1/data_stream/_dev/test/pipeline/common_config.spec.yml b/versions/1/integration/data_stream/_dev/test/pipeline/common_config.spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/pipeline/common_config.spec.yml rename to versions/1/integration/data_stream/_dev/test/pipeline/common_config.spec.yml diff --git a/versions/1/data_stream/_dev/test/pipeline/config_json.spec.yml b/versions/1/integration/data_stream/_dev/test/pipeline/config_json.spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/pipeline/config_json.spec.yml rename to versions/1/integration/data_stream/_dev/test/pipeline/config_json.spec.yml diff --git a/versions/1/data_stream/_dev/test/pipeline/config_raw.spec.yml b/versions/1/integration/data_stream/_dev/test/pipeline/config_raw.spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/pipeline/config_raw.spec.yml rename to versions/1/integration/data_stream/_dev/test/pipeline/config_raw.spec.yml diff --git a/versions/1/data_stream/_dev/test/pipeline/event.spec.yml b/versions/1/integration/data_stream/_dev/test/pipeline/event.spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/pipeline/event.spec.yml rename to versions/1/integration/data_stream/_dev/test/pipeline/event.spec.yml diff --git a/versions/1/data_stream/_dev/test/pipeline/expected.spec.yml b/versions/1/integration/data_stream/_dev/test/pipeline/expected.spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/pipeline/expected.spec.yml rename to versions/1/integration/data_stream/_dev/test/pipeline/expected.spec.yml diff --git a/versions/1/data_stream/_dev/test/pipeline/spec.yml b/versions/1/integration/data_stream/_dev/test/pipeline/spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/pipeline/spec.yml rename to versions/1/integration/data_stream/_dev/test/pipeline/spec.yml diff --git a/versions/1/data_stream/_dev/test/skip.spec.yml b/versions/1/integration/data_stream/_dev/test/skip.spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/skip.spec.yml rename to versions/1/integration/data_stream/_dev/test/skip.spec.yml diff --git a/versions/1/data_stream/_dev/test/spec.yml b/versions/1/integration/data_stream/_dev/test/spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/spec.yml rename to versions/1/integration/data_stream/_dev/test/spec.yml diff --git a/versions/1/data_stream/_dev/test/static/config.spec.yml b/versions/1/integration/data_stream/_dev/test/static/config.spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/static/config.spec.yml rename to versions/1/integration/data_stream/_dev/test/static/config.spec.yml diff --git a/versions/1/data_stream/_dev/test/static/spec.yml b/versions/1/integration/data_stream/_dev/test/static/spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/static/spec.yml rename to versions/1/integration/data_stream/_dev/test/static/spec.yml diff --git a/versions/1/data_stream/_dev/test/system/config.spec.yml b/versions/1/integration/data_stream/_dev/test/system/config.spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/system/config.spec.yml rename to versions/1/integration/data_stream/_dev/test/system/config.spec.yml diff --git a/versions/1/data_stream/_dev/test/system/spec.yml b/versions/1/integration/data_stream/_dev/test/system/spec.yml similarity index 100% rename from versions/1/data_stream/_dev/test/system/spec.yml rename to versions/1/integration/data_stream/_dev/test/system/spec.yml diff --git a/versions/1/data_stream/fields/fields.spec.yml b/versions/1/integration/data_stream/fields/fields.spec.yml similarity index 100% rename from versions/1/data_stream/fields/fields.spec.yml rename to versions/1/integration/data_stream/fields/fields.spec.yml diff --git a/versions/1/data_stream/fields/spec.yml b/versions/1/integration/data_stream/fields/spec.yml similarity index 100% rename from versions/1/data_stream/fields/spec.yml rename to versions/1/integration/data_stream/fields/spec.yml diff --git a/versions/1/data_stream/manifest.spec.yml b/versions/1/integration/data_stream/manifest.spec.yml similarity index 100% rename from versions/1/data_stream/manifest.spec.yml rename to versions/1/integration/data_stream/manifest.spec.yml diff --git a/versions/1/data_stream/spec.yml b/versions/1/integration/data_stream/spec.yml similarity index 100% rename from versions/1/data_stream/spec.yml rename to versions/1/integration/data_stream/spec.yml diff --git a/versions/1/docs/spec.yml b/versions/1/integration/docs/spec.yml similarity index 100% rename from versions/1/docs/spec.yml rename to versions/1/integration/docs/spec.yml diff --git a/versions/1/elasticsearch/spec.yml b/versions/1/integration/elasticsearch/spec.yml similarity index 100% rename from versions/1/elasticsearch/spec.yml rename to versions/1/integration/elasticsearch/spec.yml diff --git a/versions/1/kibana/spec.yml b/versions/1/integration/kibana/spec.yml similarity index 100% rename from versions/1/kibana/spec.yml rename to versions/1/integration/kibana/spec.yml diff --git a/versions/1/manifest.spec.yml b/versions/1/integration/manifest.spec.yml similarity index 99% rename from versions/1/manifest.spec.yml rename to versions/1/integration/manifest.spec.yml index d08387366..2ae136136 100644 --- a/versions/1/manifest.spec.yml +++ b/versions/1/integration/manifest.spec.yml @@ -299,4 +299,5 @@ spec: - title - description - version + - type - owner diff --git a/versions/1/spec.yml b/versions/1/integration/spec.yml similarity index 100% rename from versions/1/spec.yml rename to versions/1/integration/spec.yml