This is an automated email from the ASF dual-hosted git repository.
bzp2010 pushed a commit to branch next
in repository https://gitbox.apache.org/repos/asf/apisix-dashboard.git
The following commit(s) were added to refs/heads/next by this push:
new 3c3dc9fd feat: move api module to GitHub repo's name (#2494)
3c3dc9fd is described below
commit 3c3dc9fd8a86f2c118483dc55b914f9a38fe4f03
Author: Zeping Bai <[email protected]>
AuthorDate: Fri Jul 1 16:53:57 2022 +0800
feat: move api module to GitHub repo's name (#2494)
---
api/build.sh | 2 +-
api/cmd/root.go | 6 +--
api/cmd/version.go | 2 +-
api/internal/conf/conf.go | 2 +-
api/internal/core/entity/entity.go | 2 +-
api/internal/core/entity/format.go | 2 +-
api/internal/core/migrate/conflict.go | 4 +-
api/internal/core/migrate/dataset.go | 4 +-
api/internal/core/migrate/migrate.go | 4 +-
api/internal/core/server/http.go | 6 +--
api/internal/core/server/server.go | 6 +--
api/internal/core/server/store.go | 8 ++--
api/internal/core/storage/etcd.go | 8 ++--
api/internal/core/store/store.go | 10 ++---
api/internal/core/store/store_test.go | 6 +--
api/internal/core/store/storehub.go | 8 ++--
api/internal/core/store/validate.go | 6 +--
api/internal/core/store/validate_test.go | 2 +-
api/internal/filter/authentication.go | 4 +-
api/internal/filter/authentication_test.go | 2 +-
api/internal/filter/cors.go | 2 +-
api/internal/filter/ip_filter.go | 6 +--
api/internal/filter/ip_filter_test.go | 2 +-
api/internal/filter/logging_test.go | 2 +-
api/internal/filter/recover.go | 2 +-
api/internal/filter/schema.go | 8 ++--
.../handler/authentication/authentication.go | 6 +--
api/internal/handler/consumer/consumer.go | 6 +--
api/internal/handler/consumer/consumer_test.go | 4 +-
api/internal/handler/data_loader/loader/loader.go | 2 +-
.../handler/data_loader/loader/openapi3/export.go | 2 +-
.../handler/data_loader/loader/openapi3/import.go | 6 +--
.../data_loader/loader/openapi3/import_test.go | 2 +-
api/internal/handler/data_loader/route_export.go | 12 +++---
.../handler/data_loader/route_export_test.go | 4 +-
api/internal/handler/data_loader/route_import.go | 12 +++---
api/internal/handler/global_rule/global_rule.go | 8 ++--
.../handler/global_rule/global_rule_test.go | 4 +-
api/internal/handler/handler.go | 6 +--
api/internal/handler/handler_test.go | 2 +-
api/internal/handler/healthz/healthz.go | 2 +-
api/internal/handler/label/label.go | 8 ++--
api/internal/handler/label/label_test.go | 4 +-
api/internal/handler/migrate/migrate.go | 8 ++--
.../handler/plugin_config/plugin_config.go | 10 ++---
.../handler/plugin_config/plugin_config_test.go | 6 +--
api/internal/handler/proto/proto.go | 8 ++--
api/internal/handler/proto/proto_test.go | 2 +-
api/internal/handler/route/route.go | 14 +++----
api/internal/handler/route/route_test.go | 8 ++--
.../route_online_debug/route_online_debug.go | 2 +-
api/internal/handler/schema/plugin.go | 4 +-
api/internal/handler/schema/schema.go | 4 +-
api/internal/handler/server_info/server_info.go | 6 +--
.../handler/server_info/server_info_test.go | 4 +-
api/internal/handler/service/service.go | 8 ++--
api/internal/handler/service/service_test.go | 6 +--
api/internal/handler/ssl/ssl.go | 12 +++---
api/internal/handler/ssl/ssl_test.go | 8 ++--
api/internal/handler/stream_route/stream_route.go | 8 ++--
.../handler/stream_route/stream_route_test.go | 4 +-
.../handler/system_config/system_config.go | 6 +--
.../handler/system_config/system_config_test.go | 4 +-
api/internal/handler/tool/tool.go | 4 +-
api/internal/handler/tool/tool_test.go | 2 +-
api/internal/handler/upstream/upstream.go | 10 ++---
api/internal/handler/upstream/upstream_test.go | 8 ++--
api/internal/log/zap.go | 2 +-
api/internal/route.go | 44 +++++++++++-----------
api/internal/utils/runtime/runtime.go | 2 +-
api/main.go | 2 +-
api/test/docker/Dockerfile | 18 ++++-----
api/test/docker/docker-compose.yaml | 4 +-
api/test/e2e/auth/authentication_test.go | 2 +-
api/test/e2e/balancer/balancer_suite_test.go | 2 +-
api/test/e2e/balancer/balancer_test.go | 2 +-
api/test/e2e/consumer/consumer_suite_test.go | 2 +-
api/test/e2e/consumer/consumer_test.go | 2 +-
api/test/e2e/consumer/consumer_with_labels_test.go | 2 +-
.../consumer/consumer_with_plugin_key_auth_test.go | 2 +-
api/test/e2e/data_loader/data_loader_suite_test.go | 2 +-
api/test/e2e/data_loader/openapi3_test.go | 2 +-
api/test/e2e/global_rule/global_rule_suite_test.go | 2 +-
api/test/e2e/global_rule/global_rule_test.go | 2 +-
api/test/e2e/go.mod | 2 +-
api/test/e2e/gzip/gzip_test.go | 2 +-
api/test/e2e/healthz/healthz_test.go | 2 +-
.../e2e/id_compatible/id_compatible_suite_test.go | 2 +-
api/test/e2e/id_compatible/id_crossing_test.go | 2 +-
api/test/e2e/id_compatible/id_not_in_body_test.go | 2 +-
api/test/e2e/id_compatible/id_using_int_test.go | 2 +-
api/test/e2e/id_compatible/id_using_string_test.go | 2 +-
api/test/e2e/label/label_test.go | 2 +-
api/test/e2e/migrate/migrate_suite_test.go | 2 +-
api/test/e2e/migrate/migrate_test.go | 2 +-
.../e2e/plugin_config/plugin_config_suite_test.go | 2 +-
api/test/e2e/plugin_config/plugin_config_test.go | 2 +-
api/test/e2e/proto/proto_suite_test.go | 2 +-
api/test/e2e/proto/proto_test.go | 2 +-
api/test/e2e/route/host_test.go | 2 +-
api/test/e2e/route/route_export_test.go | 2 +-
api/test/e2e/route/route_service_upstream_test.go | 2 +-
api/test/e2e/route/route_suite_test.go | 2 +-
api/test/e2e/route/route_test.go | 2 +-
.../e2e/route/route_with_management_fields_test.go | 2 +-
api/test/e2e/route/route_with_methods_test.go | 2 +-
api/test/e2e/route/route_with_plugin_cors_test.go | 2 +-
.../route/route_with_plugin_http_logger_test.go | 2 +-
api/test/e2e/route/route_with_plugin_jwt_test.go | 2 +-
.../route/route_with_plugin_limit_count_test.go | 2 +-
.../route/route_with_plugin_orchestration_test.go | 2 +-
.../e2e/route/route_with_plugin_prometheus_test.go | 2 +-
.../route/route_with_plugin_proxy_rewrite_test.go | 2 +-
.../route/route_with_plugin_uri_blocker_test.go | 2 +-
api/test/e2e/route/route_with_priority_test.go | 2 +-
api/test/e2e/route/route_with_remote_addr_test.go | 2 +-
.../e2e/route/route_with_script_luacode_test.go | 2 +-
api/test/e2e/route/route_with_uri_uris_test.go | 2 +-
api/test/e2e/route/route_with_vars_test.go | 2 +-
.../route_online_debug_suite_test.go | 2 +-
.../route_online_debug/route_online_debug_test.go | 2 +-
api/test/e2e/schema/plugin_test.go | 2 +-
api/test/e2e/schema/schema_test.go | 2 +-
api/test/e2e/server_info/server_info_suite_test.go | 2 +-
api/test/e2e/server_info/server_info_test.go | 2 +-
api/test/e2e/service/service_suite_test.go | 2 +-
api/test/e2e/service/service_test.go | 2 +-
api/test/e2e/ssl/ssl_suite_test.go | 2 +-
api/test/e2e/ssl/ssl_test.go | 2 +-
.../e2e/stream_route/stream_route_suite_test.go | 2 +-
api/test/e2e/stream_route/stream_route_test.go | 2 +-
api/test/e2e/system_config/system_config_test.go | 2 +-
api/test/e2e/trace/route_with_skywalking_test.go | 2 +-
.../e2e/upstream/upstream_chash_hash_on_test.go | 2 +-
.../upstream_chash_query_string_arg_xxx_test.go | 2 +-
api/test/e2e/upstream/upstream_keepalive_pool.go | 2 +-
api/test/e2e/upstream/upstream_priority_test.go | 2 +-
api/test/e2e/upstream/upstream_retry.go | 2 +-
api/test/e2e/upstream/upstream_suite_test.go | 2 +-
api/test/e2e/upstream/upstream_test.go | 2 +-
api/test/e2e/version/version_test.go | 2 +-
api/test/shell/cli_test.sh | 2 +-
api/go.mod => go.mod | 2 +-
api/go.sum => go.sum | 0
144 files changed, 287 insertions(+), 287 deletions(-)
diff --git a/api/build.sh b/api/build.sh
index db74cb20..2415c25a 100755
--- a/api/build.sh
+++ b/api/build.sh
@@ -20,7 +20,7 @@ set -e
VERSION=$(cat ./api/VERSION)
GITHASH=$(cat ./.githash 2> /dev/null || HASH="ref: HEAD"; while [[ $HASH ==
ref\:* ]]; do HASH="$(cat ".git/$(echo $HASH | cut -d \ -f 2)")"; done; echo
${HASH:0:7})
-GOLDFLAGS="-X github.com/apisix/manager-api/internal/utils.version=${VERSION}
-X github.com/apisix/manager-api/internal/utils.gitHash=${GITHASH}"
+GOLDFLAGS="-X
github.com/apache/apisix-dashboard/api/internal/utils.version=${VERSION} -X
github.com/apache/apisix-dashboard/api/internal/utils.gitHash=${GITHASH}"
# Enter dry-run mode
if [ "$1" == "--dry-run" ]; then
diff --git a/api/cmd/root.go b/api/cmd/root.go
index 984f54e1..9e41c6f0 100644
--- a/api/cmd/root.go
+++ b/api/cmd/root.go
@@ -24,9 +24,9 @@ import (
"github.com/spf13/cobra"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/core/server"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/core/server"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
var rootCmd = &cobra.Command{
diff --git a/api/cmd/version.go b/api/cmd/version.go
index c064502b..0a3ab30f 100644
--- a/api/cmd/version.go
+++ b/api/cmd/version.go
@@ -19,7 +19,7 @@ package cmd
import (
"github.com/spf13/cobra"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
func newVersionCommand() *cobra.Command {
diff --git a/api/internal/conf/conf.go b/api/internal/conf/conf.go
index 20074238..30c48ab5 100644
--- a/api/internal/conf/conf.go
+++ b/api/internal/conf/conf.go
@@ -28,7 +28,7 @@ import (
"github.com/spf13/viper"
"github.com/tidwall/gjson"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
const (
diff --git a/api/internal/core/entity/entity.go
b/api/internal/core/entity/entity.go
index f8fcc1c6..12fee740 100644
--- a/api/internal/core/entity/entity.go
+++ b/api/internal/core/entity/entity.go
@@ -20,7 +20,7 @@ import (
"reflect"
"time"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
type BaseInfo struct {
diff --git a/api/internal/core/entity/format.go
b/api/internal/core/entity/format.go
index c13bb6cb..c8624eff 100644
--- a/api/internal/core/entity/format.go
+++ b/api/internal/core/entity/format.go
@@ -21,7 +21,7 @@ import (
"strconv"
"strings"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
func mapKV2Node(key string, val float64) (*Node, error) {
diff --git a/api/internal/core/migrate/conflict.go
b/api/internal/core/migrate/conflict.go
index 6a0723ef..ccf575c2 100644
--- a/api/internal/core/migrate/conflict.go
+++ b/api/internal/core/migrate/conflict.go
@@ -20,8 +20,8 @@ package migrate
import (
"context"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
func isConflicted(ctx context.Context, new *DataSet) (bool, *DataSet) {
diff --git a/api/internal/core/migrate/dataset.go
b/api/internal/core/migrate/dataset.go
index d09edd89..efb0a360 100644
--- a/api/internal/core/migrate/dataset.go
+++ b/api/internal/core/migrate/dataset.go
@@ -20,8 +20,8 @@ package migrate
import (
"errors"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
)
type DataSet struct {
diff --git a/api/internal/core/migrate/migrate.go
b/api/internal/core/migrate/migrate.go
index ea5a80ca..2a0d8999 100644
--- a/api/internal/core/migrate/migrate.go
+++ b/api/internal/core/migrate/migrate.go
@@ -22,8 +22,8 @@ import (
"encoding/json"
"errors"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
var (
diff --git a/api/internal/core/server/http.go b/api/internal/core/server/http.go
index ea0c56c4..28c204d0 100644
--- a/api/internal/core/server/http.go
+++ b/api/internal/core/server/http.go
@@ -25,9 +25,9 @@ import (
"github.com/shiningrush/droplet"
- "github.com/apisix/manager-api/internal"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
)
func (s *server) setupAPI() {
diff --git a/api/internal/core/server/server.go
b/api/internal/core/server/server.go
index ea3ddc11..e3ecb115 100644
--- a/api/internal/core/server/server.go
+++ b/api/internal/core/server/server.go
@@ -25,9 +25,9 @@ import (
"github.com/spf13/viper"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/log"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
// server is the manager of Manager API, which is responsible for managing the
life cycle of Manager API, including initialization, start, stop and so on
diff --git a/api/internal/core/server/store.go
b/api/internal/core/server/store.go
index 6130a197..ad07bb0e 100644
--- a/api/internal/core/server/store.go
+++ b/api/internal/core/server/store.go
@@ -17,10 +17,10 @@
package server
import (
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/core/storage"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/core/storage"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
func (s *server) setupStore() error {
diff --git a/api/internal/core/storage/etcd.go
b/api/internal/core/storage/etcd.go
index 210a65a1..d7f5b52e 100644
--- a/api/internal/core/storage/etcd.go
+++ b/api/internal/core/storage/etcd.go
@@ -24,10 +24,10 @@ import (
"go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/pkg/transport"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/log"
- "github.com/apisix/manager-api/internal/utils"
- "github.com/apisix/manager-api/internal/utils/runtime"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/utils/runtime"
)
const (
diff --git a/api/internal/core/store/store.go b/api/internal/core/store/store.go
index 53c5f229..0b28ad5d 100644
--- a/api/internal/core/store/store.go
+++ b/api/internal/core/store/store.go
@@ -29,11 +29,11 @@ import (
"github.com/shiningrush/droplet/data"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/storage"
- "github.com/apisix/manager-api/internal/log"
- "github.com/apisix/manager-api/internal/utils"
- "github.com/apisix/manager-api/internal/utils/runtime"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/storage"
+ "github.com/apache/apisix-dashboard/api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/utils/runtime"
)
type Pagination struct {
diff --git a/api/internal/core/store/store_test.go
b/api/internal/core/store/store_test.go
index 1cb8f8dd..e022d709 100644
--- a/api/internal/core/store/store_test.go
+++ b/api/internal/core/store/store_test.go
@@ -29,9 +29,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/storage"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/storage"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
func TestNewGenericStore(t *testing.T) {
diff --git a/api/internal/core/store/storehub.go
b/api/internal/core/store/storehub.go
index 9efc6855..98ed09f9 100644
--- a/api/internal/core/store/storehub.go
+++ b/api/internal/core/store/storehub.go
@@ -20,10 +20,10 @@ import (
"fmt"
"reflect"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/log"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
type HubKey string
diff --git a/api/internal/core/store/validate.go
b/api/internal/core/store/validate.go
index 94d7fe71..51ebf64a 100644
--- a/api/internal/core/store/validate.go
+++ b/api/internal/core/store/validate.go
@@ -25,9 +25,9 @@ import (
"github.com/xeipuuv/gojsonschema"
"go.uber.org/zap/buffer"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
type Validator interface {
diff --git a/api/internal/core/store/validate_test.go
b/api/internal/core/store/validate_test.go
index 6ea2466e..04a98a7a 100644
--- a/api/internal/core/store/validate_test.go
+++ b/api/internal/core/store/validate_test.go
@@ -23,7 +23,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apisix/manager-api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
)
type TestObj struct {
diff --git a/api/internal/filter/authentication.go
b/api/internal/filter/authentication.go
index 08855e15..9b453c97 100644
--- a/api/internal/filter/authentication.go
+++ b/api/internal/filter/authentication.go
@@ -23,8 +23,8 @@ import (
"github.com/gin-gonic/gin"
"github.com/golang-jwt/jwt"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
func Authentication() gin.HandlerFunc {
diff --git a/api/internal/filter/authentication_test.go
b/api/internal/filter/authentication_test.go
index ab3da9d7..ed09d4f2 100644
--- a/api/internal/filter/authentication_test.go
+++ b/api/internal/filter/authentication_test.go
@@ -25,7 +25,7 @@ import (
"github.com/golang-jwt/jwt"
"github.com/stretchr/testify/assert"
- "github.com/apisix/manager-api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
)
func genToken(username string, issueAt, expireAt int64) string {
diff --git a/api/internal/filter/cors.go b/api/internal/filter/cors.go
index 28ca3316..0f5730ed 100644
--- a/api/internal/filter/cors.go
+++ b/api/internal/filter/cors.go
@@ -19,7 +19,7 @@ package filter
import (
"github.com/gin-gonic/gin"
- "github.com/apisix/manager-api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
)
func CORS() gin.HandlerFunc {
diff --git a/api/internal/filter/ip_filter.go b/api/internal/filter/ip_filter.go
index 2d07dea5..b6b3eed9 100644
--- a/api/internal/filter/ip_filter.go
+++ b/api/internal/filter/ip_filter.go
@@ -23,9 +23,9 @@ import (
"github.com/gin-gonic/gin"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/log"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
type subnet struct {
diff --git a/api/internal/filter/ip_filter_test.go
b/api/internal/filter/ip_filter_test.go
index e0c975f7..14268f75 100644
--- a/api/internal/filter/ip_filter_test.go
+++ b/api/internal/filter/ip_filter_test.go
@@ -23,7 +23,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert"
- "github.com/apisix/manager-api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
)
func TestIPFilter_Handle(t *testing.T) {
diff --git a/api/internal/filter/logging_test.go
b/api/internal/filter/logging_test.go
index 5a02bafd..c266a9aa 100644
--- a/api/internal/filter/logging_test.go
+++ b/api/internal/filter/logging_test.go
@@ -24,7 +24,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/stretchr/testify/assert"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
func performRequest(r http.Handler, method, path string, headers
map[string]string) *httptest.ResponseRecorder {
diff --git a/api/internal/filter/recover.go b/api/internal/filter/recover.go
index a8da66c4..8bbb9ba9 100644
--- a/api/internal/filter/recover.go
+++ b/api/internal/filter/recover.go
@@ -26,7 +26,7 @@ import (
"github.com/gin-gonic/gin"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
var (
diff --git a/api/internal/filter/schema.go b/api/internal/filter/schema.go
index 4c37f26d..4f970267 100644
--- a/api/internal/filter/schema.go
+++ b/api/internal/filter/schema.go
@@ -30,10 +30,10 @@ import (
"github.com/gin-gonic/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/log"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
var resources = map[string]string{
diff --git a/api/internal/handler/authentication/authentication.go
b/api/internal/handler/authentication/authentication.go
index 28efa5cb..d9530baa 100644
--- a/api/internal/handler/authentication/authentication.go
+++ b/api/internal/handler/authentication/authentication.go
@@ -26,9 +26,9 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
type Handler struct {
diff --git a/api/internal/handler/consumer/consumer.go
b/api/internal/handler/consumer/consumer.go
index 0b169bbc..86ec1e19 100644
--- a/api/internal/handler/consumer/consumer.go
+++ b/api/internal/handler/consumer/consumer.go
@@ -26,9 +26,9 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
)
type Handler struct {
diff --git a/api/internal/handler/consumer/consumer_test.go
b/api/internal/handler/consumer/consumer_test.go
index 9a76bc98..08289f48 100644
--- a/api/internal/handler/consumer/consumer_test.go
+++ b/api/internal/handler/consumer/consumer_test.go
@@ -28,8 +28,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
)
func TestHandler_Get(t *testing.T) {
diff --git a/api/internal/handler/data_loader/loader/loader.go
b/api/internal/handler/data_loader/loader/loader.go
index a1bd8ffa..60542df1 100644
--- a/api/internal/handler/data_loader/loader/loader.go
+++ b/api/internal/handler/data_loader/loader/loader.go
@@ -16,7 +16,7 @@
*/
package loader
-import "github.com/apisix/manager-api/internal/core/entity"
+import "github.com/apache/apisix-dashboard/api/internal/core/entity"
// DataSets are intermediate structures used to handle
// import and export data with APISIX entities.
diff --git a/api/internal/handler/data_loader/loader/openapi3/export.go
b/api/internal/handler/data_loader/loader/openapi3/export.go
index 9d56dd3a..6db7613f 100644
--- a/api/internal/handler/data_loader/loader/openapi3/export.go
+++ b/api/internal/handler/data_loader/loader/openapi3/export.go
@@ -16,7 +16,7 @@
*/
package openapi3
-import "github.com/apisix/manager-api/internal/handler/data_loader/loader"
+import
"github.com/apache/apisix-dashboard/api/internal/handler/data_loader/loader"
func (Loader) Export(data loader.DataSets) (interface{}, error) {
//TODO implement me
diff --git a/api/internal/handler/data_loader/loader/openapi3/import.go
b/api/internal/handler/data_loader/loader/openapi3/import.go
index 8ff332a7..b38e77f7 100644
--- a/api/internal/handler/data_loader/loader/openapi3/import.go
+++ b/api/internal/handler/data_loader/loader/openapi3/import.go
@@ -25,9 +25,9 @@ import (
"github.com/getkin/kin-openapi/openapi3"
"github.com/pkg/errors"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/handler/data_loader/loader"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+
"github.com/apache/apisix-dashboard/api/internal/handler/data_loader/loader"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
func (o Loader) Import(input interface{}) (*loader.DataSets, error) {
diff --git a/api/internal/handler/data_loader/loader/openapi3/import_test.go
b/api/internal/handler/data_loader/loader/openapi3/import_test.go
index bc6ff809..a03944da 100644
--- a/api/internal/handler/data_loader/loader/openapi3/import_test.go
+++ b/api/internal/handler/data_loader/loader/openapi3/import_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apisix/manager-api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
)
var (
diff --git a/api/internal/handler/data_loader/route_export.go
b/api/internal/handler/data_loader/route_export.go
index a61d5d1e..548816a0 100644
--- a/api/internal/handler/data_loader/route_export.go
+++ b/api/internal/handler/data_loader/route_export.go
@@ -31,12 +31,12 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/log"
- "github.com/apisix/manager-api/internal/utils"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
type Handler struct {
diff --git a/api/internal/handler/data_loader/route_export_test.go
b/api/internal/handler/data_loader/route_export_test.go
index ad397f25..e5c8eeb3 100644
--- a/api/internal/handler/data_loader/route_export_test.go
+++ b/api/internal/handler/data_loader/route_export_test.go
@@ -23,8 +23,8 @@ import (
"strings"
"testing"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
"github.com/shiningrush/droplet"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
diff --git a/api/internal/handler/data_loader/route_import.go
b/api/internal/handler/data_loader/route_import.go
index e94dec02..a1c64c54 100644
--- a/api/internal/handler/data_loader/route_import.go
+++ b/api/internal/handler/data_loader/route_import.go
@@ -30,12 +30,12 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- loader
"github.com/apisix/manager-api/internal/handler/data_loader/loader"
-
"github.com/apisix/manager-api/internal/handler/data_loader/loader/openapi3"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ loader
"github.com/apache/apisix-dashboard/api/internal/handler/data_loader/loader"
+
"github.com/apache/apisix-dashboard/api/internal/handler/data_loader/loader/openapi3"
)
type ImportHandler struct {
diff --git a/api/internal/handler/global_rule/global_rule.go
b/api/internal/handler/global_rule/global_rule.go
index cc83e939..509b39c2 100644
--- a/api/internal/handler/global_rule/global_rule.go
+++ b/api/internal/handler/global_rule/global_rule.go
@@ -27,10 +27,10 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
type Handler struct {
diff --git a/api/internal/handler/global_rule/global_rule_test.go
b/api/internal/handler/global_rule/global_rule_test.go
index 6e13e9fb..3281067b 100644
--- a/api/internal/handler/global_rule/global_rule_test.go
+++ b/api/internal/handler/global_rule/global_rule_test.go
@@ -29,8 +29,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
)
func performRequest(r http.Handler, method, path string)
*httptest.ResponseRecorder {
diff --git a/api/internal/handler/handler.go b/api/internal/handler/handler.go
index af5c9dc2..8094a9b0 100644
--- a/api/internal/handler/handler.go
+++ b/api/internal/handler/handler.go
@@ -45,9 +45,9 @@ import (
"github.com/shiningrush/droplet/data"
"github.com/shiningrush/droplet/middleware"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
type RegisterFactory func() (RouteRegister, error)
diff --git a/api/internal/handler/handler_test.go
b/api/internal/handler/handler_test.go
index 4e5b5333..0ff6ad79 100644
--- a/api/internal/handler/handler_test.go
+++ b/api/internal/handler/handler_test.go
@@ -26,7 +26,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
)
func TestSpecCodeResponse(t *testing.T) {
diff --git a/api/internal/handler/healthz/healthz.go
b/api/internal/handler/healthz/healthz.go
index c35c8601..a804d167 100644
--- a/api/internal/handler/healthz/healthz.go
+++ b/api/internal/handler/healthz/healthz.go
@@ -21,7 +21,7 @@ import (
"github.com/shiningrush/droplet"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
)
type Handler struct {
diff --git a/api/internal/handler/label/label.go
b/api/internal/handler/label/label.go
index fc767256..8ded719c 100644
--- a/api/internal/handler/label/label.go
+++ b/api/internal/handler/label/label.go
@@ -31,10 +31,10 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
type Handler struct {
diff --git a/api/internal/handler/label/label_test.go
b/api/internal/handler/label/label_test.go
index d227b952..6136ebb7 100644
--- a/api/internal/handler/label/label_test.go
+++ b/api/internal/handler/label/label_test.go
@@ -26,8 +26,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
)
type testCase struct {
diff --git a/api/internal/handler/migrate/migrate.go
b/api/internal/handler/migrate/migrate.go
index 28c4fe6f..8bff952b 100644
--- a/api/internal/handler/migrate/migrate.go
+++ b/api/internal/handler/migrate/migrate.go
@@ -25,10 +25,10 @@ import (
"github.com/gin-gonic/gin"
"github.com/shiningrush/droplet/data"
- "github.com/apisix/manager-api/internal/core/migrate"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/log"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/core/migrate"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
const (
diff --git a/api/internal/handler/plugin_config/plugin_config.go
b/api/internal/handler/plugin_config/plugin_config.go
index ec09a7f4..9c94ff33 100644
--- a/api/internal/handler/plugin_config/plugin_config.go
+++ b/api/internal/handler/plugin_config/plugin_config.go
@@ -29,11 +29,11 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/log"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
type Handler struct {
diff --git a/api/internal/handler/plugin_config/plugin_config_test.go
b/api/internal/handler/plugin_config/plugin_config_test.go
index 1dbdbbe6..6b871f65 100644
--- a/api/internal/handler/plugin_config/plugin_config_test.go
+++ b/api/internal/handler/plugin_config/plugin_config_test.go
@@ -28,9 +28,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
)
func TestPluginConfig_Get(t *testing.T) {
diff --git a/api/internal/handler/proto/proto.go
b/api/internal/handler/proto/proto.go
index 6c815e73..dd9d9ca2 100644
--- a/api/internal/handler/proto/proto.go
+++ b/api/internal/handler/proto/proto.go
@@ -31,10 +31,10 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
type Handler struct {
diff --git a/api/internal/handler/proto/proto_test.go
b/api/internal/handler/proto/proto_test.go
index 942dacdd..23141917 100644
--- a/api/internal/handler/proto/proto_test.go
+++ b/api/internal/handler/proto/proto_test.go
@@ -22,7 +22,7 @@ import (
"github.com/stretchr/testify/assert"
- "github.com/apisix/manager-api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
)
func TestStructUnmarshal(t *testing.T) {
diff --git a/api/internal/handler/route/route.go
b/api/internal/handler/route/route.go
index fae4429d..227ecb67 100644
--- a/api/internal/handler/route/route.go
+++ b/api/internal/handler/route/route.go
@@ -33,13 +33,13 @@ import (
wgin "github.com/shiningrush/droplet/wrapper/gin"
lua "github.com/yuin/gopher-lua"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/log"
- "github.com/apisix/manager-api/internal/utils"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
type Handler struct {
diff --git a/api/internal/handler/route/route_test.go
b/api/internal/handler/route/route_test.go
index aab0731a..d1d4bd6f 100644
--- a/api/internal/handler/route/route_test.go
+++ b/api/internal/handler/route/route_test.go
@@ -28,10 +28,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
type testCase struct {
diff --git a/api/internal/handler/route_online_debug/route_online_debug.go
b/api/internal/handler/route_online_debug/route_online_debug.go
index c65b69b6..dc8840b0 100644
--- a/api/internal/handler/route_online_debug/route_online_debug.go
+++ b/api/internal/handler/route_online_debug/route_online_debug.go
@@ -34,7 +34,7 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
)
type Handler struct {
diff --git a/api/internal/handler/schema/plugin.go
b/api/internal/handler/schema/plugin.go
index d282640c..ee001a60 100644
--- a/api/internal/handler/schema/plugin.go
+++ b/api/internal/handler/schema/plugin.go
@@ -24,8 +24,8 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
)
type Handler struct {
diff --git a/api/internal/handler/schema/schema.go
b/api/internal/handler/schema/schema.go
index 7341376e..d8996d6b 100644
--- a/api/internal/handler/schema/schema.go
+++ b/api/internal/handler/schema/schema.go
@@ -27,8 +27,8 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
)
type SchemaHandler struct {
diff --git a/api/internal/handler/server_info/server_info.go
b/api/internal/handler/server_info/server_info.go
index ee16a7ba..a616335e 100644
--- a/api/internal/handler/server_info/server_info.go
+++ b/api/internal/handler/server_info/server_info.go
@@ -25,9 +25,9 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
)
type Handler struct {
diff --git a/api/internal/handler/server_info/server_info_test.go
b/api/internal/handler/server_info/server_info_test.go
index c8ebcfe2..0e1766b9 100644
--- a/api/internal/handler/server_info/server_info_test.go
+++ b/api/internal/handler/server_info/server_info_test.go
@@ -26,8 +26,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
)
func TestHandler_Get(t *testing.T) {
diff --git a/api/internal/handler/service/service.go
b/api/internal/handler/service/service.go
index fe382b06..082ab76d 100644
--- a/api/internal/handler/service/service.go
+++ b/api/internal/handler/service/service.go
@@ -29,10 +29,10 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
type Handler struct {
diff --git a/api/internal/handler/service/service_test.go
b/api/internal/handler/service/service_test.go
index 3132843d..13382b99 100644
--- a/api/internal/handler/service/service_test.go
+++ b/api/internal/handler/service/service_test.go
@@ -28,9 +28,9 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
)
func TestService_Get(t *testing.T) {
diff --git a/api/internal/handler/ssl/ssl.go b/api/internal/handler/ssl/ssl.go
index 154a0a99..b22f6e7a 100644
--- a/api/internal/handler/ssl/ssl.go
+++ b/api/internal/handler/ssl/ssl.go
@@ -32,12 +32,12 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
type Handler struct {
diff --git a/api/internal/handler/ssl/ssl_test.go
b/api/internal/handler/ssl/ssl_test.go
index 3d1404c4..b76dff6a 100644
--- a/api/internal/handler/ssl/ssl_test.go
+++ b/api/internal/handler/ssl/ssl_test.go
@@ -30,10 +30,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
func getTestKeyCert(t *testing.T) (string, string) {
diff --git a/api/internal/handler/stream_route/stream_route.go
b/api/internal/handler/stream_route/stream_route.go
index 66253fc7..419b300f 100644
--- a/api/internal/handler/stream_route/stream_route.go
+++ b/api/internal/handler/stream_route/stream_route.go
@@ -28,10 +28,10 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
type Handler struct {
diff --git a/api/internal/handler/stream_route/stream_route_test.go
b/api/internal/handler/stream_route/stream_route_test.go
index 3dc3fc78..65a7efe7 100644
--- a/api/internal/handler/stream_route/stream_route_test.go
+++ b/api/internal/handler/stream_route/stream_route_test.go
@@ -24,8 +24,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
)
func TestStructUnmarshal(t *testing.T) {
diff --git a/api/internal/handler/system_config/system_config.go
b/api/internal/handler/system_config/system_config.go
index 154c029d..2261172a 100644
--- a/api/internal/handler/system_config/system_config.go
+++ b/api/internal/handler/system_config/system_config.go
@@ -25,9 +25,9 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
)
type Handler struct {
diff --git a/api/internal/handler/system_config/system_config_test.go
b/api/internal/handler/system_config/system_config_test.go
index ca5d6acc..b3758cc5 100644
--- a/api/internal/handler/system_config/system_config_test.go
+++ b/api/internal/handler/system_config/system_config_test.go
@@ -25,8 +25,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
)
func TestSystem_Get(t *testing.T) {
diff --git a/api/internal/handler/tool/tool.go
b/api/internal/handler/tool/tool.go
index c3f9e996..b4524f1c 100644
--- a/api/internal/handler/tool/tool.go
+++ b/api/internal/handler/tool/tool.go
@@ -21,8 +21,8 @@ import (
"github.com/shiningrush/droplet"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
type Handler struct {
diff --git a/api/internal/handler/tool/tool_test.go
b/api/internal/handler/tool/tool_test.go
index 304249fd..70187a18 100644
--- a/api/internal/handler/tool/tool_test.go
+++ b/api/internal/handler/tool/tool_test.go
@@ -22,7 +22,7 @@ import (
"github.com/shiningrush/droplet"
"github.com/stretchr/testify/assert"
- "github.com/apisix/manager-api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
)
func TestTool_Version(t *testing.T) {
diff --git a/api/internal/handler/upstream/upstream.go
b/api/internal/handler/upstream/upstream.go
index 3157fdda..f87fc3c3 100644
--- a/api/internal/handler/upstream/upstream.go
+++ b/api/internal/handler/upstream/upstream.go
@@ -29,11 +29,11 @@ import (
"github.com/shiningrush/droplet/wrapper"
wgin "github.com/shiningrush/droplet/wrapper/gin"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
type Handler struct {
diff --git a/api/internal/handler/upstream/upstream_test.go
b/api/internal/handler/upstream/upstream_test.go
index 8b4941e2..73b3481b 100644
--- a/api/internal/handler/upstream/upstream_test.go
+++ b/api/internal/handler/upstream/upstream_test.go
@@ -29,10 +29,10 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
- "github.com/apisix/manager-api/internal/core/entity"
- "github.com/apisix/manager-api/internal/core/store"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/utils/consts"
+ "github.com/apache/apisix-dashboard/api/internal/core/entity"
+ "github.com/apache/apisix-dashboard/api/internal/core/store"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/utils/consts"
)
func TestUpstream_Get(t *testing.T) {
diff --git a/api/internal/log/zap.go b/api/internal/log/zap.go
index 446dde77..02bcdb41 100644
--- a/api/internal/log/zap.go
+++ b/api/internal/log/zap.go
@@ -23,7 +23,7 @@ import (
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
- "github.com/apisix/manager-api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
)
var logger *zap.SugaredLogger
diff --git a/api/internal/route.go b/api/internal/route.go
index 7eddc9c3..937fe300 100644
--- a/api/internal/route.go
+++ b/api/internal/route.go
@@ -25,28 +25,28 @@ import (
"github.com/gin-contrib/static"
"github.com/gin-gonic/gin"
- "github.com/apisix/manager-api/internal/conf"
- "github.com/apisix/manager-api/internal/filter"
- "github.com/apisix/manager-api/internal/handler"
- "github.com/apisix/manager-api/internal/handler/authentication"
- "github.com/apisix/manager-api/internal/handler/consumer"
- "github.com/apisix/manager-api/internal/handler/data_loader"
- "github.com/apisix/manager-api/internal/handler/global_rule"
- "github.com/apisix/manager-api/internal/handler/healthz"
- "github.com/apisix/manager-api/internal/handler/label"
- "github.com/apisix/manager-api/internal/handler/migrate"
- "github.com/apisix/manager-api/internal/handler/plugin_config"
- "github.com/apisix/manager-api/internal/handler/proto"
- "github.com/apisix/manager-api/internal/handler/route"
- "github.com/apisix/manager-api/internal/handler/schema"
- "github.com/apisix/manager-api/internal/handler/server_info"
- "github.com/apisix/manager-api/internal/handler/service"
- "github.com/apisix/manager-api/internal/handler/ssl"
- "github.com/apisix/manager-api/internal/handler/stream_route"
- "github.com/apisix/manager-api/internal/handler/system_config"
- "github.com/apisix/manager-api/internal/handler/tool"
- "github.com/apisix/manager-api/internal/handler/upstream"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/conf"
+ "github.com/apache/apisix-dashboard/api/internal/filter"
+ "github.com/apache/apisix-dashboard/api/internal/handler"
+ "github.com/apache/apisix-dashboard/api/internal/handler/authentication"
+ "github.com/apache/apisix-dashboard/api/internal/handler/consumer"
+ "github.com/apache/apisix-dashboard/api/internal/handler/data_loader"
+ "github.com/apache/apisix-dashboard/api/internal/handler/global_rule"
+ "github.com/apache/apisix-dashboard/api/internal/handler/healthz"
+ "github.com/apache/apisix-dashboard/api/internal/handler/label"
+ "github.com/apache/apisix-dashboard/api/internal/handler/migrate"
+ "github.com/apache/apisix-dashboard/api/internal/handler/plugin_config"
+ "github.com/apache/apisix-dashboard/api/internal/handler/proto"
+ "github.com/apache/apisix-dashboard/api/internal/handler/route"
+ "github.com/apache/apisix-dashboard/api/internal/handler/schema"
+ "github.com/apache/apisix-dashboard/api/internal/handler/server_info"
+ "github.com/apache/apisix-dashboard/api/internal/handler/service"
+ "github.com/apache/apisix-dashboard/api/internal/handler/ssl"
+ "github.com/apache/apisix-dashboard/api/internal/handler/stream_route"
+ "github.com/apache/apisix-dashboard/api/internal/handler/system_config"
+ "github.com/apache/apisix-dashboard/api/internal/handler/tool"
+ "github.com/apache/apisix-dashboard/api/internal/handler/upstream"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
func SetUpRouter() *gin.Engine {
diff --git a/api/internal/utils/runtime/runtime.go
b/api/internal/utils/runtime/runtime.go
index 7b6dcd99..482117dc 100644
--- a/api/internal/utils/runtime/runtime.go
+++ b/api/internal/utils/runtime/runtime.go
@@ -20,7 +20,7 @@ import (
"net/http"
"runtime"
- "github.com/apisix/manager-api/internal/log"
+ "github.com/apache/apisix-dashboard/api/internal/log"
)
var (
diff --git a/api/main.go b/api/main.go
index 6fc7013d..04affdfc 100644
--- a/api/main.go
+++ b/api/main.go
@@ -17,7 +17,7 @@
package main
import (
- "github.com/apisix/manager-api/cmd"
+ "github.com/apache/apisix-dashboard/api/cmd"
)
func main() {
diff --git a/api/test/docker/Dockerfile b/api/test/docker/Dockerfile
index 072960b2..c854bc88 100644
--- a/api/test/docker/Dockerfile
+++ b/api/test/docker/Dockerfile
@@ -15,19 +15,19 @@
# limitations under the License.
#
-FROM golang:1.15 AS build-env
+FROM golang:1.18 AS build-env
-WORKDIR /go/src/github.com/apisix/manager-api
+WORKDIR /workspace
COPY ./ ./
RUN mkdir -p /go/manager-api/conf \
- && go test -c -cover -covermode=atomic -o /go/manager-api/manager-api
-coverpkg "./..." ./ \
- && mv /go/src/github.com/apisix/manager-api/entry.sh /go/manager-api/ \
- && mv /go/src/github.com/apisix/manager-api/conf/conf.yaml
/go/manager-api/conf/conf.yaml \
- && mv /go/src/github.com/apisix/manager-api/conf/schema.json
/go/manager-api/conf/schema.json \
- && mv /go/src/github.com/apisix/manager-api/conf/customize_schema.json
/go/manager-api/conf/customize_schema.json \
- && rm -rf /go/src/github.com/apisix/manager-api \
+ && go test -c -cover -covermode=atomic -o /go/manager-api/manager-api
-coverpkg "./..." ./api \
+ && mv /workspace/api/entry.sh /go/manager-api/ \
+ && mv /workspace/api/conf/conf.yaml /go/manager-api/conf/conf.yaml \
+ && mv /workspace/api/conf/schema.json /go/manager-api/conf/schema.json \
+ && mv /workspace/api/conf/customize_schema.json
/go/manager-api/conf/customize_schema.json \
+ && rm -rf /workspace \
&& rm -rf /etc/localtime \
&& ln -s /usr/share/zoneinfo/Hongkong /etc/localtime \
&& dpkg-reconfigure -f noninteractive tzdata
@@ -37,7 +37,7 @@ RUN wget
https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz \
&& mkdir -p /go/manager-api/dag-to-lua \
&& mv -u ./dag-to-lua-1.1/lib/* /go/manager-api/dag-to-lua/
-FROM alpine:3.11
+FROM alpine:3.14
RUN mkdir -p /go/manager-api \
&& apk update \
diff --git a/api/test/docker/docker-compose.yaml
b/api/test/docker/docker-compose.yaml
index c0a52960..91a2a1c6 100644
--- a/api/test/docker/docker-compose.yaml
+++ b/api/test/docker/docker-compose.yaml
@@ -154,8 +154,8 @@ services:
managerapi:
build:
- context: ../../
- dockerfile: test/docker/Dockerfile
+ context: ../../../
+ dockerfile: api/test/docker/Dockerfile
restart: always
volumes:
- ../../conf/conf.yaml:/go/manager-api/conf/conf.yaml:ro
diff --git a/api/test/e2e/auth/authentication_test.go
b/api/test/e2e/auth/authentication_test.go
index 3a41f17d..e48a3eba 100644
--- a/api/test/e2e/auth/authentication_test.go
+++ b/api/test/e2e/auth/authentication_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Authentication", func() {
diff --git a/api/test/e2e/balancer/balancer_suite_test.go
b/api/test/e2e/balancer/balancer_suite_test.go
index 91cfab1e..06e008db 100644
--- a/api/test/e2e/balancer/balancer_suite_test.go
+++ b/api/test/e2e/balancer/balancer_suite_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestAuth(t *testing.T) {
diff --git a/api/test/e2e/balancer/balancer_test.go
b/api/test/e2e/balancer/balancer_test.go
index 9ad3ed1b..b58c72e7 100644
--- a/api/test/e2e/balancer/balancer_test.go
+++ b/api/test/e2e/balancer/balancer_test.go
@@ -24,7 +24,7 @@ import (
"github.com/onsi/ginkgo/extensions/table"
"github.com/stretchr/testify/assert"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Balancer", func() {
diff --git a/api/test/e2e/consumer/consumer_suite_test.go
b/api/test/e2e/consumer/consumer_suite_test.go
index e2a414bb..48d731a0 100644
--- a/api/test/e2e/consumer/consumer_suite_test.go
+++ b/api/test/e2e/consumer/consumer_suite_test.go
@@ -23,7 +23,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestConsumer(t *testing.T) {
diff --git a/api/test/e2e/consumer/consumer_test.go
b/api/test/e2e/consumer/consumer_test.go
index 23db5c47..ccb596d4 100644
--- a/api/test/e2e/consumer/consumer_test.go
+++ b/api/test/e2e/consumer/consumer_test.go
@@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = Describe("Consumer", func() {
diff --git a/api/test/e2e/consumer/consumer_with_labels_test.go
b/api/test/e2e/consumer/consumer_with_labels_test.go
index d116a414..b98ae142 100644
--- a/api/test/e2e/consumer/consumer_with_labels_test.go
+++ b/api/test/e2e/consumer/consumer_with_labels_test.go
@@ -21,7 +21,7 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = DescribeTable("Consumer With Labels",
diff --git a/api/test/e2e/consumer/consumer_with_plugin_key_auth_test.go
b/api/test/e2e/consumer/consumer_with_plugin_key_auth_test.go
index d84db8b7..6bedbee2 100644
--- a/api/test/e2e/consumer/consumer_with_plugin_key_auth_test.go
+++ b/api/test/e2e/consumer/consumer_with_plugin_key_auth_test.go
@@ -21,7 +21,7 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = DescribeTable("Consumer With key-auth",
diff --git a/api/test/e2e/data_loader/data_loader_suite_test.go
b/api/test/e2e/data_loader/data_loader_suite_test.go
index 4489e7c0..04a995c1 100644
--- a/api/test/e2e/data_loader/data_loader_suite_test.go
+++ b/api/test/e2e/data_loader/data_loader_suite_test.go
@@ -23,7 +23,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestDataLoader(t *testing.T) {
diff --git a/api/test/e2e/data_loader/openapi3_test.go
b/api/test/e2e/data_loader/openapi3_test.go
index ba19cf9c..6e18fa98 100644
--- a/api/test/e2e/data_loader/openapi3_test.go
+++ b/api/test/e2e/data_loader/openapi3_test.go
@@ -27,7 +27,7 @@ import (
"github.com/savsgio/gotils/bytes"
"github.com/tidwall/gjson"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = Describe("OpenAPI 3", func() {
diff --git a/api/test/e2e/global_rule/global_rule_suite_test.go
b/api/test/e2e/global_rule/global_rule_suite_test.go
index 455f2e7b..28eeb774 100644
--- a/api/test/e2e/global_rule/global_rule_suite_test.go
+++ b/api/test/e2e/global_rule/global_rule_suite_test.go
@@ -23,7 +23,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestGlobalRule(t *testing.T) {
diff --git a/api/test/e2e/global_rule/global_rule_test.go
b/api/test/e2e/global_rule/global_rule_test.go
index 0536d894..f61b57a1 100644
--- a/api/test/e2e/global_rule/global_rule_test.go
+++ b/api/test/e2e/global_rule/global_rule_test.go
@@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = Describe("Global Rule", func() {
diff --git a/api/test/e2e/go.mod b/api/test/e2e/go.mod
index f02e25db..c6e5395b 100644
--- a/api/test/e2e/go.mod
+++ b/api/test/e2e/go.mod
@@ -1,4 +1,4 @@
-module github.com/apisix/manager-api/test/e2e
+module github.com/apache/apisix-dashboard/api/test/e2e
go 1.15
diff --git a/api/test/e2e/gzip/gzip_test.go b/api/test/e2e/gzip/gzip_test.go
index fbacc278..3508199a 100644
--- a/api/test/e2e/gzip/gzip_test.go
+++ b/api/test/e2e/gzip/gzip_test.go
@@ -21,7 +21,7 @@ import (
"github.com/onsi/ginkgo"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Gzip enable", func() {
diff --git a/api/test/e2e/healthz/healthz_test.go
b/api/test/e2e/healthz/healthz_test.go
index 4a5550f5..363f1e15 100644
--- a/api/test/e2e/healthz/healthz_test.go
+++ b/api/test/e2e/healthz/healthz_test.go
@@ -21,7 +21,7 @@ import (
"github.com/onsi/ginkgo"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Healthy check", func() {
diff --git a/api/test/e2e/id_compatible/id_compatible_suite_test.go
b/api/test/e2e/id_compatible/id_compatible_suite_test.go
index e08ca874..8cae475b 100644
--- a/api/test/e2e/id_compatible/id_compatible_suite_test.go
+++ b/api/test/e2e/id_compatible/id_compatible_suite_test.go
@@ -23,7 +23,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestIdCompatible(t *testing.T) {
diff --git a/api/test/e2e/id_compatible/id_crossing_test.go
b/api/test/e2e/id_compatible/id_crossing_test.go
index b768dafb..a26365bc 100644
--- a/api/test/e2e/id_compatible/id_crossing_test.go
+++ b/api/test/e2e/id_compatible/id_crossing_test.go
@@ -21,7 +21,7 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = DescribeTable("Id Crossing",
diff --git a/api/test/e2e/id_compatible/id_not_in_body_test.go
b/api/test/e2e/id_compatible/id_not_in_body_test.go
index 1e155d8f..32786ed3 100644
--- a/api/test/e2e/id_compatible/id_not_in_body_test.go
+++ b/api/test/e2e/id_compatible/id_not_in_body_test.go
@@ -25,7 +25,7 @@ import (
. "github.com/onsi/gomega"
"github.com/tidwall/gjson"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = DescribeTable("Id Not In Body",
diff --git a/api/test/e2e/id_compatible/id_using_int_test.go
b/api/test/e2e/id_compatible/id_using_int_test.go
index 7a3350d6..48757aa8 100644
--- a/api/test/e2e/id_compatible/id_using_int_test.go
+++ b/api/test/e2e/id_compatible/id_using_int_test.go
@@ -21,7 +21,7 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = DescribeTable("Id Using Int",
diff --git a/api/test/e2e/id_compatible/id_using_string_test.go
b/api/test/e2e/id_compatible/id_using_string_test.go
index dc326f5c..c993e76a 100644
--- a/api/test/e2e/id_compatible/id_using_string_test.go
+++ b/api/test/e2e/id_compatible/id_using_string_test.go
@@ -21,7 +21,7 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = DescribeTable("Id Using String",
diff --git a/api/test/e2e/label/label_test.go b/api/test/e2e/label/label_test.go
index d15bc013..9634ff16 100644
--- a/api/test/e2e/label/label_test.go
+++ b/api/test/e2e/label/label_test.go
@@ -21,7 +21,7 @@ import (
"github.com/onsi/ginkgo"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Test label", func() {
diff --git a/api/test/e2e/migrate/migrate_suite_test.go
b/api/test/e2e/migrate/migrate_suite_test.go
index 9f624217..12976a49 100644
--- a/api/test/e2e/migrate/migrate_suite_test.go
+++ b/api/test/e2e/migrate/migrate_suite_test.go
@@ -24,7 +24,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestMigrate(t *testing.T) {
diff --git a/api/test/e2e/migrate/migrate_test.go
b/api/test/e2e/migrate/migrate_test.go
index 79f3929d..d2c02b6b 100644
--- a/api/test/e2e/migrate/migrate_test.go
+++ b/api/test/e2e/migrate/migrate_test.go
@@ -29,7 +29,7 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
const (
diff --git a/api/test/e2e/plugin_config/plugin_config_suite_test.go
b/api/test/e2e/plugin_config/plugin_config_suite_test.go
index 102ed9ea..1af6ebff 100644
--- a/api/test/e2e/plugin_config/plugin_config_suite_test.go
+++ b/api/test/e2e/plugin_config/plugin_config_suite_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestPluginConfig(t *testing.T) {
diff --git a/api/test/e2e/plugin_config/plugin_config_test.go
b/api/test/e2e/plugin_config/plugin_config_test.go
index ac01c073..5c4dc79a 100644
--- a/api/test/e2e/plugin_config/plugin_config_test.go
+++ b/api/test/e2e/plugin_config/plugin_config_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Plugin Config", func() {
diff --git a/api/test/e2e/proto/proto_suite_test.go
b/api/test/e2e/proto/proto_suite_test.go
index 4386887e..c93a1bc4 100644
--- a/api/test/e2e/proto/proto_suite_test.go
+++ b/api/test/e2e/proto/proto_suite_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestRoute(t *testing.T) {
diff --git a/api/test/e2e/proto/proto_test.go b/api/test/e2e/proto/proto_test.go
index ad5fa4e8..7587fa01 100644
--- a/api/test/e2e/proto/proto_test.go
+++ b/api/test/e2e/proto/proto_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var correctProtobuf = `syntax = "proto3";
diff --git a/api/test/e2e/route/host_test.go b/api/test/e2e/route/host_test.go
index 36563de3..ff49d7e1 100644
--- a/api/test/e2e/route/host_test.go
+++ b/api/test/e2e/route/host_test.go
@@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = Describe("Route", func() {
diff --git a/api/test/e2e/route/route_export_test.go
b/api/test/e2e/route/route_export_test.go
index c3df0d86..ac0072f8 100644
--- a/api/test/e2e/route/route_export_test.go
+++ b/api/test/e2e/route/route_export_test.go
@@ -24,7 +24,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/stretchr/testify/assert"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Route", func() {
diff --git a/api/test/e2e/route/route_service_upstream_test.go
b/api/test/e2e/route/route_service_upstream_test.go
index 4e4591c6..4552a6cc 100644
--- a/api/test/e2e/route/route_service_upstream_test.go
+++ b/api/test/e2e/route/route_service_upstream_test.go
@@ -24,7 +24,7 @@ import (
"github.com/onsi/ginkgo/extensions/table"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("create route that not exists service or upstream",
func() {
diff --git a/api/test/e2e/route/route_suite_test.go
b/api/test/e2e/route/route_suite_test.go
index 9d448282..b41c3dc7 100644
--- a/api/test/e2e/route/route_suite_test.go
+++ b/api/test/e2e/route/route_suite_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestRoute(t *testing.T) {
diff --git a/api/test/e2e/route/route_test.go b/api/test/e2e/route/route_test.go
index 7fd8d6bb..79314439 100644
--- a/api/test/e2e/route/route_test.go
+++ b/api/test/e2e/route/route_test.go
@@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = Describe("Route", func() {
diff --git a/api/test/e2e/route/route_with_management_fields_test.go
b/api/test/e2e/route/route_with_management_fields_test.go
index 37d16d68..747967cc 100644
--- a/api/test/e2e/route/route_with_management_fields_test.go
+++ b/api/test/e2e/route/route_with_management_fields_test.go
@@ -26,7 +26,7 @@ import (
"github.com/onsi/gomega"
"github.com/tidwall/gjson"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with management fields", func() {
diff --git a/api/test/e2e/route/route_with_methods_test.go
b/api/test/e2e/route/route_with_methods_test.go
index df81dbba..ebddf689 100644
--- a/api/test/e2e/route/route_with_methods_test.go
+++ b/api/test/e2e/route/route_with_methods_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with methods", func() {
diff --git a/api/test/e2e/route/route_with_plugin_cors_test.go
b/api/test/e2e/route/route_with_plugin_cors_test.go
index c3c87608..b102d0d7 100644
--- a/api/test/e2e/route/route_with_plugin_cors_test.go
+++ b/api/test/e2e/route/route_with_plugin_cors_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with plugin cors", func() {
diff --git a/api/test/e2e/route/route_with_plugin_http_logger_test.go
b/api/test/e2e/route/route_with_plugin_http_logger_test.go
index 0509d43c..55e33499 100644
--- a/api/test/e2e/route/route_with_plugin_http_logger_test.go
+++ b/api/test/e2e/route/route_with_plugin_http_logger_test.go
@@ -24,7 +24,7 @@ import (
"github.com/onsi/ginkgo/extensions/table"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with plugin http logger", func() {
diff --git a/api/test/e2e/route/route_with_plugin_jwt_test.go
b/api/test/e2e/route/route_with_plugin_jwt_test.go
index 8c7c5089..2ab89804 100644
--- a/api/test/e2e/route/route_with_plugin_jwt_test.go
+++ b/api/test/e2e/route/route_with_plugin_jwt_test.go
@@ -25,7 +25,7 @@ import (
"github.com/onsi/ginkgo/extensions/table"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with jwt plugin", func() {
diff --git a/api/test/e2e/route/route_with_plugin_limit_count_test.go
b/api/test/e2e/route/route_with_plugin_limit_count_test.go
index bae972bc..ec962ab3 100644
--- a/api/test/e2e/route/route_with_plugin_limit_count_test.go
+++ b/api/test/e2e/route/route_with_plugin_limit_count_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with limit plugin", func() {
diff --git a/api/test/e2e/route/route_with_plugin_orchestration_test.go
b/api/test/e2e/route/route_with_plugin_orchestration_test.go
index 5795f6f8..cf7463fe 100644
--- a/api/test/e2e/route/route_with_plugin_orchestration_test.go
+++ b/api/test/e2e/route/route_with_plugin_orchestration_test.go
@@ -25,7 +25,7 @@ import (
"github.com/onsi/gomega"
"github.com/tidwall/gjson"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with plugin orchestration", func() {
diff --git a/api/test/e2e/route/route_with_plugin_prometheus_test.go
b/api/test/e2e/route/route_with_plugin_prometheus_test.go
index 0ebd3712..925622f5 100644
--- a/api/test/e2e/route/route_with_plugin_prometheus_test.go
+++ b/api/test/e2e/route/route_with_plugin_prometheus_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with plugin prometheus", func() {
diff --git a/api/test/e2e/route/route_with_plugin_proxy_rewrite_test.go
b/api/test/e2e/route/route_with_plugin_proxy_rewrite_test.go
index 2f1903bf..cdf7f04e 100644
--- a/api/test/e2e/route/route_with_plugin_proxy_rewrite_test.go
+++ b/api/test/e2e/route/route_with_plugin_proxy_rewrite_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with plugin proxy rewrite", func() {
diff --git a/api/test/e2e/route/route_with_plugin_uri_blocker_test.go
b/api/test/e2e/route/route_with_plugin_uri_blocker_test.go
index 96f14a46..0ea8273d 100644
--- a/api/test/e2e/route/route_with_plugin_uri_blocker_test.go
+++ b/api/test/e2e/route/route_with_plugin_uri_blocker_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with plugin uri blocker", func() {
diff --git a/api/test/e2e/route/route_with_priority_test.go
b/api/test/e2e/route/route_with_priority_test.go
index 39f32d8f..ef5dc30d 100644
--- a/api/test/e2e/route/route_with_priority_test.go
+++ b/api/test/e2e/route/route_with_priority_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with priority test", func() {
diff --git a/api/test/e2e/route/route_with_remote_addr_test.go
b/api/test/e2e/route/route_with_remote_addr_test.go
index 03403591..7d96a5c0 100644
--- a/api/test/e2e/route/route_with_remote_addr_test.go
+++ b/api/test/e2e/route/route_with_remote_addr_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with valid remote_addr remote_addrs", func() {
diff --git a/api/test/e2e/route/route_with_script_luacode_test.go
b/api/test/e2e/route/route_with_script_luacode_test.go
index 28bbd3b4..081979d7 100644
--- a/api/test/e2e/route/route_with_script_luacode_test.go
+++ b/api/test/e2e/route/route_with_script_luacode_test.go
@@ -24,7 +24,7 @@ import (
"github.com/onsi/ginkgo/extensions/table"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("route with script lucacode", func() {
diff --git a/api/test/e2e/route/route_with_uri_uris_test.go
b/api/test/e2e/route/route_with_uri_uris_test.go
index 3e1081bb..eccc62d9 100644
--- a/api/test/e2e/route/route_with_uri_uris_test.go
+++ b/api/test/e2e/route/route_with_uri_uris_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("test route with valid uri uris", func() {
diff --git a/api/test/e2e/route/route_with_vars_test.go
b/api/test/e2e/route/route_with_vars_test.go
index 723575ac..055ed77d 100644
--- a/api/test/e2e/route/route_with_vars_test.go
+++ b/api/test/e2e/route/route_with_vars_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var upstream map[string]interface{} = map[string]interface{}{
diff --git a/api/test/e2e/route_online_debug/route_online_debug_suite_test.go
b/api/test/e2e/route_online_debug/route_online_debug_suite_test.go
index 3e9b1497..cdd094bf 100644
--- a/api/test/e2e/route_online_debug/route_online_debug_suite_test.go
+++ b/api/test/e2e/route_online_debug/route_online_debug_suite_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestRoute(t *testing.T) {
diff --git a/api/test/e2e/route_online_debug/route_online_debug_test.go
b/api/test/e2e/route_online_debug/route_online_debug_test.go
index 4a3fda83..a94581ed 100644
--- a/api/test/e2e/route_online_debug/route_online_debug_test.go
+++ b/api/test/e2e/route_online_debug/route_online_debug_test.go
@@ -28,7 +28,7 @@ import (
"github.com/onsi/gomega"
"github.com/tidwall/gjson"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var upstream map[string]interface{} = map[string]interface{}{
diff --git a/api/test/e2e/schema/plugin_test.go
b/api/test/e2e/schema/plugin_test.go
index f621e08a..182186d6 100644
--- a/api/test/e2e/schema/plugin_test.go
+++ b/api/test/e2e/schema/plugin_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Plugin List", func() {
diff --git a/api/test/e2e/schema/schema_test.go
b/api/test/e2e/schema/schema_test.go
index 8dacca87..e2d1c6c3 100644
--- a/api/test/e2e/schema/schema_test.go
+++ b/api/test/e2e/schema/schema_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Schema Test", func() {
diff --git a/api/test/e2e/server_info/server_info_suite_test.go
b/api/test/e2e/server_info/server_info_suite_test.go
index ac0c3b2e..2986e26a 100644
--- a/api/test/e2e/server_info/server_info_suite_test.go
+++ b/api/test/e2e/server_info/server_info_suite_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestRoute(t *testing.T) {
diff --git a/api/test/e2e/server_info/server_info_test.go
b/api/test/e2e/server_info/server_info_test.go
index 61c2c6b2..62c69027 100644
--- a/api/test/e2e/server_info/server_info_test.go
+++ b/api/test/e2e/server_info/server_info_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("server info test", func() {
diff --git a/api/test/e2e/service/service_suite_test.go
b/api/test/e2e/service/service_suite_test.go
index 3bbdbda8..8134e818 100644
--- a/api/test/e2e/service/service_suite_test.go
+++ b/api/test/e2e/service/service_suite_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestRoute(t *testing.T) {
diff --git a/api/test/e2e/service/service_test.go
b/api/test/e2e/service/service_test.go
index 0531e4d2..027c4a1b 100644
--- a/api/test/e2e/service/service_test.go
+++ b/api/test/e2e/service/service_test.go
@@ -26,7 +26,7 @@ import (
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("create service without plugin", func() {
diff --git a/api/test/e2e/ssl/ssl_suite_test.go
b/api/test/e2e/ssl/ssl_suite_test.go
index bd410366..29d04ea9 100644
--- a/api/test/e2e/ssl/ssl_suite_test.go
+++ b/api/test/e2e/ssl/ssl_suite_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestSSL(t *testing.T) {
diff --git a/api/test/e2e/ssl/ssl_test.go b/api/test/e2e/ssl/ssl_test.go
index eee4f09b..e6c00cc9 100644
--- a/api/test/e2e/ssl/ssl_test.go
+++ b/api/test/e2e/ssl/ssl_test.go
@@ -30,7 +30,7 @@ import (
"github.com/onsi/ginkgo/extensions/table"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("SSL Basic", func() {
diff --git a/api/test/e2e/stream_route/stream_route_suite_test.go
b/api/test/e2e/stream_route/stream_route_suite_test.go
index ba403330..4fbd6efa 100644
--- a/api/test/e2e/stream_route/stream_route_suite_test.go
+++ b/api/test/e2e/stream_route/stream_route_suite_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestStreamRoute(t *testing.T) {
diff --git a/api/test/e2e/stream_route/stream_route_test.go
b/api/test/e2e/stream_route/stream_route_test.go
index 9d8aa436..ab060584 100644
--- a/api/test/e2e/stream_route/stream_route_test.go
+++ b/api/test/e2e/stream_route/stream_route_test.go
@@ -27,7 +27,7 @@ import (
. "github.com/onsi/ginkgo/extensions/table"
. "github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = Describe("Stream Route", func() {
diff --git a/api/test/e2e/system_config/system_config_test.go
b/api/test/e2e/system_config/system_config_test.go
index 37acbf4b..5a98d05d 100644
--- a/api/test/e2e/system_config/system_config_test.go
+++ b/api/test/e2e/system_config/system_config_test.go
@@ -22,7 +22,7 @@ import (
. "github.com/onsi/ginkgo"
. "github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = Describe("system config", func() {
diff --git a/api/test/e2e/trace/route_with_skywalking_test.go
b/api/test/e2e/trace/route_with_skywalking_test.go
index a7e95799..3c3ce474 100644
--- a/api/test/e2e/trace/route_with_skywalking_test.go
+++ b/api/test/e2e/trace/route_with_skywalking_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/stretchr/testify/assert"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Route", func() {
diff --git a/api/test/e2e/upstream/upstream_chash_hash_on_test.go
b/api/test/e2e/upstream/upstream_chash_hash_on_test.go
index f952af7e..516e4373 100644
--- a/api/test/e2e/upstream/upstream_chash_hash_on_test.go
+++ b/api/test/e2e/upstream/upstream_chash_hash_on_test.go
@@ -26,7 +26,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var nodes []map[string]interface{} = []map[string]interface{}{
diff --git a/api/test/e2e/upstream/upstream_chash_query_string_arg_xxx_test.go
b/api/test/e2e/upstream/upstream_chash_query_string_arg_xxx_test.go
index 6f1ff334..2573d0ac 100644
--- a/api/test/e2e/upstream/upstream_chash_query_string_arg_xxx_test.go
+++ b/api/test/e2e/upstream/upstream_chash_query_string_arg_xxx_test.go
@@ -27,7 +27,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var createUpstreamBody map[string]interface{} = map[string]interface{}{
diff --git a/api/test/e2e/upstream/upstream_keepalive_pool.go
b/api/test/e2e/upstream/upstream_keepalive_pool.go
index 1bfb9f32..0b705c66 100644
--- a/api/test/e2e/upstream/upstream_keepalive_pool.go
+++ b/api/test/e2e/upstream/upstream_keepalive_pool.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
// just test for schema check
diff --git a/api/test/e2e/upstream/upstream_priority_test.go
b/api/test/e2e/upstream/upstream_priority_test.go
index a3163fa9..2d989cdb 100644
--- a/api/test/e2e/upstream/upstream_priority_test.go
+++ b/api/test/e2e/upstream/upstream_priority_test.go
@@ -24,7 +24,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
// just test for schema check
diff --git a/api/test/e2e/upstream/upstream_retry.go
b/api/test/e2e/upstream/upstream_retry.go
index 3372f129..03a1fda6 100644
--- a/api/test/e2e/upstream/upstream_retry.go
+++ b/api/test/e2e/upstream/upstream_retry.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
// just test for schema check
diff --git a/api/test/e2e/upstream/upstream_suite_test.go
b/api/test/e2e/upstream/upstream_suite_test.go
index 430470e1..b70dbfb4 100644
--- a/api/test/e2e/upstream/upstream_suite_test.go
+++ b/api/test/e2e/upstream/upstream_suite_test.go
@@ -23,7 +23,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
func TestRoute(t *testing.T) {
diff --git a/api/test/e2e/upstream/upstream_test.go
b/api/test/e2e/upstream/upstream_test.go
index fff7b4d2..05b7c48e 100644
--- a/api/test/e2e/upstream/upstream_test.go
+++ b/api/test/e2e/upstream/upstream_test.go
@@ -26,7 +26,7 @@ import (
"github.com/onsi/ginkgo/extensions/table"
"github.com/onsi/gomega"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Upstream", func() {
diff --git a/api/test/e2e/version/version_test.go
b/api/test/e2e/version/version_test.go
index 2e3c3b83..c552e04c 100644
--- a/api/test/e2e/version/version_test.go
+++ b/api/test/e2e/version/version_test.go
@@ -22,7 +22,7 @@ import (
"github.com/onsi/ginkgo"
"github.com/onsi/ginkgo/extensions/table"
- "github.com/apisix/manager-api/test/e2e/base"
+ "github.com/apache/apisix-dashboard/api/test/e2e/base"
)
var _ = ginkgo.Describe("Version", func() {
diff --git a/api/test/shell/cli_test.sh b/api/test/shell/cli_test.sh
index 56d783f5..44073d6b 100755
--- a/api/test/shell/cli_test.sh
+++ b/api/test/shell/cli_test.sh
@@ -79,7 +79,7 @@ stop_dashboard() {
### Test Case
#pre
@test "Build and Deploy APISIX Dashboard Manager API" {
- run go build -o ./manager-api -ldflags "-X
github.com/apisix/manager-api/internal/utils.version=${VERSION} -X
github.com/apisix/manager-api/internal/utils.gitHash=${GITHASH}" ./main.go
+ run go build -o ./manager-api -ldflags "-X
github.com/apache/apisix-dashboard/api/internal/utils.version=${VERSION} -X
github.com/apache/apisix-dashboard/api/internal/utils.gitHash=${GITHASH}"
./main.go
[ "$status" -eq 0 ]
# prepare service files
diff --git a/api/go.mod b/go.mod
similarity index 97%
rename from api/go.mod
rename to go.mod
index 3584277b..2cb34d1e 100644
--- a/api/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/apisix/manager-api
+module github.com/apache/apisix-dashboard
go 1.15
diff --git a/api/go.sum b/go.sum
similarity index 100%
rename from api/go.sum
rename to go.sum
