Fix some broken code in master

There were several PRs that while all passed CI independently, when they all got merged into the same branch caused compilation errors in test code.

The main changes that caused issues where changing agent/cache.Cache.New to require a concrete options struct instead of a pointer. This broke the cert monitor tests and the catalog_list_services_test.go. Another change was made to unembed the http.Server from the agent.HTTPServer struct. That coupled with another change to add a test to ensure cache rate limiting coming from HTTP requests was working as expected caused compilation failures.

agent/agent_test.go

@@ -912,7 +912,7 @@ func TestCacheRateLimit(test *testing.T) {
 				require.NoError(t, err)
 
 				resp := httptest.NewRecorder()
-				a.srv.Handler.ServeHTTP(resp, req)
+				a.srv.handler(false).ServeHTTP(resp, req)
 				// Key doesn't actually exist so we should get 404
 				if got, want := resp.Code, http.StatusOK; got != want {
 					t.Fatalf("bad response code got %d want %d", got, want)

agent/cache-types/catalog_list_services_test.go

@@ -82,7 +82,7 @@ func TestCatalogListServices_IntegrationWithCache_NotModifiedResponse(t *testing
 			reply.NotModified = true
 		})
 
-	c := cache.New(nil)
+	c := cache.New(cache.Options{})
 	c.RegisterType(CatalogListServicesName, typ)
 	last := cache.FetchResult{
 		Value: &structs.IndexedServices{

agent/cert-monitor/cert_monitor_test.go

@@ -633,7 +633,7 @@ func TestCertMonitor_New_Errors(t *testing.T) {
 		},
 		"no-tls-configurator": {
 			cfg: Config{
-				Cache:      cache.New(nil),
+				Cache:      cache.New(cache.Options{}),
 				Fallback:   fallback,
 				Tokens:     tokens,
 				Datacenter: "foo",
@@ -643,7 +643,7 @@ func TestCertMonitor_New_Errors(t *testing.T) {
 		},
 		"no-fallback": {
 			cfg: Config{
-				Cache:           cache.New(nil),
+				Cache:           cache.New(cache.Options{}),
 				TLSConfigurator: testTLSConfigurator(t),
 				Tokens:          tokens,
 				Datacenter:      "foo",
@@ -653,7 +653,7 @@ func TestCertMonitor_New_Errors(t *testing.T) {
 		},
 		"no-tokens": {
 			cfg: Config{
-				Cache:           cache.New(nil),
+				Cache:           cache.New(cache.Options{}),
 				TLSConfigurator: testTLSConfigurator(t),
 				Fallback:        fallback,
 				Datacenter:      "foo",
@@ -663,7 +663,7 @@ func TestCertMonitor_New_Errors(t *testing.T) {
 		},
 		"no-datacenter": {
 			cfg: Config{
-				Cache:           cache.New(nil),
+				Cache:           cache.New(cache.Options{}),
 				TLSConfigurator: testTLSConfigurator(t),
 				Fallback:        fallback,
 				Tokens:          tokens,
@@ -673,7 +673,7 @@ func TestCertMonitor_New_Errors(t *testing.T) {
 		},
 		"no-node-name": {
 			cfg: Config{
-				Cache:           cache.New(nil),
+				Cache:           cache.New(cache.Options{}),
 				TLSConfigurator: testTLSConfigurator(t),
 				Fallback:        fallback,
 				Tokens:          tokens,