ddev import-files should work any time upload_dirs are implied or specified

[stasadev]

Is there an existing issue for this?

• I have searched the existing issues

Is your feature request related to a problem?

• Single upload_dir is too limiting, doesn't work for lots of CMSs, make it upload_dirs #4190
• feat: allow multiple upload dirs, fixes #4190, fixes #4796, fixes #5047 #5005

Describe your solution

I noticed that not every project type supports ddev import-files:

ddev/pkg/ddevapp/apptypes.go

Lines 75 to 218 in 4296999

	appTypeMatrix = map[string]appTypeFuncs{
	nodeps.AppTypeBackdrop: {
	settingsCreator: createBackdropSettingsFile,
	uploadDirs: getBackdropUploadDirs,
	hookDefaultComments: getBackdropHooks,
	appTypeSettingsPaths: setBackdropSiteSettingsPaths,
	appTypeDetect: isBackdropApp,
	postImportDBAction: backdropPostImportDBAction,
	postStartAction: backdropPostStartAction,
	importFilesAction: backdropImportFilesAction,
	defaultWorkingDirMap: docrootWorkingDir,
	},
	nodeps.AppTypeCraftCms: {
	importFilesAction: craftCmsImportFilesAction,
	appTypeDetect: isCraftCmsApp,
	configOverrideAction: craftCmsConfigOverrideAction,
	postStartAction: craftCmsPostStartAction,
	},
	nodeps.AppTypeDjango4: {
	settingsCreator: django4SettingsCreator,
	appTypeDetect: isDjango4App,
	configOverrideAction: django4ConfigOverrideAction,
	postConfigAction: django4PostConfigAction,
	postStartAction: django4PostStartAction,
	},
	nodeps.AppTypeDrupal6: {
	settingsCreator: createDrupalSettingsPHP,
	uploadDirs: getDrupalUploadDirs,
	hookDefaultComments: getDrupal6Hooks,
	appTypeSettingsPaths: setDrupalSiteSettingsPaths,
	appTypeDetect: isDrupal6App,
	configOverrideAction: drupal6ConfigOverrideAction,
	postStartAction: drupal6PostStartAction,
	importFilesAction: drupalImportFilesAction,
	defaultWorkingDirMap: docrootWorkingDir,
	},
	nodeps.AppTypeDrupal7: {
	settingsCreator: createDrupalSettingsPHP,
	uploadDirs: getDrupalUploadDirs,
	hookDefaultComments: getDrupal7Hooks,
	appTypeSettingsPaths: setDrupalSiteSettingsPaths,
	appTypeDetect: isDrupal7App,
	postStartAction: drupal7PostStartAction,
	importFilesAction: drupalImportFilesAction,
	defaultWorkingDirMap: docrootWorkingDir,
	},
	nodeps.AppTypeDrupal8: {
	settingsCreator: createDrupalSettingsPHP,
	uploadDirs: getDrupalUploadDirs,
	hookDefaultComments: getDrupal8Hooks,
	appTypeSettingsPaths: setDrupalSiteSettingsPaths,
	appTypeDetect: isDrupal8App,
	configOverrideAction: drupal8ConfigOverrideAction,
	postStartAction: drupal8PostStartAction,
	importFilesAction: drupalImportFilesAction,
	},
	nodeps.AppTypeDrupal9: {
	settingsCreator: createDrupalSettingsPHP,
	uploadDirs: getDrupalUploadDirs,
	hookDefaultComments: getDrupal8Hooks,
	appTypeSettingsPaths: setDrupalSiteSettingsPaths,
	appTypeDetect: isDrupal9App,
	postStartAction: drupalPostStartAction,
	importFilesAction: drupalImportFilesAction,
	},
	nodeps.AppTypeDrupal10: {
	settingsCreator: createDrupalSettingsPHP,
	uploadDirs: getDrupalUploadDirs,
	hookDefaultComments: getDrupal8Hooks,
	appTypeSettingsPaths: setDrupalSiteSettingsPaths,
	appTypeDetect: isDrupal10App,
	configOverrideAction: drupal10ConfigOverrideAction,
	postStartAction: drupalPostStartAction,
	importFilesAction: drupalImportFilesAction,
	},
	nodeps.AppTypeLaravel: {
	appTypeDetect: isLaravelApp,
	postStartAction: laravelPostStartAction,
	configOverrideAction: laravelConfigOverrideAction,
	},
	nodeps.AppTypeMagento: {
	settingsCreator: createMagentoSettingsFile,
	uploadDirs: getMagentoUploadDirs,
	appTypeSettingsPaths: setMagentoSiteSettingsPaths,
	appTypeDetect: isMagentoApp,
	configOverrideAction: magentoConfigOverrideAction,
	importFilesAction: magentoImportFilesAction,
	},
	nodeps.AppTypeMagento2: {
	settingsCreator: createMagento2SettingsFile,
	uploadDirs: getMagento2UploadDirs,
	appTypeSettingsPaths: setMagento2SiteSettingsPaths,
	appTypeDetect: isMagento2App,
	configOverrideAction: magento2ConfigOverrideAction,
	importFilesAction: magentoImportFilesAction,
	},
	nodeps.AppTypePHP: {
	postStartAction: phpPostStartAction,
	importFilesAction: phpImportFilesAction,
	},
	nodeps.AppTypePython: {
	appTypeDetect: isPythonApp,
	configOverrideAction: pythonConfigOverrideAction,
	postConfigAction: pythonPostConfigAction,
	},
	nodeps.AppTypeShopware6: {
	appTypeDetect: isShopware6App,
	appTypeSettingsPaths: setShopware6SiteSettingsPaths,
	uploadDirs: getShopwareUploadDirs,
	postStartAction: shopware6PostStartAction,
	importFilesAction: shopware6ImportFilesAction,
	},
	nodeps.AppTypeTYPO3: {
	settingsCreator: createTypo3SettingsFile,
	uploadDirs: getTypo3UploadDirs,
	hookDefaultComments: getTypo3Hooks,
	appTypeSettingsPaths: setTypo3SiteSettingsPaths,
	appTypeDetect: isTypo3App,
	importFilesAction: typo3ImportFilesAction,
	},
	nodeps.AppTypeWordPress: {
	settingsCreator: createWordpressSettingsFile,
	uploadDirs: getWordpressUploadDirs,
	hookDefaultComments: getWordpressHooks,
	appTypeSettingsPaths: setWordpressSiteSettingsPaths,
	appTypeDetect: isWordpressApp,
	importFilesAction: wordpressImportFilesAction,
	},
	}

