restructured api to api/http, api/grpc, pkg http

cmd/podinfo/main.go

@@ -13,8 +13,8 @@ import (
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
 
-	"github.com/stefanprodan/podinfo/pkg/api"
-	"github.com/stefanprodan/podinfo/pkg/grpc"
+	"github.com/stefanprodan/podinfo/pkg/api/grpc"
+	"github.com/stefanprodan/podinfo/pkg/api/http"
 	"github.com/stefanprodan/podinfo/pkg/signals"
 	"github.com/stefanprodan/podinfo/pkg/version"
 	go_grpc "google.golang.org/grpc"
@@ -142,7 +142,7 @@ func main() {
 	}
 
 	// load HTTP server config
-	var srvCfg api.Config
+	var srvCfg http.Config
 	if err := viper.Unmarshal(&srvCfg); err != nil {
 		logger.Panic("config unmarshal failed", zap.Error(err))
 	}
@@ -155,7 +155,7 @@ func main() {
 	)
 
 	// start HTTP server
-	srv, _ := api.NewServer(&srvCfg, logger)
+	srv, _ := http.NewServer(&srvCfg, logger)
 	httpServer, httpsServer, healthy, ready := srv.ListenAndServe()
 
 	// graceful shutdown

pkg/api/http/cache.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"fmt"

pkg/api/http/chunked.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"math/rand"

pkg/api/http/chunked_test.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/configs.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import "net/http"
 

pkg/api/http/delay.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"math/rand"

pkg/api/http/delay_test.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/echo.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"bytes"

pkg/api/http/echo_test.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/echows.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/env.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/env_test.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/headers.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/headers_test.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"fmt"

pkg/api/http/health.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/health_test.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/http.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"bytes"

pkg/api/http/index.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"html/template"

pkg/api/http/info.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/info_test.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/logging.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/metrics.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"bufio"

pkg/api/http/mock.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"time"

pkg/api/http/panic.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/server.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"context"
@@ -14,7 +14,7 @@ import (
 	"github.com/gomodule/redigo/redis"
 	"github.com/gorilla/mux"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	_ "github.com/stefanprodan/podinfo/pkg/api/docs"
+	_ "github.com/stefanprodan/podinfo/pkg/api/http/docs"
 	"github.com/stefanprodan/podinfo/pkg/fscache"
 	httpSwagger "github.com/swaggo/http-swagger"
 	"github.com/swaggo/swag"

pkg/api/http/status.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/status_test.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/store.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"crypto/sha1"

pkg/api/http/token.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"fmt"

pkg/api/http/token_test.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"encoding/json"

pkg/api/http/tracer.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"context"

pkg/api/http/version.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"net/http"

pkg/api/http/version_test.go

@@ -1,4 +1,4 @@
-package api
+package http
 
 import (
 	"fmt"