chore: openfaas pro reconcile fn over 1 dot 65

.github/workflows/build-push-docker-image.yml

@@ -38,6 +38,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.1
         with:
+          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 1
 
       - name: Setup Docker Buildx
@@ -77,7 +78,7 @@ jobs:
             linux/arm64
           build-args: |
             version=${{ inputs.img_tag }}-arm64
-            GIT_COMMIT_SHA=${{ github.sha }}
+            GIT_COMMIT_SHA=${{ github.event.pull_request.head.sha }}
           # cache-from: type=gha
           # cache-to: type=gha,mode=max
 
@@ -88,6 +89,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4.1.1
         with:
+          ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 1
 
       - name: Setup Docker Buildx
@@ -127,7 +129,7 @@ jobs:
             linux/amd64
           build-args: |
             version=${{ inputs.img_tag }}-amd64
-            GIT_COMMIT_SHA=${{ github.sha }}
+            GIT_COMMIT_SHA=${{ github.event.pull_request.head.sha }}
           # cache-from: type=gha
           # cache-to: type=gha,mode=max
 

src/util/customTransformer-faas.js

@@ -11,20 +11,26 @@ const {
 } = require('./openfaas');
 const { getLibraryCodeV1 } = require('./customTransforrmationsStore-v1');
 
+const HASH_SECRET = process.env.OPENFAAS_FN_HASH_SECRET || '';
 const libVersionIdsCache = new NodeCache();
 
-function generateFunctionName(userTransformation, libraryVersionIds, testMode) {
+function generateFunctionName(userTransformation, libraryVersionIds, testMode, hashSecret = '') {
   if (userTransformation.versionId === FAAS_AST_VID) return FAAS_AST_FN_NAME;
 
   if (testMode) {
     const funcName = `fn-test-${uuidv4()}`;
     return funcName.substring(0, 63).toLowerCase();
   }
 
-  const ids = [userTransformation.workspaceId, userTransformation.versionId].concat(
+  let ids = [userTransformation.workspaceId, userTransformation.versionId].concat(
     (libraryVersionIds || []).sort(),
   );
 
+  if (hashSecret !== '') {
+    ids = ids.concat([hashSecret]);
+  }
+
+  // FIXME: Why the id's are sorted ?!
   const hash = crypto.createHash('md5').update(`${ids}`).digest('hex');
   return `fn-${userTransformation.workspaceId}-${hash}`.substring(0, 63).toLowerCase();
 }
@@ -90,7 +96,13 @@ async function setOpenFaasUserTransform(
     testMode,
   };
   const functionName =
-    pregeneratedFnName || generateFunctionName(userTransformation, libraryVersionIds, testMode);
+    pregeneratedFnName ||
+    generateFunctionName(
+      userTransformation,
+      libraryVersionIds,
+      testMode,
+      process.env.OPENFAAS_FN_HASH_SECRET,
+    );
   const setupTime = new Date();
 
   await setupFaasFunction(
@@ -130,7 +142,13 @@ async function runOpenFaasUserTransform(
 
   const trMetadata = events[0].metadata ? getTransformationMetadata(events[0].metadata) : {};
   // check and deploy faas function if not exists
-  const functionName = generateFunctionName(userTransformation, libraryVersionIds, testMode);
+  const functionName = generateFunctionName(
+    userTransformation,
+    libraryVersionIds,
+    testMode,
+    process.env.OPENFAAS_FN_HASH_SECRET,
+  );
+
   if (testMode) {
     await setOpenFaasUserTransform(
       userTransformation,

src/util/openfaas/faasApi.js

@@ -1,6 +1,8 @@
 const axios = require('axios');
 const { RespStatusError, RetryRequestError } = require('../utils');
 
+const logger = require('../../logger');
+
 const OPENFAAS_GATEWAY_URL = process.env.OPENFAAS_GATEWAY_URL || 'http://localhost:8080';
 const OPENFAAS_GATEWAY_USERNAME = process.env.OPENFAAS_GATEWAY_USERNAME || '';
 const OPENFAAS_GATEWAY_PASSWORD = process.env.OPENFAAS_GATEWAY_PASSWORD || '';
@@ -12,7 +14,7 @@ const basicAuth = {
 
 const parseAxiosError = (error) => {
   if (error.response) {
-    const status = error.response.status || 400;
+    const status = error.response.status || 500;
     const errorData = error.response?.data;
     const message =
       (errorData && (errorData.message || errorData.error || errorData)) || error.message;
@@ -61,6 +63,8 @@ const invokeFunction = async (functionName, payload) =>
   });
 
 const checkFunctionHealth = async (functionName) => {
+  logger.debug(`Checking function health: ${functionName}`);
+
   return new Promise((resolve, reject) => {
     const url = `${OPENFAAS_GATEWAY_URL}/function/${functionName}`;
     axios
@@ -76,8 +80,10 @@ const checkFunctionHealth = async (functionName) => {
   });
 };
 
-const deployFunction = async (payload) =>
-  new Promise((resolve, reject) => {
+const deployFunction = async (payload) => {
+  logger.debug(`Deploying function: ${payload?.name}`);
+
+  return new Promise((resolve, reject) => {
     const url = `${OPENFAAS_GATEWAY_URL}/system/functions`;
     axios
       .post(url, payload, { auth: basicAuth })
@@ -86,6 +92,21 @@ const deployFunction = async (payload) =>
         reject(parseAxiosError(err));
       });
   });
+};
+
+const updateFunction = async (fnName, payload) => {
+  logger.warn(`Updating function: ${fnName}`);
+
+  return new Promise((resolve, reject) => {
+    const url = `${OPENFAAS_GATEWAY_URL}/system/functions`;
+    axios
+      .put(url, payload, { auth: basicAuth })
+      .then((resp) => resolve(resp.data))
+      .catch((err) => {
+        reject(parseAxiosError(err));
+      });
+  });
+};
 
 module.exports = {
   deleteFunction,
@@ -94,4 +115,5 @@ module.exports = {
   getFunctionList,
   invokeFunction,
   checkFunctionHealth,
+  updateFunction,
 };