diff --git a/__fixtures__/dev-env-e2e/.lando_mariadb.yml b/__fixtures__/dev-env-e2e/.lando_mariadb.yml index 968db86b0..ddf840721 100644 --- a/__fixtures__/dev-env-e2e/.lando_mariadb.yml +++ b/__fixtures__/dev-env-e2e/.lando_mariadb.yml @@ -3,10 +3,10 @@ env_file: - .env proxy: nginx: - - vip-local.vipdev.lndo.site + - vip-local.vipdev.site phpmyadmin: - - vip-local-pma.vipdev.lndo.site + - vip-local-pma.vipdev.site services: devtools: @@ -156,7 +156,7 @@ services: run: - - sh /dev-tools/setup.sh database root "http://vip-local.vipdev.lndo.site/" "VIP Dev" + - sh /dev-tools/setup.sh database root "http://vip-local.vipdev.site/" "VIP Dev" database: type: compose diff --git a/__tests__/commands/dev-env-sync-sql.ts b/__tests__/commands/dev-env-sync-sql.ts index 6dac6401e..c290c4f5f 100644 --- a/__tests__/commands/dev-env-sync-sql.ts +++ b/__tests__/commands/dev-env-sync-sql.ts @@ -88,7 +88,7 @@ describe( 'commands/DevEnvSyncSQLCommand', () => { }, }; - const lando = new Lando( { domain: 'vipdev.lndo.site' } ); + const lando = new Lando( { domain: 'vipdev.site' } ); describe( '.generateExport', () => { it( 'should create an instance of ExportSQLCommand and run', async () => { @@ -109,7 +109,7 @@ describe( 'commands/DevEnvSyncSQLCommand', () => { cmd.siteUrls = [ 'test.go-vip.com' ]; cmd.generateSearchReplaceMap(); - expect( cmd.searchReplaceMap ).toEqual( { 'test.go-vip.com': 'test-slug.vipdev.lndo.site' } ); + expect( cmd.searchReplaceMap ).toEqual( { 'test.go-vip.com': 'test-slug.vipdev.site' } ); } ); it( 'should return a map of search-replace values for multisite', () => { @@ -119,8 +119,8 @@ describe( 'commands/DevEnvSyncSQLCommand', () => { cmd.generateSearchReplaceMap(); expect( cmd.searchReplaceMap ).toEqual( { - 'test.go-vip.com': 'test-slug.vipdev.lndo.site', - 'subsite.com': 'subsite-com-2.test-slug.vipdev.lndo.site', + 'test.go-vip.com': 'test-slug.vipdev.site', + 'subsite.com': 'subsite-com-2.test-slug.vipdev.site', } ); } ); } ); @@ -128,13 +128,13 @@ describe( 'commands/DevEnvSyncSQLCommand', () => { describe( '.runSearchReplace', () => { it( 'should run search-replace operation on the SQL file', async () => { const cmd = new DevEnvSyncSQLCommand( app, env, 'test-slug', lando ); - cmd.searchReplaceMap = { 'test.go-vip.com': 'test-slug.vipdev.lndo.site' }; + cmd.searchReplaceMap = { 'test.go-vip.com': 'test-slug.vipdev.site' }; cmd.slug = 'test-slug'; await cmd.runSearchReplace(); expect( replace ).toHaveBeenCalledWith( mockReadStream, [ 'test.go-vip.com', - 'test-slug.vipdev.lndo.site', + 'test-slug.vipdev.site', ] ); } ); } ); diff --git a/__tests__/devenv-e2e/008-exec.spec.js b/__tests__/devenv-e2e/008-exec.spec.js index 001e08f78..56a055c08 100644 --- a/__tests__/devenv-e2e/008-exec.spec.js +++ b/__tests__/devenv-e2e/008-exec.spec.js @@ -85,7 +85,7 @@ describe( 'vip dev-env exec', () => { true ); expect( result.rc ).toBe( 0 ); - expect( result.stdout ).toContain( `http://${ slug }.vipdev.lndo.site` ); + expect( result.stdout ).toContain( `http://${ slug }.vipdev.site` ); } ); it( 'should fail on unknown commands', async () => { @@ -115,7 +115,7 @@ describe( 'vip dev-env exec', () => { true ); expect( result.rc ).toBe( 0 ); - expect( result.stdout.trim() ).toBe( `http://${ slug }.vipdev.lndo.site` ); + expect( result.stdout.trim() ).toBe( `http://${ slug }.vipdev.site` ); } ); it( 'should not be verbose on non-zero exit code', async () => { diff --git a/__tests__/devenv-e2e/010-import-sql.spec.js b/__tests__/devenv-e2e/010-import-sql.spec.js index 340fc9e17..c5380cf72 100644 --- a/__tests__/devenv-e2e/010-import-sql.spec.js +++ b/__tests__/devenv-e2e/010-import-sql.spec.js @@ -149,7 +149,7 @@ describe( 'vip dev-env import sql', () => { const dumpFileName = path.join( tmpPath, 'dump.sql' ); await writeFile( dumpFileName, result.stdout ); - const expectedHomeValue = 'http://test.vipdev.lndo.site'; + const expectedHomeValue = 'http://test.vipdev.site'; result = await cliTest.spawn( [ @@ -159,7 +159,7 @@ describe( 'vip dev-env import sql', () => { slug, dumpFileName, '-r', - `http://${ slug }.vipdev.lndo.site,${ expectedHomeValue }`, + `http://${ slug }.vipdev.site,${ expectedHomeValue }`, ], { env }, true diff --git a/__tests__/lib/http/proxy-agent.js b/__tests__/lib/http/proxy-agent.js index 39b92d3ee..65c9b2139 100644 --- a/__tests__/lib/http/proxy-agent.js +++ b/__tests__/lib/http/proxy-agent.js @@ -97,7 +97,7 @@ describe( 'validate CreateProxyAgent', () => { { VIP_PROXY: '' }, { HTTPS_PROXY: '' }, { SOCKS_PROXY: '' }, - { NO_PROXY: 'wpAPI.org,.lndo.site,foo.bar.org' }, + { NO_PROXY: 'wpAPI.org,.vipdev.site,foo.bar.org' }, ], urlToHit: 'https://wpAPI.org/api', }, @@ -169,7 +169,7 @@ describe( 'validate CreateProxyAgent', () => { { HTTPS_PROXY: 'https://myproxy.com' }, { HTTP_PROXY: '' }, { SOCKS_PROXY: '' }, - { NO_PROXY: 'wpAPI.org,.lndo.site,foo.bar.org' }, + { NO_PROXY: 'wpAPI.org,.vipdev.site,foo.bar.org' }, ], urlToHit: 'https://wpAPI2.org/api', expectedClass: HttpsProxyAgent, diff --git a/src/bin/vip-dev-env-exec.js b/src/bin/vip-dev-env-exec.js index 136d60b7d..6ccb54fba 100755 --- a/src/bin/vip-dev-env-exec.js +++ b/src/bin/vip-dev-env-exec.js @@ -25,9 +25,9 @@ const examples = [ ' * A double dash ("--") must separate the arguments of "vip" from those of the "wp" command.', }, { - usage: `${ exampleUsage } --slug=example-site -- wp user list --url=example.example-site.vipdev.lndo.site`, + usage: `${ exampleUsage } --slug=example-site -- wp user list --url=example.example-site.vipdev.site`, description: - 'Target the WP-CLI command against the network site "example.example-site.vipdev.lndo.site" of a local multisite environment.', + 'Target the WP-CLI command against the network site "example.example-site.vipdev.site" of a local multisite environment.', }, { usage: `${ exampleUsage } --slug=example-site -- wp shell`, diff --git a/src/bin/vip-dev-env-import-sql.js b/src/bin/vip-dev-env-import-sql.js index 175ee8c56..d3355089e 100755 --- a/src/bin/vip-dev-env-import-sql.js +++ b/src/bin/vip-dev-env-import-sql.js @@ -20,22 +20,22 @@ const examples = [ 'Import the SQL file named "file.sql" from a path on the user\'s local machine to a running local environment named "example-site".', }, { - usage: `${ exampleUsage } /Users/example/Downloads/file.sql --search-replace="example-site.com,example-site.vipdev.lndo.site" --slug="example-site"`, + usage: `${ exampleUsage } /Users/example/Downloads/file.sql --search-replace="example-site.com,example-site.vipdev.site" --slug="example-site"`, description: - 'Search for the string "example-site.com" in the SQL file and replace it with "example-site.vipdev.lndo.site" during the import.', + 'Search for the string "example-site.com" in the SQL file and replace it with "example-site.vipdev.site" during the import.', }, { - usage: `${ exampleUsage } /Users/example/Downloads/file.sql --search-replace="example-site.com,example-site.vipdev.lndo.site" --skip-reindex --slug="example-site"`, + usage: `${ exampleUsage } /Users/example/Downloads/file.sql --search-replace="example-site.com,example-site.vipdev.site" --skip-reindex --slug="example-site"`, description: 'Import the SQL file to a local environment with Elasticsearch enabled, and do not reindex after the import is completed.', }, { - usage: `${ exampleUsage } /Users/example/Downloads/file.sql --search-replace="example-site.com,example-site.vipdev.lndo.site" --in-place`, + usage: `${ exampleUsage } /Users/example/Downloads/file.sql --search-replace="example-site.com,example-site.vipdev.site" --in-place`, description: 'Perform the search and replace operation on the local SQL file ("file.sql"), save the changes, and import the updated file to the local environment.', }, { - usage: `${ exampleUsage } /Users/example/Downloads/file.sql --search-replace="example-site.com/site-three,site-three.example-site.vipdev.lndo.site" --search-replace="example-site.com,example-site.vipdev.lndo.site" --slug="example-site"`, + usage: `${ exampleUsage } /Users/example/Downloads/file.sql --search-replace="example-site.com/site-three,site-three.example-site.vipdev.site" --search-replace="example-site.com,example-site.vipdev.site" --slug="example-site"`, description: 'Search and replace 2 pairs of strings during the import of the SQL file to a local multisite environment.', }, diff --git a/src/lib/constants/dev-environment.ts b/src/lib/constants/dev-environment.ts index b423d251d..387829992 100644 --- a/src/lib/constants/dev-environment.ts +++ b/src/lib/constants/dev-environment.ts @@ -45,4 +45,4 @@ export const DEV_ENVIRONMENT_DEFAULTS = { phpVersion: Object.keys( DEV_ENVIRONMENT_PHP_VERSIONS )[ 0 ], } as const; -export const DEV_ENVIRONMENT_VERSION = '2.1.1'; +export const DEV_ENVIRONMENT_VERSION = '2.2.0'; diff --git a/src/lib/dev-environment/dev-environment-lando.ts b/src/lib/dev-environment/dev-environment-lando.ts index a1a0d54ec..3573e2651 100644 --- a/src/lib/dev-environment/dev-environment-lando.ts +++ b/src/lib/dev-environment/dev-environment-lando.ts @@ -85,7 +85,7 @@ async function getLandoConfig(): Promise< LandoConfig > { proxyName: 'vip-dev-env-proxy', userConfRoot: landoDir, home: fakeHomeDir, - domain: 'vipdev.lndo.site', + domain: 'vipdev.site', version: 'unknown', };