Merge branch 'feat/release-candidate' into fix/docker-labels

dyrector-io · Dec 12, 2024 · c486653 · c486653
2 parents cc18591 + c0876dd
commit c486653
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/web/crux-ui/src/validations/container.ts b/web/crux-ui/src/validations/container.ts
@@ -555,6 +555,30 @@ const testSecretRules = (imageLabels: Record<string, string>) => (secrets: Uniqu
   return testRules(secretRules, secrets, 'secret')
 }
 
+const testEnvironmentRules = (imageLabels: Record<string, string>) => (envs: UniqueKeyValue[]) => {
+  const rules = parseDyrectorioEnvRules(imageLabels)
+  if (!rules) {
+    return true
+  }
+
+  const requiredRules = Object.entries(rules).filter(([, rule]) => rule.required)
+  const envRules = requiredRules.filter(([_, rule]) => !rule.secret)
+
+  return testRules(envRules, envs, 'environment')
+}
+
+const testSecretRules = (imageLabels: Record<string, string>) => (secrets: UniqueSecretKeyValue[]) => {
+  const rules = parseDyrectorioEnvRules(imageLabels)
+  if (!rules) {
+    return true
+  }
+
+  const requiredRules = Object.entries(rules).filter(([, rule]) => rule.required)
+  const secretRules = requiredRules.filter(([_, rule]) => rule.secret)
+
+  return testRules(secretRules, secrets, 'secret')
+}
+
 const createContainerConfigBaseSchema = (imageLabels: Record<string, string>) =>
   yup.object().shape({
     name: matchContainerName(yup.string().nullable().optional().label('container:common.containerName')),