From c5ec9e0faf1e751f38787875911d469c777e12b8 Mon Sep 17 00:00:00 2001
From: "zhu.boxiang" <zhu.boxiang@99cloud.net>
Date: Thu, 25 Nov 2021 11:26:47 +0800
Subject: [PATCH] feat: Add swift endpoint url when generate nginx.conf

Add swift endpoint url when generate nginx.conf.
Add swift type into service mapping. Also update
the sample file of skyline.yaml.

Change-Id: Ib7dc4202bb390557afb665da7f5ae4004d40f324
---
 etc/skyline.yaml.sample                                    | 1 +
 .../skyline_apiserver/config/openstack.py                  | 1 +
 libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py     | 7 ++++++-
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/etc/skyline.yaml.sample b/etc/skyline.yaml.sample
index 346bb1f..22560f1 100644
--- a/etc/skyline.yaml.sample
+++ b/etc/skyline.yaml.sample
@@ -72,6 +72,7 @@ openstack:
     image: glance
     load-balancer: octavia
     network: neutron
+    object-store: swift
     orchestration: heat
     placement: placement
     volumev3: cinder
diff --git a/libs/skyline-apiserver/skyline_apiserver/config/openstack.py b/libs/skyline-apiserver/skyline_apiserver/config/openstack.py
index eeb16a5..3e4bf57 100644
--- a/libs/skyline-apiserver/skyline_apiserver/config/openstack.py
+++ b/libs/skyline-apiserver/skyline_apiserver/config/openstack.py
@@ -174,6 +174,7 @@ service_mapping = Opt(
         "placement": "placement",
         "baremetal": "ironic",
         "load-balancer": "octavia",
+        "object-store": "swift",
     },
 )
 
diff --git a/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py b/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py
index 94d9e8a..de09824 100644
--- a/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py
+++ b/libs/skyline-nginx/skyline_nginx/cmd/generate_nginx.py
@@ -91,7 +91,12 @@ def get_proxy_endpoints() -> Dict[str, ProxyEndpoint]:
         if raw_url.path:
             raw_path = PurePath(raw_url.path)
             if len(raw_path.parts) > 1:
-                if raw_path.match("%(tenant_id)s") or raw_path.match("$(project_id)s"):
+                if (
+                    raw_path.match("%(tenant_id)s")
+                    or raw_path.match("AUTH_%(tenant_id)s")
+                    or raw_path.match("$(project_id)s")
+                    or raw_path.match("AUTH_$(project_id)s")
+                ):
                     path = "" if str(raw_path.parents[1]) == "/" else raw_path.parents[1]
                 elif raw_path.match("v[0-9]") or raw_path.match("v[0-9][.][0-9]"):
                     path = "" if str(raw_path.parents[0]) == "/" else raw_path.parents[0]