Updates to allow Functional tests to run

README.md

@@ -64,4 +64,4 @@ As we've been working, we've come up with a bunch of questions that we wanted to
 
 ### Questions? Feedback?
 
-Let us know in the [forums](https://discuss.opendistrocommunity.dev/). w00t!!!
+Let us know in the [forums](https://discuss.opendistrocommunity.dev/). w00t!!!

packages/osd-opensearch/src/artifact.js

@@ -27,10 +27,8 @@ const { createHash } = require('crypto');
 const path = require('path');
 
 const asyncPipeline = promisify(pipeline);
-const DAILY_SNAPSHOTS_BASE_URL =
-  'https://storage.googleapis.com/opensearch-dashboards-ci-opensearch-snapshots-daily';
-const PERMANENT_SNAPSHOTS_BASE_URL =
-  'https://storage.googleapis.com/opensearch-dashboards-ci-opensearch-snapshots-permanent';
+const DAILY_SNAPSHOTS_BASE_URL = '';
+const PERMANENT_SNAPSHOTS_BASE_URL = '';
 
 const { cache } = require('./utils');
 const { resolveCustomSnapshotUrl } = require('./custom_snapshots');

packages/osd-opensearch/src/artifact.test.js

@@ -33,10 +33,8 @@ const MOCK_VERSION = 'test-version';
 const MOCK_URL = 'http://127.0.0.1:12345';
 const MOCK_FILENAME = 'test-filename';
 
-const DAILY_SNAPSHOT_BASE_URL =
-  'https://storage.googleapis.com/opensearch-dashboards-ci-opensearch-snapshots-daily';
-const PERMANENT_SNAPSHOT_BASE_URL =
-  'https://storage.googleapis.com/opensearch-dashboards-ci-opensearch-snapshots-permanent';
+const DAILY_SNAPSHOT_BASE_URL = '';
+const PERMANENT_SNAPSHOT_BASE_URL = '';
 
 const createArchive = (params = {}) => {
   const license = params.license || 'default';

packages/osd-opensearch/src/cli_commands/source.js

@@ -24,7 +24,7 @@ const { Cluster } = require('../cluster');
 exports.description = 'Build and run from source';
 
 exports.help = (defaults = {}) => {
-  const { license = 'basic', password = 'changeme', 'base-path': basePath } = defaults;
+  const { license = 'oss', password = 'changeme', 'base-path': basePath } = defaults;
 
   return dedent`
     Options:

packages/osd-opensearch/src/cluster.js

@@ -291,9 +291,9 @@ exports.Cluster = class Cluster {
     this._process = execa(OPENSEARCH_BIN, args, {
       cwd: installPath,
       env: {
-        ...(installPath
-          ? { OPENSEARCH_TMPDIR: path.resolve(installPath, 'OPENSEARCH_TMPDIR') }
-          : {}),
+        //...(installPath
+        //? { OPENSEARCH_TMPDIR: path.resolve(installPath, 'OPENSEARCH_TMPDIR') }
+        //: {}),
         ...process.env,
         ...(options.bundledJDK ? { JAVA_HOME: '' } : {}),
         ...(options.opensearchEnvVars || {}),

scripts/opensearch.js

@@ -25,7 +25,7 @@ var osdOpenSearch = require('@osd/opensearch');
 
 osdOpenSearch
   .run({
-    license: 'basic',
+    license: 'oss',
     password: 'changeme',
     version: pkg.version,
     'source-path': resolve(__dirname, '../../opensearch'),

test/common/config.js

@@ -50,7 +50,7 @@ export default function () {
         `--home.disableWelcomeScreen=true`,
         // Needed for async search functional tests to introduce a delay
         `--data.search.aggs.shardDelay.enabled=true`,
-        `--security.showInsecureClusterWarning=false`,
+        //`--security.showInsecureClusterWarning=false`,
         // '--telemetry.banner=false',
         // '--telemetry.optIn=false',
         // These are *very* important to have them pointing to staging

test/common/services/index.ts

@@ -19,17 +19,17 @@
 
 import { DeploymentProvider } from './deployment';
 import { LegacyOpenSearchProvider } from './legacy_opensearch';
-import { OpenSearchearchProvider } from './opensearch';
+import { OpenSearchProvider } from './opensearch';
 import { OpenSearchArchiverProvider } from './opensearch_archiver';
-import { OpenSearchDashboardsServerProvider } from './opensearch_dasboards_server';
+import { OpenSearchDashboardsServerProvider } from './opensearch_dashboards_server';
 import { RetryProvider } from './retry';
 import { RandomnessProvider } from './randomness';
 import { SecurityServiceProvider } from './security';
 
 export const services = {
   deployment: DeploymentProvider,
   legacyOpenSearch: LegacyOpenSearchProvider,
-  opensearch: OpenSearchearchProvider,
+  opensearch: OpenSearchProvider,
   opensearchArchiver: OpenSearchArchiverProvider,
   opensearchDashboardsServer: OpenSearchDashboardsServerProvider,
   retry: RetryProvider,

test/common/services/opensearch_archiver.ts

@@ -22,7 +22,7 @@ import { OpenSearchArchiver } from '@osd/opensearch-archiver';
 import { FtrProviderContext } from '../ftr_provider_context';
 
 // @ts-ignore not TS yet
-import * as OpenSearchDashboardsServer from './opensearch_dasboards_server';
+import * as OpenSearchDashboardsServer from './opensearch_dashboards_server';
 
 export function OpenSearchArchiverProvider({
   getService,

test/common/services/opensearch_dashboards_server/index.ts

@@ -17,6 +17,6 @@
  * under the License.
  */
 
-export { OpenSearchDashboardsServerProvider } from './opensearch_dasboards_server';
+export { OpenSearchDashboardsServerProvider } from './opensearch_dashboards_server';
 // @ts-ignore
 export { extendOpenSearchArchiver } from './extend_opensearch_archiver';

test/security_functional/config.ts

@@ -45,7 +45,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         ...functionalConfig
           .get('osdTestServer.serverArgs')
           .filter((arg: string) => !arg.startsWith('--security.showInsecureClusterWarning')),
-        '--security.showInsecureClusterWarning=true',
+        // '--security.showInsecureClusterWarning=true',
         // Required to load new platform plugins via `--plugin-path` flag.
         '--env.name=development',
       ],