revert unreviewed pr (#841)

api/conf/conf.go

@@ -93,7 +93,7 @@ type Config struct {
 	Authentication Authentication
 }
 
-func InitConf() {
+func init() {
 	//go test
 	if workDir := os.Getenv("APISIX_API_WORKDIR"); workDir != "" {
 		WorkDir = workDir

api/internal/handler/consumer/consumer_test.go

@@ -19,10 +19,6 @@ package consumer
 
 import (
 	"encoding/json"
-	"fmt"
-	"github.com/shiningrush/droplet/data"
-	"github.com/stretchr/testify/mock"
-	"net/http"
 	"testing"
 	"time"
 
@@ -34,53 +30,6 @@ import (
 	"github.com/apisix/manager-api/internal/core/store"
 )
 
-func TestHandler_Get(t *testing.T) {
-	tests := []struct {
-		caseDesc   string
-		giveInput  *GetInput
-		giveRet    interface{}
-		giveErr    error
-		wantErr    error
-		wantGetKey string
-		wantRet    interface{}
-	}{
-		{
-			caseDesc:   "normal",
-			giveInput:  &GetInput{Username: "test"},
-			wantGetKey: "test",
-			giveRet:    "hello",
-			wantRet:    "hello",
-		},
-		{
-			caseDesc:   "failed",
-			giveInput:  &GetInput{Username: "failed key"},
-			wantGetKey: "failed key",
-			giveErr:    fmt.Errorf("get failed"),
-			wantErr:    fmt.Errorf("get failed"),
-			wantRet: &data.SpecCodeResponse{
-				StatusCode: http.StatusInternalServerError,
-			},
-		},
-	}
-
-	for _, tc := range tests {
-		getCalled := true
-		mStore := &store.MockInterface{}
-		mStore.On("Get", mock.Anything).Run(func(args mock.Arguments) {
-			getCalled = true
-			assert.Equal(t, tc.wantGetKey, args.Get(0), tc.caseDesc)
-		}).Return(tc.giveRet, tc.giveErr)
-
-		h := Handler{consumerStore: mStore}
-		ctx := droplet.NewContext()
-		ctx.SetInput(tc.giveInput)
-		ret, err := h.Get(ctx)
-		assert.True(t, getCalled, tc.caseDesc)
-		assert.Equal(t, tc.wantRet, ret, tc.caseDesc)
-		assert.Equal(t, tc.wantErr, err, tc.caseDesc)
-	}
-}
-
 func TestConsumer(t *testing.T) {
 	// init
 	err := storage.InitETCDClient([]string{"127.0.0.1:2379"})

api/log/zap.go

@@ -27,7 +27,7 @@ import (
 
 var logger *zap.SugaredLogger
 
-func InitLog() {
+func init() {
 	writeSyncer := fileWriter()
 	encoder := getEncoder()
 	logLevel := getLogLevel()

api/main.go

@@ -34,8 +34,7 @@ import (
 )
 
 func main() {
-	conf.InitConf()
-	log.InitLog()
+
 	if err := storage.InitETCDClient(conf.ETCDEndpoints); err != nil {
 		log.Error("init etcd client fail: %w", err)
 		panic(err)