Change to use shell cat to fetch commit_id

Command file can not do correct when run it on centos 7
with docker to build. So Change it to use shell cat.

Change-Id: I1186b22c224bbc6e828f71014f5b7f920df3a651
(cherry picked from commit 2a3a08e328)

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/skyline-apiserver.git
-defaultbranch=master
+defaultbranch=stable/2024.1

.zuul.yaml

@@ -25,13 +25,40 @@
         tox_install_siblings: false
         tox_envlist: functional
 
+- job:
+    name: skyline-tox-py38
+    parent: openstack-tox-py38
+    description: |
+      Skyline py38 unittest tests
+    vars:
+      python_version: 3.8
+      tox_envlist: py38
+
+- job:
+    name: skyline-tox-pep8-py38
+    parent: openstack-tox-py38
+    description: |
+      Skyline code static analysis
+    vars:
+      python_version: 3.8
+      tox_envlist: pep8
+
 - project:
     templates:
-      - openstack-python3-jobs
       - release-notes-jobs-python3
       - publish-openstack-docs-pti
     check:
       jobs:
+        - skyline-tox-py38:
+            irrelevant-files:
+              - ^container/.*$
+              - ^devstack/.*$
+              - ^docs/.*$
+              - ^tools/.*$
+              - ^.*\.rst$
+              - ^.*\.md$
+              - ^kolla/.*$
+        - skyline-tox-pep8-py38
         - skyline-functional-devstack:
             irrelevant-files:
               - ^container/.*$
@@ -44,6 +71,16 @@
               - ^releasenotes/.*$
     gate:
       jobs:
+        - skyline-tox-py38:
+            irrelevant-files:
+              - ^container/.*$
+              - ^devstack/.*$
+              - ^docs/.*$
+              - ^tools/.*$
+              - ^.*\.rst$
+              - ^.*\.md$
+              - ^kolla/.*$
+        - skyline-tox-pep8-py38
         - skyline-functional-devstack:
             irrelevant-files:
               - ^container/.*$

Makefile

@@ -17,7 +17,7 @@ GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
 GIT_COMMIT ?= $(shell git rev-parse --verify HEAD)
 
 # URL for skyline-console packages
-SKYLINE_CONSOLE_PACKAGE_URL ?= "https://tarballs.opendev.org/openstack/skyline-console/skyline-console-master.tar.gz"
+SKYLINE_CONSOLE_PACKAGE_URL ?= "https://tarballs.opendev.org/openstack/skyline-console/skyline-console-stable-2024.1.tar.gz"
 
 
 .PHONY: help
@@ -81,7 +81,7 @@ BUILD_ENGINE ?= docker
 BUILD_CONTEXT ?= .
 DOCKER_FILE ?= container/Dockerfile
 IMAGE ?= skyline
-IMAGE_TAG ?= latest
+IMAGE_TAG ?= 2024.1
 ifeq ($(BUILD_ENGINE), docker)
     build_cmd = docker build
 else ifeq ($(BUILD_ENGINE), buildah)

container/Dockerfile

@@ -25,12 +25,12 @@ RUN pip install -U /opt/skyline_apiserver/skyline_console/skyline_console.tar.gz
 
 COPY ./requirements.txt /opt/skyline_apiserver/requirements.txt
 
-RUN pip install -r /opt/skyline_apiserver/requirements.txt -chttps://releases.openstack.org/constraints/upper/master
+RUN pip install -r /opt/skyline_apiserver/requirements.txt -chttps://releases.openstack.org/constraints/upper/2024.1
 
 COPY ./ /opt/skyline_apiserver/
 
 RUN git init /opt/skyline_apiserver \
-    && pip install /opt/skyline_apiserver -chttps://releases.openstack.org/constraints/upper/master \
+    && pip install /opt/skyline_apiserver -chttps://releases.openstack.org/constraints/upper/2024.1 \
     && apt-get clean \
     && rm -rf ~/.cache/pip \
     && mkdir -p /etc/skyline /var/log/skyline /var/lib/skyline

releasenotes/source/2024.1.rst

@@ -1,6 +0,0 @@
-===========================
-2024.1 Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: stable/2024.1

releasenotes/source/2024.2.rst

@@ -1,6 +0,0 @@
-===========================
-2024.2 Series Release Notes
-===========================
-
-.. release-notes::
-   :branch: stable/2024.2

releasenotes/source/index.rst

@@ -6,8 +6,6 @@ Skyline APIServer Release Notes
    :maxdepth: 1
 
    unreleased
-   2024.2
-   2024.1
    2023.2
    2023.1
    zed

releasenotes/source/zed.rst

@@ -3,4 +3,4 @@ Zed Series Release Notes
 ========================
 
 .. release-notes::
-   :branch: unmaintained/zed
+   :branch: stable/zed

requirements.txt

@@ -4,8 +4,8 @@ pydantic<=1.10.0 # MIT
 uvicorn<=0.17.6 # BSD License (3 clause)
 gunicorn>=20.1.0 # MIT
 python-jose<=3.3.0 # MIT
-databases>=0.9.0 # BSD License (3 clause)
+databases<=0.8.0 # BSD License (3 clause)
-aiomysql>=0.2.0 # MIT
+aiomysql<=0.1.1 # MIT
 aiosqlite<=0.17.0 # MIT
 loguru<=0.5.3 # MIT
 PyYAML>=5.4.1 # MIT

