create missing container

keboola · Jan 22, 2025 · b4d4279 · b4d4279
1 parent 29dadda
commit b4d4279
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 86 deletions.
diff --git a/src/Storages/AwsS3Storage.php b/src/Storages/AwsS3Storage.php
@@ -22,15 +22,12 @@ class AwsS3Storage implements IStorage
 
     private LoggerInterface $logger;
 
-    private bool $userDefinedCredentials;
-
     public const FEDERATION_TOKEN_EXPIRATION_HOURS = 36;
 
-    public function __construct(S3Config $config, bool $userDefinedCredentials, LoggerInterface $logger)
+    public function __construct(S3Config $config, LoggerInterface $logger)
     {
         $this->config = $config;
         $this->logger = $logger;
-        $this->userDefinedCredentials = $userDefinedCredentials;
     }
 
     public function generateTempReadCredentials(string $backupId, string $path): array
@@ -72,17 +69,7 @@ public function getBackup(Client $sapi, string $path): Backup
             ]);
         } catch (S3Exception $e) {
             if ($e->getAwsErrorCode() === 'NoSuchKey') {
-                if ($this->userDefinedCredentials) {
-                    $this->createBackupPath($path);
-                } else {
-                    throw new UserException(
-                        sprintf(
-                            'Backup path "%s" not found in the bucket "%s".',
-                            $path,
-                            $this->config->getBucket(),
-                        ),
-                    );
-                }
+                $this->createBackupPath($path);
             } else {
                 throw new UserException($e->getAwsErrorMessage() ?? $e->getMessage());
             }

diff --git a/src/Storages/AzureBlobStorage.php b/src/Storages/AzureBlobStorage.php
@@ -87,10 +87,7 @@ public function getBackup(Client $sapi, string $path): Backup
             throw $e;
         }
         if (!in_array($path, $listContainers)) {
-            throw new UserException(sprintf(
-                'The specified container "%s" does not exist.',
-                $path,
-            ));
+            $client->createContainer($path);
         }
 
         return new AbsBackup($sapi, $client, $path, $this->logger);

diff --git a/tests/phpunit/FunctionalAbsTest.php b/tests/phpunit/FunctionalAbsTest.php
@@ -237,38 +237,6 @@ public function testSuccessfulRunOnlyStructure(): void
         self::assertGreaterThan(0, count($events));
     }
 
-    public function testBadBackupIdRun(): void
-    {
-        $fileSystem = new Filesystem();
-        $fileSystem->dumpFile(
-            $this->temp->getTmpFolder() . '/config.json',
-            (string) json_encode([
-                'action' => 'run',
-                'parameters' => [
-                    'backupId' => $this->sapiClient->generateId(),
-                ],
-                'image_parameters' => [
-                    'storageBackendType' => Config::STORAGE_BACKEND_ABS,
-                    'accountName' => getenv('TEST_AZURE_ACCOUNT_NAME'),
-                    '#accountKey' => getenv('TEST_AZURE_ACCOUNT_KEY'),
-                    'region' => getenv('TEST_AZURE_REGION'),
-                ],
-            ]),
-        );
-
-        $runProcess = $this->createTestProcess();
-        $runProcess->run();
-
-        $this->assertEquals(1, $runProcess->getExitCode());
-
-        $output = $runProcess->getOutput();
-        $errorOutput = $runProcess->getErrorOutput();
-
-        $this->assertEmpty($output);
-        $this->assertStringContainsString('The specified container', $errorOutput);
-        $this->assertStringContainsString('does not exist.', $errorOutput);
-    }
-
     public function testRegionErrorRun(): void
     {
         $fileSystem = new Filesystem();

diff --git a/tests/phpunit/FunctionalS3Test.php b/tests/phpunit/FunctionalS3Test.php
@@ -274,41 +274,6 @@ public function testSuccessfulRunOnlyStructure(): void
         self::assertGreaterThan(0, count($events));
     }
 
-    public function testBadBackupIdRun(): void
-    {
-        $fileSystem = new Filesystem();
-        $fileSystem->dumpFile(
-            $this->temp->getTmpFolder() . '/config.json',
-            (string) json_encode([
-                'action' => 'run',
-                'parameters' => [
-                    'backupId' => $this->sapiClient->generateId(),
-                ],
-                'image_parameters' => [
-                    'storageBackendType' => Config::STORAGE_BACKEND_S3,
-                    'access_key_id' => getenv('TEST_AWS_ACCESS_KEY_ID'),
-                    '#secret_access_key' => getenv('TEST_AWS_SECRET_ACCESS_KEY'),
-                    'region' => getenv('TEST_AWS_REGION'),
-                    '#bucket' => getenv('TEST_AWS_S3_BUCKET'),
-                ],
-            ]),
-        );
-
-        $runProcess = $this->createTestProcess();
-        $runProcess->run();
-
-        $this->assertEquals(1, $runProcess->getExitCode());
-
-        $output = $runProcess->getOutput();
-        $errorOutput = $runProcess->getErrorOutput();
-
-        $this->assertEmpty($output);
-        $this->assertStringMatchesFormat(
-            'Backup path "%s" not found in the bucket "%s".',
-            trim($errorOutput),
-        );
-    }
-
     public function testCreateUnexistsBackupFolderS3(): void
     {
         $fileSystem = new Filesystem();