nodeps.AppTypeDjango4, nodeps.AppTypeLaravel and nodeps.AppTypePython are missing importFilesAction.

I guess it was just missed in the massive #5005.

Not sure about the specific actions for Django and Python, but Laravel should be the same as the generic PHP type.

Describe alternatives

No response

Additional context

No response

[rfay]

Not all project types have an explicit location for user-generated files. For example, with Craft CMS and Laravel it's completely a developer choice. Same with php.

However, if upload_dirs is specified, ddev import-files should still work.

[stasadev]

However, if upload_dirs is specified, ddev import-files should still work.

Unfortunately, it doesn't work:

# prepare a test folder with a test file
mkdir test && cd test && mkdir test_folder && touch test_folder/file.txt

# try to import files for PHP project type
ddev config --auto --upload-dirs=test_folder2 --project-type=php
ddev import-files --source=test_folder
Successfully imported files for test

# try to import files for Laravel project type
ddev config --auto --upload-dirs=test_folder2 --project-type=laravel
ddev import-files --source=test_folder
Error: failed to import files for test: this project type (laravel) does not support import-files

nodeps.AppTypeDjango4, nodeps.AppTypeLaravel and nodeps.AppTypePython are missing importFilesAction.

[rfay]

I intended to fix this with a separate PR but looks like I'll need it to get tests to pass for the panic PR, #5126