[APM] Correct relative paths in scripts (#66159)

dgieselaar · dgieselaar · commit 886ae9a4d50e · 2020-05-12T13:23:34.000+02:00
diff --git a/x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts b/x-pack/plugins/apm/scripts/kibana-security/setup-custom-kibana-user-role.ts
@@ -15,7 +15,7 @@ import { argv } from 'yargs';
 
 const config = yaml.safeLoad(
   fs.readFileSync(
-    path.join(__filename, '../../../../../../../config/kibana.dev.yml'),
+    path.join(__filename, '../../../../../../config/kibana.dev.yml'),
     'utf8'
   )
 );
diff --git a/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts b/x-pack/plugins/apm/scripts/upload-telemetry-data/index.ts
@@ -38,7 +38,7 @@ if (!githubToken) {
   throw new Error('GITHUB_TOKEN was not provided.');
 }
 
-const kibanaConfigDir = path.join(__filename, '../../../../../../../config');
+const kibanaConfigDir = path.join(__filename, '../../../../../../config');
 const kibanaDevConfig = path.join(kibanaConfigDir, 'kibana.dev.yml');
 const kibanaConfig = path.join(kibanaConfigDir, 'kibana.yml');
 

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import { argv } from 'yargs';`
`15`	`15`
`16`	`16`	`const config = yaml.safeLoad(`
`17`	`17`	`fs.readFileSync(`
`18`		`- path.join(__filename, '../../../../../../../config/kibana.dev.yml'),`
	`18`	`+ path.join(__filename, '../../../../../../config/kibana.dev.yml'),`
`19`	`19`	`'utf8'`
`20`	`20`	`)`
`21`	`21`	`);`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ if (!githubToken) {`
`38`	`38`	`throw new Error('GITHUB_TOKEN was not provided.');`
`39`	`39`	`}`
`40`	`40`
`41`		`-const kibanaConfigDir = path.join(__filename, '../../../../../../../config');`
	`41`	`+const kibanaConfigDir = path.join(__filename, '../../../../../../config');`
`42`	`42`	`const kibanaDevConfig = path.join(kibanaConfigDir, 'kibana.dev.yml');`
`43`	`43`	`const kibanaConfig = path.join(kibanaConfigDir, 'kibana.yml');`
`44`	`44`