fixing issue #4753

Author: jackyalbo

frontend/src/app/actions.js

@@ -135,11 +135,11 @@ export async function updateFuncConfig(name, version, config) {
         await api.func.update_func({
             config: { name, version, ...config }
         });
-        notify(`Func ${config.name} updated successfully`, 'success');
-        loadFunc(config.name);
+        notify(`Func ${name} updated successfully`, 'success');
+        loadFunc(name);
 
     } catch (error) {
-        notify(`Func ${config.name} update failed`, 'error');
+        notify(`Func ${name} update failed`, 'error');
     }
 }
 

src/agent/func_services/func_node.js

@@ -62,7 +62,7 @@ class FuncNode {
                         });
                     });
                 const msg = {
-                    config: func.config,
+                    config: req.params.config,
                     event: req.params.event,
                     aws_config: req.params.aws_config,
                     rpc_options: req.params.rpc_options,
@@ -73,9 +73,9 @@ class FuncNode {
     }
 
     _load_func_code(req) {
-        const name = req.params.name;
-        const version = req.params.version;
-        const code_sha256 = req.params.code_sha256;
+        const name = req.params.config.name;
+        const version = req.params.config.version;
+        const code_sha256 = req.params.config.code_sha256;
         const version_dir = path.join(this.functions_path, name, version);
         const func_json_path = path.join(version_dir, 'func.json');
         // replacing the base64 encoded sha256 from using / to - in order to use as folder name
@@ -98,9 +98,10 @@ class FuncNode {
                     .then(res => {
                         func = res;
                         if (code_sha256 !== func.config.code_sha256 ||
-                            req.params.code_size !== func.config.code_size) {
+                            req.params.config.code_size !== func.config.code_size) {
                             throw new RpcError('FUNC_CODE_MISMATCH',
-                                `Function code does not match for ${func.name} version ${func.version} code_size ${func.config.code_size} code_sha256 ${func.config.code_sha256} requested code_size ${req.params.code_size} code_sha256 ${req.params.code_sha256}`);
+                                `Function code does not match for ${func.name} version ${func.version} code_size ${func.config.code_size} code_sha256 ${func.config.code_sha256} 
+                                requested code_size ${req.params.config.code_size} code_sha256 ${req.params.config.code_sha256}`);
                         }
                     })
                     .then(() => zip_utils.unzip_from_buffer(func[RPC_BUFFERS].zipfile))

src/api/func_node_api.js

@@ -16,24 +16,10 @@ module.exports = {
             method: 'PUT',
             params: {
                 type: 'object',
-                required: [
-                    'name',
-                    'version',
-                    'code_size',
-                    'code_sha256'
-                ],
+                required: ['config'],
                 properties: {
-                    name: {
-                        type: 'string'
-                    },
-                    version: {
-                        type: 'string'
-                    },
-                    code_size: {
-                        type: 'integer'
-                    },
-                    code_sha256: {
-                        type: 'string'
+                    config: {
+                        $ref: 'func_api#/definitions/func_config'
                     },
                     event: {
                         $ref: 'func_api#/definitions/event_type'

src/server/func_services/func_server.js

@@ -235,10 +235,7 @@ function invoke_func(req) {
             const func = req.func;
             const node = node_allocator.allocate_node(func.pools);
             const params = {
-                name: func.name,
-                version: func.version,
-                code_size: func.code_size,
-                code_sha256: func.code_sha256,
+                config: _get_func_info(func).config,
                 event: req.params.event,
                 aws_config: _make_aws_config(req),
                 rpc_options: _make_rpc_options(req),
@@ -298,7 +295,7 @@ function _get_func_code_stream(req, func_code) {
                 this.push(req.rpc_params[RPC_BUFFERS].zipfile);
                 this.push(null);
             }
-       });
+        });
     } else if (func_code.s3_bucket && func_code.s3_key) {
         console.log(`reading function code from bucket ${func_code.s3_bucket} and key ${func_code.s3_key}`);
         const account_keys = req.account.access_keys[0];