feedback addressed, file still to be reverted

Signed-off-by: dj014275 <[email protected]>

Author: dj014275

pkg/agent/apiserver/handlers/fqdncache/handler.go

@@ -29,7 +29,7 @@ import (
 
 func HandleFunc(npq querier.AgentNetworkPolicyInfoQuerier) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		fqdnFilter, err := newFilterFromURLQuery(w, r.URL.Query())
+		fqdnFilter, err := newFilterFromURLQuery(r.URL.Query())
 		if err != nil {
 			http.Error(w, "Regex formatted incorrectly to parse: "+err.Error(), http.StatusBadRequest)
 			klog.ErrorS(err, "Regex formatted incorrectly to parse")
@@ -46,11 +46,12 @@ func HandleFunc(npq querier.AgentNetworkPolicyInfoQuerier) http.HandlerFunc {
 		if err := json.NewEncoder(w).Encode(resp); err != nil {
 			http.Error(w, "Failed to encode response: "+err.Error(), http.StatusBadRequest)
 			klog.ErrorS(err, "Failed to encode response")
+			return
 		}
 	}
 }
 
-func newFilterFromURLQuery(w http.ResponseWriter, query url.Values) (*querier.FQDNCacheFilter, error) {
+func newFilterFromURLQuery(query url.Values) (*querier.FQDNCacheFilter, error) {
 	domain := query.Get("domain")
 	if len(domain) == 0 {
 		return nil, nil

pkg/agent/apiserver/handlers/fqdncache/handler_test.go

@@ -38,13 +38,11 @@ func TestFqdnCacheQuery(t *testing.T) {
 	expirationTime := time.Now().Add(1 * time.Hour).UTC()
 	tests := []struct {
 		name                 string
-		expectedStatus       int
 		filteredCacheEntries []types.DnsCacheEntry
 		expectedResponse     []apis.FQDNCacheResponse
 	}{
 		{
-			name:           "FQDN cache exists - multiple addresses multiple domains",
-			expectedStatus: http.StatusOK,
+			name: "FQDN cache exists - multiple addresses multiple domains",
 			filteredCacheEntries: []types.DnsCacheEntry{
 				{
 					FQDNName:       "example.com",
@@ -82,7 +80,6 @@ func TestFqdnCacheQuery(t *testing.T) {
 		},
 		{
 			name:                 "FQDN cache does not exist",
-			expectedStatus:       http.StatusOK,
 			filteredCacheEntries: []types.DnsCacheEntry{},
 			expectedResponse:     []apis.FQDNCacheResponse{},
 		},
@@ -97,7 +94,6 @@ func TestFqdnCacheQuery(t *testing.T) {
 			require.NoError(t, err)
 			recorder := httptest.NewRecorder()
 			handler.ServeHTTP(recorder, req)
-			assert.Equal(t, tt.expectedStatus, recorder.Code)
 			var receivedResponse []apis.FQDNCacheResponse
 			err = json.Unmarshal(recorder.Body.Bytes(), &receivedResponse)
 			require.NoError(t, err)
@@ -107,8 +103,6 @@ func TestFqdnCacheQuery(t *testing.T) {
 }
 
 func TestNewFilterFromURLQuery(t *testing.T) {
-	simplePattern, _ := regexp.Compile("^example[.]com$")
-	wildcardPattern, _ := regexp.Compile("^example[.]com[.].*$")
 	tests := []struct {
 		name           string
 		queryParams    url.Values
@@ -126,23 +120,23 @@ func TestNewFilterFromURLQuery(t *testing.T) {
 			queryParams: url.Values{
 				"domain": {"example.com"},
 			},
-			expectedFilter: &querier.FQDNCacheFilter{DomainRegex: simplePattern},
+			expectedFilter: &querier.FQDNCacheFilter{DomainRegex: regexp.MustCompile("^example[.]com$")},
 			expectedStatus: http.StatusOK, // No HTTP error
 		},
 		{
 			name: "Valid regex domain",
 			queryParams: url.Values{
-				"domain": {"example.com.*"},
+				"domain": {"*.example.com"},
 			},
-			expectedFilter: &querier.FQDNCacheFilter{DomainRegex: wildcardPattern},
+			expectedFilter: &querier.FQDNCacheFilter{DomainRegex: regexp.MustCompile("^.*[.]example[.]com$")},
 			expectedStatus: http.StatusOK, // No HTTP error
 		},
 	}
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			recorder := httptest.NewRecorder()
-			result, _ := newFilterFromURLQuery(recorder, tt.queryParams)
+			result, _ := newFilterFromURLQuery(tt.queryParams)
 
 			assert.Equal(t, tt.expectedFilter, result)
 			assert.Equal(t, tt.expectedStatus, recorder.Code)

pkg/agent/controller/networkpolicy/networkpolicy_controller_test.go

@@ -962,8 +962,7 @@ func TestGetFqdnCache(t *testing.T) {
 	}
 	returnedList := controller.GetFQDNCache(nil)
 	assert.ElementsMatch(t, expectedEntryList, returnedList)
-	regexPattern := "^" + strings.ReplaceAll(regexp.QuoteMeta("*.io"), `\*`, ".*") + "$"
-	pattern, _ := regexp.Compile(regexPattern)
+	pattern := regexp.MustCompile("^.*[.]io$")
 	returnedList = controller.GetFQDNCache(&querier.FQDNCacheFilter{DomainRegex: pattern})
 	assert.ElementsMatch(t, []agenttypes.DnsCacheEntry{expectedEntryList[3]}, returnedList)
 }

pkg/agent/querier/querier.go

@@ -26,7 +26,6 @@ import (
 	"antrea.io/antrea/pkg/agent/memberlist"
 	"antrea.io/antrea/pkg/agent/openflow"
 	"antrea.io/antrea/pkg/agent/proxy"
-	"antrea.io/antrea/pkg/agent/types"
 	"antrea.io/antrea/pkg/apis/crd/v1beta1"
 	"antrea.io/antrea/pkg/ovs/ovsconfig"
 	"antrea.io/antrea/pkg/ovs/ovsctl"
@@ -98,11 +97,6 @@ func NewAgentQuerier(
 	}
 }
 
-// GetFQDNCache returns dnsEntryCache within fqdnController
-func (aq agentQuerier) GetFqdnCache(fqdnFilter *querier.FQDNCacheFilter) []types.DnsCacheEntry {
-	return aq.networkPolicyInfoQuerier.GetFQDNCache(fqdnFilter)
-}
-
 // GetNodeLister returns NodeLister.
 func (aq agentQuerier) GetNodeLister() corelisters.NodeLister {
 	return aq.nodeLister

pkg/antctl/antctl.go

@@ -732,9 +732,9 @@ $ antctl get podmulticaststats pod -n namespace`,
 			long:  "Print effective fqdn cache information including fqdn name, IP addresses, and expiration time",
 			example: `	Get the list of all fqdn rules currently applied
 			$ antctl get fqdncache
-			Get the list of all fqdn rules currently applied
-			$ antctl get fqdncache --domain DomainName
-			Get the list of all fqdn rules currently applied for a given domain name
+			Get the list of all fqdn rules currently applied for a given domain name (wildcard supported)
+			$ antctl get fqdncache --domain example.com
+			$ antctl get fqdncache --domain *.antrea.io
 			`,
 			agentEndpoint: &endpoint{
 				nonResourceEndpoint: &nonResourceEndpoint{