Skip to content

Commit

Permalink
[7.9] [Ingest Manager] Update package registry for testing to f6b01d (#…
Browse files Browse the repository at this point in the history
…74341) (#74405)

* [Ingest Manager] Update package registry for testing to f6b01d (#74341)

Many changes went into the registry and the packages recently. This is updating to the most recent version of the registry distribution currently in production.

Co-authored-by: Sonja Krause-Harder <sonja.krause-harder@elastic.co>
# Conflicts:
#	x-pack/test/ingest_manager_api_integration/apis/epm/list.ts
#	x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_logs/fields/fields.yml
#	x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/all_assets/0.1.0/dataset/test_metrics/fields/fields.yml
#	x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.1.0/dataset/test/fields/fields.yml
#	x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.2.0/dataset/test/fields/fields.yml
#	x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/multiple_versions/0.3.0/dataset/test/fields/fields.yml
#	x-pack/test/ingest_manager_api_integration/config.ts

* Remove accidentally added partial packages.

* Adjust test case.

* Update content type tests

Co-authored-by: Elastic Machine <elasticmachine@users.noreply.github.com>
Co-authored-by: Sonja Krause-Harder <sonja.krause-harder@elastic.co>
Co-authored-by: Jen Huang <its.jenetic@gmail.com>
  • Loading branch information
4 people authored Aug 6, 2020
1 parent 50d4b93 commit 09cc87d
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
6 changes: 3 additions & 3 deletions x-pack/test/ingest_manager_api_integration/apis/epm/file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export default function ({ getService }: FtrProviderContext) {
'/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/visualization/sample_visualization.json'
)
.set('kbn-xsrf', 'xxx')
.expect('Content-Type', 'text/plain; charset=utf-8')
.expect('Content-Type', 'application/json; charset=utf-8')
.expect(200);
} else {
warnAndSkipTest(this, log);
Expand All @@ -61,7 +61,7 @@ export default function ({ getService }: FtrProviderContext) {
'/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/dashboard/sample_dashboard.json'
)
.set('kbn-xsrf', 'xxx')
.expect('Content-Type', 'text/plain; charset=utf-8')
.expect('Content-Type', 'application/json; charset=utf-8')
.expect(200);
} else {
warnAndSkipTest(this, log);
Expand All @@ -73,7 +73,7 @@ export default function ({ getService }: FtrProviderContext) {
await supertest
.get('/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/search/sample_search.json')
.set('kbn-xsrf', 'xxx')
.expect('Content-Type', 'text/plain; charset=utf-8')
.expect('Content-Type', 'application/json; charset=utf-8')
.expect(200);
} else {
warnAndSkipTest(this, log);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export default function ({ getService }: FtrProviderContext) {
return response.body;
};
const listResponse = await fetchPackageList();
expect(listResponse.response.length).to.be(11);
expect(listResponse.response.length).to.be(5);
} else {
warnAndSkipTest(this, log);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
- name: dataset.type
- name: data_stream.type
type: constant_keyword
description: >
Dataset type.
- name: dataset.name
Data stream type.
- name: data_stream.dataset
type: constant_keyword
description: >
Dataset name.
- name: dataset.namespace
Data stream dataset.
- name: data_stream.namespace
type: constant_keyword
description: >
Dataset namespace.
Data stream namespace.
- name: '@timestamp'
type: date
description: >
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ export default function ({ getService }: FtrProviderContext) {
package: {
name: 'endpoint',
title: 'Endpoint',
version: '0.8.0',
version: '0.13.0',
},
})
.expect(200);
Expand All @@ -120,7 +120,7 @@ export default function ({ getService }: FtrProviderContext) {
package: {
name: 'endpoint',
title: 'Endpoint',
version: '0.8.0',
version: '0.13.0',
},
})
.expect(500);
Expand Down
2 changes: 1 addition & 1 deletion x-pack/test/ingest_manager_api_integration/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { services } from '../api_integration/services';
// Docker image to use for Ingest Manager API integration tests.
// This hash comes from the commit hash here: https://github.com/elastic/package-storage/commit/48f3935a72b0c5aacc6fec8ef36d559b089a238b
export const dockerImage =
'docker.elastic.co/package-registry/distribution:48f3935a72b0c5aacc6fec8ef36d559b089a238b';
'docker.elastic.co/package-registry/distribution:f6b01daec8cfe355101e366de9941d35a4c3763e';

export default async function ({ readConfigFile }: FtrConfigProviderContext) {
const xPackAPITestsConfig = await readConfigFile(require.resolve('../api_integration/config.ts'));
Expand Down

0 comments on commit 09cc87d

Please sign in to comment.