fix(obtenant): added primaryZone field for obtenant

oceanbase · Mar 14, 2024 · ac89577 · ac89577
1 parent 65adde0
commit ac89577
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 0 deletions.
diff --git a/internal/dashboard/business/oceanbase/obtenant.go b/internal/dashboard/business/oceanbase/obtenant.go
@@ -170,6 +170,7 @@ func buildBriefFromApiType(t *v1alpha1.OBTenant) *response.OBTenantBrief {
 	rt.Status = t.Status.Status
 	rt.Charset = t.Spec.Charset
 	rt.Locality = t.Status.TenantRecordInfo.Locality
+	rt.PrimaryZone = t.Status.TenantRecordInfo.PrimaryZone
 
 	for i := range t.Spec.Pools {
 		pool := t.Spec.Pools[i]

diff --git a/internal/dashboard/generated/swagger/docs.go b/internal/dashboard/generated/swagger/docs.go
@@ -4345,6 +4345,10 @@ const docTemplate = `{
                     "description": "Namespace of the resource",
                     "type": "string"
                 },
+                "primaryZone": {
+                    "description": "Primary zone of the tenant",
+                    "type": "string"
+                },
                 "status": {
                     "description": "Status of the tenant",
                     "type": "string"
@@ -4400,6 +4404,10 @@ const docTemplate = `{
                 "primaryTenant": {
                     "type": "string"
                 },
+                "primaryZone": {
+                    "description": "Primary zone of the tenant",
+                    "type": "string"
+                },
                 "restoreSource": {
                     "$ref": "#/definitions/response.RestoreSource"
                 },

diff --git a/internal/dashboard/generated/swagger/swagger.json b/internal/dashboard/generated/swagger/swagger.json
@@ -4338,6 +4338,10 @@
                     "description": "Namespace of the resource",
                     "type": "string"
                 },
+                "primaryZone": {
+                    "description": "Primary zone of the tenant",
+                    "type": "string"
+                },
                 "status": {
                     "description": "Status of the tenant",
                     "type": "string"
@@ -4393,6 +4397,10 @@
                 "primaryTenant": {
                     "type": "string"
                 },
+                "primaryZone": {
+                    "description": "Primary zone of the tenant",
+                    "type": "string"
+                },
                 "restoreSource": {
                     "$ref": "#/definitions/response.RestoreSource"
                 },

diff --git a/internal/dashboard/generated/swagger/swagger.yaml b/internal/dashboard/generated/swagger/swagger.yaml
@@ -1095,6 +1095,9 @@ definitions:
       namespace:
         description: Namespace of the resource
         type: string
+      primaryZone:
+        description: Primary zone of the tenant
+        type: string
       status:
         description: Status of the tenant
         type: string
@@ -1135,6 +1138,9 @@ definitions:
         type: string
       primaryTenant:
         type: string
+      primaryZone:
+        description: Primary zone of the tenant
+        type: string
       restoreSource:
         $ref: '#/definitions/response.RestoreSource'
       rootCredential:

diff --git a/internal/dashboard/model/response/obtenant.go b/internal/dashboard/model/response/obtenant.go
@@ -25,6 +25,7 @@ type OBTenantBrief struct {
 	CreateTime  string            `json:"createTime"`          // Creation time of the tenant
 	Locality    string            `json:"locality"`            // Locality of the tenant units
 	Charset     string            `json:"charset"`             // Charset of the tenant
+	PrimaryZone string            `json:"primaryZone"`         // Primary zone of the tenant
 }
 
 type OBTenantDetail struct {