skyline_apiserver/api/v1/login.py

@@ -173,10 +173,9 @@ async def login(
         regex=constants.INBOUND_HEADER_REGEX,
     ),
 ) -> schemas.Profile:
-    region = credential.region or CONF.openstack.default_region
     try:
         project_scope, unscope_token, default_project_id = await _get_projects_and_unscope_token(
-            region=region,
+            region=credential.region,
             domain=credential.domain,
             username=credential.username,
             password=credential.password,
@@ -187,13 +186,13 @@ async def login(
             default_project_id = None
         project_scope_token = await get_project_scope_token(
             keystone_token=unscope_token,
-            region=region,
+            region=credential.region,
             project_id=default_project_id or project_scope[0].id,
         )
 
         profile = await generate_profile(
             keystone_token=project_scope_token,
-            region=region,
+            region=credential.region,
         )
 
         profile = await _patch_profile(profile, x_openstack_request_id)

skyline_apiserver/db/api.py

@@ -16,9 +16,9 @@ from __future__ import annotations
 
 import time
 from functools import wraps
-from typing import Any, Union
+from typing import Any
 
-from sqlalchemy import Insert, Update, delete, func, insert, select, update
+from sqlalchemy import delete, func, insert, select, update
 
 from skyline_apiserver.types import Fn
 
@@ -41,7 +41,7 @@ def check_db_connected(fn: Fn) -> Any:
 async def check_token(token_id: str) -> bool:
     count_label = "revoked_count"
     query = (
-        select(func.count(RevokedToken.c.uuid).label(count_label))
+        select([func.count(RevokedToken.c.uuid).label(count_label)])
         .select_from(RevokedToken)
         .where(RevokedToken.c.uuid == token_id)
     )
@@ -76,7 +76,7 @@ async def purge_revoked_token() -> Any:
 
 @check_db_connected
 async def list_settings() -> Any:
-    query = select(Settings)
+    query = select([Settings])
     db = DB.get()
     async with db.transaction():
         result = await db.fetch_all(query)
@@ -86,7 +86,7 @@ async def list_settings() -> Any:
 
 @check_db_connected
 async def get_setting(key: str) -> Any:
-    query = select(Settings).where(Settings.c.key == key)
+    query = select([Settings]).where(Settings.c.key == key)
     db = DB.get()
     async with db.transaction():
         result = await db.fetch_one(query)
@@ -97,17 +97,17 @@ async def get_setting(key: str) -> Any:
 @check_db_connected
 async def update_setting(key: str, value: Any) -> Any:
     get_query = (
-        select(Settings.c.key, Settings.c.value).where(Settings.c.key == key).with_for_update()
+        select([Settings.c.key, Settings.c.value]).where(Settings.c.key == key).with_for_update()
     )
     db = DB.get()
     async with db.transaction():
         is_exist = await db.fetch_one(get_query)
-        stmt: Union[Insert, Update]
         if is_exist is None:
-            stmt = insert(Settings).values(key=key, value=value)
+            query = insert(Settings)
+            await db.execute(query, {"key": key, "value": value})
         else:
-            stmt = update(Settings).where(Settings.c.key == key).values(value=value)
+            query = update(Settings).where(Settings.c.key == key)
-        await db.execute(stmt)
+            await db.execute(query, {"value": value})
         result = await db.fetch_one(get_query)
 
     return result

skyline_apiserver/schemas/login.py

@@ -24,7 +24,7 @@ from skyline_apiserver.types import constants
 
 
 class Credential(BaseModel):
-    region: Optional[str] = Field(None, description="Credential identity service region")
+    region: str = Field(..., description="Credential user region")
     domain: str = Field(..., description="Credential user domain")
     username: str = Field(..., description="Credential username")
     password: str = Field(..., description="Credential password for user")

swagger.json

@@ -2229,6 +2229,7 @@
             "Credential": {
                 "title": "Credential",
                 "required": [
+                    "region",
                     "domain",
                     "username",
                     "password"
@@ -2238,7 +2239,7 @@
                     "region": {
                         "title": "Region",
                         "type": "string",
-                        "description": "Credential identity service region"
+                        "description": "Credential user region"
                     },
                     "domain": {
                         "title": "Domain",

tox.ini

@@ -14,8 +14,8 @@ setenv =
   OS_STDOUT_CAPTURE=1
   OS_STDERR_CAPTURE=1
 
-deps =
+deps = 
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/test-requirements.txt
 
@@ -77,7 +77,7 @@ commands =
 
 [testenv:docs]
 deps =
-  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+  -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}
   -r{toxinidir}/requirements.txt
   -r{toxinidir}/doc/requirements.txt
 commands =
@@ -106,7 +106,6 @@ commands =
 description =
   Generate swagger files.
 envdir = {toxworkdir}/shared
-allowlist_externals = skyline-swagger-generator
 commands =
   skyline-swagger-generator -o swagger.json
 
@@ -114,7 +113,6 @@ commands =
 description =
   Generate config files.
 envdir = {toxworkdir}/shared
-allowlist_externals = skyline-sample-config-generator
 commands =
   skyline-sample-config-generator -o etc/skyline.yaml.sample