Skip to content

Commit 09cc87d

Browse files
ruflinelasticmachineskhjen-huang
authored
[7.9] [Ingest Manager] Update package registry for testing to f6b01d (elastic#74341) (elastic#74405)
* [Ingest Manager] Update package registry for testing to f6b01d (elastic#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>
1 parent 50d4b93 commit 09cc87d

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

x-pack/test/ingest_manager_api_integration/apis/epm/file.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export default function ({ getService }: FtrProviderContext) {
4747
'/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/visualization/sample_visualization.json'
4848
)
4949
.set('kbn-xsrf', 'xxx')
50-
.expect('Content-Type', 'text/plain; charset=utf-8')
50+
.expect('Content-Type', 'application/json; charset=utf-8')
5151
.expect(200);
5252
} else {
5353
warnAndSkipTest(this, log);
@@ -61,7 +61,7 @@ export default function ({ getService }: FtrProviderContext) {
6161
'/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/dashboard/sample_dashboard.json'
6262
)
6363
.set('kbn-xsrf', 'xxx')
64-
.expect('Content-Type', 'text/plain; charset=utf-8')
64+
.expect('Content-Type', 'application/json; charset=utf-8')
6565
.expect(200);
6666
} else {
6767
warnAndSkipTest(this, log);
@@ -73,7 +73,7 @@ export default function ({ getService }: FtrProviderContext) {
7373
await supertest
7474
.get('/api/ingest_manager/epm/packages/filetest/0.1.0/kibana/search/sample_search.json')
7575
.set('kbn-xsrf', 'xxx')
76-
.expect('Content-Type', 'text/plain; charset=utf-8')
76+
.expect('Content-Type', 'application/json; charset=utf-8')
7777
.expect(200);
7878
} else {
7979
warnAndSkipTest(this, log);

x-pack/test/ingest_manager_api_integration/apis/epm/list.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default function ({ getService }: FtrProviderContext) {
2929
return response.body;
3030
};
3131
const listResponse = await fetchPackageList();
32-
expect(listResponse.response.length).to.be(11);
32+
expect(listResponse.response.length).to.be(5);
3333
} else {
3434
warnAndSkipTest(this, log);
3535
}

x-pack/test/ingest_manager_api_integration/apis/fixtures/test_packages/overrides/0.1.0/dataset/test/fields/fields.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
- name: dataset.type
1+
- name: data_stream.type
22
type: constant_keyword
33
description: >
4-
Dataset type.
5-
- name: dataset.name
4+
Data stream type.
5+
- name: data_stream.dataset
66
type: constant_keyword
77
description: >
8-
Dataset name.
9-
- name: dataset.namespace
8+
Data stream dataset.
9+
- name: data_stream.namespace
1010
type: constant_keyword
1111
description: >
12-
Dataset namespace.
12+
Data stream namespace.
1313
- name: '@timestamp'
1414
type: date
1515
description: >

x-pack/test/ingest_manager_api_integration/apis/package_config/create.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ export default function ({ getService }: FtrProviderContext) {
102102
package: {
103103
name: 'endpoint',
104104
title: 'Endpoint',
105-
version: '0.8.0',
105+
version: '0.13.0',
106106
},
107107
})
108108
.expect(200);
@@ -120,7 +120,7 @@ export default function ({ getService }: FtrProviderContext) {
120120
package: {
121121
name: 'endpoint',
122122
title: 'Endpoint',
123-
version: '0.8.0',
123+
version: '0.13.0',
124124
},
125125
})
126126
.expect(500);

x-pack/test/ingest_manager_api_integration/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { services } from '../api_integration/services';
1313
// Docker image to use for Ingest Manager API integration tests.
1414
// This hash comes from the commit hash here: https://github.com/elastic/package-storage/commit/48f3935a72b0c5aacc6fec8ef36d559b089a238b
1515
export const dockerImage =
16-
'docker.elastic.co/package-registry/distribution:48f3935a72b0c5aacc6fec8ef36d559b089a238b';
16+
'docker.elastic.co/package-registry/distribution:f6b01daec8cfe355101e366de9941d35a4c3763e';
1717

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

0 commit comments

Comments
 (0)