commit

internal/controller/waf.go

@@ -26,7 +26,9 @@ func (c *WafController) Waf(ctx *gin.Context) {
 	defer cancel()
 
 	gatewayName := ctx.Param("gateway_name")
-	waf, err := c.service.GetWaf(ctx1, gatewayName)
+	regionCode := ctx.Param("region_code")
+	namespace := ctx.Param("namespace")
+	waf, err := c.service.GetWaf(ctx1, regionCode, namespace, gatewayName)
 	if err != nil {
 		// logging.Get().Err(err).Msgf("get waf")
 		utils.AssembleResponse(ctx, nil, err)

internal/service/service.go

@@ -4,7 +4,7 @@ import "context"
 
 type Service interface {
 	// QueryIP(ip string) (*model.IPInfo, error)
-	GetWaf(ctx context.Context, gatewayName string) (*WafService, error)
+	GetWaf(ctx context.Context, regionCode, namespace, gatewayName string) (*WafService, error)
 	CreateWaf(ctx context.Context, req *CreateWafReq) (*WafService, error)
 	UpdateMode(ctx context.Context, req *UpdateModeReq) (*WafService, error)
 	SaveRuleCategoryToDB(ctx context.Context) error

internal/service/waf.go

@@ -23,13 +23,15 @@ func NewWafService(client *versioned.Clientset, db *gorm.DB) Service {
 	return &wafService{client: client, db: db}
 }
 
-func (s *wafService) GetWaf(ctx context.Context, gatewayName string) (*WafService, error) {
+func (s *wafService) GetWaf(ctx context.Context, regionCode, namespace, gatewayName string) (*WafService, error) {
 	wafService := &model.WafService{}
-	err := s.db.Model(&model.WafService{}).Where("gateway_name = ?", gatewayName).First(wafService).Error
+	err := s.db.Model(&model.WafService{}).Where("gateway_name = ? AND region_code = ? AND namespace = ?", gatewayName, regionCode, namespace).First(wafService).Error
 	if err != nil {
 		if err == gorm.ErrRecordNotFound {
 			// Create new WAF service record if not found
 			wafService = &model.WafService{
+				RegionCode:  regionCode,
+				Namespace:   namespace,
 				GatewayName: gatewayName,
 				Mode:        string(WafModeAlert),
 			}
@@ -88,6 +90,8 @@ func (s *wafService) CreateWaf(ctx context.Context, req *CreateWafReq) (*WafServ
 		if err == gorm.ErrRecordNotFound {
 			// Create new WAF service record if not found
 			wafService = &model.WafService{
+				RegionCode:  req.RegionCode,
+				Namespace:   req.Namespace,
 				GatewayName: req.GatewayName,
 				Mode:        string(WafModeAlert),
 			}
@@ -145,6 +149,8 @@ func (s *wafService) UpdateMode(ctx context.Context, req *UpdateModeReq) (*WafSe
 		if err == gorm.ErrRecordNotFound {
 			// Create new WAF service record if not found
 			wafService = &model.WafService{
+				RegionCode:  req.RegionCode,
+				Namespace:   req.Namespace,
 				GatewayName: req.GatewayName,
 				Mode:        string(req.Mode),
 			}