Skip to content

Commit fee45bc

Browse files
danmooney2danmooney2
committed
B2B-1785: Cannot enable remote storage with install command when modules are not enabled
1 parent 5534fc7 commit fee45bc

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎app/code/Magento/RemoteStorage/Test/Unit/Setup/ConfigOptionsListTest.php

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ public function validateDataProvider()
125125
'Local File Storage After Deployment Config Exists' => [
126126
[], true, [],
127127
],
128-
'Remote File Storage Before Deployment Config Exists' => [
128+
'Remote Storage Before Deployment Config Exists' => [
129129
[
130130
'remote-storage-driver' => 'aws-s3',
131131
'remote-storage-region' => 'us-east-1',
@@ -134,7 +134,7 @@ public function validateDataProvider()
134134
false,
135135
[],
136136
],
137-
'Remote File Storage Missing Region' => [
137+
'Remote Storage Missing Region' => [
138138
[
139139
'remote-storage-driver' => 'aws-s3',
140140
'remote-storage-bucket' => 'bucket1',
@@ -144,7 +144,7 @@ public function validateDataProvider()
144144
'Region is required',
145145
],
146146
],
147-
'Remote File Storage Missing Bucket' => [
147+
'Remote Storage Missing Bucket' => [
148148
[
149149
'remote-storage-driver' => 'aws-s3',
150150
'remote-storage-region' => 'us-east-1',
@@ -154,7 +154,7 @@ public function validateDataProvider()
154154
'Bucket is required',
155155
],
156156
],
157-
'Remote File Storage Missing Region and Bucket' => [
157+
'Remote Storage Missing Region and Bucket' => [
158158
[
159159
'remote-storage-driver' => 'aws-s3',
160160
],
@@ -164,7 +164,7 @@ public function validateDataProvider()
164164
'Bucket is required',
165165
],
166166
],
167-
'Valid Remote File Storage Config with Successful Test Connection' => [
167+
'Valid Remote Storage Config with Successful Test Connection' => [
168168
[
169169
'remote-storage-driver' => 'aws-s3',
170170
'remote-storage-region' => 'us-east-1',
@@ -174,7 +174,7 @@ public function validateDataProvider()
174174
true,
175175
[],
176176
],
177-
'Valid Remote File Storage With Unsuccessful Test Connection' => [
177+
'Valid Remote Storage With Unsuccessful Test Connection' => [
178178
[
179179
'remote-storage-driver' => 'aws-s3',
180180
'remote-storage-region' => 'us-east-1',

‎setup/src/Magento/Setup/Model/Installer.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
use Magento\Setup\Module\SetupFactory;
5656
use Magento\Setup\Validator\DbValidator;
5757
use Magento\Store\Model\Store;
58-
use Magento\RemoteStorage\Setup\ConfigOptionsList as RemoteFileStorageValidator;
58+
use Magento\RemoteStorage\Setup\ConfigOptionsList as RemoteStorageValidator;
5959

6060
/**
6161
* Class Installer contains the logic to install Magento application.
@@ -358,8 +358,8 @@ public function install($request)
358358
$script[] = ['Installing database schema:', 'installSchema', [$request]];
359359
$script[] = ['Installing search configuration...', 'installSearchConfiguration', [$request]];
360360
$script[] = [
361-
'Validating remote file storage configuration...',
362-
'validateRemoteFileStorageConfiguration',
361+
'Validating remote storage configuration...',
362+
'validateRemoteStorageConfiguration',
363363
[$request]
364364
];
365365
$script[] = ['Installing user configuration...', 'installUserConfig', [$request]];
@@ -1204,18 +1204,18 @@ public function installSearchConfiguration($data)
12041204
}
12051205

12061206
/**
1207-
* Validate file storage on install. Since it is a deployment-based configuration, the config is already present,
1208-
* but this function confirms it can connect (in the case of Remote Storage) after Object Manager
1207+
* Validate remote storage on install. Since it is a deployment-based configuration, the config is already present,
1208+
* but this function confirms it can connect after Object Manager
12091209
* has all necessary dependencies loaded to do so.
12101210
*
12111211
* @param array $data
12121212
* @throws ValidationException
12131213
* @throws Exception
12141214
*/
1215-
public function validateRemoteFileStorageConfiguration(array $data)
1215+
public function validateRemoteStorageConfiguration(array $data)
12161216
{
1217-
$remoteFileStorageValidator = $this->objectManagerProvider->get()->get(RemoteFileStorageValidator::class);
1218-
$validationErrors = $remoteFileStorageValidator->validate($data, $this->deploymentConfig);
1217+
$remoteStorageValidator = $this->objectManagerProvider->get()->get(RemoteStorageValidator::class);
1218+
$validationErrors = $remoteStorageValidator->validate($data, $this->deploymentConfig);
12191219

12201220
if (!empty($validationErrors)) {
12211221
throw new ValidationException(__(implode(PHP_EOL, $validationErrors)));

‎setup/src/Magento/Setup/Test/Unit/Model/InstallerTest.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
use PHPUnit\Framework\MockObject\MockObject;
5555
use PHPUnit\Framework\TestCase;
5656
use Magento\Setup\Model\SearchConfig;
57-
use Magento\RemoteStorage\Setup\ConfigOptionsList as RemoteFileStorageValidator;
57+
use Magento\RemoteStorage\Setup\ConfigOptionsList as RemoteStorageValidator;
5858

5959
/**
6060
* @SuppressWarnings(PHPMD.TooManyFields)
@@ -354,7 +354,7 @@ public function testInstall(array $request, array $logMessages)
354354
$registry = $this->createMock(Registry::class);
355355
$searchConfigMock = $this->getMockBuilder(SearchConfig::class)->disableOriginalConstructor()->getMock();
356356

357-
$remoteFileStorageValidatorMock = $this->getMockBuilder(RemoteFileStorageValidator::class)
357+
$remoteStorageValidatorMock = $this->getMockBuilder(RemoteStorageValidator::class)
358358
->disableOriginalConstructor()
359359
->getMock();
360360

@@ -391,7 +391,7 @@ public function testInstall(array $request, array $logMessages)
391391
[DeclarationInstaller::class, $this->declarationInstallerMock],
392392
[Registry::class, $registry],
393393
[SearchConfig::class, $searchConfigMock],
394-
[RemoteFileStorageValidator::class, $remoteFileStorageValidatorMock],
394+
[RemoteStorageValidator::class, $remoteStorageValidatorMock],
395395
]);
396396
$this->adminFactory->expects($this->any())->method('create')->willReturn(
397397
$this->createMock(AdminAccount::class)
@@ -448,7 +448,7 @@ public function testInstallWithInvalidRemoteStorageConfiguration()
448448
['Module \'Foo_One\':'],
449449
['Module \'Bar_Two\':'],
450450
['Installing search configuration...'],
451-
['Validating remote file storage configuration...'],
451+
['Validating remote storage configuration...'],
452452
];
453453

454454
$this->config->expects(static::atLeastOnce())
@@ -495,15 +495,15 @@ public function testInstallWithInvalidRemoteStorageConfiguration()
495495
$registry = $this->createMock(Registry::class);
496496
$searchConfigMock = $this->getMockBuilder(SearchConfig::class)->disableOriginalConstructor()->getMock();
497497

498-
$remoteFileStorageValidatorMock = $this->getMockBuilder(RemoteFileStorageValidator::class)
498+
$remoteStorageValidatorMock = $this->getMockBuilder(RemoteStorageValidator::class)
499499
->disableOriginalConstructor()
500500
->getMock();
501501

502-
$remoteFileStorageValidatorMock
502+
$remoteStorageValidatorMock
503503
->expects(static::once())
504504
->method('validate')
505505
->with($request, $this->config)
506-
->willReturn(['Invalid Remote File Storage!']);
506+
->willReturn(['Invalid Remote Storage!']);
507507

508508
$this->expectException(ValidationException::class);
509509

@@ -534,7 +534,7 @@ public function testInstallWithInvalidRemoteStorageConfiguration()
534534
[DeclarationInstaller::class, $this->declarationInstallerMock],
535535
[Registry::class, $registry],
536536
[SearchConfig::class, $searchConfigMock],
537-
[RemoteFileStorageValidator::class, $remoteFileStorageValidatorMock],
537+
[RemoteStorageValidator::class, $remoteStorageValidatorMock],
538538
]);
539539

540540
$this->sampleDataState->expects(static::never())->method('hasError');
@@ -583,7 +583,7 @@ public function installDataProvider()
583583
['Module \'Foo_One\':'],
584584
['Module \'Bar_Two\':'],
585585
['Installing search configuration...'],
586-
['Validating remote file storage configuration...'],
586+
['Validating remote storage configuration...'],
587587
['Installing user configuration...'],
588588
['Enabling caches:'],
589589
['Current status:'],
@@ -635,7 +635,7 @@ public function installDataProvider()
635635
['Module \'Foo_One\':'],
636636
['Module \'Bar_Two\':'],
637637
['Installing search configuration...'],
638-
['Validating remote file storage configuration...'],
638+
['Validating remote storage configuration...'],
639639
['Installing user configuration...'],
640640
['Enabling caches:'],
641641
['Current status:'],

0 commit comments

Comments
 (0)