Skip to content

Commit 617d9d7

Browse files
AllenShenAllenShen
authored
Feature/module update v2 (#3251)
* update module version Signed-off-by: allenshen <[email protected]> * update module version Signed-off-by: allenshen <[email protected]> * update import uri Signed-off-by: allenshen <[email protected]> --------- Signed-off-by: allenshen <[email protected]>
1 parent 04a696e commit 617d9d7

File tree

1,178 files changed

+5387
-5382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,178 files changed

+5387
-5382
lines changed

‎cmd/aslan/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os/signal"
2323
"syscall"
2424

25-
"github.com/koderover/zadig/pkg/microservice/aslan/server"
25+
"github.com/koderover/zadig/v2/pkg/microservice/aslan/server"
2626
)
2727

2828
func main() {

‎cmd/cron/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os/signal"
2323
"syscall"
2424

25-
"github.com/koderover/zadig/pkg/microservice/cron/server"
25+
"github.com/koderover/zadig/v2/pkg/microservice/cron/server"
2626
)
2727

2828
func main() {

‎cmd/hub-agent/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os/signal"
2323
"syscall"
2424

25-
"github.com/koderover/zadig/pkg/microservice/hubagent/server"
25+
"github.com/koderover/zadig/v2/pkg/microservice/hubagent/server"
2626
)
2727

2828
func main() {

‎cmd/hub-server/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os/signal"
2323
"syscall"
2424

25-
"github.com/koderover/zadig/pkg/microservice/hubserver/server"
25+
"github.com/koderover/zadig/v2/pkg/microservice/hubserver/server"
2626
)
2727

