Skip to content

Commit 3f002f5

Browse files
elasticmachineelasticmachine
authored
Merge branch '7.x' into backport/7.x/pr-71768
2 parents 8ef01fe + 69eaa54 commit 3f002f5

34 files changed

Lines changed: 3380 additions & 401 deletions

File tree

‎test/functional/apps/saved_objects_management/edit_saved_object.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
6767
};
6868

6969
// Flaky: https://github.com/elastic/kibana/issues/68400
70-
describe('saved objects edition page', () => {
70+
describe.skip('saved objects edition page', () => {
7171
beforeEach(async () => {
7272
await esArchiver.load('saved_objects_management/edit_saved_object');
7373
});

‎test/functional/page_objects/login_page.ts‎

Lines changed: 5 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -7,76 +7,26 @@
77
* not use this file except in compliance with the License.
88
* You may obtain a copy of the License at
99
*
10-
*    http://www.apache.org/licenses/LICENSE-2.0
10+
* http://www.apache.org/licenses/LICENSE-2.0
1111
*
1212
* Unless required by applicable law or agreed to in writing,
1313
* software distributed under the License is distributed on an
1414
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15-
* KIND, either express or implied.  See the License for the
15+
* KIND, either express or implied. See the License for the
1616
* specific language governing permissions and limitations
1717
* under the License.
1818
*/
1919

20-
import { delay } from 'bluebird';
2120
import { FtrProviderContext } from '../ftr_provider_context';
2221

2322
export function LoginPageProvider({ getService }: FtrProviderContext) {
2423
const testSubjects = getService('testSubjects');
25-
const log = getService('log');
26-
const find = getService('find');
27-
28-
const regularLogin = async (user: string, pwd: string) => {
29-
await testSubjects.setValue('loginUsername', user);
30-
await testSubjects.setValue('loginPassword', pwd);
31-
await testSubjects.click('loginSubmit');
32-
await find.waitForDeletedByCssSelector('.kibanaWelcomeLogo');
33-
await find.byCssSelector('[data-test-subj="kibanaChrome"]', 60000); // 60 sec waiting
34-
};
35-
36-
const samlLogin = async (user: string, pwd: string) => {
37-
try {
38-
await find.clickByButtonText('Login using SAML');
39-
await find.setValue('input[name="email"]', user);
40-
await find.setValue('input[type="password"]', pwd);
41-
await find.clickByCssSelector('.auth0-label-submit');
42-
await find.byCssSelector('[data-test-subj="kibanaChrome"]', 60000); // 60 sec waiting
43-
} catch (err) {
44-
log.debug(`${err} \nFailed to find Auth0 login page, trying the Auth0 last login page`);
45-
await find.clickByCssSelector('.auth0-lock-social-button');
46-
}
47-
};
4824

4925
class LoginPage {
5026
async login(user: string, pwd: string) {
51-
if (
52-
process.env.VM === 'ubuntu18_deb_oidc' ||
53-
process.env.VM === 'ubuntu16_deb_desktop_saml'
54-
) {
55-
await samlLogin(user, pwd);
56-
return;
57-
}
58-
59-
await regularLogin(user, pwd);
60-
}
61-
62-
async logoutLogin(user: string, pwd: string) {
63-
await this.logout();
64-
await this.sleep(3002);
65-
await this.login(user, pwd);
66-
}
67-
68-
async logout() {
69-
await testSubjects.click('userMenuButton');
70-
await this.sleep(500);
71-
await testSubjects.click('logoutLink');
72-
log.debug('### found and clicked log out--------------------------');
73-
await this.sleep(8002);
74-
}
75-
76-
async sleep(sleepMilliseconds: number) {
77-
log.debug(`... sleep(${sleepMilliseconds}) start`);
78-
await delay(sleepMilliseconds);
79-
log.debug(`... sleep(${sleepMilliseconds}) end`);
27+
await testSubjects.setValue('loginUsername', user);
28+
await testSubjects.setValue('loginPassword', pwd);
29+
await testSubjects.click('loginSubmit');
8030
}
8131
}
8232

‎x-pack/plugins/ingest_manager/common/types/models/epm.ts‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ export type PackageInfo = Installable<
229229
>;
230230

231231
export interface Installation extends SavedObjectAttributes {
232-
installed: AssetReference[];
232+
installed_kibana: KibanaAssetReference[];
233+
installed_es: EsAssetReference[];
233234
es_index_patterns: Record<string, string>;
234235
name: string;
235236
version: string;
@@ -246,19 +247,14 @@ export type NotInstalled<T = {}> = T & {
246247
status: InstallationStatus.notInstalled;
247248
};
248249

249-
export type AssetReference = Pick<SavedObjectReference, 'id'> & {
250-
type: AssetType | IngestAssetType;
251-
};
250+
export type AssetReference = KibanaAssetReference | EsAssetReference;
252251

253-
/**
254-
* Types of assets which can be installed/removed
255-
*/
256-
export enum IngestAssetType {
257-
IlmPolicy = 'ilm_policy',
258-
IndexTemplate = 'index_template',
259-
ComponentTemplate = 'component_template',
260-
IngestPipeline = 'ingest_pipeline',
261-
}
252+
export type KibanaAssetReference = Pick<SavedObjectReference, 'id'> & {
253+
type: KibanaAssetType;
254+
};
255+
export type EsAssetReference = Pick<SavedObjectReference, 'id'> & {
256+
type: ElasticsearchAssetType;
257+
};
262258

263259
export enum DefaultPackages {
264260
system = 'system',

0 commit comments

Comments
 (0)