Skip to content

Commit

Permalink
[REV] update package api design,remove pkg dir (fixed goodrain#57)
Browse files Browse the repository at this point in the history
  • Loading branch information
barnett committed Apr 24, 2018
1 parent 72c10ad commit 287f8bd
Show file tree
Hide file tree
Showing 467 changed files with 817 additions and 825 deletions.
0 pkg/api/apiFunc/api_interface.go → api/apiFunc/api_interface.go
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/api/apiRouters/cloud/cloudRouter.go → api/apiRouters/cloud/cloudRouter.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package cloud

import (
"github.com/go-chi/chi"
"github.com/goodrain/rainbond/pkg/api/controller"
"github.com/goodrain/rainbond/api/controller"
)

//Routes routes
Expand Down
0 pkg/api/apiRouters/doc/html.go → api/apiRouters/doc/html.go
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions pkg/api/apiRouters/license/license.go → api/apiRouters/license/license.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package license

import (
"github.com/goodrain/rainbond/pkg/api/controller"
"github.com/goodrain/rainbond/pkg/api/util"
"github.com/goodrain/rainbond/api/controller"
"github.com/goodrain/rainbond/api/util"
"net/http"

"github.com/go-chi/chi"
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/apiRouters/rootFunc/rootFunc.go → api/apiRouters/rootFunc/rootFunc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package rootFunc

import (
"github.com/goodrain/rainbond/pkg/api/controller"
"github.com/goodrain/rainbond/api/controller"

"github.com/go-chi/chi"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/apiRouters/version2/v2Nodes.go → api/apiRouters/version2/v2Nodes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package version2

import (
"github.com/goodrain/rainbond/pkg/api/controller"
"github.com/goodrain/rainbond/api/controller"

"github.com/go-chi/chi"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/apiRouters/version2/v2Plugin.go → api/apiRouters/version2/v2Plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package version2

import (
"github.com/goodrain/rainbond/pkg/api/controller"
"github.com/goodrain/rainbond/pkg/api/middleware"
"github.com/goodrain/rainbond/api/controller"
"github.com/goodrain/rainbond/api/middleware"

"github.com/go-chi/chi"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/apiRouters/version2/v2Routers.go → api/apiRouters/version2/v2Routers.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
package version2

import (
"github.com/goodrain/rainbond/pkg/api/controller"
"github.com/goodrain/rainbond/pkg/api/middleware"
"github.com/goodrain/rainbond/api/controller"
"github.com/goodrain/rainbond/api/middleware"

"github.com/go-chi/chi"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/apiRouters/version2/v2Rules.go → api/apiRouters/version2/v2Rules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package version2

import (
"github.com/go-chi/chi"
"github.com/goodrain/rainbond/pkg/api/controller"
"github.com/goodrain/rainbond/api/controller"
)

//PluginRouter plugin router
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/apiRouters/version2/v2Sources.go → api/apiRouters/version2/v2Sources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ package version2

import (
"github.com/go-chi/chi"
"github.com/goodrain/rainbond/pkg/api/controller"
"github.com/goodrain/rainbond/api/controller"
)

//PluginRouter plugin router
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/apiRouters/websocket/websocket.go → api/apiRouters/websocket/websocket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package websocket

import (
"github.com/goodrain/rainbond/pkg/api/controller"
"github.com/goodrain/rainbond/api/controller"

"github.com/go-chi/chi"
)
Expand Down
10 changes: 5 additions & 5 deletions pkg/api/controller/chargesVerify.go → api/controller/chargesVerify.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import (
"os"
"strconv"

"github.com/goodrain/rainbond/pkg/api/handler/publiccloud"
"github.com/goodrain/rainbond/api/handler/publiccloud"

"github.com/goodrain/rainbond/pkg/db"
"github.com/goodrain/rainbond/pkg/db/model"
"github.com/goodrain/rainbond/db"
"github.com/goodrain/rainbond/db/model"

"github.com/goodrain/rainbond/pkg/api/middleware"
httputil "github.com/goodrain/rainbond/pkg/util/http"
"github.com/goodrain/rainbond/api/middleware"
httputil "github.com/goodrain/rainbond/util/http"
)

//ChargesVerifyController service charges verify
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/controller/check.go → api/controller/check.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"strings"

"github.com/go-chi/chi"
"github.com/goodrain/rainbond/pkg/api/handler"
"github.com/goodrain/rainbond/pkg/api/middleware"
api_model "github.com/goodrain/rainbond/pkg/api/model"
httputil "github.com/goodrain/rainbond/pkg/util/http"
"github.com/goodrain/rainbond/api/handler"
"github.com/goodrain/rainbond/api/middleware"
api_model "github.com/goodrain/rainbond/api/model"
httputil "github.com/goodrain/rainbond/util/http"
)

//Check service check
Expand Down
6 changes: 3 additions & 3 deletions pkg/api/controller/cloud.go → api/controller/cloud.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ import (
"net/http"

"github.com/go-chi/chi"
"github.com/goodrain/rainbond/pkg/api/handler"
api_model "github.com/goodrain/rainbond/pkg/api/model"
httputil "github.com/goodrain/rainbond/pkg/util/http"
"github.com/goodrain/rainbond/api/handler"
api_model "github.com/goodrain/rainbond/api/model"
httputil "github.com/goodrain/rainbond/util/http"
)

//CloudManager cloud manager
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/controller/defineSources.go → api/controller/defineSources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"net/http"

"github.com/go-chi/chi"
"github.com/goodrain/rainbond/pkg/api/handler"
"github.com/goodrain/rainbond/pkg/api/middleware"
api_model "github.com/goodrain/rainbond/pkg/api/model"
httputil "github.com/goodrain/rainbond/pkg/util/http"
"github.com/goodrain/rainbond/api/handler"
"github.com/goodrain/rainbond/api/middleware"
api_model "github.com/goodrain/rainbond/api/model"
httputil "github.com/goodrain/rainbond/util/http"
)

//SetDefineSource SetDefineSource
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/controller/entrance.go → api/controller/entrance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package controller

import (
"github.com/goodrain/rainbond/pkg/api/proxy"
"github.com/goodrain/rainbond/api/proxy"
"net/http"

"github.com/Sirupsen/logrus"
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/controller/event.go → api/controller/event.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (

"github.com/Sirupsen/logrus"
"github.com/bitly/go-simplejson"
"github.com/goodrain/rainbond/pkg/db"
httputil "github.com/goodrain/rainbond/pkg/util/http"
"github.com/goodrain/rainbond/db"
httputil "github.com/goodrain/rainbond/util/http"
)

//Event GetLogs
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/controller/eventLog.go → api/controller/eventLog.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ import (
"os"
"strings"

httputil "github.com/goodrain/rainbond/pkg/util/http"
httputil "github.com/goodrain/rainbond/util/http"

"github.com/Sirupsen/logrus"
"github.com/go-chi/chi"

"github.com/goodrain/rainbond/pkg/api/handler"
"github.com/goodrain/rainbond/pkg/api/middleware"
api_model "github.com/goodrain/rainbond/pkg/api/model"
"github.com/goodrain/rainbond/api/handler"
"github.com/goodrain/rainbond/api/middleware"
api_model "github.com/goodrain/rainbond/api/model"
)

//EventLogStruct eventlog struct
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/controller/license.go → api/controller/license.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ import (
"fmt"
"net/http"

"github.com/goodrain/rainbond/pkg/api/handler"
"github.com/goodrain/rainbond/api/handler"

httputil "github.com/goodrain/rainbond/pkg/util/http"
httputil "github.com/goodrain/rainbond/util/http"

"github.com/Sirupsen/logrus"
validator "github.com/thedevsaddam/govalidator"
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/controller/manager.go → api/controller/manager.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"net/http"

"github.com/goodrain/rainbond/cmd/api/option"
"github.com/goodrain/rainbond/pkg/api/apiFunc"
"github.com/goodrain/rainbond/pkg/api/discover"
"github.com/goodrain/rainbond/pkg/api/proxy"
"github.com/goodrain/rainbond/pkg/appruntimesync/client"
"github.com/goodrain/rainbond/api/apiFunc"
"github.com/goodrain/rainbond/api/discover"
"github.com/goodrain/rainbond/api/proxy"
"github.com/goodrain/rainbond/appruntimesync/client"

"github.com/Sirupsen/logrus"
)
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/controller/netStreamRules.go → api/controller/netStreamRules.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ package controller
import (
"net/http"

"github.com/goodrain/rainbond/pkg/api/handler"
"github.com/goodrain/rainbond/pkg/api/middleware"
api_model "github.com/goodrain/rainbond/pkg/api/model"
httputil "github.com/goodrain/rainbond/pkg/util/http"
"github.com/goodrain/rainbond/api/handler"
"github.com/goodrain/rainbond/api/middleware"
api_model "github.com/goodrain/rainbond/api/model"
httputil "github.com/goodrain/rainbond/util/http"
)

//SetDownStreamRule 设置下游规则
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/controller/nodes.go → api/controller/nodes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package controller

import (
"github.com/goodrain/rainbond/pkg/api/proxy"
"github.com/goodrain/rainbond/api/proxy"
"net/http"

"github.com/Sirupsen/logrus"
Expand Down
8 changes: 4 additions & 4 deletions pkg/api/controller/plugin.go → api/controller/plugin.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ package controller
import (
"net/http"

"github.com/goodrain/rainbond/pkg/api/handler"
"github.com/goodrain/rainbond/pkg/api/middleware"
"github.com/goodrain/rainbond/api/handler"
"github.com/goodrain/rainbond/api/middleware"

"github.com/go-chi/chi"

api_model "github.com/goodrain/rainbond/pkg/api/model"
httputil "github.com/goodrain/rainbond/pkg/util/http"
api_model "github.com/goodrain/rainbond/api/model"
httputil "github.com/goodrain/rainbond/util/http"
)

//PluginAction plugin action
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/controller/publicFunc.go → api/controller/publicFunc.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"strconv"
"strings"

"github.com/goodrain/rainbond/pkg/db"
"github.com/goodrain/rainbond/db"

"github.com/Sirupsen/logrus"
"github.com/go-chi/chi"
Expand Down
0 pkg/api/controller/publicFunc_test.go → api/controller/publicFunc_test.go
View file
File renamed without changes.
12 changes: 6 additions & 6 deletions pkg/api/controller/resources.go → api/controller/resources.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ import (
"strconv"
"strings"

"github.com/goodrain/rainbond/pkg/api/middleware"
api_model "github.com/goodrain/rainbond/pkg/api/model"
dbmodel "github.com/goodrain/rainbond/pkg/db/model"
"github.com/goodrain/rainbond/api/middleware"
api_model "github.com/goodrain/rainbond/api/model"
dbmodel "github.com/goodrain/rainbond/db/model"

"github.com/pquerna/ffjson/ffjson"

"github.com/go-chi/chi"
"github.com/jinzhu/gorm"
validator "github.com/thedevsaddam/govalidator"

"github.com/goodrain/rainbond/pkg/api/handler"
"github.com/goodrain/rainbond/pkg/appruntimesync/client"
httputil "github.com/goodrain/rainbond/pkg/util/http"
"github.com/goodrain/rainbond/api/handler"
"github.com/goodrain/rainbond/appruntimesync/client"
httputil "github.com/goodrain/rainbond/util/http"

"github.com/Sirupsen/logrus"
"github.com/renstorm/fuzzysearch/fuzzy"
Expand Down
0 pkg/api/controller/rootFunc.go → api/controller/rootFunc.go
View file
File renamed without changes.
18 changes: 9 additions & 9 deletions pkg/api/controller/serviceAction.go → api/controller/serviceAction.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,19 +22,19 @@ import (
"fmt"
"net/http"

"github.com/goodrain/rainbond/pkg/api/middleware"
api_model "github.com/goodrain/rainbond/pkg/api/model"
"github.com/goodrain/rainbond/pkg/event"
"github.com/goodrain/rainbond/pkg/worker/discover/model"
"github.com/goodrain/rainbond/api/middleware"
api_model "github.com/goodrain/rainbond/api/model"
"github.com/goodrain/rainbond/event"
"github.com/goodrain/rainbond/worker/discover/model"

"time"

"github.com/Sirupsen/logrus"
"github.com/goodrain/rainbond/pkg/api/handler"
"github.com/goodrain/rainbond/pkg/db"
dbmodel "github.com/goodrain/rainbond/pkg/db/model"
tutil "github.com/goodrain/rainbond/pkg/util"
httputil "github.com/goodrain/rainbond/pkg/util/http"
"github.com/goodrain/rainbond/api/handler"
"github.com/goodrain/rainbond/db"
dbmodel "github.com/goodrain/rainbond/db/model"
tutil "github.com/goodrain/rainbond/util"
httputil "github.com/goodrain/rainbond/util/http"
validator "github.com/thedevsaddam/govalidator"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/api/controller/service_share.go → api/controller/service_share.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import (
"net/http"

"github.com/go-chi/chi"
"github.com/goodrain/rainbond/pkg/api/handler"
"github.com/goodrain/rainbond/pkg/api/middleware"
api_model "github.com/goodrain/rainbond/pkg/api/model"
httputil "github.com/goodrain/rainbond/pkg/util/http"
"github.com/goodrain/rainbond/api/handler"
"github.com/goodrain/rainbond/api/middleware"
api_model "github.com/goodrain/rainbond/api/model"
httputil "github.com/goodrain/rainbond/util/http"
)

//Share 应用分享
Expand Down
10 changes: 5 additions & 5 deletions pkg/api/controller/volume.go → api/controller/volume.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"net/http"
"strings"

"github.com/goodrain/rainbond/pkg/api/handler"
"github.com/goodrain/rainbond/pkg/api/middleware"
"github.com/goodrain/rainbond/api/handler"
"github.com/goodrain/rainbond/api/middleware"

api_model "github.com/goodrain/rainbond/pkg/api/model"
dbmodel "github.com/goodrain/rainbond/pkg/db/model"
httputil "github.com/goodrain/rainbond/pkg/util/http"
api_model "github.com/goodrain/rainbond/api/model"
dbmodel "github.com/goodrain/rainbond/db/model"
httputil "github.com/goodrain/rainbond/util/http"

"github.com/Sirupsen/logrus"
"github.com/go-chi/chi"
Expand Down
4 changes: 2 additions & 2 deletions pkg/api/controller/websocket.go → api/controller/websocket.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"net/http"
"os"

"github.com/goodrain/rainbond/pkg/api/discover"
"github.com/goodrain/rainbond/pkg/api/proxy"
"github.com/goodrain/rainbond/api/discover"
"github.com/goodrain/rainbond/api/proxy"

"github.com/Sirupsen/logrus"

Expand Down
2 changes: 1 addition & 1 deletion pkg/api/daemon/region_api.go → api/daemon/region_api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
package daemon

import (
"github.com/goodrain/rainbond/pkg/api/util"
"github.com/goodrain/rainbond/api/util"
"net/http"
"os"
"os/exec"
Expand Down
12 changes: 6 additions & 6 deletions pkg/api/db/db.go → api/db/db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ import (
"time"

"github.com/goodrain/rainbond/cmd/api/option"
"github.com/goodrain/rainbond/pkg/db"
"github.com/goodrain/rainbond/pkg/db/config"
"github.com/goodrain/rainbond/pkg/event"
"github.com/goodrain/rainbond/pkg/mq/api/grpc/client"
"github.com/goodrain/rainbond/pkg/mq/api/grpc/pb"
"github.com/goodrain/rainbond/pkg/worker/discover/model"
"github.com/goodrain/rainbond/db"
"github.com/goodrain/rainbond/db/config"
"github.com/goodrain/rainbond/event"
"github.com/goodrain/rainbond/mq/api/grpc/client"
"github.com/goodrain/rainbond/mq/api/grpc/pb"
"github.com/goodrain/rainbond/worker/discover/model"

"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
Expand Down
Loading

0 comments on commit 287f8bd

Please sign in to comment.