2828
func main() {

‎cmd/init/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package main
1818

1919
import (
20-
"github.com/koderover/zadig/pkg/cli/initconfig/cmd"
20+
"github.com/koderover/zadig/v2/pkg/cli/initconfig/cmd"
2121
)
2222

2323
func main() {

‎cmd/jenkins-plugin/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"log"
2121

22-
"github.com/koderover/zadig/pkg/microservice/jenkinsplugin/executor"
22+
"github.com/koderover/zadig/v2/pkg/microservice/jenkinsplugin/executor"
2323
)
2424

2525
func main() {

‎cmd/jobexecutor/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os/signal"
2323
"syscall"
2424

25-
"github.com/koderover/zadig/pkg/microservice/jobexecutor/executor"
25+
"github.com/koderover/zadig/v2/pkg/microservice/jobexecutor/executor"
2626
)
2727

2828
func main() {

‎cmd/packager-plugin/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"log"
2121

22-
"github.com/koderover/zadig/pkg/microservice/packager/executor"
22+
"github.com/koderover/zadig/v2/pkg/microservice/packager/executor"
2323
)
2424

2525
func main() {

‎cmd/predator-plugin/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"log"
2121

22-
"github.com/koderover/zadig/pkg/microservice/predator/executor"
22+
"github.com/koderover/zadig/v2/pkg/microservice/predator/executor"
2323
)
2424

2525
func main() {

‎cmd/reaper/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"log"
2121

22-
"github.com/koderover/zadig/pkg/microservice/reaper/executor"
22+
"github.com/koderover/zadig/v2/pkg/microservice/reaper/executor"
2323
)
2424

2525
func main() {

‎cmd/ua/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package main
1919
import (
2020
"log"
2121

22-
"github.com/koderover/zadig/pkg/cli/upgradeassistant/executor"
22+
"github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/executor"
2323
)
2424

2525
func main() {

‎cmd/user/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os/signal"
2323
"syscall"
2424

25-
"github.com/koderover/zadig/pkg/microservice/user/server"
25+
"github.com/koderover/zadig/v2/pkg/microservice/user/server"
2626
)
2727

2828
func main() {

‎cmd/warpdrive/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"os/signal"
2323
"syscall"
2424

25-
"github.com/koderover/zadig/pkg/microservice/warpdrive/server"
25+
"github.com/koderover/zadig/v2/pkg/microservice/warpdrive/server"
2626
)
2727

2828
func main() {

‎cmd/zadig-agent/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ import (
2020
"os"
2121
"runtime/debug"
2222

23-
"github.com/koderover/zadig/pkg/cli/zadig-agent/command"
24-
"github.com/koderover/zadig/pkg/cli/zadig-agent/helper/log"
23+
"github.com/koderover/zadig/v2/pkg/cli/zadig-agent/command"
24+
"github.com/koderover/zadig/v2/pkg/cli/zadig-agent/helper/log"
2525
)
2626

2727
func main() {

‎cmd/zgctl/cmd/root.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ import (
2222

2323
"github.com/spf13/cobra"
2424

25-
"github.com/koderover/zadig/pkg/config"
26-
"github.com/koderover/zadig/pkg/setting"
27-
"github.com/koderover/zadig/pkg/tool/log"
25+
"github.com/koderover/zadig/v2/pkg/config"
26+
"github.com/koderover/zadig/v2/pkg/setting"
27+
"github.com/koderover/zadig/v2/pkg/tool/log"
2828
)
2929

3030
var zadigHost string

‎cmd/zgctl/cmd/serve.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ import (
2525
"github.com/gin-gonic/gin"
2626
"github.com/spf13/cobra"
2727

28-
"github.com/koderover/zadig/pkg/config"
29-
"github.com/koderover/zadig/pkg/microservice/zgctl"
30-
ginmiddleware "github.com/koderover/zadig/pkg/middleware/gin"
31-
"github.com/koderover/zadig/pkg/tool/log"
28+
"github.com/koderover/zadig/v2/pkg/config"
29+
"github.com/koderover/zadig/v2/pkg/microservice/zgctl"
30+
ginmiddleware "github.com/koderover/zadig/v2/pkg/middleware/gin"
31+
"github.com/koderover/zadig/v2/pkg/tool/log"
3232
)
3333

3434
var listenAddr string

‎go.mod

+1-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ require (
4848
github.com/jinzhu/copier v0.3.5
4949
github.com/jinzhu/now v1.1.5
5050
github.com/juju/ratelimit v1.0.2
51-
github.com/koderover/zadig v0.0.0-00010101000000-000000000000
5251
github.com/larksuite/oapi-sdk-go/v3 v3.0.10
5352
github.com/magiconair/properties v1.8.5
5453
github.com/mholt/archiver v3.1.1+incompatible
@@ -160,6 +159,7 @@ require (
160159
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
161160
github.com/fatih/color v1.13.0 // indirect
162161
github.com/fatih/structs v1.1.0 // indirect
162+
github.com/frankban/quicktest v1.14.6 // indirect
163163
github.com/fsnotify/fsnotify v1.5.4 // indirect
164164
github.com/gabriel-vasile/mimetype v1.4.2 // indirect
165165
github.com/gaukas/godicttls v0.0.4 // indirect
@@ -316,5 +316,3 @@ require (
316316
replace github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.9.0
317317

318318
replace github.com/docker/libnetwork => github.com/docker/libnetwork v0.8.0-dev.2.0.20220716072657-0dde5c895075
319-
320-
replace github.com/koderover/zadig => ../zadig

‎pkg/cli/initconfig/cmd/healthz.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ package cmd
1919
import (
2020
"fmt"
2121

22-
"github.com/koderover/zadig/pkg/config"
23-
"github.com/koderover/zadig/pkg/shared/client/aslan"
22+
"github.com/koderover/zadig/v2/pkg/config"
23+
"github.com/koderover/zadig/v2/pkg/shared/client/aslan"
2424
)
2525

2626
func Healthz() error {

‎pkg/cli/initconfig/cmd/init.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ import (
2222

2323
"github.com/spf13/cobra"
2424

25-
"github.com/koderover/zadig/pkg/config"
26-
"github.com/koderover/zadig/pkg/setting"
27-
"github.com/koderover/zadig/pkg/shared/client/aslan"
28-
kubeclient "github.com/koderover/zadig/pkg/shared/kube/client"
29-
"github.com/koderover/zadig/pkg/tool/kube/updater"
30-
"github.com/koderover/zadig/pkg/tool/log"
25+
"github.com/koderover/zadig/v2/pkg/config"
26+
"github.com/koderover/zadig/v2/pkg/setting"
27+
"github.com/koderover/zadig/v2/pkg/shared/client/aslan"
28+
kubeclient "github.com/koderover/zadig/v2/pkg/shared/kube/client"
29+
"github.com/koderover/zadig/v2/pkg/tool/kube/updater"
30+
"github.com/koderover/zadig/v2/pkg/tool/log"
3131
)
3232

3333
func init() {

‎pkg/cli/initconfig/cmd/root.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"github.com/spf13/cobra"
2121
"github.com/spf13/viper"
2222

23-
"github.com/koderover/zadig/pkg/tool/log"
23+
"github.com/koderover/zadig/v2/pkg/tool/log"
2424
)
2525

2626
var rootCmd = &cobra.Command{

‎pkg/cli/upgradeassistant/cmd/migrate.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
"github.com/spf13/viper"
2727
"k8s.io/apimachinery/pkg/util/sets"
2828

29-
_ "github.com/koderover/zadig/pkg/cli/upgradeassistant/cmd/migrate"
30-
"github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/upgradepath"
31-
"github.com/koderover/zadig/pkg/setting"
32-
"github.com/koderover/zadig/pkg/tool/log"
33-
mongotool "github.com/koderover/zadig/pkg/tool/mongo"
29+
_ "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/cmd/migrate"
30+
"github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/upgradepath"
31+
"github.com/koderover/zadig/v2/pkg/setting"
32+
"github.com/koderover/zadig/v2/pkg/tool/log"
33+
mongotool "github.com/koderover/zadig/v2/pkg/tool/mongo"
3434
)
3535

3636
const oldestVersion = "1.3.0"

‎pkg/cli/upgradeassistant/cmd/migrate/1100.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ package migrate
2525
// "go.mongodb.org/mongo-driver/mongo"
2626
// "go.mongodb.org/mongo-driver/mongo/options"
2727
//
28-
// "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/models"
29-
// internalmodels "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/models"
30-
// internalmongodb "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/mongodb"
31-
// "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/orm"
32-
// "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/upgradepath"
33-
// "github.com/koderover/zadig/pkg/config"
34-
// "github.com/koderover/zadig/pkg/setting"
35-
// "github.com/koderover/zadig/pkg/tool/log"
36-
// mongotool "github.com/koderover/zadig/pkg/tool/mongo"
37-
// "github.com/koderover/zadig/pkg/types"
28+
// "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/models"
29+
// internalmodels "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/models"
30+
// internalmongodb "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/mongodb"
31+
// "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/orm"
32+
// "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/upgradepath"
33+
// "github.com/koderover/zadig/v2/pkg/config"
34+
// "github.com/koderover/zadig/v2/pkg/setting"
35+
// "github.com/koderover/zadig/v2/pkg/tool/log"
36+
// mongotool "github.com/koderover/zadig/v2/pkg/tool/mongo"
37+
// "github.com/koderover/zadig/v2/pkg/types"
3838
//)
3939
//
4040
//func init() {

‎pkg/cli/upgradeassistant/cmd/migrate/1110.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ package migrate
2323
// "go.mongodb.org/mongo-driver/bson"
2424
// "k8s.io/apimachinery/pkg/util/sets"
2525
//
26-
// "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/models"
27-
// "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/upgradepath"
28-
// "github.com/koderover/zadig/pkg/tool/log"
26+
// "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/models"
27+
// "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/upgradepath"
28+
// "github.com/koderover/zadig/v2/pkg/tool/log"
2929
//)
3030
//
3131
//func init() {

‎pkg/cli/upgradeassistant/cmd/migrate/1120.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"go.mongodb.org/mongo-driver/bson"
2424
"go.mongodb.org/mongo-driver/mongo"
2525

26-
"github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/models"
27-
internalmongodb "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/mongodb"
28-
"github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/upgradepath"
29-
"github.com/koderover/zadig/pkg/tool/log"
26+
"github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/models"
27+
internalmongodb "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/mongodb"
28+
"github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/upgradepath"
29+
"github.com/koderover/zadig/v2/pkg/tool/log"
3030
)
3131

3232
func init() {

‎pkg/cli/upgradeassistant/cmd/migrate/1130.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ import (
2121

2222
"go.mongodb.org/mongo-driver/bson/primitive"
2323

24-
"github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/models"
25-
internalmongodb "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/mongodb"
26-
"github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/upgradepath"
27-
"github.com/koderover/zadig/pkg/tool/log"
24+
"github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/models"
25+
internalmongodb "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/mongodb"
26+
"github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/upgradepath"
27+
"github.com/koderover/zadig/v2/pkg/tool/log"
2828
)
2929

3030
func init() {

‎pkg/cli/upgradeassistant/cmd/migrate/1150.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import (
2323
"go.mongodb.org/mongo-driver/bson"
2424
"go.mongodb.org/mongo-driver/mongo"
2525

26-
"github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/models"
27-
internalmongodb "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/mongodb"
28-
"github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/upgradepath"
29-
"github.com/koderover/zadig/pkg/microservice/aslan/config"
30-
commonmodels "github.com/koderover/zadig/pkg/microservice/aslan/core/common/repository/models"
31-
"github.com/koderover/zadig/pkg/setting"
32-
"github.com/koderover/zadig/pkg/tool/log"
26+
"github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/models"
27+
internalmongodb "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/mongodb"
28+
"github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/upgradepath"
29+
"github.com/koderover/zadig/v2/pkg/microservice/aslan/config"
30+
commonmodels "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models"
31+
"github.com/koderover/zadig/v2/pkg/setting"
32+
"github.com/koderover/zadig/v2/pkg/tool/log"
3333
)
3434

3535
func init() {

‎pkg/cli/upgradeassistant/cmd/migrate/1160.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,19 @@ import (
2727
"go.mongodb.org/mongo-driver/mongo"
2828
"go.mongodb.org/mongo-driver/mongo/options"
2929

30-
"github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/upgradepath"
31-
"github.com/koderover/zadig/pkg/microservice/aslan/config"
32-
"github.com/koderover/zadig/pkg/microservice/aslan/core/common/repository/models"
33-
"github.com/koderover/zadig/pkg/microservice/aslan/core/common/repository/models/task"
34-
"github.com/koderover/zadig/pkg/microservice/aslan/core/common/repository/models/template"
35-
"github.com/koderover/zadig/pkg/microservice/aslan/core/common/repository/mongodb"
36-
templaterepo "github.com/koderover/zadig/pkg/microservice/aslan/core/common/repository/mongodb/template"
37-
projectservice "github.com/koderover/zadig/pkg/microservice/aslan/core/project/service"
38-
systemservice "github.com/koderover/zadig/pkg/microservice/aslan/core/system/service"
39-
"github.com/koderover/zadig/pkg/setting"
40-
"github.com/koderover/zadig/pkg/tool/log"
41-
"github.com/koderover/zadig/pkg/types"
42-
steptypes "github.com/koderover/zadig/pkg/types/step"
30+
"github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/upgradepath"
31+
"github.com/koderover/zadig/v2/pkg/microservice/aslan/config"
32+
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models"
33+
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models/task"
34+
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models/template"
35+
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/mongodb"
36+
templaterepo "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/mongodb/template"
37+
projectservice "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/project/service"
38+
systemservice "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/system/service"
39+
"github.com/koderover/zadig/v2/pkg/setting"
40+
"github.com/koderover/zadig/v2/pkg/tool/log"
41+
"github.com/koderover/zadig/v2/pkg/types"
42+
steptypes "github.com/koderover/zadig/v2/pkg/types/step"
4343
)
4444

4545
func init() {

‎pkg/cli/upgradeassistant/cmd/migrate/1160_vars.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ import (
2222
"fmt"
2323
"strings"
2424

25-
uamodel "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/models"
26-
uamongo "github.com/koderover/zadig/pkg/cli/upgradeassistant/internal/repository/mongodb"
27-
"github.com/koderover/zadig/pkg/microservice/aslan/config"
28-
"github.com/koderover/zadig/pkg/microservice/aslan/core/common/repository/models"
29-
"github.com/koderover/zadig/pkg/microservice/aslan/core/common/repository/mongodb"
30-
templaterepo "github.com/koderover/zadig/pkg/microservice/aslan/core/common/repository/mongodb/template"
31-
"github.com/koderover/zadig/pkg/setting"
32-
"github.com/koderover/zadig/pkg/tool/log"
33-
"github.com/koderover/zadig/pkg/util"
25+
uamodel "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/models"
26+
uamongo "github.com/koderover/zadig/v2/pkg/cli/upgradeassistant/internal/repository/mongodb"
27+
"github.com/koderover/zadig/v2/pkg/microservice/aslan/config"
28+
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/models"
29+
"github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/mongodb"
30+
templaterepo "github.com/koderover/zadig/v2/pkg/microservice/aslan/core/common/repository/mongodb/template"
31+
"github.com/koderover/zadig/v2/pkg/setting"
32+
"github.com/koderover/zadig/v2/pkg/tool/log"
33+
"github.com/koderover/zadig/v2/pkg/util"
3434
"go.mongodb.org/mongo-driver/bson"
3535
"go.mongodb.org/mongo-driver/mongo"
3636
"gopkg.in/yaml.v3"

0 commit comments

Comments
 (0)