Changing further instances of search-query to search api

api/api.go

@@ -13,8 +13,8 @@ import (
 
 var httpServer *server.Server
 
-//SearchQueryAPI provides an API around elasticseach
-type SearchQueryAPI struct {
+//SearchAPI provides an API around elasticseach
+type SearchAPI struct {
 	Router        *mux.Router
 	QueryBuilder  QueryBuilder
 	ElasticSearch ElasticSearcher
@@ -38,7 +38,7 @@ type ResponseTransformer interface {
 	TransformSearchResponse(ctx context.Context, responseData []byte) ([]byte, error)
 }
 
-// CreateAndInitialise initiates a new Search Query API
+// CreateAndInitialise initiates a new Search API
 func CreateAndInitialise(bindAddr string, queryBuilder QueryBuilder, elasticSearchClient ElasticSearcher, transformer ResponseTransformer, errorChan chan error) error {
 
 	if elasticSearchClient == nil {
@@ -60,28 +60,28 @@ func CreateAndInitialise(bindAddr string, queryBuilder QueryBuilder, elasticSear
 		return errors.Wrap(errTimeseries, "Failed to setup timeseries templates")
 	}
 
-	api := NewSearchQueryAPI(router, elasticSearchClient, queryBuilder, transformer)
+	api := NewSearchAPI(router, elasticSearchClient, queryBuilder, transformer)
 
 	httpServer = server.New(bindAddr, api.Router)
 
 	// Disable this here to allow service to manage graceful shutdown of the entire app.
 	httpServer.HandleOSSignals = false
 
 	go func() {
-		log.Event(nil, "search-query api starting", log.INFO)
+		log.Event(nil, "search api starting", log.INFO)
 		if err := httpServer.ListenAndServe(); err != nil {
-			log.Event(nil, "search-query api http server returned error", log.Error(err), log.ERROR)
+			log.Event(nil, "search api http server returned error", log.Error(err), log.ERROR)
 			errorChan <- err
 		}
 	}()
 
 	return nil
 }
 
-// NewSearchQueryAPI returns a new Search Query API struct after registering the routes
-func NewSearchQueryAPI(router *mux.Router, elasticSearch ElasticSearcher, queryBuilder QueryBuilder, transformer ResponseTransformer) *SearchQueryAPI {
+// NewSearchAPI returns a new Search Query API struct after registering the routes
+func NewSearchAPI(router *mux.Router, elasticSearch ElasticSearcher, queryBuilder QueryBuilder, transformer ResponseTransformer) *SearchAPI {
 
-	api := &SearchQueryAPI{
+	api := &SearchAPI{
 		Router:        router,
 		QueryBuilder:  queryBuilder,
 		ElasticSearch: elasticSearch,

cmd/dp-search-api/main.go

@@ -63,7 +63,7 @@ func main() {
 	// blocks until a fatal error occurs
 	select {
 	case err := <-apiErrors:
-		log.Event(nil, "search-query api error received", log.Error(err), log.FATAL)
+		log.Event(nil, "search api error received", log.Error(err), log.FATAL)
 	case <-signals:
 		log.Event(nil, "os signal received", log.INFO)
 		gracefulShutdown()

config/config.go

@@ -7,7 +7,7 @@ import (
 	"github.com/kelseyhightower/envconfig"
 )
 
-// Config is the search query handler config
+// Config is the search API handler config
 type Config struct {
 	BindAddr                string        `envconfig:"BIND_ADDR"`
 	ElasticSearchAPIURL     string        `envconfig:"ELASTIC_SEARCH_URL"`

swagger.yaml

@@ -1,6 +1,6 @@
 swagger: "2.0"
 info:
-  description: "Search Query API"
+  description: "Search API"
   version: "1.0.1"
   title: "dp-search-api"
   license: