Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

for release v2 #44

Merged
merged 1 commit into from
Jul 29, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions api/active.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"
"time"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/baetyl/baetyl-go/v2/errors"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
"github.com/baetyl/baetyl-go/v2/utils"
Expand Down
6 changes: 3 additions & 3 deletions api/active_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"testing"
"time"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions api/api.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package api

import (
"github.com/baetyl/baetyl-cloud/config"
"github.com/baetyl/baetyl-cloud/service"
"github.com/baetyl/baetyl-cloud/v2/config"
"github.com/baetyl/baetyl-cloud/v2/service"
)

// API baetyl api server
Expand Down
4 changes: 2 additions & 2 deletions api/application.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strconv"
"strings"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/baetyl/baetyl-go/v2/errors"
"github.com/baetyl/baetyl-go/v2/log"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
Expand Down
6 changes: 3 additions & 3 deletions api/application_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"net/http/httptest"
"testing"

"github.com/baetyl/baetyl-cloud/common"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions api/callback.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package api

import (
"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
)

func (api *API) CreateCallback(c *common.Context) (interface{}, error) {
Expand Down
6 changes: 3 additions & 3 deletions api/callback_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package api
import (
"bytes"
"encoding/json"
"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions api/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"strings"
"time"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/baetyl/baetyl-go/v2/errors"
"github.com/baetyl/baetyl-go/v2/log"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
Expand Down
6 changes: 3 additions & 3 deletions api/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ import (
"testing"
"time"

"github.com/baetyl/baetyl-cloud/common"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions api/function.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"strings"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
)

// ListFunctionSources ListFunctionSources
Expand Down
6 changes: 3 additions & 3 deletions api/function_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/baetyl/baetyl-cloud/common"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions api/namespace.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package api

import (
"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
)

// CreateNamespace create one namespace
Expand Down
6 changes: 3 additions & 3 deletions api/namespace_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"net/http/httptest"
"testing"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"

ms "github.com/baetyl/baetyl-cloud/mock/service"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
)

func getMockNS(name string) *models.Namespace {
Expand Down
6 changes: 3 additions & 3 deletions api/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package api
import (
"time"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/plugin"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/baetyl/baetyl-cloud/v2/plugin"
"github.com/baetyl/baetyl-go/v2/errors"
"github.com/baetyl/baetyl-go/v2/log"
"github.com/baetyl/baetyl-go/v2/spec/v1"
Expand Down
12 changes: 6 additions & 6 deletions api/node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"net/http/httptest"
"testing"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/config"
mockPlugin "github.com/baetyl/baetyl-cloud/mock/plugin"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/plugin"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/config"
mockPlugin "github.com/baetyl/baetyl-cloud/v2/mock/plugin"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/baetyl/baetyl-cloud/v2/plugin"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions api/object.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package api

import (
"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
)

func (api *API) ListObjectSources(c *common.Context) (interface{}, error) {
Expand Down
6 changes: 3 additions & 3 deletions api/object_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package api
import (
"encoding/json"
"errors"
"github.com/baetyl/baetyl-cloud/common"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions api/property.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package api

import (
"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
)

func (api *API) CreateProperty(c *common.Context) (interface{}, error) {
Expand Down
6 changes: 3 additions & 3 deletions api/property_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"net/http/httptest"
"testing"

"github.com/baetyl/baetyl-cloud/common"
plugin "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
plugin "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions api/register.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package api

import (
"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
"path"
"strings"
"time"
Expand Down
6 changes: 3 additions & 3 deletions api/register_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package api
import (
"bytes"
"encoding/json"
"github.com/baetyl/baetyl-cloud/common"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions api/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"time"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/baetyl/baetyl-go/v2/errors"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
)
Expand Down
6 changes: 3 additions & 3 deletions api/registry_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"net/http/httptest"
"testing"

"github.com/baetyl/baetyl-cloud/common"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions api/secret.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"time"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/baetyl/baetyl-go/v2/errors"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
)
Expand Down
6 changes: 3 additions & 3 deletions api/secret_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"net/http/httptest"
"testing"

"github.com/baetyl/baetyl-cloud/common"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
Expand Down
2 changes: 1 addition & 1 deletion api/sync.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package api

import (
"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/v2/common"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
)

Expand Down
4 changes: 2 additions & 2 deletions api/sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/http/httptest"
"testing"

"github.com/baetyl/baetyl-cloud/common"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/v2/common"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
Expand Down
4 changes: 2 additions & 2 deletions api/sysapp.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"encoding/json"
"fmt"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/baetyl/baetyl-go/v2/log"
specV1 "github.com/baetyl/baetyl-go/v2/spec/v1"
)
Expand Down
6 changes: 3 additions & 3 deletions api/sysapp_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"

"github.com/baetyl/baetyl-cloud/common"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
)

func TestAPI_GenSysApp(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions api/sysconfig.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"bytes"
"text/template"

"github.com/baetyl/baetyl-cloud/common"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
"github.com/baetyl/baetyl-cloud/v2/models"
)

// TODO: optimize this layer, general abstraction
Expand Down
6 changes: 3 additions & 3 deletions api/sysconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package api

import (
"fmt"
"github.com/baetyl/baetyl-cloud/common"
ms "github.com/baetyl/baetyl-cloud/mock/service"
"github.com/baetyl/baetyl-cloud/models"
"github.com/baetyl/baetyl-cloud/v2/common"
ms "github.com/baetyl/baetyl-cloud/v2/mock/service"
"github.com/baetyl/baetyl-cloud/v2/models"
"github.com/gin-gonic/gin"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/baetyl/baetyl-cloud
module github.com/baetyl/baetyl-cloud/v2

go 1.13

Expand Down
Loading