From 41a9f7ce2161ec5b6b54c8846f66e964dd38e7dc Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 18 Jul 2025 14:08:53 +0200 Subject: [PATCH 1/2] refs #2504 add endpoint for GetGitData --- CHANGELOG.md | 6 ++++ .../modules/server/ogAdmClient/__init__.py | 35 +++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6248a0d..5a53cef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [6.2.0] - 2025-07-18 + +### Added + +- Add endpoint for GetGitData + ## [6.1.1] - 2025-06-26 ### Changed diff --git a/src/opengnsys/modules/server/ogAdmClient/__init__.py b/src/opengnsys/modules/server/ogAdmClient/__init__.py index 4fcd2ae..7bb22b2 100644 --- a/src/opengnsys/modules/server/ogAdmClient/__init__.py +++ b/src/opengnsys/modules/server/ogAdmClient/__init__.py @@ -1032,3 +1032,38 @@ class ogAdmClientWorker (ogLiveWorker): r.update ({ 'nfn':'RESPUESTA_KillJob', 'job':jid }) logger.debug (f'r aft ({r})') return r + + @execution_level('full') + @check_secret + def process_GetGitData (self, path, get_params, post_params, server): + logger.debug ('in process_GetGitData, path "{}" get_params "{}" post_params "{}" server "{}"'.format (path, get_params, post_params, server)) + + for k in ['nfn', 'dsk', 'par', 'nfn']: + if k not in post_params: + logger.error (f'required parameter ({k}) not in POST params') + return {} + + tmp_gitdata = f'/tmp/gitdata-{self.IPlocal}' + nfn = post_params['nfn'] + dsk = post_params['dsk'] + par = post_params['par'] + + try: + self.interfaceAdmin (nfn, [dsk, par, tmp_gitdata]) + herror = 0 + except: + herror = 1 + + if not os.path.exists (tmp_gitdata): + return self.respuestaEjecucionComando ({'nfn':'RESPUESTA_GetGitData'}, 1) + + with open (tmp_gitdata, 'r') as fd: + gitdata = fd.read().strip() + + branch, repo = gitdata.split (':') + cmd = { + 'nfn': 'RESPUESTA_GetGitData', + 'branch': branch, + 'repo': repo, + } + return self.respuestaEjecucionComando (cmd, herror) From e0da448e90db7c1f5cdd34395ffbc60ed8fa5dc7 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 18 Jul 2025 14:10:43 +0200 Subject: [PATCH 2/2] refs #2504 add endpoint for GetGitData --- linux/debian/changelog | 6 ++++++ src/VERSION | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/linux/debian/changelog b/linux/debian/changelog index 86f6441..86eb080 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,9 @@ +ogagent (6.2.0-1) stable; urgency=medium + + * Add endpoint for GetGitData + + -- OpenGnsys developers Fri, 18 Jul 2025 14:10:06 +0200 + ogagent (6.1.1-1) stable; urgency=medium * Write output of launch_browser into a file diff --git a/src/VERSION b/src/VERSION index f3b5af3..6abaeb2 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -6.1.1 +6.2.0