Replace appscode/go with gomodules.xyz/x (#71)

Signed-off-by: Tamal Saha <[email protected]>
stashed · Nov 5, 2020 · af00ba6 · af00ba6
1 parent 0144016
commit af00ba6
Show file tree

Hide file tree

Showing 132 changed files with 3,349 additions and 2,913 deletions.
diff --git a/cmd/kubectl-stash/main.go b/cmd/kubectl-stash/main.go
@@ -25,7 +25,7 @@ import (
 	_ "stash.appscode.dev/apimachinery/client/clientset/versioned/fake"
 	"stash.appscode.dev/cli/pkg"
 
-	"github.com/appscode/go/log"
+	"gomodules.xyz/x/log"
 	_ "k8s.io/client-go/kubernetes/fake"
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"kmodules.xyz/client-go/logs"

diff --git a/cmd/kubectl-stash/version.go b/cmd/kubectl-stash/version.go
@@ -17,7 +17,7 @@ limitations under the License.
 package main
 
 import (
-	v "github.com/appscode/go/version"
+	v "gomodules.xyz/x/version"
 )
 
 var (

diff --git a/go.mod b/go.mod
@@ -3,29 +3,29 @@ module stash.appscode.dev/cli
 go 1.12
 
 require (
-	github.com/appscode/go v0.0.0-20200928211031-cc0c23082d91
 	github.com/evanphx/json-patch v4.9.0+incompatible
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
 	github.com/json-iterator/go v1.1.10
 	github.com/kubernetes-csi/external-snapshotter/v2 v2.1.1-0.20200521091436-82ef6e66e992
 	github.com/pkg/errors v0.9.1
-	github.com/spf13/cobra v1.0.0
+	github.com/spf13/cobra v1.1.1
+	gomodules.xyz/pointer v0.0.0-20201105071923-daf60fa55209
+	gomodules.xyz/runtime v0.0.0-20201104200926-d838b09dda8b
+	gomodules.xyz/x v0.0.0-20201105065653-91c568df6331
 	k8s.io/api v0.18.9
 	k8s.io/apimachinery v0.18.9
 	k8s.io/cli-runtime v0.18.9
 	k8s.io/client-go v0.18.9
 	k8s.io/component-base v0.18.9
 	k8s.io/kubectl v0.18.9
-	kmodules.xyz/client-go v0.0.0-20201027113349-01a6d453d836
-	kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41
-	kmodules.xyz/offshoot-api v0.0.0-20201027212804-f5e6dc573558
-	kmodules.xyz/openshift v0.0.0-20200922211657-1ece16d36c18
-	stash.appscode.dev/apimachinery v0.11.5
-	stash.appscode.dev/stash v0.11.5
+	kmodules.xyz/client-go v0.0.0-20201105071625-0b277310b9b8
+	kmodules.xyz/objectstore-api v0.0.0-20201105133858-cbb2af88d50a
+	kmodules.xyz/offshoot-api v0.0.0-20201105074700-8675f5f686f2
+	kmodules.xyz/openshift v0.0.0-20201105073146-0da509a7d39f
+	stash.appscode.dev/apimachinery v0.11.6-0.20201105125158-b51d7c6a387c
+	stash.appscode.dev/stash v0.11.6-0.20201105141522-d0a4751b8fbc
 )
 
-// release-1.18
-
 replace bitbucket.org/ww/goautoneg => gomodules.xyz/goautoneg v0.0.0-20120707110453-a547fc61f48d
 
 replace cloud.google.com/go => cloud.google.com/go v0.49.0

diff --git a/go.sum b/go.sum
diff --git a/hack/gendocs/main.go b/hack/gendocs/main.go
@@ -28,8 +28,8 @@ import (
 
 	"stash.appscode.dev/cli/pkg"
 
-	"github.com/appscode/go/runtime"
 	"github.com/spf13/cobra/doc"
+	"gomodules.xyz/runtime"
 )
 
 var (

diff --git a/pkg/clone_pvc.go b/pkg/clone_pvc.go
@@ -25,8 +25,8 @@ import (
 	"stash.appscode.dev/apimachinery/apis/stash/v1alpha1"
 	"stash.appscode.dev/apimachinery/apis/stash/v1beta1"
 
-	"github.com/appscode/go/log"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubectl/pkg/util/templates"

diff --git a/pkg/copy_backupconfiguration.go b/pkg/copy_backupconfiguration.go
@@ -22,8 +22,8 @@ import (
 
 	"stash.appscode.dev/apimachinery/apis/stash/v1beta1"
 
-	"github.com/appscode/go/log"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/pkg/copy_repository.go b/pkg/copy_repository.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/appscode/go/log"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/pkg/copy_secret.go b/pkg/copy_secret.go
@@ -20,8 +20,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/appscode/go/log"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	core_util "kmodules.xyz/client-go/core/v1"

diff --git a/pkg/copy_volumesnapshot.go b/pkg/copy_volumesnapshot.go
@@ -20,11 +20,11 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/appscode/go/log"
 	jsoniter "github.com/json-iterator/go"
 	vs_api "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
 	vs_v1alpha1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/pkg/create_backupconfiguration.go b/pkg/create_backupconfiguration.go
@@ -25,8 +25,8 @@ import (
 	"stash.appscode.dev/apimachinery/apis/stash/v1beta1"
 	v1beta1_util "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util"
 
-	"github.com/appscode/go/log"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	core "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubectl/pkg/util/templates"

diff --git a/pkg/create_repository.go b/pkg/create_repository.go
@@ -23,8 +23,8 @@ import (
 	"stash.appscode.dev/apimachinery/apis/stash/v1alpha1"
 	"stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1alpha1/util"
 
-	"github.com/appscode/go/log"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/kubectl/pkg/util/templates"
 	storage "kmodules.xyz/objectstore-api/api/v1"

diff --git a/pkg/create_restoresession.go b/pkg/create_restoresession.go
@@ -25,10 +25,10 @@ import (
 	v1beta1_util "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/util"
 	"stash.appscode.dev/stash/pkg/util"
 
-	"github.com/appscode/go/log"
-	"github.com/appscode/go/types"
 	vs "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/pointer"
+	"gomodules.xyz/x/log"
 	core "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -168,7 +168,7 @@ func (opt restoreSessionOption) setRestoreTarget(restoreSession *v1beta1.Restore
 		restoreSession.Spec.Target.VolumeClaimTemplates[0].Spec.DataSource = &core.TypedLocalObjectReference{
 			Kind:     "VolumeSnapshot",
 			Name:     opt.volumeClaimTemplate.dataSource,
-			APIGroup: types.StringP(vs.GroupName),
+			APIGroup: pointer.StringP(vs.GroupName),
 		}
 	} else {
 		if opt.targetRef.Kind != "" && util.BackupModel(opt.targetRef.Kind) == apis.ModelSidecar {

diff --git a/pkg/delete_snapshot.go b/pkg/delete_snapshot.go
@@ -29,9 +29,9 @@ import (
 	"stash.appscode.dev/stash/pkg/registry/snapshot"
 	"stash.appscode.dev/stash/pkg/util"
 
-	"github.com/appscode/go/log"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/kubernetes"

diff --git a/pkg/docker/delete_snapshot.go b/pkg/docker/delete_snapshot.go
@@ -21,8 +21,8 @@ import (
 
 	"stash.appscode.dev/apimachinery/pkg/restic"
 
-	"github.com/appscode/go/log"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 )
 
 func NewDeleteSnapshotCmd() *cobra.Command {

diff --git a/pkg/docker/download.go b/pkg/docker/download.go
@@ -22,8 +22,8 @@ import (
 	"stash.appscode.dev/apimachinery/apis/stash/v1beta1"
 	"stash.appscode.dev/apimachinery/pkg/restic"
 
-	"github.com/appscode/go/log"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 )
 
 // RemoveIt!

diff --git a/pkg/docker/unlock_repository.go b/pkg/docker/unlock_repository.go
@@ -21,8 +21,8 @@ import (
 
 	"stash.appscode.dev/apimachinery/pkg/restic"
 
-	"github.com/appscode/go/log"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 )
 
 func NewUnlockRepositoryCmd() *cobra.Command {

diff --git a/pkg/download.go b/pkg/download.go
@@ -29,9 +29,9 @@ import (
 	"stash.appscode.dev/cli/pkg/docker"
 	"stash.appscode.dev/stash/pkg/util"
 
-	"github.com/appscode/go/log"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/kubernetes"

diff --git a/pkg/root.go b/pkg/root.go
@@ -21,8 +21,8 @@ import (
 
 	"stash.appscode.dev/apimachinery/client/clientset/versioned/scheme"
 
-	v "github.com/appscode/go/version"
 	"github.com/spf13/cobra"
+	v "gomodules.xyz/x/version"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	clientsetscheme "k8s.io/client-go/kubernetes/scheme"

diff --git a/pkg/trigger.go b/pkg/trigger.go
@@ -24,9 +24,9 @@ import (
 	"stash.appscode.dev/apimachinery/apis/stash/v1beta1"
 	cs "stash.appscode.dev/apimachinery/client/clientset/versioned"
 
-	"github.com/appscode/go/log"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	core_util "kmodules.xyz/client-go/core/v1"

diff --git a/pkg/unlock.go b/pkg/unlock.go
@@ -29,9 +29,9 @@ import (
 	"stash.appscode.dev/apimachinery/pkg/restic"
 	"stash.appscode.dev/stash/pkg/util"
 
-	"github.com/appscode/go/log"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"gomodules.xyz/x/log"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/cli-runtime/pkg/genericclioptions"
 	"k8s.io/client-go/kubernetes"

diff --git a/vendor/github.com/appscode/go/encoding/json/types/array_or_int.go b/vendor/github.com/appscode/go/encoding/json/types/array_or_int.go
diff --git a/vendor/github.com/appscode/go/encoding/json/types/array_or_string.go b/vendor/github.com/appscode/go/encoding/json/types/array_or_string.go
diff --git a/vendor/github.com/appscode/go/encoding/json/types/bool_yo.go b/vendor/github.com/appscode/go/encoding/json/types/bool_yo.go
diff --git a/vendor/github.com/appscode/go/encoding/json/types/doc.go b/vendor/github.com/appscode/go/encoding/json/types/doc.go