Commit 552a43d8 authored by qiuqunfeng's avatar qiuqunfeng
Browse files

Fix status handling in CreateWaf and DeleteListenerWaf methods to correctly...

Fix status handling in CreateWaf and DeleteListenerWaf methods to correctly reflect success and failure states. Update default status values and error handling logic for improved clarity and accuracy.
parent 24146d5a
......@@ -224,7 +224,7 @@ func (s *wafService) getRulesForService(req *CreateWafReq) ([]v1alpha1.Rule, err
func (s *wafService) CreateWaf(ctx context.Context, req *CreateWafReq) (*WafService, error) {
var errMsg string
var status int = 1 // Success by default
var status int = 0 // Success by default
name := fmt.Sprintf("%s-%d", req.GatewayName, req.Port)
......@@ -265,14 +265,14 @@ func (s *wafService) CreateWaf(ctx context.Context, req *CreateWafReq) (*WafServ
rules, err := s.getRulesForService(req)
if err != nil {
status = 0 // Failure
status = 1 // Failure
errMsg = fmt.Sprintf("failed to get rules for service: %v", err)
return nil, fmt.Errorf("%s", errMsg)
}
service.Spec.Rules = rules
if len(service.Spec.Rules) == 0 {
status = 0 // Failure
status = 1 // Failure
errMsg = "cannot create WAF service with no rules"
return nil, fmt.Errorf("%s", errMsg)
}
......@@ -280,12 +280,12 @@ func (s *wafService) CreateWaf(ctx context.Context, req *CreateWafReq) (*WafServ
// Create the WAF service in Kubernetes
client := s.clusterClientManager.GetClient(req.RegionCode)
if client == nil {
status = 0 // Failure
status = 1 // Failure
errMsg = fmt.Sprintf("failed to get cluster client for region %s", req.RegionCode)
return nil, fmt.Errorf("%s", errMsg)
}
if _, err := client.Versioned.WafV1alpha1().Services(req.Namespace).Create(ctx, service, metav1.CreateOptions{}); err != nil {
status = 0 // Failure
status = 1 // Failure
errMsg = fmt.Sprintf("failed to create WAF service: %v", err)
return nil, fmt.Errorf("%s", errMsg)
}
......@@ -300,7 +300,7 @@ func (s *wafService) CreateWaf(ctx context.Context, req *CreateWafReq) (*WafServ
func (s *wafService) DeleteListenerWaf(ctx context.Context, req *DeleteListenerReq) error {
var errMsg string
var status int = 1 // Success by default
var status int = 0 // Success by default
name := fmt.Sprintf("%s-%d", req.GatewayName, req.Port)
......@@ -310,13 +310,13 @@ func (s *wafService) DeleteListenerWaf(ctx context.Context, req *DeleteListenerR
client := s.clusterClientManager.GetClient(req.RegionCode)
if client == nil {
status = 0 // Failure
status = 1 // Failure
errMsg = fmt.Sprintf("failed to get cluster client for region %s", req.RegionCode)
return fmt.Errorf("%s", errMsg)
}
if err := client.Versioned.WafV1alpha1().Services(req.Namespace).Delete(ctx, name, metav1.DeleteOptions{}); err != nil {
status = 0 // Failure
status = 1 // Failure
errMsg = fmt.Sprintf("failed to delete WAF service: %v", err)
return fmt.Errorf("%s", errMsg)
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment