chore: cars openfaas pro setup over 1.61.1

src/util/openfaas/faasApi.js

@@ -1,7 +1,16 @@
 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 || '';
+
+const basicAuth = {
+  username: OPENFAAS_GATEWAY_USERNAME,
+  password: OPENFAAS_GATEWAY_PASSWORD,
+};
 
 const parseAxiosError = (error) => {
   if (error.response) {
@@ -21,7 +30,7 @@ const deleteFunction = async (functionName) =>
   new Promise((resolve, reject) => {
     const url = `${OPENFAAS_GATEWAY_URL}/system/functions`;
     axios
-      .delete(url, { data: { functionName } })
+      .delete(url, { data: { functionName }, auth: basicAuth })
       .then(() => resolve())
       .catch((err) => reject(parseAxiosError(err)));
   });
@@ -30,7 +39,7 @@ const getFunction = async (functionName) =>
   new Promise((resolve, reject) => {
     const url = `${OPENFAAS_GATEWAY_URL}/system/function/${functionName}`;
     axios
-      .get(url)
+      .get(url, { auth: basicAuth })
       .then((resp) => resolve(resp.data))
       .catch((err) => reject(parseAxiosError(err)));
   });
@@ -39,7 +48,7 @@ const getFunctionList = async () =>
   new Promise((resolve, reject) => {
     const url = `${OPENFAAS_GATEWAY_URL}/system/functions`;
     axios
-      .get(url)
+      .get(url, { auth: basicAuth })
       .then((resp) => resolve(resp.data))
       .catch((err) => reject(parseAxiosError(err)));
   });
@@ -48,29 +57,39 @@ const invokeFunction = async (functionName, payload) =>
   new Promise((resolve, reject) => {
     const url = `${OPENFAAS_GATEWAY_URL}/function/${functionName}`;
     axios
-      .post(url, payload)
+      .post(url, payload, { auth: basicAuth })
       .then((resp) => resolve(resp.data))
       .catch((err) => reject(parseAxiosError(err)));
   });
 
-const checkFunctionHealth = async (functionName) =>
-  new Promise((resolve, reject) => {
+const checkFunctionHealth = async (functionName) => {
+  //logger.error(`checking function health: ${functionName}`);
+
+  return new Promise((resolve, reject) => {
     const url = `${OPENFAAS_GATEWAY_URL}/function/${functionName}`;
     axios
-      .get(url, {
-        headers: { 'X-REQUEST-TYPE': 'HEALTH-CHECK' },
-      })
+      .get(
+        url,
+        {
+          headers: { 'X-REQUEST-TYPE': 'HEALTH-CHECK' },
+        },
+        { auth: basicAuth },
+      )
       .then((resp) => resolve(resp))
       .catch((err) => reject(parseAxiosError(err)));
   });
+};
 
 const deployFunction = async (payload) =>
   new Promise((resolve, reject) => {
     const url = `${OPENFAAS_GATEWAY_URL}/system/functions`;
     axios
-      .post(url, payload)
+      .post(url, payload, { auth: basicAuth })
       .then((resp) => resolve(resp.data))
-      .catch((err) => reject(parseAxiosError(err)));
+      .catch((err) => {
+        //logger.error(err);
+        reject(parseAxiosError(err));
+      });
   });
 
 module.exports = {

src/util/openfaas/index.js

@@ -11,6 +11,13 @@
 const { getMetadata, getTransformationMetadata } = require('../../v0/util');
 const { HTTP_STATUS_CODES } = require('../../v0/util/constant');
 
+const FAAS_GUNICORN_WORKERS = process.env.FAAS_GUNICORN_WORKERS || '1';
+const FAAS_GUNICORN_THREADS = process.env.FAAS_GUNICORN_THREADS || '1';
+const FAAS_SCALE_TYPE = process.env.FAAS_SCALE_TYPE || 'capacity';
+const FAAS_SCALE_TARGET = process.env.FAAS_SCALE_TARGET || '4';
+const FAAS_SCALE_TARGET_PROPORTION = process.env.FAAS_SCALE_TARGET_PROPORTION || '0.70';
+const FAAS_SCALE_ZERO = process.env.FAAS_SCALE_ZERO || 'false';
+const FAAS_SCALE_ZERO_DURATION = process.env.FAAS_SCALE_ZERO_DURATION || '15m';
 const FAAS_BASE_IMG = process.env.FAAS_BASE_IMG || 'rudderlabs/openfaas-flask:main';
 const FAAS_MAX_PODS_IN_TEXT = process.env.FAAS_MAX_PODS_IN_TEXT || '40';
 const FAAS_MIN_PODS_IN_TEXT = process.env.FAAS_MIN_PODS_IN_TEXT || '1';
@@ -61,6 +68,8 @@
   maxWaitInMs = 22000,
   waitBetweenIntervalsInMs = 250,
 ) => {
+  //logger.error(`awaiting function readiness: ${functionName}`);
+
   const executionPromise = new Promise(async (resolve) => {
     try {
       await callWithRetry(
@@ -124,7 +133,7 @@
   trMetadata = {},
 ) => {
   try {
-    logger.debug('[Faas] Deploying a faas function');
+    logger.debug(`[Faas] Deploying a faas function: ${functionName}`);
     let envProcess = 'python index.py';
 
     const lvidsString = libraryVersionIDs.join(',');
@@ -135,7 +144,11 @@
       envProcess = `${envProcess} --code "${code}" --config-backend-url ${CONFIG_BACKEND_URL} --lvids "${lvidsString}"`;
     }
 
-    const envVars = {};
+    const envVars = {
+      GUNICORN_WORKER_COUNT: FAAS_GUNICORN_WORKERS,
+      GUNICORN_THREAD_COUNT: FAAS_GUNICORN_THREADS,
+    };
+
     if (FAAS_ENABLE_WATCHDOG_ENV_VARS.trim().toLowerCase() === 'true') {
       envVars.max_inflight = FAAS_MAX_INFLIGHT;
       envVars.exec_timeout = FAAS_EXEC_TIMEOUT;
@@ -149,6 +162,11 @@
       'parent-component': 'openfaas',
       'com.openfaas.scale.max': FAAS_MAX_PODS_IN_TEXT,
       'com.openfaas.scale.min': FAAS_MIN_PODS_IN_TEXT,
+      'com.openfaas.scale.zero': FAAS_SCALE_ZERO,
+      'com.openfaas.scale.zero-duration': FAAS_SCALE_ZERO_DURATION,
+      'com.openfaas.scale.target': FAAS_SCALE_TARGET,
+      'com.openfaas.scale.target-proportion': FAAS_SCALE_TARGET_PROPORTION,
+      'com.openfaas.scale.type': FAAS_SCALE_TYPE,
       transformationId: trMetadata.transformationId,
       workspaceId: trMetadata.workspaceId,
     };
@@ -197,6 +215,18 @@
   }
 };
 
+async function removeFaasFunction(fname) {
+  logger.debug(`[Faas] Removing faas function: ${fname}`);
+  try {
+    await deleteFunction(fname);
+  } catch (error) {
+    if (error.statusCode !== 404) {
+      logger.error(`[Faas] Error while removing ${fname}: ${error.message}`);
+      throw error;
+    }
+  }
+}
+
 async function setupFaasFunction(
   functionName,
   code,
@@ -207,7 +237,7 @@
 ) {
   try {
     if (!testMode && isFunctionDeployed(functionName)) {
-      logger.debug(`[Faas] Function ${functionName} already deployed`);
+      logger.error(`[Faas] Function ${functionName} already deployed`);
       return;
     }
     // deploy faas function

test/__tests__/user_transformation.test.js

@@ -37,6 +37,10 @@ const { parserForImport } = require("../../src/util/parser");
 const { RetryRequestError, RespStatusError } = require("../../src/util/utils");
 
 const OPENFAAS_GATEWAY_URL = "http://localhost:8080";
+const defaultBasicAuth = {
+  "username": "",
+  "password": ""
+};
 
 const randomID = () =>
   Math.random()
@@ -1400,12 +1404,14 @@ describe("Python transformations", () => {
     expect(axios.post).toHaveBeenCalledTimes(1);
     expect(axios.post).toHaveBeenCalledWith(
       `${OPENFAAS_GATEWAY_URL}/system/functions`,
-      expect.objectContaining({ name: funcName, service: funcName })
+      expect.objectContaining({ name: funcName, service: funcName }),
+      { auth: defaultBasicAuth },
     );
     expect(axios.get).toHaveBeenCalledTimes(1);
     expect(axios.get).toHaveBeenCalledWith(
       `${OPENFAAS_GATEWAY_URL}/function/${funcName}`,
-      {"headers": {"X-REQUEST-TYPE": "HEALTH-CHECK"}}
+      {"headers": {"X-REQUEST-TYPE": "HEALTH-CHECK"}},
+      { auth: defaultBasicAuth },
     );
   });
 
@@ -1622,7 +1628,8 @@ describe("Python transformations", () => {
     expect(axios.post).toHaveBeenCalledTimes(1);
     expect(axios.post).toHaveBeenCalledWith(
       `${OPENFAAS_GATEWAY_URL}/function/${funcName}`,
-      inputData
+      inputData,
+      { auth: defaultBasicAuth },
     );
   });
 
@@ -1641,6 +1648,10 @@ describe("Python transformations", () => {
         json: jest.fn().mockResolvedValue(respBody)
       });
 
+    axios.delete.mockResolvedValue({
+      response: { status: 404, data: `error finding function ${funcName}` }
+    }); // delete function
+
     axios.post
       .mockRejectedValueOnce({
         response: { status: 404, data: `error finding function ${funcName}` } // invoke function not found
@@ -1655,17 +1666,20 @@ describe("Python transformations", () => {
     expect(axios.post).toHaveBeenCalledTimes(2);
     expect(axios.post).toHaveBeenCalledWith(
       `${OPENFAAS_GATEWAY_URL}/function/${funcName}`,
-      inputData
+      inputData,
+      { auth: defaultBasicAuth },
     );
     expect(axios.post).toHaveBeenCalledWith(
       `${OPENFAAS_GATEWAY_URL}/system/functions`,
-      expect.objectContaining({ name: funcName, service: funcName })
+      expect.objectContaining({ name: funcName, service: funcName }),
+      { auth: defaultBasicAuth },
     );
 
     expect(axios.get).toHaveBeenCalledTimes(1);
     expect(axios.get).toHaveBeenCalledWith(
       `${OPENFAAS_GATEWAY_URL}/function/${funcName}`,
-      {"headers": {"X-REQUEST-TYPE": "HEALTH-CHECK"}}
+      {"headers": {"X-REQUEST-TYPE": "HEALTH-CHECK"}},
+      { auth: defaultBasicAuth },
     );
   });