From a71bdea9d484551fc38d13458136da823746aae8 Mon Sep 17 00:00:00 2001 From: Anisur Rahman Date: Fri, 27 Feb 2026 10:44:58 +0600 Subject: [PATCH 1/3] Remove Buffer Size Signed-off-by: Anisur Rahman --- pkg/restic/commands.go | 10 ++++------ pkg/restic/retry.go | 16 +++++++--------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/pkg/restic/commands.go b/pkg/restic/commands.go index 0d54e5fa5..cb5ca5d07 100644 --- a/pkg/restic/commands.go +++ b/pkg/restic/commands.go @@ -17,6 +17,7 @@ limitations under the License. package restic import ( + "bytes" "encoding/json" "errors" "fmt" @@ -30,7 +31,6 @@ import ( "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - "github.com/armon/circbuf" "k8s.io/klog/v2" storage "kmodules.xyz/objectstore-api/api/v1" ) @@ -464,11 +464,9 @@ func (w *ResticWrapper) appendCaCertFlag(args []any) []any { func (w *ResticWrapper) run(commands ...Command) ([]byte, error) { // write std errors into os.Stderr and buffer - errBuff, err := circbuf.NewBuffer(256) - if err != nil { - return nil, err - } - w.sh.Stderr = io.MultiWriter(os.Stderr, errBuff) + var err error + var errBuff bytes.Buffer + w.sh.Stderr = io.MultiWriter(os.Stderr, &errBuff) for _, cmd := range commands { if cmd.Name == ResticCMD { diff --git a/pkg/restic/retry.go b/pkg/restic/retry.go index 9b9e40f85..e5f4722b8 100644 --- a/pkg/restic/retry.go +++ b/pkg/restic/retry.go @@ -50,7 +50,6 @@ func NewRetryConfig() *RetryConfig { return false } combined := strings.ToLower(err.Error() + " " + output) - klog.Infoln("Combined output: " + combined) for _, pattern := range retryablePatterns { if strings.Contains(combined, strings.ToLower(pattern)) { return true @@ -64,7 +63,7 @@ func NewRetryConfig() *RetryConfig { func (rc *RetryConfig) RunWithRetry(ctx context.Context, execFunc func() ([]byte, error)) ([]byte, error) { var output []byte var lastErr error - attempts := 0 + attempts := 1 err := wait.PollUntilContextCancel( ctx, @@ -72,24 +71,23 @@ func (rc *RetryConfig) RunWithRetry(ctx context.Context, execFunc func() ([]byte true, // Run immediately on first call func(ctx context.Context) (bool, error) { // Stop if max retries reached - if attempts >= rc.MaxRetries { + if attempts > rc.MaxRetries { return false, fmt.Errorf("max retries reached") } output, lastErr = execFunc() + klog.Infof("Attempt #%d: retrying in %v", attempts, rc.Delay) + klog.Infof("Attempt #%d error: %v", attempts, lastErr) + klog.Infof("Attempt #%d output: %s", attempts, string(output)) + if !rc.ShouldRetry(lastErr, string(output)) { return true, nil } - klog.Infoln("Retrying command after error", - "attempt", attempts, - "maxRetries", rc.MaxRetries, - "error", fmt.Sprintf("%s %s", lastErr, string(output))) attempts++ return false, nil }, ) if err != nil { - return nil, fmt.Errorf("failed after %d attempts: %w", attempts, lastErr) + return output, fmt.Errorf("failed after %d attempts: %w", attempts, lastErr) } - return output, lastErr } From eab8d90c9c8e902b05dd588a44d1649d6032b927 Mon Sep 17 00:00:00 2001 From: Anisur Rahman Date: Fri, 27 Feb 2026 13:57:22 +0600 Subject: [PATCH 2/3] make gen Signed-off-by: Anisur Rahman --- apis/repositories/v1alpha1/zz_generated.conversion.go | 3 +-- client/clientset/versioned/clientset.go | 7 +++---- .../clientset/versioned/fake/clientset_generated.go | 11 +++++------ client/clientset/versioned/fake/register.go | 9 ++++----- client/clientset/versioned/scheme/register.go | 9 ++++----- .../v1alpha1/fake/fake_repositories_client.go | 3 +-- .../typed/repositories/v1alpha1/fake/fake_snapshot.go | 3 +-- .../repositories/v1alpha1/repositories_client.go | 3 +-- .../versioned/typed/repositories/v1alpha1/snapshot.go | 5 ++--- .../typed/stash/v1alpha1/fake/fake_repository.go | 3 +-- .../typed/stash/v1alpha1/fake/fake_stash_client.go | 3 +-- .../versioned/typed/stash/v1alpha1/repository.go | 5 ++--- .../versioned/typed/stash/v1alpha1/stash_client.go | 3 +-- .../versioned/typed/stash/v1beta1/backupbatch.go | 5 ++--- .../versioned/typed/stash/v1beta1/backupblueprint.go | 5 ++--- .../typed/stash/v1beta1/backupconfiguration.go | 5 ++--- .../versioned/typed/stash/v1beta1/backupsession.go | 5 ++--- .../typed/stash/v1beta1/fake/fake_backupbatch.go | 3 +-- .../typed/stash/v1beta1/fake/fake_backupblueprint.go | 3 +-- .../stash/v1beta1/fake/fake_backupconfiguration.go | 3 +-- .../typed/stash/v1beta1/fake/fake_backupsession.go | 3 +-- .../typed/stash/v1beta1/fake/fake_function.go | 3 +-- .../typed/stash/v1beta1/fake/fake_restorebatch.go | 3 +-- .../typed/stash/v1beta1/fake/fake_restoresession.go | 3 +-- .../typed/stash/v1beta1/fake/fake_stash_client.go | 3 +-- .../versioned/typed/stash/v1beta1/fake/fake_task.go | 3 +-- .../versioned/typed/stash/v1beta1/function.go | 5 ++--- .../versioned/typed/stash/v1beta1/restorebatch.go | 5 ++--- .../versioned/typed/stash/v1beta1/restoresession.go | 5 ++--- .../versioned/typed/stash/v1beta1/stash_client.go | 3 +-- .../clientset/versioned/typed/stash/v1beta1/task.go | 5 ++--- .../versioned/typed/ui/v1alpha1/ui_client.go | 3 +-- client/informers/externalversions/factory.go | 7 +++---- client/informers/externalversions/generic.go | 5 ++--- .../internalinterfaces/factory_interfaces.go | 3 +-- .../externalversions/stash/v1alpha1/repository.go | 9 ++++----- .../externalversions/stash/v1beta1/backupbatch.go | 9 ++++----- .../externalversions/stash/v1beta1/backupblueprint.go | 9 ++++----- .../stash/v1beta1/backupconfiguration.go | 9 ++++----- .../externalversions/stash/v1beta1/backupsession.go | 9 ++++----- .../externalversions/stash/v1beta1/function.go | 9 ++++----- .../externalversions/stash/v1beta1/restorebatch.go | 9 ++++----- .../externalversions/stash/v1beta1/restoresession.go | 9 ++++----- .../informers/externalversions/stash/v1beta1/task.go | 9 ++++----- client/listers/repositories/v1alpha1/snapshot.go | 3 +-- client/listers/stash/v1alpha1/repository.go | 3 +-- client/listers/stash/v1beta1/backupbatch.go | 3 +-- client/listers/stash/v1beta1/backupblueprint.go | 3 +-- client/listers/stash/v1beta1/backupconfiguration.go | 3 +-- client/listers/stash/v1beta1/backupsession.go | 3 +-- client/listers/stash/v1beta1/function.go | 3 +-- client/listers/stash/v1beta1/restorebatch.go | 3 +-- client/listers/stash/v1beta1/restoresession.go | 3 +-- client/listers/stash/v1beta1/task.go | 3 +-- 54 files changed, 106 insertions(+), 160 deletions(-) diff --git a/apis/repositories/v1alpha1/zz_generated.conversion.go b/apis/repositories/v1alpha1/zz_generated.conversion.go index bc14d58c6..3c22404c5 100644 --- a/apis/repositories/v1alpha1/zz_generated.conversion.go +++ b/apis/repositories/v1alpha1/zz_generated.conversion.go @@ -24,10 +24,9 @@ package v1alpha1 import ( unsafe "unsafe" - repositories "stash.appscode.dev/apimachinery/apis/repositories" - conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" + repositories "stash.appscode.dev/apimachinery/apis/repositories" ) func init() { diff --git a/client/clientset/versioned/clientset.go b/client/clientset/versioned/clientset.go index 0b92d90ee..6b5e86bcd 100644 --- a/client/clientset/versioned/clientset.go +++ b/client/clientset/versioned/clientset.go @@ -22,14 +22,13 @@ import ( "fmt" "net/http" + discovery "k8s.io/client-go/discovery" + rest "k8s.io/client-go/rest" + flowcontrol "k8s.io/client-go/util/flowcontrol" repositoriesv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/repositories/v1alpha1" stashv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1alpha1" stashv1beta1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1" uiv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/ui/v1alpha1" - - discovery "k8s.io/client-go/discovery" - rest "k8s.io/client-go/rest" - flowcontrol "k8s.io/client-go/util/flowcontrol" ) type Interface interface { diff --git a/client/clientset/versioned/fake/clientset_generated.go b/client/clientset/versioned/fake/clientset_generated.go index b2ab8e154..5becefde7 100644 --- a/client/clientset/versioned/fake/clientset_generated.go +++ b/client/clientset/versioned/fake/clientset_generated.go @@ -19,6 +19,11 @@ limitations under the License. package fake import ( + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/discovery" + fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" clientset "stash.appscode.dev/apimachinery/client/clientset/versioned" repositoriesv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/repositories/v1alpha1" fakerepositoriesv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/repositories/v1alpha1/fake" @@ -28,12 +33,6 @@ import ( fakestashv1beta1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/fake" uiv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/ui/v1alpha1" fakeuiv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/ui/v1alpha1/fake" - - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/discovery" - fakediscovery "k8s.io/client-go/discovery/fake" - "k8s.io/client-go/testing" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/client/clientset/versioned/fake/register.go b/client/clientset/versioned/fake/register.go index 2e8fe7274..6fee1441d 100644 --- a/client/clientset/versioned/fake/register.go +++ b/client/clientset/versioned/fake/register.go @@ -19,16 +19,15 @@ limitations under the License. package fake import ( - repositoriesv1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" - stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - uiv1alpha1 "stash.appscode.dev/apimachinery/apis/ui/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + repositoriesv1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" + stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + uiv1alpha1 "stash.appscode.dev/apimachinery/apis/ui/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/client/clientset/versioned/scheme/register.go b/client/clientset/versioned/scheme/register.go index 0a4876d30..e6a07e922 100644 --- a/client/clientset/versioned/scheme/register.go +++ b/client/clientset/versioned/scheme/register.go @@ -19,16 +19,15 @@ limitations under the License. package scheme import ( - repositoriesv1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" - stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - uiv1alpha1 "stash.appscode.dev/apimachinery/apis/ui/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" + repositoriesv1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" + stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + uiv1alpha1 "stash.appscode.dev/apimachinery/apis/ui/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_repositories_client.go b/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_repositories_client.go index c44088f69..23465cc6e 100644 --- a/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_repositories_client.go +++ b/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_repositories_client.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - v1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/repositories/v1alpha1" - rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + v1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/repositories/v1alpha1" ) type FakeRepositoriesV1alpha1 struct { diff --git a/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_snapshot.go b/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_snapshot.go index a8dfb4af0..e6d30abb6 100644 --- a/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_snapshot.go +++ b/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_snapshot.go @@ -21,11 +21,10 @@ package fake import ( "context" - v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" testing "k8s.io/client-go/testing" + v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" ) // FakeSnapshots implements SnapshotInterface diff --git a/client/clientset/versioned/typed/repositories/v1alpha1/repositories_client.go b/client/clientset/versioned/typed/repositories/v1alpha1/repositories_client.go index b6c3c6b72..a2ed1d892 100644 --- a/client/clientset/versioned/typed/repositories/v1alpha1/repositories_client.go +++ b/client/clientset/versioned/typed/repositories/v1alpha1/repositories_client.go @@ -21,10 +21,9 @@ package v1alpha1 import ( "net/http" + rest "k8s.io/client-go/rest" v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - - rest "k8s.io/client-go/rest" ) type RepositoriesV1alpha1Interface interface { diff --git a/client/clientset/versioned/typed/repositories/v1alpha1/snapshot.go b/client/clientset/versioned/typed/repositories/v1alpha1/snapshot.go index d504ceb0f..ea161b5bb 100644 --- a/client/clientset/versioned/typed/repositories/v1alpha1/snapshot.go +++ b/client/clientset/versioned/typed/repositories/v1alpha1/snapshot.go @@ -22,11 +22,10 @@ import ( "context" "time" - v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" rest "k8s.io/client-go/rest" + v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // SnapshotsGetter has a method to return a SnapshotInterface. diff --git a/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_repository.go b/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_repository.go index b0b25f033..23ea12141 100644 --- a/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_repository.go +++ b/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_repository.go @@ -21,13 +21,12 @@ package fake import ( "context" - v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" ) // FakeRepositories implements RepositoryInterface diff --git a/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_stash_client.go b/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_stash_client.go index 5741aec3e..a12ff53d8 100644 --- a/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_stash_client.go +++ b/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_stash_client.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - v1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1alpha1" - rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + v1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1alpha1" ) type FakeStashV1alpha1 struct { diff --git a/client/clientset/versioned/typed/stash/v1alpha1/repository.go b/client/clientset/versioned/typed/stash/v1alpha1/repository.go index 653a85c8e..b7f933083 100644 --- a/client/clientset/versioned/typed/stash/v1alpha1/repository.go +++ b/client/clientset/versioned/typed/stash/v1alpha1/repository.go @@ -22,13 +22,12 @@ import ( "context" "time" - v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // RepositoriesGetter has a method to return a RepositoryInterface. diff --git a/client/clientset/versioned/typed/stash/v1alpha1/stash_client.go b/client/clientset/versioned/typed/stash/v1alpha1/stash_client.go index bd03fa7ab..d834979f7 100644 --- a/client/clientset/versioned/typed/stash/v1alpha1/stash_client.go +++ b/client/clientset/versioned/typed/stash/v1alpha1/stash_client.go @@ -21,10 +21,9 @@ package v1alpha1 import ( "net/http" + rest "k8s.io/client-go/rest" v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - - rest "k8s.io/client-go/rest" ) type StashV1alpha1Interface interface { diff --git a/client/clientset/versioned/typed/stash/v1beta1/backupbatch.go b/client/clientset/versioned/typed/stash/v1beta1/backupbatch.go index aae2944af..9c9f30023 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/backupbatch.go +++ b/client/clientset/versioned/typed/stash/v1beta1/backupbatch.go @@ -22,13 +22,12 @@ import ( "context" "time" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // BackupBatchesGetter has a method to return a BackupBatchInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/backupblueprint.go b/client/clientset/versioned/typed/stash/v1beta1/backupblueprint.go index dd70fa40e..8bc3a12e8 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/backupblueprint.go +++ b/client/clientset/versioned/typed/stash/v1beta1/backupblueprint.go @@ -22,13 +22,12 @@ import ( "context" "time" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // BackupBlueprintsGetter has a method to return a BackupBlueprintInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/backupconfiguration.go b/client/clientset/versioned/typed/stash/v1beta1/backupconfiguration.go index 72a63bf87..c2d9e26d8 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/backupconfiguration.go +++ b/client/clientset/versioned/typed/stash/v1beta1/backupconfiguration.go @@ -22,13 +22,12 @@ import ( "context" "time" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // BackupConfigurationsGetter has a method to return a BackupConfigurationInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/backupsession.go b/client/clientset/versioned/typed/stash/v1beta1/backupsession.go index 46ee51744..2fe2bb746 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/backupsession.go +++ b/client/clientset/versioned/typed/stash/v1beta1/backupsession.go @@ -22,13 +22,12 @@ import ( "context" "time" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // BackupSessionsGetter has a method to return a BackupSessionInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupbatch.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupbatch.go index d917454a5..d47674f40 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupbatch.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupbatch.go @@ -21,13 +21,12 @@ package fake import ( "context" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeBackupBatches implements BackupBatchInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupblueprint.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupblueprint.go index ed5234d96..27b2d06fa 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupblueprint.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupblueprint.go @@ -21,13 +21,12 @@ package fake import ( "context" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeBackupBlueprints implements BackupBlueprintInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupconfiguration.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupconfiguration.go index 4c9e57f28..eef5f878e 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupconfiguration.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupconfiguration.go @@ -21,13 +21,12 @@ package fake import ( "context" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeBackupConfigurations implements BackupConfigurationInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupsession.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupsession.go index 50e18d091..238846437 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupsession.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupsession.go @@ -21,13 +21,12 @@ package fake import ( "context" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeBackupSessions implements BackupSessionInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_function.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_function.go index 987b16011..80f8548fb 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_function.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_function.go @@ -21,13 +21,12 @@ package fake import ( "context" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeFunctions implements FunctionInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restorebatch.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restorebatch.go index e131a7ec0..fb6463d74 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restorebatch.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restorebatch.go @@ -21,13 +21,12 @@ package fake import ( "context" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeRestoreBatches implements RestoreBatchInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restoresession.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restoresession.go index 36d5b3e54..dea99459e 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restoresession.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restoresession.go @@ -21,13 +21,12 @@ package fake import ( "context" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeRestoreSessions implements RestoreSessionInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_stash_client.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_stash_client.go index 3872ba0ca..e5b752805 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_stash_client.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_stash_client.go @@ -19,10 +19,9 @@ limitations under the License. package fake import ( - v1beta1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1" - rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" + v1beta1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1" ) type FakeStashV1beta1 struct { diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_task.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_task.go index 04159504f..3cddac926 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_task.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_task.go @@ -21,13 +21,12 @@ package fake import ( "context" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeTasks implements TaskInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/function.go b/client/clientset/versioned/typed/stash/v1beta1/function.go index dd8abee89..1bf012a54 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/function.go +++ b/client/clientset/versioned/typed/stash/v1beta1/function.go @@ -22,13 +22,12 @@ import ( "context" "time" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // FunctionsGetter has a method to return a FunctionInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/restorebatch.go b/client/clientset/versioned/typed/stash/v1beta1/restorebatch.go index acb3dd5a9..1c545c5dc 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/restorebatch.go +++ b/client/clientset/versioned/typed/stash/v1beta1/restorebatch.go @@ -22,13 +22,12 @@ import ( "context" "time" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // RestoreBatchesGetter has a method to return a RestoreBatchInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/restoresession.go b/client/clientset/versioned/typed/stash/v1beta1/restoresession.go index f28eb5ae2..e334972e3 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/restoresession.go +++ b/client/clientset/versioned/typed/stash/v1beta1/restoresession.go @@ -22,13 +22,12 @@ import ( "context" "time" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // RestoreSessionsGetter has a method to return a RestoreSessionInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/stash_client.go b/client/clientset/versioned/typed/stash/v1beta1/stash_client.go index ea60a990d..e67e7cabe 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/stash_client.go +++ b/client/clientset/versioned/typed/stash/v1beta1/stash_client.go @@ -21,10 +21,9 @@ package v1beta1 import ( "net/http" + rest "k8s.io/client-go/rest" v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - - rest "k8s.io/client-go/rest" ) type StashV1beta1Interface interface { diff --git a/client/clientset/versioned/typed/stash/v1beta1/task.go b/client/clientset/versioned/typed/stash/v1beta1/task.go index 21c2b876e..a6fb11a1c 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/task.go +++ b/client/clientset/versioned/typed/stash/v1beta1/task.go @@ -22,13 +22,12 @@ import ( "context" "time" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // TasksGetter has a method to return a TaskInterface. diff --git a/client/clientset/versioned/typed/ui/v1alpha1/ui_client.go b/client/clientset/versioned/typed/ui/v1alpha1/ui_client.go index 89fb035b0..af7684bed 100644 --- a/client/clientset/versioned/typed/ui/v1alpha1/ui_client.go +++ b/client/clientset/versioned/typed/ui/v1alpha1/ui_client.go @@ -21,10 +21,9 @@ package v1alpha1 import ( "net/http" + rest "k8s.io/client-go/rest" v1alpha1 "stash.appscode.dev/apimachinery/apis/ui/v1alpha1" "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" - - rest "k8s.io/client-go/rest" ) type UiV1alpha1Interface interface { diff --git a/client/informers/externalversions/factory.go b/client/informers/externalversions/factory.go index f91497532..41e910cf0 100644 --- a/client/informers/externalversions/factory.go +++ b/client/informers/externalversions/factory.go @@ -23,14 +23,13 @@ import ( sync "sync" time "time" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - stash "stash.appscode.dev/apimachinery/client/informers/externalversions/stash" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + stash "stash.appscode.dev/apimachinery/client/informers/externalversions/stash" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/client/informers/externalversions/generic.go b/client/informers/externalversions/generic.go index f28fbfdfb..75c717b96 100644 --- a/client/informers/externalversions/generic.go +++ b/client/informers/externalversions/generic.go @@ -21,11 +21,10 @@ package externalversions import ( "fmt" - v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" + v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 60d4e2d97..6135223d1 100644 --- a/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,11 +21,10 @@ package internalinterfaces import ( time "time" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/client/informers/externalversions/stash/v1alpha1/repository.go b/client/informers/externalversions/stash/v1alpha1/repository.go index 6e40906ac..c7593ca45 100644 --- a/client/informers/externalversions/stash/v1alpha1/repository.go +++ b/client/informers/externalversions/stash/v1alpha1/repository.go @@ -22,15 +22,14 @@ import ( "context" time "time" - stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - v1alpha1 "stash.appscode.dev/apimachinery/client/listers/stash/v1alpha1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + v1alpha1 "stash.appscode.dev/apimachinery/client/listers/stash/v1alpha1" ) // RepositoryInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/backupbatch.go b/client/informers/externalversions/stash/v1beta1/backupbatch.go index 0adc8f829..91b5e405f 100644 --- a/client/informers/externalversions/stash/v1beta1/backupbatch.go +++ b/client/informers/externalversions/stash/v1beta1/backupbatch.go @@ -22,15 +22,14 @@ import ( "context" time "time" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" ) // BackupBatchInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/backupblueprint.go b/client/informers/externalversions/stash/v1beta1/backupblueprint.go index c476da26e..0758d8092 100644 --- a/client/informers/externalversions/stash/v1beta1/backupblueprint.go +++ b/client/informers/externalversions/stash/v1beta1/backupblueprint.go @@ -22,15 +22,14 @@ import ( "context" time "time" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" ) // BackupBlueprintInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/backupconfiguration.go b/client/informers/externalversions/stash/v1beta1/backupconfiguration.go index 4e0f4011e..2f77756b7 100644 --- a/client/informers/externalversions/stash/v1beta1/backupconfiguration.go +++ b/client/informers/externalversions/stash/v1beta1/backupconfiguration.go @@ -22,15 +22,14 @@ import ( "context" time "time" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" ) // BackupConfigurationInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/backupsession.go b/client/informers/externalversions/stash/v1beta1/backupsession.go index 3399c35c3..05dcfc59a 100644 --- a/client/informers/externalversions/stash/v1beta1/backupsession.go +++ b/client/informers/externalversions/stash/v1beta1/backupsession.go @@ -22,15 +22,14 @@ import ( "context" time "time" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" ) // BackupSessionInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/function.go b/client/informers/externalversions/stash/v1beta1/function.go index 54b44631a..d90bf09d3 100644 --- a/client/informers/externalversions/stash/v1beta1/function.go +++ b/client/informers/externalversions/stash/v1beta1/function.go @@ -22,15 +22,14 @@ import ( "context" time "time" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" ) // FunctionInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/restorebatch.go b/client/informers/externalversions/stash/v1beta1/restorebatch.go index 578816d85..3c9c611e3 100644 --- a/client/informers/externalversions/stash/v1beta1/restorebatch.go +++ b/client/informers/externalversions/stash/v1beta1/restorebatch.go @@ -22,15 +22,14 @@ import ( "context" time "time" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" ) // RestoreBatchInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/restoresession.go b/client/informers/externalversions/stash/v1beta1/restoresession.go index e32ada030..1431940fd 100644 --- a/client/informers/externalversions/stash/v1beta1/restoresession.go +++ b/client/informers/externalversions/stash/v1beta1/restoresession.go @@ -22,15 +22,14 @@ import ( "context" time "time" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" ) // RestoreSessionInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/task.go b/client/informers/externalversions/stash/v1beta1/task.go index ad5e5a25b..4c30adb74 100644 --- a/client/informers/externalversions/stash/v1beta1/task.go +++ b/client/informers/externalversions/stash/v1beta1/task.go @@ -22,15 +22,14 @@ import ( "context" time "time" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" watch "k8s.io/apimachinery/pkg/watch" cache "k8s.io/client-go/tools/cache" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" ) // TaskInformer provides access to a shared informer and lister for diff --git a/client/listers/repositories/v1alpha1/snapshot.go b/client/listers/repositories/v1alpha1/snapshot.go index 3d831b4a9..55249c543 100644 --- a/client/listers/repositories/v1alpha1/snapshot.go +++ b/client/listers/repositories/v1alpha1/snapshot.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" ) // SnapshotLister helps list Snapshots. diff --git a/client/listers/stash/v1alpha1/repository.go b/client/listers/stash/v1alpha1/repository.go index e2fe60515..ea7219d75 100644 --- a/client/listers/stash/v1alpha1/repository.go +++ b/client/listers/stash/v1alpha1/repository.go @@ -19,11 +19,10 @@ limitations under the License. package v1alpha1 import ( - v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" ) // RepositoryLister helps list Repositories. diff --git a/client/listers/stash/v1beta1/backupbatch.go b/client/listers/stash/v1beta1/backupbatch.go index 06bbfde96..42736891b 100644 --- a/client/listers/stash/v1beta1/backupbatch.go +++ b/client/listers/stash/v1beta1/backupbatch.go @@ -19,11 +19,10 @@ limitations under the License. package v1beta1 import ( - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // BackupBatchLister helps list BackupBatches. diff --git a/client/listers/stash/v1beta1/backupblueprint.go b/client/listers/stash/v1beta1/backupblueprint.go index cd806bb5c..d8adc78af 100644 --- a/client/listers/stash/v1beta1/backupblueprint.go +++ b/client/listers/stash/v1beta1/backupblueprint.go @@ -19,11 +19,10 @@ limitations under the License. package v1beta1 import ( - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // BackupBlueprintLister helps list BackupBlueprints. diff --git a/client/listers/stash/v1beta1/backupconfiguration.go b/client/listers/stash/v1beta1/backupconfiguration.go index d58ee623c..785770e06 100644 --- a/client/listers/stash/v1beta1/backupconfiguration.go +++ b/client/listers/stash/v1beta1/backupconfiguration.go @@ -19,11 +19,10 @@ limitations under the License. package v1beta1 import ( - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // BackupConfigurationLister helps list BackupConfigurations. diff --git a/client/listers/stash/v1beta1/backupsession.go b/client/listers/stash/v1beta1/backupsession.go index 1b527b4b7..c24ed8e67 100644 --- a/client/listers/stash/v1beta1/backupsession.go +++ b/client/listers/stash/v1beta1/backupsession.go @@ -19,11 +19,10 @@ limitations under the License. package v1beta1 import ( - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // BackupSessionLister helps list BackupSessions. diff --git a/client/listers/stash/v1beta1/function.go b/client/listers/stash/v1beta1/function.go index de11b872a..32e643293 100644 --- a/client/listers/stash/v1beta1/function.go +++ b/client/listers/stash/v1beta1/function.go @@ -19,11 +19,10 @@ limitations under the License. package v1beta1 import ( - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FunctionLister helps list Functions. diff --git a/client/listers/stash/v1beta1/restorebatch.go b/client/listers/stash/v1beta1/restorebatch.go index 4488ca7a0..6ecd796ea 100644 --- a/client/listers/stash/v1beta1/restorebatch.go +++ b/client/listers/stash/v1beta1/restorebatch.go @@ -19,11 +19,10 @@ limitations under the License. package v1beta1 import ( - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // RestoreBatchLister helps list RestoreBatches. diff --git a/client/listers/stash/v1beta1/restoresession.go b/client/listers/stash/v1beta1/restoresession.go index 0d23777b6..5e16507e0 100644 --- a/client/listers/stash/v1beta1/restoresession.go +++ b/client/listers/stash/v1beta1/restoresession.go @@ -19,11 +19,10 @@ limitations under the License. package v1beta1 import ( - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // RestoreSessionLister helps list RestoreSessions. diff --git a/client/listers/stash/v1beta1/task.go b/client/listers/stash/v1beta1/task.go index 5bca18016..23d8bd1e3 100644 --- a/client/listers/stash/v1beta1/task.go +++ b/client/listers/stash/v1beta1/task.go @@ -19,11 +19,10 @@ limitations under the License. package v1beta1 import ( - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // TaskLister helps list Tasks. From 98197381e435f47e757b5a8aef8d289d27c3d109 Mon Sep 17 00:00:00 2001 From: Anisur Rahman Date: Fri, 27 Feb 2026 15:01:26 +0600 Subject: [PATCH 3/3] fix ci Signed-off-by: Anisur Rahman --- .../v1alpha1/zz_generated.conversion.go | 3 +- client/clientset/versioned/clientset.go | 7 +- .../versioned/fake/clientset_generated.go | 11 ++- client/clientset/versioned/fake/register.go | 9 +- client/clientset/versioned/scheme/register.go | 9 +- .../v1alpha1/fake/fake_repositories_client.go | 3 +- .../v1alpha1/fake/fake_snapshot.go | 3 +- .../v1alpha1/repositories_client.go | 3 +- .../typed/repositories/v1alpha1/snapshot.go | 5 +- .../stash/v1alpha1/fake/fake_repository.go | 3 +- .../stash/v1alpha1/fake/fake_stash_client.go | 3 +- .../typed/stash/v1alpha1/repository.go | 5 +- .../typed/stash/v1alpha1/stash_client.go | 3 +- .../typed/stash/v1beta1/backupbatch.go | 5 +- .../typed/stash/v1beta1/backupblueprint.go | 5 +- .../stash/v1beta1/backupconfiguration.go | 5 +- .../typed/stash/v1beta1/backupsession.go | 5 +- .../stash/v1beta1/fake/fake_backupbatch.go | 3 +- .../v1beta1/fake/fake_backupblueprint.go | 3 +- .../v1beta1/fake/fake_backupconfiguration.go | 3 +- .../stash/v1beta1/fake/fake_backupsession.go | 3 +- .../typed/stash/v1beta1/fake/fake_function.go | 3 +- .../stash/v1beta1/fake/fake_restorebatch.go | 3 +- .../stash/v1beta1/fake/fake_restoresession.go | 3 +- .../stash/v1beta1/fake/fake_stash_client.go | 3 +- .../typed/stash/v1beta1/fake/fake_task.go | 3 +- .../versioned/typed/stash/v1beta1/function.go | 5 +- .../typed/stash/v1beta1/restorebatch.go | 5 +- .../typed/stash/v1beta1/restoresession.go | 5 +- .../typed/stash/v1beta1/stash_client.go | 3 +- .../versioned/typed/stash/v1beta1/task.go | 5 +- .../versioned/typed/ui/v1alpha1/ui_client.go | 3 +- client/informers/externalversions/factory.go | 7 +- client/informers/externalversions/generic.go | 5 +- .../internalinterfaces/factory_interfaces.go | 3 +- .../stash/v1alpha1/repository.go | 9 +- .../stash/v1beta1/backupbatch.go | 9 +- .../stash/v1beta1/backupblueprint.go | 9 +- .../stash/v1beta1/backupconfiguration.go | 9 +- .../stash/v1beta1/backupsession.go | 9 +- .../stash/v1beta1/function.go | 9 +- .../stash/v1beta1/restorebatch.go | 9 +- .../stash/v1beta1/restoresession.go | 9 +- .../externalversions/stash/v1beta1/task.go | 9 +- .../listers/repositories/v1alpha1/snapshot.go | 3 +- client/listers/stash/v1alpha1/repository.go | 3 +- client/listers/stash/v1beta1/backupbatch.go | 3 +- .../listers/stash/v1beta1/backupblueprint.go | 3 +- .../stash/v1beta1/backupconfiguration.go | 3 +- client/listers/stash/v1beta1/backupsession.go | 3 +- client/listers/stash/v1beta1/function.go | 3 +- client/listers/stash/v1beta1/restorebatch.go | 3 +- .../listers/stash/v1beta1/restoresession.go | 3 +- client/listers/stash/v1beta1/task.go | 3 +- go.mod | 1 - go.sum | 2 - vendor/github.com/armon/circbuf/.gitignore | 22 ----- vendor/github.com/armon/circbuf/LICENSE | 20 ---- vendor/github.com/armon/circbuf/README.md | 28 ------ vendor/github.com/armon/circbuf/circbuf.go | 92 ------------------- vendor/modules.txt | 3 - 61 files changed, 160 insertions(+), 274 deletions(-) delete mode 100644 vendor/github.com/armon/circbuf/.gitignore delete mode 100644 vendor/github.com/armon/circbuf/LICENSE delete mode 100644 vendor/github.com/armon/circbuf/README.md delete mode 100644 vendor/github.com/armon/circbuf/circbuf.go diff --git a/apis/repositories/v1alpha1/zz_generated.conversion.go b/apis/repositories/v1alpha1/zz_generated.conversion.go index 3c22404c5..bc14d58c6 100644 --- a/apis/repositories/v1alpha1/zz_generated.conversion.go +++ b/apis/repositories/v1alpha1/zz_generated.conversion.go @@ -24,9 +24,10 @@ package v1alpha1 import ( unsafe "unsafe" + repositories "stash.appscode.dev/apimachinery/apis/repositories" + conversion "k8s.io/apimachinery/pkg/conversion" runtime "k8s.io/apimachinery/pkg/runtime" - repositories "stash.appscode.dev/apimachinery/apis/repositories" ) func init() { diff --git a/client/clientset/versioned/clientset.go b/client/clientset/versioned/clientset.go index 6b5e86bcd..0b92d90ee 100644 --- a/client/clientset/versioned/clientset.go +++ b/client/clientset/versioned/clientset.go @@ -22,13 +22,14 @@ import ( "fmt" "net/http" - discovery "k8s.io/client-go/discovery" - rest "k8s.io/client-go/rest" - flowcontrol "k8s.io/client-go/util/flowcontrol" repositoriesv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/repositories/v1alpha1" stashv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1alpha1" stashv1beta1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1" uiv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/ui/v1alpha1" + + discovery "k8s.io/client-go/discovery" + rest "k8s.io/client-go/rest" + flowcontrol "k8s.io/client-go/util/flowcontrol" ) type Interface interface { diff --git a/client/clientset/versioned/fake/clientset_generated.go b/client/clientset/versioned/fake/clientset_generated.go index 5becefde7..b2ab8e154 100644 --- a/client/clientset/versioned/fake/clientset_generated.go +++ b/client/clientset/versioned/fake/clientset_generated.go @@ -19,11 +19,6 @@ limitations under the License. package fake import ( - "k8s.io/apimachinery/pkg/runtime" - "k8s.io/apimachinery/pkg/watch" - "k8s.io/client-go/discovery" - fakediscovery "k8s.io/client-go/discovery/fake" - "k8s.io/client-go/testing" clientset "stash.appscode.dev/apimachinery/client/clientset/versioned" repositoriesv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/repositories/v1alpha1" fakerepositoriesv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/repositories/v1alpha1/fake" @@ -33,6 +28,12 @@ import ( fakestashv1beta1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1/fake" uiv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/ui/v1alpha1" fakeuiv1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/ui/v1alpha1/fake" + + "k8s.io/apimachinery/pkg/runtime" + "k8s.io/apimachinery/pkg/watch" + "k8s.io/client-go/discovery" + fakediscovery "k8s.io/client-go/discovery/fake" + "k8s.io/client-go/testing" ) // NewSimpleClientset returns a clientset that will respond with the provided objects. diff --git a/client/clientset/versioned/fake/register.go b/client/clientset/versioned/fake/register.go index 6fee1441d..2e8fe7274 100644 --- a/client/clientset/versioned/fake/register.go +++ b/client/clientset/versioned/fake/register.go @@ -19,15 +19,16 @@ limitations under the License. package fake import ( + repositoriesv1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" + stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + uiv1alpha1 "stash.appscode.dev/apimachinery/apis/ui/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - repositoriesv1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" - stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - uiv1alpha1 "stash.appscode.dev/apimachinery/apis/ui/v1alpha1" ) var scheme = runtime.NewScheme() diff --git a/client/clientset/versioned/scheme/register.go b/client/clientset/versioned/scheme/register.go index e6a07e922..0a4876d30 100644 --- a/client/clientset/versioned/scheme/register.go +++ b/client/clientset/versioned/scheme/register.go @@ -19,15 +19,16 @@ limitations under the License. package scheme import ( + repositoriesv1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" + stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" + stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + uiv1alpha1 "stash.appscode.dev/apimachinery/apis/ui/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" serializer "k8s.io/apimachinery/pkg/runtime/serializer" utilruntime "k8s.io/apimachinery/pkg/util/runtime" - repositoriesv1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" - stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - uiv1alpha1 "stash.appscode.dev/apimachinery/apis/ui/v1alpha1" ) var Scheme = runtime.NewScheme() diff --git a/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_repositories_client.go b/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_repositories_client.go index 23465cc6e..c44088f69 100644 --- a/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_repositories_client.go +++ b/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_repositories_client.go @@ -19,9 +19,10 @@ limitations under the License. package fake import ( + v1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/repositories/v1alpha1" + rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/repositories/v1alpha1" ) type FakeRepositoriesV1alpha1 struct { diff --git a/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_snapshot.go b/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_snapshot.go index e6d30abb6..a8dfb4af0 100644 --- a/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_snapshot.go +++ b/client/clientset/versioned/typed/repositories/v1alpha1/fake/fake_snapshot.go @@ -21,10 +21,11 @@ package fake import ( "context" + v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" testing "k8s.io/client-go/testing" - v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" ) // FakeSnapshots implements SnapshotInterface diff --git a/client/clientset/versioned/typed/repositories/v1alpha1/repositories_client.go b/client/clientset/versioned/typed/repositories/v1alpha1/repositories_client.go index a2ed1d892..b6c3c6b72 100644 --- a/client/clientset/versioned/typed/repositories/v1alpha1/repositories_client.go +++ b/client/clientset/versioned/typed/repositories/v1alpha1/repositories_client.go @@ -21,9 +21,10 @@ package v1alpha1 import ( "net/http" - rest "k8s.io/client-go/rest" v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + + rest "k8s.io/client-go/rest" ) type RepositoriesV1alpha1Interface interface { diff --git a/client/clientset/versioned/typed/repositories/v1alpha1/snapshot.go b/client/clientset/versioned/typed/repositories/v1alpha1/snapshot.go index ea161b5bb..d504ceb0f 100644 --- a/client/clientset/versioned/typed/repositories/v1alpha1/snapshot.go +++ b/client/clientset/versioned/typed/repositories/v1alpha1/snapshot.go @@ -22,10 +22,11 @@ import ( "context" "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - rest "k8s.io/client-go/rest" v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + rest "k8s.io/client-go/rest" ) // SnapshotsGetter has a method to return a SnapshotInterface. diff --git a/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_repository.go b/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_repository.go index 23ea12141..b0b25f033 100644 --- a/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_repository.go +++ b/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_repository.go @@ -21,12 +21,13 @@ package fake import ( "context" + v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" ) // FakeRepositories implements RepositoryInterface diff --git a/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_stash_client.go b/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_stash_client.go index a12ff53d8..5741aec3e 100644 --- a/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_stash_client.go +++ b/client/clientset/versioned/typed/stash/v1alpha1/fake/fake_stash_client.go @@ -19,9 +19,10 @@ limitations under the License. package fake import ( + v1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1alpha1" + rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1alpha1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1alpha1" ) type FakeStashV1alpha1 struct { diff --git a/client/clientset/versioned/typed/stash/v1alpha1/repository.go b/client/clientset/versioned/typed/stash/v1alpha1/repository.go index b7f933083..653a85c8e 100644 --- a/client/clientset/versioned/typed/stash/v1alpha1/repository.go +++ b/client/clientset/versioned/typed/stash/v1alpha1/repository.go @@ -22,12 +22,13 @@ import ( "context" "time" + v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // RepositoriesGetter has a method to return a RepositoryInterface. diff --git a/client/clientset/versioned/typed/stash/v1alpha1/stash_client.go b/client/clientset/versioned/typed/stash/v1alpha1/stash_client.go index d834979f7..bd03fa7ab 100644 --- a/client/clientset/versioned/typed/stash/v1alpha1/stash_client.go +++ b/client/clientset/versioned/typed/stash/v1alpha1/stash_client.go @@ -21,9 +21,10 @@ package v1alpha1 import ( "net/http" - rest "k8s.io/client-go/rest" v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + + rest "k8s.io/client-go/rest" ) type StashV1alpha1Interface interface { diff --git a/client/clientset/versioned/typed/stash/v1beta1/backupbatch.go b/client/clientset/versioned/typed/stash/v1beta1/backupbatch.go index 9c9f30023..aae2944af 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/backupbatch.go +++ b/client/clientset/versioned/typed/stash/v1beta1/backupbatch.go @@ -22,12 +22,13 @@ import ( "context" "time" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // BackupBatchesGetter has a method to return a BackupBatchInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/backupblueprint.go b/client/clientset/versioned/typed/stash/v1beta1/backupblueprint.go index 8bc3a12e8..dd70fa40e 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/backupblueprint.go +++ b/client/clientset/versioned/typed/stash/v1beta1/backupblueprint.go @@ -22,12 +22,13 @@ import ( "context" "time" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // BackupBlueprintsGetter has a method to return a BackupBlueprintInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/backupconfiguration.go b/client/clientset/versioned/typed/stash/v1beta1/backupconfiguration.go index c2d9e26d8..72a63bf87 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/backupconfiguration.go +++ b/client/clientset/versioned/typed/stash/v1beta1/backupconfiguration.go @@ -22,12 +22,13 @@ import ( "context" "time" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // BackupConfigurationsGetter has a method to return a BackupConfigurationInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/backupsession.go b/client/clientset/versioned/typed/stash/v1beta1/backupsession.go index 2fe2bb746..46ee51744 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/backupsession.go +++ b/client/clientset/versioned/typed/stash/v1beta1/backupsession.go @@ -22,12 +22,13 @@ import ( "context" "time" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // BackupSessionsGetter has a method to return a BackupSessionInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupbatch.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupbatch.go index d47674f40..d917454a5 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupbatch.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupbatch.go @@ -21,12 +21,13 @@ package fake import ( "context" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeBackupBatches implements BackupBatchInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupblueprint.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupblueprint.go index 27b2d06fa..ed5234d96 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupblueprint.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupblueprint.go @@ -21,12 +21,13 @@ package fake import ( "context" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeBackupBlueprints implements BackupBlueprintInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupconfiguration.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupconfiguration.go index eef5f878e..4c9e57f28 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupconfiguration.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupconfiguration.go @@ -21,12 +21,13 @@ package fake import ( "context" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeBackupConfigurations implements BackupConfigurationInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupsession.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupsession.go index 238846437..50e18d091 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupsession.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_backupsession.go @@ -21,12 +21,13 @@ package fake import ( "context" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeBackupSessions implements BackupSessionInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_function.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_function.go index 80f8548fb..987b16011 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_function.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_function.go @@ -21,12 +21,13 @@ package fake import ( "context" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeFunctions implements FunctionInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restorebatch.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restorebatch.go index fb6463d74..e131a7ec0 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restorebatch.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restorebatch.go @@ -21,12 +21,13 @@ package fake import ( "context" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeRestoreBatches implements RestoreBatchInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restoresession.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restoresession.go index dea99459e..36d5b3e54 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restoresession.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_restoresession.go @@ -21,12 +21,13 @@ package fake import ( "context" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeRestoreSessions implements RestoreSessionInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_stash_client.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_stash_client.go index e5b752805..3872ba0ca 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_stash_client.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_stash_client.go @@ -19,9 +19,10 @@ limitations under the License. package fake import ( + v1beta1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1" + rest "k8s.io/client-go/rest" testing "k8s.io/client-go/testing" - v1beta1 "stash.appscode.dev/apimachinery/client/clientset/versioned/typed/stash/v1beta1" ) type FakeStashV1beta1 struct { diff --git a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_task.go b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_task.go index 3cddac926..04159504f 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/fake/fake_task.go +++ b/client/clientset/versioned/typed/stash/v1beta1/fake/fake_task.go @@ -21,12 +21,13 @@ package fake import ( "context" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" labels "k8s.io/apimachinery/pkg/labels" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" testing "k8s.io/client-go/testing" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FakeTasks implements TaskInterface diff --git a/client/clientset/versioned/typed/stash/v1beta1/function.go b/client/clientset/versioned/typed/stash/v1beta1/function.go index 1bf012a54..dd8abee89 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/function.go +++ b/client/clientset/versioned/typed/stash/v1beta1/function.go @@ -22,12 +22,13 @@ import ( "context" "time" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // FunctionsGetter has a method to return a FunctionInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/restorebatch.go b/client/clientset/versioned/typed/stash/v1beta1/restorebatch.go index 1c545c5dc..acb3dd5a9 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/restorebatch.go +++ b/client/clientset/versioned/typed/stash/v1beta1/restorebatch.go @@ -22,12 +22,13 @@ import ( "context" "time" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // RestoreBatchesGetter has a method to return a RestoreBatchInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/restoresession.go b/client/clientset/versioned/typed/stash/v1beta1/restoresession.go index e334972e3..f28eb5ae2 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/restoresession.go +++ b/client/clientset/versioned/typed/stash/v1beta1/restoresession.go @@ -22,12 +22,13 @@ import ( "context" "time" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // RestoreSessionsGetter has a method to return a RestoreSessionInterface. diff --git a/client/clientset/versioned/typed/stash/v1beta1/stash_client.go b/client/clientset/versioned/typed/stash/v1beta1/stash_client.go index e67e7cabe..ea60a990d 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/stash_client.go +++ b/client/clientset/versioned/typed/stash/v1beta1/stash_client.go @@ -21,9 +21,10 @@ package v1beta1 import ( "net/http" - rest "k8s.io/client-go/rest" v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + + rest "k8s.io/client-go/rest" ) type StashV1beta1Interface interface { diff --git a/client/clientset/versioned/typed/stash/v1beta1/task.go b/client/clientset/versioned/typed/stash/v1beta1/task.go index a6fb11a1c..21c2b876e 100644 --- a/client/clientset/versioned/typed/stash/v1beta1/task.go +++ b/client/clientset/versioned/typed/stash/v1beta1/task.go @@ -22,12 +22,13 @@ import ( "context" "time" + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" types "k8s.io/apimachinery/pkg/types" watch "k8s.io/apimachinery/pkg/watch" rest "k8s.io/client-go/rest" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" - scheme "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" ) // TasksGetter has a method to return a TaskInterface. diff --git a/client/clientset/versioned/typed/ui/v1alpha1/ui_client.go b/client/clientset/versioned/typed/ui/v1alpha1/ui_client.go index af7684bed..89fb035b0 100644 --- a/client/clientset/versioned/typed/ui/v1alpha1/ui_client.go +++ b/client/clientset/versioned/typed/ui/v1alpha1/ui_client.go @@ -21,9 +21,10 @@ package v1alpha1 import ( "net/http" - rest "k8s.io/client-go/rest" v1alpha1 "stash.appscode.dev/apimachinery/apis/ui/v1alpha1" "stash.appscode.dev/apimachinery/client/clientset/versioned/scheme" + + rest "k8s.io/client-go/rest" ) type UiV1alpha1Interface interface { diff --git a/client/informers/externalversions/factory.go b/client/informers/externalversions/factory.go index 41e910cf0..f91497532 100644 --- a/client/informers/externalversions/factory.go +++ b/client/informers/externalversions/factory.go @@ -23,13 +23,14 @@ import ( sync "sync" time "time" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" + stash "stash.appscode.dev/apimachinery/client/informers/externalversions/stash" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" cache "k8s.io/client-go/tools/cache" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" - internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" - stash "stash.appscode.dev/apimachinery/client/informers/externalversions/stash" ) // SharedInformerOption defines the functional option type for SharedInformerFactory. diff --git a/client/informers/externalversions/generic.go b/client/informers/externalversions/generic.go index 75c717b96..f28fbfdfb 100644 --- a/client/informers/externalversions/generic.go +++ b/client/informers/externalversions/generic.go @@ -21,10 +21,11 @@ package externalversions import ( "fmt" - schema "k8s.io/apimachinery/pkg/runtime/schema" - cache "k8s.io/client-go/tools/cache" v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + + schema "k8s.io/apimachinery/pkg/runtime/schema" + cache "k8s.io/client-go/tools/cache" ) // GenericInformer is type of SharedIndexInformer which will locate and delegate to other diff --git a/client/informers/externalversions/internalinterfaces/factory_interfaces.go b/client/informers/externalversions/internalinterfaces/factory_interfaces.go index 6135223d1..60d4e2d97 100644 --- a/client/informers/externalversions/internalinterfaces/factory_interfaces.go +++ b/client/informers/externalversions/internalinterfaces/factory_interfaces.go @@ -21,10 +21,11 @@ package internalinterfaces import ( time "time" + versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" cache "k8s.io/client-go/tools/cache" - versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" ) // NewInformerFunc takes versioned.Interface and time.Duration to return a SharedIndexInformer. diff --git a/client/informers/externalversions/stash/v1alpha1/repository.go b/client/informers/externalversions/stash/v1alpha1/repository.go index c7593ca45..6e40906ac 100644 --- a/client/informers/externalversions/stash/v1alpha1/repository.go +++ b/client/informers/externalversions/stash/v1alpha1/repository.go @@ -22,14 +22,15 @@ import ( "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" stashv1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" v1alpha1 "stash.appscode.dev/apimachinery/client/listers/stash/v1alpha1" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // RepositoryInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/backupbatch.go b/client/informers/externalversions/stash/v1beta1/backupbatch.go index 91b5e405f..0adc8f829 100644 --- a/client/informers/externalversions/stash/v1beta1/backupbatch.go +++ b/client/informers/externalversions/stash/v1beta1/backupbatch.go @@ -22,14 +22,15 @@ import ( "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // BackupBatchInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/backupblueprint.go b/client/informers/externalversions/stash/v1beta1/backupblueprint.go index 0758d8092..c476da26e 100644 --- a/client/informers/externalversions/stash/v1beta1/backupblueprint.go +++ b/client/informers/externalversions/stash/v1beta1/backupblueprint.go @@ -22,14 +22,15 @@ import ( "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // BackupBlueprintInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/backupconfiguration.go b/client/informers/externalversions/stash/v1beta1/backupconfiguration.go index 2f77756b7..4e0f4011e 100644 --- a/client/informers/externalversions/stash/v1beta1/backupconfiguration.go +++ b/client/informers/externalversions/stash/v1beta1/backupconfiguration.go @@ -22,14 +22,15 @@ import ( "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // BackupConfigurationInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/backupsession.go b/client/informers/externalversions/stash/v1beta1/backupsession.go index 05dcfc59a..3399c35c3 100644 --- a/client/informers/externalversions/stash/v1beta1/backupsession.go +++ b/client/informers/externalversions/stash/v1beta1/backupsession.go @@ -22,14 +22,15 @@ import ( "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // BackupSessionInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/function.go b/client/informers/externalversions/stash/v1beta1/function.go index d90bf09d3..54b44631a 100644 --- a/client/informers/externalversions/stash/v1beta1/function.go +++ b/client/informers/externalversions/stash/v1beta1/function.go @@ -22,14 +22,15 @@ import ( "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // FunctionInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/restorebatch.go b/client/informers/externalversions/stash/v1beta1/restorebatch.go index 3c9c611e3..578816d85 100644 --- a/client/informers/externalversions/stash/v1beta1/restorebatch.go +++ b/client/informers/externalversions/stash/v1beta1/restorebatch.go @@ -22,14 +22,15 @@ import ( "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // RestoreBatchInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/restoresession.go b/client/informers/externalversions/stash/v1beta1/restoresession.go index 1431940fd..e32ada030 100644 --- a/client/informers/externalversions/stash/v1beta1/restoresession.go +++ b/client/informers/externalversions/stash/v1beta1/restoresession.go @@ -22,14 +22,15 @@ import ( "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // RestoreSessionInformer provides access to a shared informer and lister for diff --git a/client/informers/externalversions/stash/v1beta1/task.go b/client/informers/externalversions/stash/v1beta1/task.go index 4c30adb74..ad5e5a25b 100644 --- a/client/informers/externalversions/stash/v1beta1/task.go +++ b/client/informers/externalversions/stash/v1beta1/task.go @@ -22,14 +22,15 @@ import ( "context" time "time" - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" - runtime "k8s.io/apimachinery/pkg/runtime" - watch "k8s.io/apimachinery/pkg/watch" - cache "k8s.io/client-go/tools/cache" stashv1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" versioned "stash.appscode.dev/apimachinery/client/clientset/versioned" internalinterfaces "stash.appscode.dev/apimachinery/client/informers/externalversions/internalinterfaces" v1beta1 "stash.appscode.dev/apimachinery/client/listers/stash/v1beta1" + + v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + runtime "k8s.io/apimachinery/pkg/runtime" + watch "k8s.io/apimachinery/pkg/watch" + cache "k8s.io/client-go/tools/cache" ) // TaskInformer provides access to a shared informer and lister for diff --git a/client/listers/repositories/v1alpha1/snapshot.go b/client/listers/repositories/v1alpha1/snapshot.go index 55249c543..3d831b4a9 100644 --- a/client/listers/repositories/v1alpha1/snapshot.go +++ b/client/listers/repositories/v1alpha1/snapshot.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( + v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "stash.appscode.dev/apimachinery/apis/repositories/v1alpha1" ) // SnapshotLister helps list Snapshots. diff --git a/client/listers/stash/v1alpha1/repository.go b/client/listers/stash/v1alpha1/repository.go index ea7219d75..e2fe60515 100644 --- a/client/listers/stash/v1alpha1/repository.go +++ b/client/listers/stash/v1alpha1/repository.go @@ -19,10 +19,11 @@ limitations under the License. package v1alpha1 import ( + v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1alpha1 "stash.appscode.dev/apimachinery/apis/stash/v1alpha1" ) // RepositoryLister helps list Repositories. diff --git a/client/listers/stash/v1beta1/backupbatch.go b/client/listers/stash/v1beta1/backupbatch.go index 42736891b..06bbfde96 100644 --- a/client/listers/stash/v1beta1/backupbatch.go +++ b/client/listers/stash/v1beta1/backupbatch.go @@ -19,10 +19,11 @@ limitations under the License. package v1beta1 import ( + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // BackupBatchLister helps list BackupBatches. diff --git a/client/listers/stash/v1beta1/backupblueprint.go b/client/listers/stash/v1beta1/backupblueprint.go index d8adc78af..cd806bb5c 100644 --- a/client/listers/stash/v1beta1/backupblueprint.go +++ b/client/listers/stash/v1beta1/backupblueprint.go @@ -19,10 +19,11 @@ limitations under the License. package v1beta1 import ( + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // BackupBlueprintLister helps list BackupBlueprints. diff --git a/client/listers/stash/v1beta1/backupconfiguration.go b/client/listers/stash/v1beta1/backupconfiguration.go index 785770e06..d58ee623c 100644 --- a/client/listers/stash/v1beta1/backupconfiguration.go +++ b/client/listers/stash/v1beta1/backupconfiguration.go @@ -19,10 +19,11 @@ limitations under the License. package v1beta1 import ( + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // BackupConfigurationLister helps list BackupConfigurations. diff --git a/client/listers/stash/v1beta1/backupsession.go b/client/listers/stash/v1beta1/backupsession.go index c24ed8e67..1b527b4b7 100644 --- a/client/listers/stash/v1beta1/backupsession.go +++ b/client/listers/stash/v1beta1/backupsession.go @@ -19,10 +19,11 @@ limitations under the License. package v1beta1 import ( + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // BackupSessionLister helps list BackupSessions. diff --git a/client/listers/stash/v1beta1/function.go b/client/listers/stash/v1beta1/function.go index 32e643293..de11b872a 100644 --- a/client/listers/stash/v1beta1/function.go +++ b/client/listers/stash/v1beta1/function.go @@ -19,10 +19,11 @@ limitations under the License. package v1beta1 import ( + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // FunctionLister helps list Functions. diff --git a/client/listers/stash/v1beta1/restorebatch.go b/client/listers/stash/v1beta1/restorebatch.go index 6ecd796ea..4488ca7a0 100644 --- a/client/listers/stash/v1beta1/restorebatch.go +++ b/client/listers/stash/v1beta1/restorebatch.go @@ -19,10 +19,11 @@ limitations under the License. package v1beta1 import ( + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // RestoreBatchLister helps list RestoreBatches. diff --git a/client/listers/stash/v1beta1/restoresession.go b/client/listers/stash/v1beta1/restoresession.go index 5e16507e0..0d23777b6 100644 --- a/client/listers/stash/v1beta1/restoresession.go +++ b/client/listers/stash/v1beta1/restoresession.go @@ -19,10 +19,11 @@ limitations under the License. package v1beta1 import ( + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // RestoreSessionLister helps list RestoreSessions. diff --git a/client/listers/stash/v1beta1/task.go b/client/listers/stash/v1beta1/task.go index 23d8bd1e3..5bca18016 100644 --- a/client/listers/stash/v1beta1/task.go +++ b/client/listers/stash/v1beta1/task.go @@ -19,10 +19,11 @@ limitations under the License. package v1beta1 import ( + v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" + "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/labels" "k8s.io/client-go/tools/cache" - v1beta1 "stash.appscode.dev/apimachinery/apis/stash/v1beta1" ) // TaskLister helps list Tasks. diff --git a/go.mod b/go.mod index eddd34f39..dec4e7d3c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.25.0 require ( github.com/Masterminds/sprig/v3 v3.3.0 - github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 github.com/evanphx/json-patch v5.9.11+incompatible github.com/gogo/protobuf v1.3.2 github.com/json-iterator/go v1.1.12 diff --git a/go.sum b/go.sum index 86e85a7d3..dd8e68b5a 100644 --- a/go.sum +++ b/go.sum @@ -16,8 +16,6 @@ github.com/PuerkitoBio/purell v1.2.1 h1:QsZ4TjvwiMpat6gBCBxEQI0rcS9ehtkKtSpiUnd9 github.com/PuerkitoBio/purell v1.2.1/go.mod h1:ZwHcC/82TOaovDi//J/804umJFFmbOHPngi8iYYv/Eo= github.com/antlr4-go/antlr/v4 v4.13.0 h1:lxCg3LAv+EUK6t1i0y1V6/SLeUi0eKEKdhQAlS8TVTI= github.com/antlr4-go/antlr/v4 v4.13.0/go.mod h1:pfChB/xh/Unjila75QW7+VU4TSnWnnk9UTnmpPaOR2g= -github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 h1:7Ip0wMmLHLRJdrloDxZfhMm0xrLXZS8+COSu2bXmEQs= -github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= diff --git a/vendor/github.com/armon/circbuf/.gitignore b/vendor/github.com/armon/circbuf/.gitignore deleted file mode 100644 index 00268614f..000000000 --- a/vendor/github.com/armon/circbuf/.gitignore +++ /dev/null @@ -1,22 +0,0 @@ -# Compiled Object files, Static and Dynamic libs (Shared Objects) -*.o -*.a -*.so - -# Folders -_obj -_test - -# Architecture specific extensions/prefixes -*.[568vq] -[568vq].out - -*.cgo1.go -*.cgo2.c -_cgo_defun.c -_cgo_gotypes.go -_cgo_export.* - -_testmain.go - -*.exe diff --git a/vendor/github.com/armon/circbuf/LICENSE b/vendor/github.com/armon/circbuf/LICENSE deleted file mode 100644 index 106569e54..000000000 --- a/vendor/github.com/armon/circbuf/LICENSE +++ /dev/null @@ -1,20 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2013 Armon Dadgar - -Permission is hereby granted, free of charge, to any person obtaining a copy of -this software and associated documentation files (the "Software"), to deal in -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/vendor/github.com/armon/circbuf/README.md b/vendor/github.com/armon/circbuf/README.md deleted file mode 100644 index f2e356b8d..000000000 --- a/vendor/github.com/armon/circbuf/README.md +++ /dev/null @@ -1,28 +0,0 @@ -circbuf -======= - -This repository provides the `circbuf` package. This provides a `Buffer` object -which is a circular (or ring) buffer. It has a fixed size, but can be written -to infinitely. Only the last `size` bytes are ever retained. The buffer implements -the `io.Writer` interface. - -Documentation -============= - -Full documentation can be found on [Godoc](http://godoc.org/github.com/armon/circbuf) - -Usage -===== - -The `circbuf` package is very easy to use: - -```go -buf, _ := NewBuffer(6) -buf.Write([]byte("hello world")) - -if string(buf.Bytes()) != " world" { - panic("should only have last 6 bytes!") -} - -``` - diff --git a/vendor/github.com/armon/circbuf/circbuf.go b/vendor/github.com/armon/circbuf/circbuf.go deleted file mode 100644 index de3cb94a3..000000000 --- a/vendor/github.com/armon/circbuf/circbuf.go +++ /dev/null @@ -1,92 +0,0 @@ -package circbuf - -import ( - "fmt" -) - -// Buffer implements a circular buffer. It is a fixed size, -// and new writes overwrite older data, such that for a buffer -// of size N, for any amount of writes, only the last N bytes -// are retained. -type Buffer struct { - data []byte - size int64 - writeCursor int64 - written int64 -} - -// NewBuffer creates a new buffer of a given size. The size -// must be greater than 0. -func NewBuffer(size int64) (*Buffer, error) { - if size <= 0 { - return nil, fmt.Errorf("Size must be positive") - } - - b := &Buffer{ - size: size, - data: make([]byte, size), - } - return b, nil -} - -// Write writes up to len(buf) bytes to the internal ring, -// overriding older data if necessary. -func (b *Buffer) Write(buf []byte) (int, error) { - // Account for total bytes written - n := len(buf) - b.written += int64(n) - - // If the buffer is larger than ours, then we only care - // about the last size bytes anyways - if int64(n) > b.size { - buf = buf[int64(n)-b.size:] - } - - // Copy in place - remain := b.size - b.writeCursor - copy(b.data[b.writeCursor:], buf) - if int64(len(buf)) > remain { - copy(b.data, buf[remain:]) - } - - // Update location of the cursor - b.writeCursor = ((b.writeCursor + int64(len(buf))) % b.size) - return n, nil -} - -// Size returns the size of the buffer -func (b *Buffer) Size() int64 { - return b.size -} - -// TotalWritten provides the total number of bytes written -func (b *Buffer) TotalWritten() int64 { - return b.written -} - -// Bytes provides a slice of the bytes written. This -// slice should not be written to. -func (b *Buffer) Bytes() []byte { - switch { - case b.written >= b.size && b.writeCursor == 0: - return b.data - case b.written > b.size: - out := make([]byte, b.size) - copy(out, b.data[b.writeCursor:]) - copy(out[b.size-b.writeCursor:], b.data[:b.writeCursor]) - return out - default: - return b.data[:b.writeCursor] - } -} - -// Reset resets the buffer so it has no content. -func (b *Buffer) Reset() { - b.writeCursor = 0 - b.written = 0 -} - -// String returns the contents of the buffer as a string -func (b *Buffer) String() string { - return string(b.Bytes()) -} diff --git a/vendor/modules.txt b/vendor/modules.txt index 7499b3952..f7c617fe1 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -26,9 +26,6 @@ github.com/PuerkitoBio/purell # github.com/antlr4-go/antlr/v4 v4.13.0 ## explicit; go 1.20 github.com/antlr4-go/antlr/v4 -# github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 -## explicit -github.com/armon/circbuf # github.com/beorn7/perks v1.0.1 ## explicit; go 1.11 github.com/beorn7/perks/quantile