commit

internal/service/waf.go

@@ -550,12 +550,15 @@ func (s *wafService) EnableGatewayWaf(ctx context.Context, req *EnableGatewayWaf
 		if err != nil {
 			return fmt.Errorf("failed to get listener list: %v", err)
 		}
+		log.Info().Msgf("listeners: %v", listeners)
 		// Create WAF for each listener
 		for _, listener := range listeners {
+			gatewayName := getGatewayNameFromCrn(listener.ApiGatewayCrn)
+			namespace := fmt.Sprintf("%s-%s", listener.CreateAccountName, listener.CreateAccountID)
 			if _, err := s.CreateWaf(ctx, &CreateWafReq{
 				GatewateInfo: GatewateInfo{
-					GatewayName: req.GatewayName,
-					Namespace:   req.Namespace,
+					GatewayName: gatewayName,
+					Namespace:   namespace,
 					RegionCode:  req.RegionCode,
 				},
 				Port: uint32(listener.Port),