Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 9 additions & 52 deletions .github/workflows/component-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,16 @@ permissions:
contents: write

on:
pull_request:
types: [opened, edited, ready_for_review, closed]
branches:
- develop
workflow_dispatch:
inputs:
tag:
description: 'Tag version to release (e.g. 1.2.3)'
required: true
type: string

jobs:
validate-version:
if: ${{ github.event.action == 'opened' || github.event.action == 'edited' || github.event.action == 'ready_for_review' }}
runs-on: ubuntu-latest
steps:
- name: Validate PR description for version field
env:
PR_DESC: ${{ github.event.pull_request.body }}
run: |
if ! echo "$PR_DESC" | grep -qiE 'version[[:space:]]*:[[:space:]]*(major|minor|patch)'; then
echo "ERROR: PR description must include a version field in the format 'version: major|minor|patch' (case-insensitive). Example: version: minor"
exit 1
fi
echo "Validation passed: version field found."
release:
if: github.event.pull_request.merged == true
if: github.event_name == 'workflow_dispatch'
runs-on: ubuntu-latest

steps:
Expand Down Expand Up @@ -61,40 +50,8 @@ jobs:
git config gitflow.prefix.versiontag ''

echo "git config completed"
# Extract version from PR description
PR_DESC="${{ github.event.pull_request.body }}"
# Get top tag from CHANGELOG.md
TOP_TAG=$(grep -m 1 -oP '^#### \[\K[^\]]+' CHANGELOG.md)
if [[ -z "$TOP_TAG" ]]; then
echo "No version found in CHANGELOG.md!"
exit 1
fi
# Validate TOP_TAG format (semantic versioning: major.minor.patch)
if [[ ! "$TOP_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
echo "Invalid version format in CHANGELOG.md: $TOP_TAG. Expected format: major.minor.patch"
exit 1
fi
IFS='.' read -r major minor patch <<< "$TOP_TAG"
VERSION_TYPE=$(echo "$PR_DESC" | grep -oiP 'version\s*:\s*\K(major|minor|patch)' | tr '[:upper:]' '[:lower:]')
if [[ -z "$VERSION_TYPE" ]]; then
echo "No version type found in PR description, defaulting to PATCH increment."
patch=$((patch + 1))
elif [[ "$VERSION_TYPE" == "major" ]]; then
major=$((major + 1))
minor=0
patch=0
elif [[ "$VERSION_TYPE" == "minor" ]]; then
minor=$((minor + 1))
patch=0
elif [[ "$VERSION_TYPE" == "patch" ]]; then
patch=$((patch + 1))
else
echo "Invalid version type in PR description: $VERSION_TYPE"
exit 1
fi
RELEASE_VERSION="$major.$minor.$patch"
echo "Using calculated version: $RELEASE_VERSION"
echo "RELEASE_VERSION=$RELEASE_VERSION"
RELEASE_VERSION="${{ inputs.tag }}"
echo "Using manually inputted version: $RELEASE_VERSION"
echo "RELEASE_VERSION=$RELEASE_VERSION" >> $GITHUB_ENV
# Check if tag already exists
if git rev-parse "refs/tags/$RELEASE_VERSION" >/dev/null 2>&1; then
Expand Down
29 changes: 29 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,35 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [1.0.4](https://github.com/rdkcentral/entservices-testframework/compare/1.0.3...1.0.4)

- RDKEMW-16428: Add cmdline entry into proc_t to fix build error in UT [`#14`](https://github.com/rdkcentral/entservices-testframework/pull/14)
- Merge tag '1.0.3' into develop [`84a45b3`](https://github.com/rdkcentral/entservices-testframework/commit/84a45b33bf3f68ef26de6b080703e2f45b523810)

#### [1.0.3](https://github.com/rdkcentral/entservices-testframework/compare/1.0.2...1.0.3)

> 17 April 2026

- RDKEMW - Remove pr dependency on this workflow [`#13`](https://github.com/rdkcentral/entservices-testframework/pull/13)
- Feature/rdkemw 17153 [`#12`](https://github.com/rdkcentral/entservices-testframework/pull/12)
- 1.0.3 release changelog updates [`24204e8`](https://github.com/rdkcentral/entservices-testframework/commit/24204e8b8687fdc580503dd37d593a221cc02918)
- Merge tag '1.0.2' into develop [`7eb1841`](https://github.com/rdkcentral/entservices-testframework/commit/7eb1841706384b114628baf14906a0e2c2a448a5)

#### [1.0.2](https://github.com/rdkcentral/entservices-testframework/compare/1.0.1...1.0.2)

> 15 April 2026

- feature/RDKEMW-17153 - Update component release yml file [`#10`](https://github.com/rdkcentral/entservices-testframework/pull/10)
- RDKE-767 : [OSCR SCAN] RDKE - entservices-testframework [`#9`](https://github.com/rdkcentral/entservices-testframework/pull/9)
- RDKEMW-15693: Add API to clear CDN access token for AuthService plugin [`#6`](https://github.com/rdkcentral/entservices-testframework/pull/6)
- Update CODEOWNERS file [`#3`](https://github.com/rdkcentral/entservices-testframework/pull/3)
- 1.0.2 release changelog updates [`abcdc7e`](https://github.com/rdkcentral/entservices-testframework/commit/abcdc7e65613f03cad2e5a125a06103487323839)
- Update CODEOWNERS [`a27e8e7`](https://github.com/rdkcentral/entservices-testframework/commit/a27e8e7f63082514797dd1ee00a1aaefba301925)
- Merge tag '1.0.1' into develop [`e62bfcd`](https://github.com/rdkcentral/entservices-testframework/commit/e62bfcdf2da3c85138b2c55a59633e96a0129dde)

#### 1.0.1

> 4 April 2026

- Import of source (develop) [`bbeaec2`](https://github.com/rdkcentral/entservices-testframework/commit/bbeaec2ba8d75305f1e8d04cce9e4db3b2999f76)
- Changelog updates for 1.0.1 [`ce34907`](https://github.com/rdkcentral/entservices-testframework/commit/ce3490772873b8e22d4c398943a2d9eb0a8a1706)
21 changes: 20 additions & 1 deletion Tests/mocks/PlayerInfoMock.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:
*
* Copyright 2026 RDK Management
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#pragma once
#include <gmock/gmock.h>
#include "PlayerInfo.h"
Expand Down Expand Up @@ -69,4 +88,4 @@ class MockRemoteConnection : public RPC::IRemoteConnection {
MOCK_METHOD(uint32_t, Launch, (), (override));
MOCK_METHOD(void, PostMortem, (), (override));
MOCK_METHOD(void*, QueryInterface, (uint32_t), (override));
};
};
19 changes: 19 additions & 0 deletions Tests/mocks/SecureStorageServerMock.cpp
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:
*
* Copyright 2026 RDK Management
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#include "SecureStorageServerMock.h"
#include <grpcpp/security/server_credentials.h>
#include <grpcpp/server_builder.h>
Expand Down
19 changes: 19 additions & 0 deletions Tests/mocks/SecureStorageServerMock.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:
*
* Copyright 2026 RDK Management
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#pragma once

#include <memory>
Expand Down
2 changes: 1 addition & 1 deletion Tests/mocks/essos-resmgr.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* If not stated otherwise in this file or this component's Licenses.txt file the
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:
*
* Copyright 2019 RDK Management
Expand Down
4 changes: 2 additions & 2 deletions Tests/mocks/maintenanceMGR.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* If not stated otherwise in this file or this component's Licenses.txt file the
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:
*
* Copyright 2021 RDK Management
Expand Down Expand Up @@ -65,4 +65,4 @@
}IARM_Bus_MaintMGR_EventData_t;


#endif
#endif
8 changes: 3 additions & 5 deletions Tests/mocks/readprocMockInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
#define PROC_FILLSTATUS 0x0020 // read status
#define PROC_FILLMEM 0x0001 // read statm
#define PROC_FILLSTAT 0x0040 // read stat
#define PROC_FILLCOM 0x0200 // fill cmdline

typedef struct proc_t {
// 1st 16 bytes
Expand All @@ -34,6 +35,7 @@ int
ppid; // stat,status pid of parent process
char
cmd[16]; // stat,status basename of executable file in call to exec(2)
char **cmdline; // cmdline the complete command line for the process, including arguments (see also: comm)

} proc_t;

Expand Down Expand Up @@ -66,8 +68,4 @@ class ProcImpl {

extern PROCTAB* (*openproc)(int, ...);
extern void (*closeproc)(PROCTAB*);
extern proc_t* (*readproc)(PROCTAB*, proc_t*);




extern proc_t* (*readproc)(PROCTAB*, proc_t*);
21 changes: 20 additions & 1 deletion Tests/mocks/systemaudioplatformmock.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/*
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:
*
* Copyright 2026 RDK Management
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

#pragma once

#include "systemaudioplatform.h"
Expand All @@ -16,4 +35,4 @@ class SystemAudioPlatformAPIMock : public ISystemAudioPlatform {
MOCK_METHOD(void, systemAudioSetThreshold, (double thresHold), (override));
MOCK_METHOD(void, systemAudioSetVolume, (GstElement * audioVolume, AudioType audioType, PlayMode playMode, int thisVol), (override));
MOCK_METHOD(bool, systemAudioGeneratePipeline, (GstElement * *pipeline, GstElement** source, GstElement* capsfilter, GstElement** audioSink, GstElement** audioVolume, AudioType type, PlayMode mode, SourceType sourceType, bool smartVolumeEnable), (override));
};
};
2 changes: 1 addition & 1 deletion Tests/mocks/tr181api.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* If not stated otherwise in this file or this component's Licenses.txt file the
* If not stated otherwise in this file or this component's LICENSE file the
* following copyright and licenses apply:
*
* Copyright 2016 RDK Management
Expand Down
18 changes: 13 additions & 5 deletions patches/RDKEMW-1007.patch
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ new file mode 100644
index 0000000..aabed49
--- /dev/null
+++ b/apis/AuthService/IAuthService.h
@@ -0,0 +1,485 @@
@@ -0,0 +1,492 @@
+/*
+ * If not stated otherwise in this file or this component's LICENSE file the
+ * following copyright and licenses apply:
Expand Down Expand Up @@ -60,8 +60,8 @@ index 0000000..aabed49
+ virtual void ServiceAccessTokenChanged() = 0;
+ // @text onPartnerIdChanged
+ // @brief The Partner ID has changed.
+ // @param oldPartnerId Previous partner ID
+ // @param newPartnerId New partner ID
+ // @param oldPartnerId old partner ID
+ // @param newPartnerId new partner ID
+ virtual void OnPartnerIdChanged(const string& oldPartnerId, const string& newPartnerId) = 0;
+ // @text onContentAccessTokenChanged
+ // @brief Indication for the clients that the Content Access Token is now changed so retrieve the token freshly
Expand Down Expand Up @@ -220,9 +220,10 @@ index 0000000..aabed49
+
+ /**********************getContentAccessToken() - start****************************/
+ // @text getContentAccessToken
+ // @brief Retrieves the content access token from the secured persistent location
+ // @brief Retrieves the content access token from the secure persistent location
+ // @param token - out - string
+ // @param expires - out - uint32_t
+ // @return Core::hresult - status/error code indicating success or failure of the operation
+ virtual Core::hresult GetContentAccessToken(string& token /* @out */, uint32_t& expires /* @out */) = 0;
+ /**********************getContentAccessToken() - end****************************/
+
Expand Down Expand Up @@ -405,7 +406,14 @@ index 0000000..aabed49
+ // @brief Clears the authorization token
+ // @param SuccessMsgResult - out - struct
+ virtual uint32_t ClearAuthToken(SuccessMsgResult& setStat /* @out */) = 0;
+ /**********************clearAuthToken() - start****************************/
+ /**********************clearAuthToken() - end****************************/
+
+ /**********************clearContentAccessToken() - start****************************/
+ // @text clearContentAccessToken
+ // @brief Clears the content access token from the secure persistent location
+ // @param SuccessMsgResult - out - struct
+ virtual Core::hresult ClearContentAccessToken(SuccessMsgResult& setStat /* @out */) = 0;
+ /**********************clearContentAccessToken() - end****************************/
+
+ /**********************clearSessionToken() - start****************************/
+ // @text clearSessionToken
Expand Down
Loading