Merge pull request #527 from keboola/pepa_PAT-161_noDindFeature

PAT-161: Allow enabling no-dind using project feature

Author: pepamartinec

src/JobFactory/JobRuntimeResolver.php

@@ -15,6 +15,7 @@
 use Keboola\StorageApiBranch\ClientWrapper;
 use Keboola\StorageApiBranch\Factory\ClientOptions;
 use Keboola\StorageApiBranch\Factory\StorageClientPlainFactory;
+use Keboola\StorageApiBranch\StorageApiToken;
 use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 
 /**
@@ -27,6 +28,7 @@ class JobRuntimeResolver
     ];
 
     private const PAY_AS_YOU_GO_FEATURE = 'pay-as-you-go';
+    private const NO_DIND_FEATURE = 'job-queue-no-dind';
 
     private ClientWrapper $clientWrapper;
     private Components $componentsApiClient;
@@ -39,7 +41,7 @@ public function __construct(
     ) {
     }
 
-    public function resolveJobData(array $jobData, array $tokenInfo): array
+    public function resolveJobData(array $jobData, StorageApiToken $token): array
     {
         $this->configuration = null;
         $this->jobData = $jobData;
@@ -56,14 +58,14 @@ public function resolveJobData(array $jobData, array $tokenInfo): array
             $jobData['tag'] = $this->resolveTag($jobData);
             $variableValues = $this->resolveVariables();
             $jobData['parallelism'] = $this->resolveParallelism($jobData);
-            $jobData['executor'] = $this->resolveExecutor($jobData)->value;
+            $jobData['executor'] = $this->resolveExecutor($jobData, $token)->value;
             $jobData = $this->resolveBranchType($jobData);
 
             // set type after resolving parallelism
             $jobData['type'] = $this->resolveJobType($jobData)->value;
 
             // set backend after resolving type
-            $jobData['backend'] = $this->resolveBackend($jobData, $tokenInfo)->toDataArray();
+            $jobData['backend'] = $this->resolveBackend($jobData, $token)->toDataArray();
 
             foreach ($variableValues->asDataArray() as $key => $value) {
                 $jobData[$key] = $value;
@@ -170,7 +172,7 @@ private function getBackend(array $jobData): Backend
         return $this->mergeBackendsData($backend, $overrideByBackend);
     }
 
-    private function resolveBackend(array $jobData, array $tokenInfo): Backend
+    private function resolveBackend(array $jobData, StorageApiToken $token): Backend
     {
         $tempBackend = $this->getBackend($jobData);
 
@@ -196,7 +198,7 @@ private function resolveBackend(array $jobData, array $tokenInfo): Backend
         We also ignore backend settings for other workspace types, as they do not make any sense at the moment.
         */
         if (in_array($stagingStorage, ['local', 's3', 'abs', 'none']) &&
-            !in_array(self::PAY_AS_YOU_GO_FEATURE, $tokenInfo['owner']['features'] ?? [])
+            !$token->hasFeature(self::PAY_AS_YOU_GO_FEATURE)
         ) {
             return new Backend(null, $tempBackend->getType(), $backendContext);
         }
@@ -288,11 +290,12 @@ private function resolveJobType(array $jobData): JobType
         return JobType::STANDARD;
     }
 
-    private function resolveExecutor(array $jobData): Executor
+    private function resolveExecutor(array $jobData, StorageApiToken $token): Executor
     {
         $value = $jobData['executor'] ??
             $this->getConfigData()['runtime']['executor'] ??
             $this->getConfiguration()['runtime']['executor'] ??
+            ($token->hasFeature(self::NO_DIND_FEATURE) ? Executor::K8S_CONTAINERS->value : null) ??
             Executor::getDefault()->value
         ;
 

src/NewJobFactory.php

@@ -31,12 +31,12 @@ public function createNewJob(array $data): JobInterface
         $data = $this->validateJobData($data, NewJobDefinition::class);
 
         try {
-            $client = $this->storageClientFactory->createClientWrapper(new ClientOptions(
-                null,
-                $data['#tokenString'],
-            ))->getBasicClient();
-            $tokenInfo = $client->verifyToken();
-            $jobId = $client->generateId();
+            $clientWrapper = $this->storageClientFactory->createClientWrapper(new ClientOptions(
+                token: $data['#tokenString'],
+            ));
+            $token = $clientWrapper->getToken();
+
+            $jobId = $clientWrapper->getBasicClient()->generateId();
             $runId = empty($data['parentRunId']) ? $jobId :
                 $data['parentRunId'] . JobInterface::RUN_ID_DELIMITER . $jobId;
         } catch (StorageClientException $e) {
@@ -53,17 +53,15 @@ public function createNewJob(array $data): JobInterface
             );
         }
 
-        $projectId = (string) $tokenInfo['owner']['id'];
-
         $jobData = [
             'id' => $jobId,
             'deduplicationId' => $data['deduplicationId'] ?? null,
             'runId' => $runId,
-            'projectId' => $projectId,
-            'projectName' => $tokenInfo['owner']['name'],
-            'tokenId' => $tokenInfo['id'],
+            'projectId' => $token->getProjectId(),
+            'projectName' => $token->getProjectName(),
+            'tokenId' => $token->getTokenId(),
             '#tokenString' => $data['#tokenString'],
-            'tokenDescription' => $tokenInfo['description'],
+            'tokenDescription' => $token->getTokenDesc(),
             'status' => JobInterface::STATUS_CREATED,
             'desiredStatus' => JobInterface::DESIRED_STATUS_PROCESSING,
             'mode' => $data['mode'],
@@ -89,14 +87,14 @@ public function createNewJob(array $data): JobInterface
             'onlyOrchestrationTaskIds' => $data['onlyOrchestrationTaskIds'] ?? null,
             'previousJobId' => $data['previousJobId'] ?? null,
         ];
-        $jobData = $this->jobRuntimeResolver->resolveJobData($jobData, $tokenInfo);
+        $jobData = $this->jobRuntimeResolver->resolveJobData($jobData, $token);
 
         $data = $this->objectEncryptor->encrypt(
             $jobData,
             (string) $data['componentId'],
-            (string) $tokenInfo['owner']['id'],
+            $token->getProjectId(),
             BranchType::from($jobData['branchType']),
-            $tokenInfo['owner']['features'],
+            $token->getFeatures(),
         );
 
         $data = $this->validateJobData($data, FullJobDefinition::class);