fix concurrent map read/write in runtime app

Author: marle3003

acceptance/petstore_test.go

@@ -191,7 +191,7 @@ func (suite *PetStoreSuite) TestKafka_TopicConfig() {
 	require.Equal(suite.T(), "petstore.order-event", r.Topics[0].Name)
 	require.Len(suite.T(), r.Topics[0].Partitions, 2)
 
-	require.Len(suite.T(), suite.cmd.App.Http, 1)
+	require.Len(suite.T(), suite.cmd.App.Http.List(), 1)
 }
 
 func (suite *PetStoreSuite) TestKafka_Produce_InvalidFormat() {

api/handler.go

@@ -164,7 +164,7 @@ func (h *handler) getServices(w http.ResponseWriter, _ *http.Request) {
 	services := make([]interface{}, 0)
 	services = append(services, getHttpServices(h.app.Http, h.app.Monitor)...)
 	services = append(services, getKafkaServices(h.app.Kafka, h.app.Monitor)...)
-	services = append(services, getMailServices(h.app.Smtp, h.app.Monitor)...)
+	services = append(services, getMailServices(h.app.Mail, h.app.Monitor)...)
 	services = append(services, getLdapServices(h.app.Ldap, h.app.Monitor)...)
 	slices.SortFunc(services, func(a interface{}, b interface{}) int {
 		return compareService(a, b)
@@ -187,16 +187,16 @@ func (h *handler) getInfo(w http.ResponseWriter, _ *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 
 	i := info{Version: h.app.Version, BuildTime: h.app.BuildTime}
-	if len(h.app.Http) > 0 {
+	if len(h.app.Http.List()) > 0 {
 		i.ActiveServices = append(i.ActiveServices, "http")
 	}
-	if len(h.app.Kafka) > 0 {
+	if len(h.app.Kafka.List()) > 0 {
 		i.ActiveServices = append(i.ActiveServices, "kafka")
 	}
-	if len(h.app.Smtp) > 0 {
+	if len(h.app.Mail.List()) > 0 {
 		i.ActiveServices = append(i.ActiveServices, "smtp")
 	}
-	if len(h.app.Ldap) > 0 {
+	if len(h.app.Ldap.List()) > 0 {
 		i.ActiveServices = append(i.ActiveServices, "ldap")
 	}
 

api/handler_fileserver_test.go

@@ -158,7 +158,7 @@ func TestOpenGraphInDashboard(t *testing.T) {
 			name: "http service",
 			test: func(t *testing.T) {
 				app := runtime.New()
-				app.AddHttp(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0", openapitest.WithInfo("Swagger Petstore", "1.0", "This is a sample server Petstore server."))})
+				app.Http.Add(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0", openapitest.WithInfo("Swagger Petstore", "1.0", "This is a sample server Petstore server."))})
 				h := api.New(app, static.Api{Path: "/mokapi", Dashboard: true})
 				try.Handler(t,
 					http.MethodGet,
@@ -177,7 +177,7 @@ func TestOpenGraphInDashboard(t *testing.T) {
 			name: "http service path without summary and description",
 			test: func(t *testing.T) {
 				app := runtime.New()
-				app.AddHttp(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0",
+				app.Http.Add(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0",
 					openapitest.WithInfo("Swagger Petstore", "1.0", "This is a sample server Petstore server."),
 					openapitest.WithPath("/pet/{petId}", openapitest.NewPath()),
 				)},
@@ -200,7 +200,7 @@ func TestOpenGraphInDashboard(t *testing.T) {
 			name: "http service path with summary and description",
 			test: func(t *testing.T) {
 				app := runtime.New()
-				app.AddHttp(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0",
+				app.Http.Add(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0",
 					openapitest.WithInfo("Swagger Petstore", "1.0", "This is a sample server Petstore server."),
 					openapitest.WithPath("/pet/{petId}", openapitest.NewPath(
 						openapitest.WithPathInfo("foo", "bar"),
@@ -225,7 +225,7 @@ func TestOpenGraphInDashboard(t *testing.T) {
 			name: "http service path with no summary but description",
 			test: func(t *testing.T) {
 				app := runtime.New()
-				app.AddHttp(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0",
+				app.Http.Add(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0",
 					openapitest.WithInfo("Swagger Petstore", "1.0", "This is a sample server Petstore server."),
 					openapitest.WithPath("/pet/{petId}", openapitest.NewPath(
 						openapitest.WithPathInfo("", "bar"),
@@ -249,7 +249,7 @@ func TestOpenGraphInDashboard(t *testing.T) {
 			name: "http service endpoint no summary and no description",
 			test: func(t *testing.T) {
 				app := runtime.New()
-				app.AddHttp(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0",
+				app.Http.Add(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0",
 					openapitest.WithInfo("Swagger Petstore", "1.0", "This is a sample server Petstore server."),
 					openapitest.WithPath("/pet/{petId}", openapitest.NewPath(
 						openapitest.WithOperation("GET", openapitest.NewOperation()),
@@ -273,7 +273,7 @@ func TestOpenGraphInDashboard(t *testing.T) {
 			name: "http service endpoint get right path",
 			test: func(t *testing.T) {
 				app := runtime.New()
-				app.AddHttp(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0",
+				app.Http.Add(&dynamic.Config{Info: dynamic.ConfigInfo{Url: mustParse("https://foo.bar")}, Data: openapitest.NewConfig("3.0",
 					openapitest.WithInfo("Swagger Petstore", "1.0", "This is a sample server Petstore server."),
 					openapitest.WithPath("/pet/{petId}", openapitest.NewPath(
 						openapitest.WithOperation("GET", openapitest.NewOperation()),

api/handler_http.go

@@ -83,9 +83,10 @@ type server struct {
 	Description string `json:"description"`
 }
 
-func getHttpServices(services map[string]*runtime.HttpInfo, m *monitor.Monitor) []interface{} {
-	result := make([]interface{}, 0, len(services))
-	for _, hs := range services {
+func getHttpServices(store *runtime.HttpStore, m *monitor.Monitor) []interface{} {
+	list := store.List()
+	result := make([]interface{}, 0, len(list))
+	for _, hs := range list {
 		s := service{
 			Name:        hs.Info.Name,
 			Description: hs.Info.Description,
@@ -115,8 +116,8 @@ func (h *handler) getHttpService(w http.ResponseWriter, r *http.Request, m *moni
 	segments := strings.Split(r.URL.Path, "/")
 	name := segments[4]
 
-	s, ok := h.app.Http[name]
-	if !ok {
+	s := h.app.Http.Get(name)
+	if s == nil {
 		w.WriteHeader(404)
 		return
 	}