Skip to content

Commit 5c1b9d1

Browse files
tozastationtozastation
committedNov 19, 2019
fix: go module path error
1 parent 169b4c1 commit 5c1b9d1

21 files changed

+45
-121
lines changed
 

‎.idea/misc.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎adapters/controller/ContainerController.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package controller
22

33
import (
44
"context"
5-
"github.com/fun-dev/ccms-poc/application/usecase"
6-
"github.com/fun-dev/ccms-poc/infrastructure/apperror/ctlerr"
5+
"github.com/fun-dev/ccms/application/usecase"
6+
"github.com/fun-dev/ccms/infrastructure/apperror/ctlerr"
77
"github.com/gin-gonic/gin"
88
"net/http"
99
)

‎adapters/gateway/AuthGateway.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package gateway
22

33
import (
4-
"github.com/fun-dev/ccms-poc/adapters/gateway/repository"
5-
"github.com/fun-dev/ccms-poc/domain/value"
4+
"github.com/fun-dev/ccms/adapters/gateway/repository"
5+
"github.com/fun-dev/ccms/domain/value"
66
)
77

88
type AuthGateway struct {}

‎adapters/gateway/ContainerGateway.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ package gateway
33
import (
44
"context"
55
"fmt"
6-
"github.com/fun-dev/ccms-poc/adapters/gateway/repository"
7-
"github.com/fun-dev/ccms-poc/domain/container"
8-
"github.com/fun-dev/ccms-poc/infrastructure/apperror/repoerr"
9-
"github.com/fun-dev/ccms-poc/infrastructure/driver"
10-
"github.com/fun-dev/ccms-poc/infrastructure/provider"
6+
"github.com/fun-dev/ccms/adapters/gateway/repository"
7+
"github.com/fun-dev/ccms/domain"
8+
"github.com/fun-dev/ccms/infrastructure/apperror/repoerr"
9+
"github.com/fun-dev/ccms/infrastructure/driver"
10+
"github.com/fun-dev/ccms/infrastructure/provider"
1111
"log"
1212
)
1313

@@ -28,7 +28,7 @@ func NewContainerGateway(
2828
}
2929
}
3030

31-
func (g ContainerGateway) GetAllByUserID(ctx *context.Context, id, namespace string) ([]container.Container, error) {
31+
func (g ContainerGateway) GetAllByUserID(ctx *context.Context, id, namespace string) ([]domain.Container, error) {
3232
panic("implement me")
3333
}
3434

‎adapters/gateway/repository/AuthRepository.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package repository
22

33
import (
4-
"github.com/fun-dev/ccms-poc/domain/value"
4+
"github.com/fun-dev/ccms/domain/value"
55
)
66

77
// AuthRepository is

‎adapters/gateway/repository/ContainerRepository.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package repository
22

33
import (
44
"context"
5-
"github.com/fun-dev/ccms-poc/domain/container"
5+
"github.com/fun-dev/ccms/domain"
66
)
77

88
// ContainerRepository is interface
99
type ContainerRepository interface {
1010
// --- External --- //
11-
GetAllByUserID(ctx *context.Context, id, namespace string) ([]container.Container, error)
11+
GetAllByUserID(ctx *context.Context, id, namespace string) ([]domain.Container, error)
1212
Create(ctx *context.Context, imageName, namespace string) error
1313
DeleteByContainerID(ctx *context.Context, id, namespace string) error
1414
// --- Internal --- //

‎application/usecase/ContainerCreateUsecase.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package usecase
22

33
import (
44
"context"
5-
"github.com/fun-dev/ccms-poc/adapters/gateway/repository"
5+
"github.com/fun-dev/ccms/adapters/gateway/repository"
66
)
77

88
type (

‎application/usecase/ContainerDeleteUsecase.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package usecase
33
import (
44
"context"
55
"fmt"
6-
"github.com/fun-dev/ccms-poc/infrastructure/apperror/usecaseerr"
6+
"github.com/fun-dev/ccms/infrastructure/apperror/usecaseerr"
77

8-
"github.com/fun-dev/ccms-poc/adapters/gateway/repository"
8+
"github.com/fun-dev/ccms/adapters/gateway/repository"
99
)
1010

1111
type (
@@ -36,7 +36,7 @@ func (i ContainerDeleteInteractor) Execute(ctx *context.Context, containerID str
3636
return usecaseerr.UserIDCanNotBeFoundOnStore
3737
}
3838
namespace := userID.Value
39-
if err = i.ContainerRepo.DeleteByContainerID(ctx., containerID, namespace); err != nil {
39+
if err = i.ContainerRepo.DeleteByContainerID(ctx, containerID, namespace); err != nil {
4040
return fmt.Errorf("call ContainerRepo.DeleteByContainerID: %w", err)
4141
}
4242
return nil

‎domain/container/container.go ‎domain/container.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package container
1+
package domain
22

33
type Container struct {
44
UID string `json:"uid"`

‎domain/container/ContainerImage.go

-5
This file was deleted.

‎domain/container/container_service_impl.go

-57
This file was deleted.

‎domain/container/image.go

-6
This file was deleted.

‎domain/container/interfaces/container_repository.go

-8
This file was deleted.

‎domain/container/interfaces/container_service.go

-8
This file was deleted.

‎domain/value/UserID.go

-6
This file was deleted.

‎go.mod

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
module github.com/fun-dev/ccms-poc
1+
module github.com/fun-dev/ccms
22

3-
go 1.12
3+
go 1.13
44

55
require (
66
github.com/gin-gonic/gin v1.4.0
77
github.com/go-redis/redis/v7 v7.0.0-beta.4
88
github.com/googleapis/gnostic v0.3.1 // indirect
99
github.com/imdario/mergo v0.3.8 // indirect
10-
github.com/kelseyhightower/envconfig v1.4.0
11-
go.uber.org/dig v1.8.0 // indirect
10+
github.com/kelseyhightower/envconfig v1.4.0 // indirect
11+
go.uber.org/dig v1.8.0
1212
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect
1313
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
1414
k8s.io/api v0.0.0-20191109101513-0171b7c15da1

‎go.sum

+8
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3
1212
github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
1313
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
1414
github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
15+
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
1516
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
1617
github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
1718
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 h1:t8FVkw33L+wilf2QiWkw0UV77qRpcH/JHPKGpKa2E8g=
@@ -47,6 +48,7 @@ github.com/googleapis/gnostic v0.3.1 h1:WeAefnSUHlBb0iJKwxFDZdbfGwkd7xRNuV+IpXMJ
4748
github.com/googleapis/gnostic v0.3.1/go.mod h1:on+2t9HRStVgn95RSsFWFz+6Q0Snyqv1awfrALZdbtU=
4849
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
4950
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
51+
github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI=
5052
github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
5153
github.com/imdario/mergo v0.3.8 h1:CGgOkSJeqMRmt0D9XLWExdT4m4F1vd3FV3VPt+0VxkQ=
5254
github.com/imdario/mergo v0.3.8/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
@@ -80,9 +82,11 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+
8082
github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
8183
github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
8284
github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
85+
github.com/onsi/ginkgo v1.10.1 h1:q/mM8GF/n0shIN8SaAZ0V+jnLPzen6WIVZdiwrRlMlo=
8386
github.com/onsi/ginkgo v1.10.1/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
8487
github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
8588
github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
89+
github.com/onsi/gomega v1.7.0 h1:XPnZz8VVBHjVsy1vzJmRwIcSwiUO+JFfrv/xGiigmME=
8690
github.com/onsi/gomega v1.7.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
8791
github.com/pmezard/go-difflib v0.0.0-20151028094244-d8ed2627bdf0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
8892
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -97,6 +101,7 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
97101
github.com/stretchr/testify v0.0.0-20151208002404-e3a8ff8ce365/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
98102
github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
99103
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
104+
github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
100105
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
101106
github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw=
102107
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
@@ -146,10 +151,12 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
146151
golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab h1:tpc/nJ4vD66vAk/2KN0sw/DvQIz2sKmCpWvyKtPmfMQ=
147152
golang.org/x/tools v0.0.0-20191030062658-86caa796c7ab/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
148153
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
154+
google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO508=
149155
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
150156
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
151157
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
152158
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
159+
gopkg.in/fsnotify.v1 v1.4.7 h1:xOHLXZwVvI9hhs+cLKq5+I5onOuwQLhQwiu63xxlHs4=
153160
gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
154161
gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
155162
gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE=
@@ -159,6 +166,7 @@ gopkg.in/inf.v0 v0.9.0 h1:3zYtXIO92bvsdS3ggAdA8Gb4Azj0YU+TVY1uGYNFA8o=
159166
gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
160167
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
161168
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
169+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
162170
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
163171
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
164172
gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=

‎infrastructure/di/Container.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package di
22

33
import (
4-
"github.com/fun-dev/ccms-poc/adapters/controller"
5-
"github.com/fun-dev/ccms-poc/adapters/gateway"
6-
"github.com/fun-dev/ccms-poc/application/usecase"
7-
"github.com/fun-dev/ccms-poc/infrastructure/driver"
8-
"github.com/fun-dev/ccms-poc/infrastructure/provider"
4+
"github.com/fun-dev/ccms/adapters/controller"
5+
"github.com/fun-dev/ccms/adapters/gateway"
6+
"github.com/fun-dev/ccms/application/usecase"
7+
"github.com/fun-dev/ccms/infrastructure/driver"
8+
"github.com/fun-dev/ccms/infrastructure/provider"
99
"go.uber.org/dig"
1010
)
1111

‎infrastructure/driver/KubectlDriver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package driver
33
import (
44
"bytes"
55
"fmt"
6-
"github.com/fun-dev/ccms-poc/infrastructure/apperror/drivererr"
6+
"github.com/fun-dev/ccms/infrastructure/apperror/drivererr"
77
"io/ioutil"
88
"os"
99
"os/exec"

‎infrastructure/provider/KubernetesProvider.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package provider
22

33
import (
44
"flag"
5-
"github.com/fun-dev/ccms-poc/infrastructure/driver"
5+
"github.com/fun-dev/ccms/infrastructure/driver"
66
"k8s.io/client-go/kubernetes"
77
"k8s.io/client-go/tools/clientcmd"
88
"k8s.io/client-go/util/homedir"

‎main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package main
22

33
import (
4-
"github.com/fun-dev/ccms-poc/infrastructure/di"
5-
"github.com/fun-dev/ccms-poc/infrastructure/driver"
4+
"github.com/fun-dev/ccms/infrastructure/di"
5+
"github.com/fun-dev/ccms/infrastructure/driver"
66
"log"
77
)
88

0 commit comments

Comments
 (0)
Please sign in to comment.