merge fixes

Signed-off-by: Sneha Chhabria <snchh@microsoft.com>
openservicemesh · Feb 24, 2021 · 24c4b49 · 24c4b49
1 parent 11dfbbb
commit 24c4b49
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 326 deletions.
diff --git a/pkg/envoy/rds/new_response.go b/pkg/envoy/rds/new_response.go
diff --git a/pkg/envoy/rds/new_response_test.go b/pkg/envoy/rds/new_response_test.go
diff --git a/pkg/envoy/rds/response_test.go b/pkg/envoy/rds/response_test.go
@@ -219,7 +219,7 @@ func TestNewResponseWithPermissiveMode(t *testing.T) {
 
 	mockCatalog.EXPECT().GetServicesFromEnvoyCertificate(gomock.Any()).Return([]service.MeshService{tests.BookstoreV1Service}, nil).AnyTimes()
 	mockCatalog.EXPECT().ListPoliciesForPermissiveMode(gomock.Any()).Return(testPermissiveInbound, testOutbound).AnyTimes()
-	mockCatalog.EXPECT().GetIngressPoliciesForService(gomock.Any(), gomock.Any()).Return(testIngressInbound, nil).AnyTimes()
+	mockCatalog.EXPECT().GetIngressPoliciesForService(gomock.Any()).Return(testIngressInbound, nil).AnyTimes()
 
 	mockConfigurator.EXPECT().IsPermissiveTrafficPolicyMode().Return(true).AnyTimes()