Merge pull request #160 from keboola/miro-PS-3506-2

PS-3506: deps (internal-api-client): unfreeze storage client version 13

Author: ErikZigo

composer.json

@@ -31,7 +31,7 @@
         "guzzlehttp/guzzle": "^6.3|^7.0",
         "keboola/kbc-manage-api-php-client": "^5.2",
         "keboola/object-encryptor": "^2.0",
-        "keboola/storage-api-client": "^12.0|13.1.0",
+        "keboola/storage-api-client": "^12.0|^13.1",
         "keboola/storage-api-php-client-branch-wrapper": "^2.0|^3.0",
         "monolog/monolog": "^2.6",
         "psr/log": "^1.1",

tests/JobFactory/JobRuntimeResolverTest.php

@@ -57,7 +57,7 @@ public function testResolveRuntimeSettingsInJob(): void
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::once())->method('apiGet')
             ->withConsecutive(
-                ['components/keboola.ex-db-snowflake']
+                ['branch/default/components/keboola.ex-db-snowflake']
             )->willReturnOnConsecutiveCalls(
                 $componentData
             );
@@ -126,7 +126,7 @@ public function testResolveRuntimeSettingsInConfigData(): void
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::once())->method('apiGet')
             ->withConsecutive(
-                ['components/keboola.ex-db-snowflake']
+                ['branch/default/components/keboola.ex-db-snowflake']
             )->willReturnOnConsecutiveCalls(
                 $componentData
             );
@@ -215,8 +215,8 @@ public function testResolveRuntimeSettingsInConfiguration(): void
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::exactly(2))->method('apiGet')
             ->withConsecutive(
-                ['components/keboola.ex-db-snowflake/configs/454124290'],
-                ['components/keboola.ex-db-snowflake']
+                ['branch/default/components/keboola.ex-db-snowflake/configs/454124290'],
+                ['branch/default/components/keboola.ex-db-snowflake']
             )->willReturnOnConsecutiveCalls(
                 $configuration,
                 $componentData
@@ -289,8 +289,8 @@ public function testResolveRuntimeSettingsInConfigurationOfTransformations(): vo
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::exactly(2))->method('apiGet')
             ->withConsecutive(
-                ['components/keboola.ex-db-snowflake/configs/454124290'],
-                ['components/keboola.ex-db-snowflake']
+                ['branch/default/components/keboola.ex-db-snowflake/configs/454124290'],
+                ['branch/default/components/keboola.ex-db-snowflake']
             )->willReturnOnConsecutiveCalls(
                 $configuration,
                 $componentData
@@ -374,8 +374,8 @@ public function testResolveRuntimeSettingsPriority(): void
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::exactly(2))->method('apiGet')
             ->withConsecutive(
-                ['components/keboola.ex-db-snowflake/configs/454124290'],
-                ['components/keboola.ex-db-snowflake'],
+                ['branch/default/components/keboola.ex-db-snowflake/configs/454124290'],
+                ['branch/default/components/keboola.ex-db-snowflake'],
             )->willReturnOnConsecutiveCalls(
                 $configuration,
                 $componentData
@@ -445,8 +445,8 @@ public function testResolveRuntimeSettingsNowhere(): void
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::exactly(2))->method('apiGet')
             ->withConsecutive(
-                ['components/keboola.ex-db-snowflake/configs/454124290'],
-                ['components/keboola.ex-db-snowflake']
+                ['branch/default/components/keboola.ex-db-snowflake/configs/454124290'],
+                ['branch/default/components/keboola.ex-db-snowflake']
             )->willReturnOnConsecutiveCalls($configuration, $component);
         $clientWrapperMock = self::createMock(ClientWrapper::class);
         $clientWrapperMock->method('getBranchClientIfAvailable')->willReturn($clientMock);
@@ -507,7 +507,7 @@ public function testResolveRuntimeSettingsConfigurationNotFound(): void
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::once())->method('apiGet')
             ->with(
-                'components/keboola.ex-db-snowflake/configs/454124290',
+                'branch/default/components/keboola.ex-db-snowflake/configs/454124290',
             )->willThrowException(new StorageClientException('Configuration "454124290" not found', 404));
         $clientWrapperMock = self::createMock(ClientWrapper::class);
         $clientWrapperMock->method('getBranchClientIfAvailable')->willReturn($clientMock);
@@ -539,7 +539,7 @@ public function testResolveNoConfiguration(): void
 
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::once())->method('apiGet')
-            ->with('components/keboola.ex-db-snowflake')->willReturn($component);
+            ->with('branch/default/components/keboola.ex-db-snowflake')->willReturn($component);
         $clientWrapperMock = self::createMock(ClientWrapper::class);
         $clientWrapperMock->method('getBranchClientIfAvailable')->willReturn($clientMock);
         $storageClientFactoryMock = self::createMock(StorageClientPlainFactory::class);
@@ -588,7 +588,7 @@ public function testResolveEmptyConfiguration(): void
 
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::once())->method('apiGet')
-            ->with('components/keboola.ex-db-snowflake')->willReturn($component);
+            ->with('branch/default/components/keboola.ex-db-snowflake')->willReturn($component);
         $clientWrapperMock = self::createMock(ClientWrapper::class);
         $clientWrapperMock->method('getBranchClientIfAvailable')->willReturn($clientMock);
         $storageClientFactoryMock = self::createMock(StorageClientPlainFactory::class);
@@ -675,7 +675,7 @@ public function testResolveInvalidComponent(): void
 
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::once())->method('apiGet')
-            ->with('components/keboola.ex-db-snowflake')->willReturn($component);
+            ->with('branch/default/components/keboola.ex-db-snowflake')->willReturn($component);
         $clientWrapperMock = self::createMock(ClientWrapper::class);
         $clientWrapperMock->method('getBranchClientIfAvailable')->willReturn($clientMock);
         $storageClientFactoryMock = self::createMock(StorageClientPlainFactory::class);
@@ -790,7 +790,7 @@ public function testConfigurationDisabledException(): void
 
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::once())->method('apiGet')
-            ->with('components/keboola.ex-db-snowflake/configs/454124290')->willReturn($configuration);
+            ->with('branch/default/components/keboola.ex-db-snowflake/configs/454124290')->willReturn($configuration);
         $clientWrapperMock = self::createMock(ClientWrapper::class);
         $clientWrapperMock->method('getBranchClientIfAvailable')->willReturn($clientMock);
         $storageClientFactoryMock = self::createMock(StorageClientPlainFactory::class);
@@ -842,7 +842,7 @@ public function testResolveBackend(
         $clientMock = self::createMock(Client::class);
         $clientMock->expects(self::exactly($expectedApiCallCount))->method('apiGet')
             ->withConsecutive(
-                ['components/keboola.ex-db-snowflake']
+                ['branch/default/components/keboola.ex-db-snowflake']
             )->willReturnOnConsecutiveCalls(
                 $componentData
             );