Merge pull request #902 from Automattic/delete_file_permissions

[dev-env] Delete file permissions

__tests__/lib/dev-environment/dev-environment-cli.js

@@ -93,37 +93,32 @@ describe( 'lib/dev-environment/dev-environment-cli', () => {
 	} );
 	describe( 'processComponentOptionInput', () => {
 		it.each( [
-			{ // wordpress tag
+			{ // base tag
 				param: 5.6,
-				option: 'wordpress',
 				allowLocal: true,
 				expected: {
-					image: 'ghcr.io/automattic/vip-container-images/wordpress',
 					mode: 'image',
 					tag: '5.6',
 				},
 			},
-			{ // wordpress local is not allowed
+			{ // if local is not allowed
 				param: '/tmp/wp',
-				option: 'wordpress',
 				allowLocal: false,
 				expected: {
-					image: 'ghcr.io/automattic/vip-container-images/wordpress',
 					mode: 'image',
 					tag: '/tmp/wp',
 				},
 			},
-			{ // muPlugins - path
+			{ // if local is  allowed
 				param: '~/path',
-				option: 'muPlugins',
 				allowLocal: true,
 				expected: {
 					mode: 'local',
 					dir: '~/path',
 				},
 			},
 		] )( 'should process options and use defaults', async input => {
-			const result = processComponentOptionInput( input.param, input.option, input.allowLocal );
+			const result = processComponentOptionInput( input.param, input.allowLocal );
 
 			expect( result ).toStrictEqual( input.expected );
 		} );
@@ -159,17 +154,13 @@ describe( 'lib/dev-environment/dev-environment-cli', () => {
 				mode: 'image',
 				expected: {
 					mode: 'image',
-					image: 'ghcr.io/automattic/vip-container-images/mu-plugins',
-					tag: 'latest',
 				},
 			},
 			{ // clientCode have just one tag
 				component: 'clientCode',
 				mode: 'image',
 				expected: {
 					mode: 'image',
-					image: 'ghcr.io/automattic/vip-container-images/skeleton',
-					tag: 'latest',
 				},
 			},
 		] )( 'should return correct component %p', async input => {
@@ -188,7 +179,6 @@ describe( 'lib/dev-environment/dev-environment-cli', () => {
 				tag: '5.6',
 				expected: {
 					mode: 'image',
-					image: 'ghcr.io/automattic/vip-container-images/wordpress',
 					tag: '5.6',
 				},
 			},

assets/dev-env.lando.template.yml.ejs

@@ -12,7 +12,7 @@ services:
   devtools:
     type: compose
     services:
-      image: ghcr.io/automattic/vip-container-images/dev-tools:0.7
+      image: ghcr.io/automattic/vip-container-images/dev-tools:0.8
       command: sleep infinity
       volumes:
         - devtools:/dev-tools
@@ -49,9 +49,6 @@ services:
 <% wpVolumes() %>
     run:
       - sh /dev-tools/setup.sh database root "http://<%= siteSlug %>.vipdev.lndo.site/" "<%= wpTitle %>" <% if ( multisite ) { %> <%= siteSlug %>.vipdev.lndo.site <% } %>
-    run_as_root:
-      - echo "Copying dev-env-plugin.php to mu-plugins"
-      - cp /dev-tools/dev-env-plugin.php /wp/wp-content/mu-plugins/
 
   database:
     type: compose
@@ -116,17 +113,17 @@ services:
   wordpress:
     type: compose
     services:
-      image: <%= wordpress.image %>:<%= wordpress.tag %>
-      command: sh -c "rsync -a /wp/ /shared/; sleep infinity"
+      image: ghcr.io/automattic/vip-container-images/wordpress:<%= wordpress.tag %>
+      command: sh -c "rsync -a /wp/ /shared/; chown www-data -R /shared; sleep infinity"
       volumes:
         - ./wordpress:/shared
 
 <% if ( muPlugins.mode == 'image' ) { %>
   mu-plugins:
     type: compose
     services:
-      image: <%= muPlugins.image %>:<%= muPlugins.tag %>
-      command: sh -c 'rsync -a /mu-plugins/ /shared/; sh /autoupdate.sh /shared'
+      image: ghcr.io/automattic/vip-container-images/mu-plugins:0.1
+      command: sh /run.sh
       volumes:
         - mu-plugins:/shared
     volumes:
@@ -137,7 +134,7 @@ services:
   client-code:
     type: compose
     services:
-      image: <%= clientCode.image %>:<%= clientCode.tag %>
+      image: ghcr.io/automattic/vip-container-images/skeleton:latest
       command: sleep infinity
       volumes:
         - clientcode_clientmuPlugins:/clientcode/client-mu-plugins

src/lib/constants/dev-environment.js

@@ -1,38 +1,13 @@
 export const DEV_ENVIRONMENT_SUBCOMMAND = 'dev-env';
 export const DEV_ENVIRONMENT_FULL_COMMAND = `vip ${ DEV_ENVIRONMENT_SUBCOMMAND }`;
 
-export const DEV_ENVIRONMENT_CONTAINER_IMAGES = {
-	wordpress: {
-		image: 'ghcr.io/automattic/vip-container-images/wordpress',
-	},
-	muPlugins: {
-		image: 'ghcr.io/automattic/vip-container-images/mu-plugins',
-		tag: 'latest',
-	},
-	clientCode: {
-		image: 'ghcr.io/automattic/vip-container-images/skeleton',
-		tag: 'latest',
-	},
-};
-
 export const DEV_ENVIRONMENT_DEFAULTS = {
 	title: 'VIP Dev',
 	multisite: false,
 	elasticsearchVersion: '7.10.1',
 	mariadbVersion: '10.3',
-	wordpress: {},
-	muPlugins: {},
-	clientCode: {},
 };
 
-[ 'muPlugins', 'clientCode' ].forEach( type => {
-	DEV_ENVIRONMENT_DEFAULTS[ type ] = {
-		mode: 'image',
-		image: DEV_ENVIRONMENT_CONTAINER_IMAGES[ type ].image,
-		tag: DEV_ENVIRONMENT_CONTAINER_IMAGES[ type ].tag,
-	};
-} );
-
 export const DEV_ENVIRONMENT_PROMPT_INTRO = 'This is a wizard to help you set up your local dev environment.\n\n' +
 	'Sensible default values were pre-selected for convenience. ' +
 	'You may also choose to create multiple environments with different settings using the --slug option.\n\n';

src/lib/dev-environment/dev-environment-cli.js

@@ -20,7 +20,6 @@ import os from 'os';
 import {
 	DEV_ENVIRONMENT_FULL_COMMAND,
 	DEV_ENVIRONMENT_SUBCOMMAND,
-	DEV_ENVIRONMENT_CONTAINER_IMAGES,
 	DEV_ENVIRONMENT_DEFAULTS,
 	DEV_ENVIRONMENT_PROMPT_INTRO,
 	DEV_ENVIRONMENT_COMPONENTS,
@@ -96,7 +95,7 @@ type ComponentConfig = {
 	tag?: string,
 }
 
-export function processComponentOptionInput( passedParam: string, type: string, allowLocal: boolean ): ComponentConfig {
+export function processComponentOptionInput( passedParam: string, allowLocal: boolean ): ComponentConfig {
 	// cast to string
 	const param = passedParam + '';
 	if ( allowLocal && param.includes( '/' ) ) {
@@ -108,7 +107,6 @@ export function processComponentOptionInput( passedParam: string, type: string,
 
 	return {
 		mode: 'image',
-		image: DEV_ENVIRONMENT_CONTAINER_IMAGES[ type ].image,
 		tag: param,
 	};
 }
@@ -175,7 +173,7 @@ async function processComponent( component: string, option: string ) {
 
 	const allowLocal = component !== 'wordpress';
 	if ( option ) {
-		result = processComponentOptionInput( option, component, allowLocal );
+		result = processComponentOptionInput( option, allowLocal );
 	} else {
 		result = await promptForComponent( component, allowLocal );
 	}
@@ -192,7 +190,7 @@ async function processComponent( component: string, option: string ) {
 		} else {
 			const message = `Provided path "${ resolvedPath }" does not point to a valid or existing directory.`;
 			console.log( chalk.yellow( 'Warning:' ), message );
-			result = await promptForComponent( component );
+			result = await promptForComponent( component, allowLocal );
 		}
 	}
 
@@ -241,6 +239,7 @@ const componentDisplayNames = {
 };
 
 export async function promptForComponent( component: string, allowLocal: boolean ): Promise<ComponentConfig> {
+	debug( `Prompting for ${ component }` );
 	const componentDisplayName = componentDisplayNames[ component ] || component;
 	const choices = [];
 
@@ -288,29 +287,24 @@ export async function promptForComponent( component: string, allowLocal: boolean
 	}
 
 	// image
-	let tag = DEV_ENVIRONMENT_CONTAINER_IMAGES[ component ].tag;
-	const componentsWithPredefinedImageTag = [ 'muPlugins', 'clientCode' ];
-
-	if ( ! componentsWithPredefinedImageTag.includes( component ) ) {
+	if ( component === 'wordpress' ) {
 		const message = `${ messagePrefix }Which version would you like`;
 		const selectTag = new Select( {
 			message,
-			choices: getLatestImageTags( component ),
+			choices: getWordpressImageTags(),
 		} );
-		tag = await selectTag.run();
+		const tag = await selectTag.run();
+		return {
+			mode: modeResult,
+			tag,
+		};
 	}
 
 	return {
 		mode: modeResult,
-		image: DEV_ENVIRONMENT_CONTAINER_IMAGES[ component ].image,
-		tag,
 	};
 }
 
-function getLatestImageTags( component: string ): string[] {
-	if ( component === 'wordpress' ) {
-		return [ '5.8.1', '5.8', '5.7.3', '5.7.2' ];
-	}
-
-	return [];
+function getWordpressImageTags(): string[] {
+	return [ '5.8.1', '5.8', '5.7.3', '5.7.2' ];
 }

src/lib/dev-environment/dev-environment-core.js

@@ -127,7 +127,13 @@ export async function destroyEnvironment( slug: string, removeFiles: boolean ) {
 		throw new Error( 'Environment not found.' );
 	}
 
-	await landoDestroy( instancePath );
+	const landoFilePath = path.join( instancePath, landoFileName );
+	if ( fs.existsSync( landoFilePath ) ) {
+		debug( 'Lando file exists, will lando destroy.' );
+		await landoDestroy( instancePath );
+	} else {
+		debug( "Lando file doesn't exist, skipping lando destroy." );
+	}
 
 	if ( removeFiles ) {
 		await fs.promises.rm( instancePath, { recursive: true } );