Merge pull request #353 from keboola/revert-351-odin-SOX-431

Revert "Allow integers for orchestrationTaskId"

Author: odinuv

src/JobFactory/FullJobDefinition.php

@@ -193,6 +193,10 @@ protected function getRootDefinition(TreeBuilder $treeBuilder): ArrayNodeDefinit
                     ->beforeNormalization()->always($this->getStringNormalizer())->end()
                 ->end()
                 ->scalarNode('orchestrationTaskId')
+                    ->validate()
+                        ->ifTrue(fn($v) => $v !== null && !is_string($v))
+                        ->thenInvalid('value must be a string')
+                    ->end()
                     ->validate()
                         ->ifTrue(fn($v) => $v === '')
                         ->thenInvalid('value cannot be empty string')

src/JobFactory/NewJobDefinition.php

@@ -86,6 +86,10 @@ protected function getRootDefinition(TreeBuilder $treeBuilder): ArrayNodeDefinit
                 ->end()
                 ->scalarNode('orchestrationJobId')->end()
                 ->scalarNode('orchestrationTaskId')
+                    ->validate()
+                        ->ifTrue(fn($v) => $v !== null && !is_string($v))
+                        ->thenInvalid('value must be a string')
+                    ->end()
                     ->validate()
                         ->ifTrue(fn($v) => $v === '')
                         ->thenInvalid('value cannot be empty string')

tests/JobFactory/FullJobDefinitionTest.php

@@ -409,7 +409,7 @@ public function invalidJobProvider(): array
                 ],
                 '#The value "invalid" is not allowed for path "job.branchType". Permissible values: "default", "dev"#',
             ],
-            'orchestrationTaskId not scalar' => [
+            'orchestrationTaskId not string' => [
                 [
                     '#tokenString' => getenv('TEST_STORAGE_API_TOKEN'),
                     'id' => '12345',
@@ -421,9 +421,9 @@ public function invalidJobProvider(): array
                     'configId' => '123',
                     'componentId' => 'keboola.test',
                     'mode' => 'run',
-                    'orchestrationTaskId' => [123],
+                    'orchestrationTaskId' => 134,
                 ],
-                '#Invalid type for path "job.orchestrationTaskId". Expected "?scalar"?, but got "?array"?.#',
+                '/Invalid configuration for path "job.orchestrationTaskId": value must be a string/',
             ],
             'orchestrationTaskId empty string' => [
                 [

tests/JobFactory/NewJobDefinitionTest.php

@@ -154,15 +154,15 @@ public function invalidJobProvider(): array
                 ],
                 '#Invalid type for path "job.parentRunId". Expected "?scalar"?, but got "?array"?.#',
             ],
-            'orchestrationTaskId not scalar' => [
+            'orchestrationTaskId not string' => [
                 [
                     '#tokenString' => getenv('TEST_STORAGE_API_TOKEN'),
                     'configId' => '123',
                     'componentId' => 'keboola.test',
                     'result' => [],
-                    'orchestrationTaskId' => [134],
+                    'orchestrationTaskId' => 134,
                 ],
-                '#Invalid type for path "job.orchestrationTaskId". Expected "?scalar"?, but got "?array"?.#',
+                '/Invalid configuration for path "job.orchestrationTaskId": value must be a string/',
             ],
             'orchestrationTaskId empty string' => [
                 [