From c2294c6780e9dc0d785ec934dcbf66cd1fb1e67b Mon Sep 17 00:00:00 2001 From: yengliong Date: Thu, 24 Oct 2024 17:21:30 +0800 Subject: [PATCH 1/2] Change release server token path This PR changes the release server token path from /etc/intel_edge_node/tokens/platform-update-agent/rs_access_token to /etc/intel_edge_node/tokens/release-service/rs_access_token. Signed-off-by: yengliong --- inbm/Changelog.md | 1 + inbm/dispatcher-agent/dispatcher/sota/constants.py | 2 +- .../fpm-template/etc/apparmor.d/usr.bin.inbm-dispatcher | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/inbm/Changelog.md b/inbm/Changelog.md index 445128740..3af5122e8 100644 --- a/inbm/Changelog.md +++ b/inbm/Changelog.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - ### Changed - (NEXMANAGE-906) Truncate the granular log instead of removing it + - Change release server token path to /etc/intel_edge_node/tokens/release-service/rs_access_token ### Fixed - (NEXMANAGE-837) Fix schema validation issue on failed UDM request sent from diff --git a/inbm/dispatcher-agent/dispatcher/sota/constants.py b/inbm/dispatcher-agent/dispatcher/sota/constants.py index 43181d863..d7a2b5ac8 100644 --- a/inbm/dispatcher-agent/dispatcher/sota/constants.py +++ b/inbm/dispatcher-agent/dispatcher/sota/constants.py @@ -18,7 +18,7 @@ TIBER_UPDATE_TOOL_PATH = get_canonical_representation_of_path('/usr/bin/os-update-tool.sh') # Release server access token path -RELEASE_SERVER_TOKEN_PATH = get_canonical_representation_of_path('/etc/intel_edge_node/tokens/platform-update-agent/' +RELEASE_SERVER_TOKEN_PATH = get_canonical_representation_of_path('/etc/intel_edge_node/tokens/release-service/' 'rs_access_token') SOTA_STATE = 'normal' diff --git a/inbm/dispatcher-agent/fpm-template/etc/apparmor.d/usr.bin.inbm-dispatcher b/inbm/dispatcher-agent/fpm-template/etc/apparmor.d/usr.bin.inbm-dispatcher index 1d4d7db6c..9955bb0b4 100644 --- a/inbm/dispatcher-agent/fpm-template/etc/apparmor.d/usr.bin.inbm-dispatcher +++ b/inbm/dispatcher-agent/fpm-template/etc/apparmor.d/usr.bin.inbm-dispatcher @@ -47,7 +47,7 @@ /etc/dpkg/dpkg.cfg r, /etc/dpkg/dpkg.cfg.d/ r, /etc/dpkg/dpkg.cfg.d/* r, - /etc/intel_edge_node/tokens/platform-update-agent/rs_access_token r, + /etc/intel_edge_node/tokens/release-service/rs_access_token r, /etc/intel_manageability.conf wr, /etc/firmware_tool_info.conf r, /etc/fstab r, From a0acfaccc11dfac9c67d39db713226cc22695da7 Mon Sep 17 00:00:00 2001 From: yengliong Date: Fri, 25 Oct 2024 08:21:24 +0800 Subject: [PATCH 2/2] Update token path --- inbm/Changelog.md | 2 +- inbm/dispatcher-agent/dispatcher/sota/constants.py | 2 +- .../fpm-template/etc/apparmor.d/usr.bin.inbm-dispatcher | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/inbm/Changelog.md b/inbm/Changelog.md index 3af5122e8..fff6a18d4 100644 --- a/inbm/Changelog.md +++ b/inbm/Changelog.md @@ -9,7 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). - ### Changed - (NEXMANAGE-906) Truncate the granular log instead of removing it - - Change release server token path to /etc/intel_edge_node/tokens/release-service/rs_access_token + - Change release server token path to /etc/intel_edge_node/tokens/release-service/access_token ### Fixed - (NEXMANAGE-837) Fix schema validation issue on failed UDM request sent from diff --git a/inbm/dispatcher-agent/dispatcher/sota/constants.py b/inbm/dispatcher-agent/dispatcher/sota/constants.py index d7a2b5ac8..a356bc057 100644 --- a/inbm/dispatcher-agent/dispatcher/sota/constants.py +++ b/inbm/dispatcher-agent/dispatcher/sota/constants.py @@ -19,7 +19,7 @@ # Release server access token path RELEASE_SERVER_TOKEN_PATH = get_canonical_representation_of_path('/etc/intel_edge_node/tokens/release-service/' - 'rs_access_token') + 'access_token') SOTA_STATE = 'normal' diff --git a/inbm/dispatcher-agent/fpm-template/etc/apparmor.d/usr.bin.inbm-dispatcher b/inbm/dispatcher-agent/fpm-template/etc/apparmor.d/usr.bin.inbm-dispatcher index 9955bb0b4..abee61131 100644 --- a/inbm/dispatcher-agent/fpm-template/etc/apparmor.d/usr.bin.inbm-dispatcher +++ b/inbm/dispatcher-agent/fpm-template/etc/apparmor.d/usr.bin.inbm-dispatcher @@ -47,7 +47,7 @@ /etc/dpkg/dpkg.cfg r, /etc/dpkg/dpkg.cfg.d/ r, /etc/dpkg/dpkg.cfg.d/* r, - /etc/intel_edge_node/tokens/release-service/rs_access_token r, + /etc/intel_edge_node/tokens/release-service/access_token r, /etc/intel_manageability.conf wr, /etc/firmware_tool_info.conf r, /etc/fstab r,