diff --git a/src/skyline_apiserver/core/security.py b/src/skyline_apiserver/core/security.py index d2372c2..81599b9 100644 --- a/src/skyline_apiserver/core/security.py +++ b/src/skyline_apiserver/core/security.py @@ -25,6 +25,7 @@ from fastapi import HTTPException, status from jose import jwt from skyline_log import LOG +from skyline_apiserver import __version__ from skyline_apiserver import schemas from skyline_apiserver.client import utils from skyline_apiserver.client.utils import get_system_session @@ -136,7 +137,7 @@ async def generate_profile( base_domains=CONF.openstack.base_domains, exp=exp or int(time.time()) + CONF.default.access_token_expire, uuid=uuid_value or uuid.uuid4().hex, - version=constants.VERSION, + version=__version__, license=license, currency=currency, ) diff --git a/src/skyline_apiserver/types/constants.py b/src/skyline_apiserver/types/constants.py index 7921766..0dfccbc 100644 --- a/src/skyline_apiserver/types/constants.py +++ b/src/skyline_apiserver/types/constants.py @@ -12,8 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -VERSION = "8.1.0" - ALGORITHM = "HS256" KEYSTONE_API_VERSION = "3.13" diff --git a/tests/api/v1/test_login.py b/tests/api/v1/test_login.py index 8f899af..099b18e 100644 --- a/tests/api/v1/test_login.py +++ b/tests/api/v1/test_login.py @@ -19,6 +19,7 @@ import pytest from httpx import AsyncClient from utils import utils +from skyline_apiserver import __version__ from skyline_apiserver import main from skyline_apiserver.config import CONF from skyline_apiserver.db import api as db_api, setup as db_setup @@ -62,7 +63,7 @@ async def test_get_profile_ok(client: AsyncClient, login_jwt: str) -> None: assert "base_domains" in result assert "license" in result assert "currency" in result - assert result["version"] == constants.VERSION + assert result["version"] == __version__ assert len(CONF.openstack.base_domains) == len(result["base_domains"]) diff --git a/tests/utils/utils.py b/tests/utils/utils.py index 71ed593..c8cdc34 100644 --- a/tests/utils/utils.py +++ b/tests/utils/utils.py @@ -17,8 +17,8 @@ import uuid from httpx import AsyncClient +from skyline_apiserver import __version__ from skyline_apiserver import config, main, schemas -from skyline_apiserver.types import constants def get_session_profile() -> schemas.Profile: @@ -63,7 +63,7 @@ def get_session_profile() -> schemas.Profile: "4c017648d2e34d1a8e732b98e3232af9": {"name": "alt_demo", "domain_id": "default"}, "e88226c062094881b7a1f01517b945b4": {"name": "admin", "domain_id": "default"}, }, - version=constants.VERSION, + version=__version__, license={ "name": "test_license_name", "summary": "test_license_summary",