fix revert to snapshot

saleor · Aug 22, 2023 · eb9b2a0 · eb9b2a0
1 parent 99accf5
commit eb9b2a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/clean-envs.yml b/.github/workflows/clean-envs.yml
@@ -35,7 +35,7 @@ jobs:
         if: steps.clean-environments.outputs.sendWarningOnSlack == 'true'
         env:
           JOB_DEPLOYMENT_KIND: "release and master envs"
-          JOB_STATUS: 'Failure'
+          JOB_STATUS: 'failure'
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_SALEOR_QA_WEBHOOK_URL }}
           JOB_TITLE: ${{ steps.clean-environments.outputs.warningMessage }}
           JOB_KIND: "Clean Environments"

diff --git a/.github/workflows/cleanEnvironments.js b/.github/workflows/cleanEnvironments.js
@@ -25,7 +25,9 @@ program
         environment.service.version,
         sortedSnapshotList,
       );
-      if (latestSnapshot) cleanEnvironment(environment, latestSnapshot, token);
+      if (latestSnapshot){
+        cleanEnvironment(environment, latestSnapshot, token);
+      }
       else {
         sendWarningOnSlack = "true";
         warningMessage += `Could not find any snapshot compatible with environment ${environment.domain}.\n`;
@@ -67,7 +69,7 @@ async function cleanEnvironment(environment, snapshot, token) {
     `${pathToCloudAPI}organizations/saleor/environments/${environment.key}/restore/`,
     {
       method: "PUT",
-      body: JSON.stringify({ restore_from: snapshot }),
+      body: JSON.stringify({ restore_from: snapshot.key }),
       headers: {
         Authorization: `Token ${token}`,
         Accept: "application/json",
@@ -106,7 +108,7 @@ async function getSnapshotsForRestore(token) {
   );
   const allSnapshots = await snapshotsResponse.json();
   return allSnapshots.filter(snapshot => {
-    snapshot.name.includes(snapshotName);
+    return snapshot.name.includes(snapshotName);
   });
 }
 
@@ -120,8 +122,6 @@ function sortSnapshots(snapshotList) {
 }
 
 function compareVersions(versionA, versionB) {
-  // if version A is grater return <0, if equal 0, if less then >0
-
   // Convert version from string to array eg. from "3.5.7" to [3, 5, 7]
   // Where 3 is main version, 5 is major version and 7 is patch version
 
@@ -146,7 +146,7 @@ function compareVersions(versionA, versionB) {
 
 function getLatestSnapshotForEnvironment(environmentVersion, snapshotList) {
   const compatibleSnapshots = snapshotList.filter(snapshot => {
-    compareVersions(environmentVersion, snapshot.saleor_version) >= 0;
+    return compareVersions(environmentVersion, snapshot.saleor_version) <= 0;
   });
   if (compatibleSnapshots.length > 0) {
     const latestSnapshot = compatibleSnapshots[0];