Merge master with develop

[ayesharustgi-delphix]

Problem

Solution

Testing Done

[github-advanced-security]

CodeQL found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.

To fix the issue, we should remove the unnecessary assignment of command_output, std_err, and exit_code for the first OS command in the make_directory method. Specifically, remove the left-hand assignment and simply execute the method for its side effect. The second assignment (after the permission change) should remain as is. This edit should be done only within the method's body to avoid unintended side effects.

To fix this problem, remove the first assignment to command_output, std_err, exit_code at line 422 in the make_directory method. Since the right-hand side (self.run_os_command(...)) performs the actual operation, we must ensure the directory gets created (and not just the assignment is removed). Therefore, we should leave the line invoking self.run_os_command(...) but only for its side effect (do not assign output to any variable, since the value is unused). Thus, change line 422 from an assignment to a plain function call. Only line 422 needs to be edited; no additional imports, methods, or changes are required.

To fix this problem, don't assign the result of self.run_os_command on line 422 to any variables if they're not subsequently used before being redefined. Instead, just call self.run_os_command(...) for its side effect. The second block (line 430) should retain the variable assignments since those values may be used for debugging or error checking later (if extended), but the first assignments can be dropped.

Only lines 422 need to be changed in src/controller/couchbase_operation.py. Leave the call in place (so the directory is created) but remove the assignment to command_output, std_err, exit_code = ..., calling self.run_os_command() for the side effect. No import or interface changes are required.

To fix an unused local variable assignment where the right-hand side has side effects (making it necessary to keep the call), you should remove only the unused variable(s) on the left side of the assignment, leaving the function call on its own line. This makes the code cleaner and clarifies that the result is not needed. In this case, for line 430 in src/controller/couchbase_operation.py, change:

430:         command_output, std_err, exit_code = self.run_os_command(
431:             os_command="change_permission", path=directory_path
432:         )

to:

430:         self.run_os_command(
431:             os_command="change_permission", path=directory_path
432:         )

Make this change at line 430, keep three lines of context around the change, and ensure you do NOT remove the function call itself.

To fix the problem of unused variables being assigned but never used, we should remove those assignments. For the line command_output, std_err, exit_code = self.run_os_command(...) at line 430, since none of the unpacked tuple values are used later, we can simply call self.run_os_command(...) without assigning its output to variables. This will maintain any side effects of the function call but not unnecessarily assign unused local variables. Only line 430 needs to be updated in this case.

The most precise way to fix this problem is to remove the unused left-hand side variables—command_output, std_err, exit_code—from the assignment, replacing them with just the function call (since the run_os_command call may have side effects and should not be removed). This should be done for both lines 422 and 430, as the pattern repeats in the same method. No additional imports or definitions are necessary. Edits should be made directly in the make_directory method within src/controller/couchbase_operation.py, lines 422 and 430.

To fix the problem, we should remove the commented-out code on lines 70 and 71: # if analytics_service: and # additional_service = additional_service + ",analytics". This will help keep the source clear and maintainable. No functional code changes are required, only deletion of these two commented lines. No new imports or definitions are needed.

---