From 97ac72090cec1f8479a4eff186ecdf4e68aeb3b6 Mon Sep 17 00:00:00 2001
From: Jian Qiu <swordqiu@gmail.com>
Date: Tue, 1 Oct 2024 08:49:04 +0800
Subject: [PATCH] fix: cloud account filter revisit (#21342)

Co-authored-by: Qiu Jian <qiujian@yunionyun.com>
---
 pkg/apis/compute/cloudaccount.go  | 10 +++++-----
 pkg/apis/compute/cloudprovider.go |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkg/apis/compute/cloudaccount.go b/pkg/apis/compute/cloudaccount.go
index da43216c5c..5cba5da9d1 100644
--- a/pkg/apis/compute/cloudaccount.go
+++ b/pkg/apis/compute/cloudaccount.go
@@ -97,25 +97,25 @@ type CloudenvResourceListInput struct {
 	// swagger:ignore
 	// Deprecated
 	// description: this param will be deprecate at 3.0
-	PublicCloud bool `json:"public_cloud"`
+	PublicCloud *bool `json:"public_cloud"`
 	// swagger:ignore
 	// Deprecated
 	// description: this param will be deprecate at 3.0
-	IsPublic bool `json:"is_public"`
+	IsPublic *bool `json:"is_public"`
 
 	// swagger:ignore
 	// Deprecated
 	// description: this param will be deprecate at 3.0
-	PrivateCloud bool `json:"private_cloud"`
+	PrivateCloud *bool `json:"private_cloud"`
 	// swagger:ignore
 	// Deprecated
 	// description: this param will be deprecate at 3.0
-	IsPrivate bool `json:"is_private"`
+	IsPrivate *bool `json:"is_private"`
 
 	// swagger:ignore
 	// Deprecated
 	// description: this param will be deprecate at 3.0
-	IsOnPremise bool `json:"is_on_premise"`
+	IsOnPremise *bool `json:"is_on_premise"`
 
 	// 以平台名称排序
 	// pattern:asc|desc
diff --git a/pkg/apis/compute/cloudprovider.go b/pkg/apis/compute/cloudprovider.go
index 8bc9e5f6c5..74f9966f5c 100644
--- a/pkg/apis/compute/cloudprovider.go
+++ b/pkg/apis/compute/cloudprovider.go
@@ -221,11 +221,11 @@ func (input *ManagedResourceListInput) AfterUnmarshal() {
 	if len(input.CloudEnv) > 0 {
 		return
 	}
-	if input.PublicCloud || input.IsPublic {
+	if (input.PublicCloud != nil && *input.PublicCloud) || (input.IsPublic != nil && *input.IsPublic) {
 		input.CloudEnv = CLOUD_ENV_PUBLIC_CLOUD
-	} else if input.PrivateCloud || input.IsPrivate {
+	} else if (input.PrivateCloud != nil && *input.PrivateCloud) || (input.IsPrivate != nil && *input.IsPrivate) {
 		input.CloudEnv = CLOUD_ENV_PRIVATE_CLOUD
-	} else if input.IsOnPremise {
+	} else if input.IsOnPremise != nil && *input.IsOnPremise {
 		input.CloudEnv = CLOUD_ENV_ON_PREMISE
 	}
 }