Merge pull request #350 from keboola/pepa_intTaskId

Allow integers for onlyOrchestrationTaskIds

Author: pepamartinec

src/JobFactory/FullJobDefinition.php

@@ -212,8 +212,8 @@ protected function getRootDefinition(TreeBuilder $treeBuilder): ArrayNodeDefinit
                         ->thenInvalid('value cannot be empty list')
                     ->end()
                     ->validate()
-                        ->ifTrue(fn($v) => count(array_filter($v ?? [], fn($i) => !is_string($i))) > 0)
-                        ->thenInvalid('items must be strings')
+                        ->ifTrue(fn($v) => count(array_filter($v ?? [], fn($i) => !is_scalar($i))) > 0)
+                        ->thenInvalid('items must be scalars')
                     ->end()
                     ->validate()
                         ->ifTrue(fn($v) => count(array_filter($v ?? [], fn($i) => $i === '')) > 0)

src/JobFactory/NewJobDefinition.php

@@ -105,8 +105,8 @@ protected function getRootDefinition(TreeBuilder $treeBuilder): ArrayNodeDefinit
                         ->thenInvalid('value cannot be empty list')
                     ->end()
                     ->validate()
-                        ->ifTrue(fn($v) => count(array_filter($v ?? [], fn($i) => !is_string($i))) > 0)
-                        ->thenInvalid('items must be strings')
+                        ->ifTrue(fn($v) => count(array_filter($v ?? [], fn($i) => !is_scalar($i))) > 0)
+                        ->thenInvalid('items must be scalars')
                     ->end()
                     ->validate()
                         ->ifTrue(fn($v) => count(array_filter($v ?? [], fn($i) => $i === '')) > 0)

tests/JobFactory/FullJobDefinitionTest.php

@@ -37,7 +37,7 @@ public function testValidJobMaximal(): void
             'type' => 'standard',
             'branchType' => BranchType::DEFAULT->value,
             'orchestrationTaskId' => '123',
-            'onlyOrchestrationTaskIds' => ['45', '67'],
+            'onlyOrchestrationTaskIds' => ['45', 67],
             'previousJobId' => '789',
         ];
         $definition = new FullJobDefinition();
@@ -473,23 +473,7 @@ public function invalidJobProvider(): array
                 ],
                 '/Invalid configuration for path "job.onlyOrchestrationTaskIds": value cannot be empty list/',
             ],
-            'onlyOrchestrationTaskIds with non-string item' => [
-                [
-                    '#tokenString' => getenv('TEST_STORAGE_API_TOKEN'),
-                    'id' => '12345',
-                    'runId' => '12345',
-                    'tokenId' => '1234',
-                    'projectId' => '123',
-                    'status' => 'created',
-                    'desiredStatus' => 'processing',
-                    'configId' => '123',
-                    'componentId' => 'keboola.test',
-                    'mode' => 'run',
-                    'onlyOrchestrationTaskIds' => [123],
-                ],
-                '/Invalid configuration for path "job.onlyOrchestrationTaskIds": items must be strings/',
-            ],
-            'onlyOrchestrationTaskIds with null item' => [
+            'onlyOrchestrationTaskIds with non-scalar item' => [
                 [
                     '#tokenString' => getenv('TEST_STORAGE_API_TOKEN'),
                     'id' => '12345',
@@ -503,7 +487,7 @@ public function invalidJobProvider(): array
                     'mode' => 'run',
                     'onlyOrchestrationTaskIds' => [null],
                 ],
-                '/Invalid configuration for path "job.onlyOrchestrationTaskIds": items must be strings/',
+                '/Invalid configuration for path "job.onlyOrchestrationTaskIds": items must be scalars/',
             ],
             'onlyOrchestrationTaskIds with empty item' => [
                 [

tests/JobFactory/NewJobDefinitionTest.php

@@ -65,7 +65,7 @@ public function testValidJobFull(string $mode): void
             ],
             'orchestrationJobId' => '123456789',
             'orchestrationTaskId' => '123',
-            'onlyOrchestrationTaskIds' => ['45', '67'],
+            'onlyOrchestrationTaskIds' => ['45', 67],
             'previousJobId' => '789',
         ];
         $definition = new NewJobDefinition();
@@ -194,25 +194,15 @@ public function invalidJobProvider(): array
                 ],
                 '/Invalid configuration for path "job.onlyOrchestrationTaskIds": value cannot be empty list/',
             ],
-            'onlyOrchestrationTaskIds with non-string item' => [
-                [
-                    '#tokenString' => getenv('TEST_STORAGE_API_TOKEN'),
-                    'configId' => '123',
-                    'componentId' => 'keboola.test',
-                    'result' => [],
-                    'onlyOrchestrationTaskIds' => [123],
-                ],
-                '/Invalid configuration for path "job.onlyOrchestrationTaskIds": items must be strings/',
-            ],
-            'onlyOrchestrationTaskIds with null item' => [
+            'onlyOrchestrationTaskIds with non-scalar item' => [
                 [
                     '#tokenString' => getenv('TEST_STORAGE_API_TOKEN'),
                     'configId' => '123',
                     'componentId' => 'keboola.test',
                     'result' => [],
                     'onlyOrchestrationTaskIds' => [null],
                 ],
-                '/Invalid configuration for path "job.onlyOrchestrationTaskIds": items must be strings/',
+                '/Invalid configuration for path "job.onlyOrchestrationTaskIds": items must be scalars/',
             ],
             'onlyOrchestrationTaskIds with empty item' => [
                 [