Merge pull request #3567 from uselagoon/environment-quota-fix

fix: check environment doesnt exist before checking env quotas
uselagoon · Oct 15, 2023 · 083aa40 · 083aa40
2 parents 3017c18 + 9c6bb5f
commit 083aa40
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/local-dev/api-data-watcher-pusher/api-data/04-populate-api-data-organizations.gql b/local-dev/api-data-watcher-pusher/api-data/04-populate-api-data-organizations.gql
@@ -7,7 +7,7 @@ mutation PopulateApi {
     friendlyName: "Test Organization"
     description: "An organization for testing"
     quotaProject: 5
-    quotaEnvironment: 15
+    quotaEnvironment: 4
     quotaGroup: 10
     quotaNotification: 10
   }) {

diff --git a/node-packages/commons/src/tasks.ts b/node-packages/commons/src/tasks.ts
@@ -768,12 +768,15 @@ export const createDeployTask = async function(deployData: any) {
   const environments = await getEnvironmentsForProject(projectName);
 
   if (project.organization) {
-    // check the environment quota, this prevents environments being deployed by the api or webhooks
-    const curOrg = await getOrganizationById(project.organization);
-    if (curOrg.environments.length >= curOrg.quotaEnvironment) {
-      throw new OrganizationEnvironmentLimit(
-        `'${branchName}' would exceed the organization environment quota of ${curOrg.quotaEnvironment}`
-      );
+    // if this would be a new environment, check it against the environment quota
+    if (!environments.project.environments.map(e => e.name).find(i => i === branchName)) {
+      // check the environment quota, this prevents environments being deployed by the api or webhooks
+      const curOrg = await getOrganizationById(project.organization);
+      if (curOrg.environments.length >= curOrg.quotaEnvironment) {
+        throw new OrganizationEnvironmentLimit(
+          `'${branchName}' would exceed the organization environment quota of ${curOrg.quotaEnvironment}`
+        );
+      }
     }
   }
 

diff --git a/services/api/src/resources/environment/resolvers.ts b/services/api/src/resources/environment/resolvers.ts
@@ -367,13 +367,16 @@ export const addOrUpdateEnvironment: ResolverFn = async (
   }
 
   if (projectOpenshift.organization) {
-    // check the environment quota, this prevents environments being added directly via the api
+    // if this would be a new environment, check it against the quota
     const curEnvs = await organizationHelpers(sqlClientPool).getEnvironmentsByOrganizationId(projectOpenshift.organization)
-    const curOrg = await organizationHelpers(sqlClientPool).getOrganizationById(projectOpenshift.organization)
-    if (curEnvs.length >= curOrg.quotaEnvironment && curOrg.quotaEnvironment != -1) {
-      throw new Error(
-        `Environment would exceed organization environment quota: ${curEnvs.length}/${curOrg.quotaEnvironment}`
-      );
+    if (!curEnvs.map(e => e.name).find(i => i === input.name)) {
+      // check the environment quota, this prevents environments being added directly via the api
+      const curOrg = await organizationHelpers(sqlClientPool).getOrganizationById(projectOpenshift.organization)
+      if (curEnvs.length >= curOrg.quotaEnvironment && curOrg.quotaEnvironment != -1) {
+        throw new Error(
+          `Environment would exceed organization environment quota: ${curEnvs.length}/${curOrg.quotaEnvironment}`
+        );
+      }
     }
   }