-
Notifications
You must be signed in to change notification settings - Fork 97
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Both Kopia repository and Azure plugin need to interact with Azure storage. In order to keep in sync with the new features for both these two places and remove duplicated code, PR vmware-tanzu/velero#6686 makes the common code as util functions in Velero repository. This commit refactors the Azure plugin based on these util functions. Signed-off-by: Wenkai Yin(尹文开) <[email protected]>
- Loading branch information
Showing
7 changed files
with
116 additions
and
501 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,30 +3,34 @@ module github.com/vmware-tanzu/velero-plugin-for-microsoft-azure | |
| go 1.18 | ||
|
|
||
| require ( | ||
| github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.0 | ||
| github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 | ||
| github.com/Azure/azure-sdk-for-go/sdk/azcore v1.6.1 | ||
| github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute v1.0.0 | ||
| github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.2.0 | ||
| github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.6.1 | ||
| github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.0.0 | ||
| github.com/gofrs/uuid v4.3.1+incompatible | ||
| github.com/joho/godotenv v1.4.0 | ||
| github.com/pkg/errors v0.9.1 | ||
| github.com/sirupsen/logrus v1.9.0 | ||
| github.com/sirupsen/logrus v1.9.3 | ||
| github.com/spf13/pflag v1.0.5 | ||
| github.com/stretchr/testify v1.8.2 | ||
| github.com/vmware-tanzu/velero v0.0.0-20230727074327-a6d79fc272a2 | ||
| github.com/stretchr/testify v1.8.4 | ||
| github.com/vmware-tanzu/velero v1.10.0 | ||
| k8s.io/api v0.26.0 | ||
| k8s.io/apimachinery v0.26.0 | ||
| sigs.k8s.io/azuredisk-csi-driver v1.26.0 | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.3.0 // indirect | ||
| github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage v1.3.0 // indirect | ||
| github.com/joho/godotenv v1.4.0 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect | ||
| ) | ||
|
|
||
| require ( | ||
| github.com/Azure/azure-sdk-for-go/sdk/internal v1.3.0 // indirect | ||
| github.com/AzureAD/microsoft-authentication-library-for-go v1.0.0 // indirect | ||
| github.com/davecgh/go-spew v1.1.1 // indirect | ||
| github.com/emicklei/go-restful/v3 v3.10.1 // indirect | ||
| github.com/fatih/color v1.15.0 // indirect | ||
| github.com/go-logr/logr v1.2.3 // indirect | ||
| github.com/go-logr/logr v1.2.4 // indirect | ||
| github.com/go-openapi/jsonpointer v0.19.6 // indirect | ||
| github.com/go-openapi/jsonreference v0.20.1 // indirect | ||
| github.com/go-openapi/swag v0.22.3 // indirect | ||
|
|
@@ -47,7 +51,7 @@ require ( | |
| github.com/kylelemons/godebug v1.1.0 // indirect | ||
| github.com/mailru/easyjson v0.7.7 // indirect | ||
| github.com/mattn/go-colorable v0.1.13 // indirect | ||
| github.com/mattn/go-isatty v0.0.17 // indirect | ||
| github.com/mattn/go-isatty v0.0.19 // indirect | ||
| github.com/mitchellh/go-testing-interface v1.14.1 // indirect | ||
| github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect | ||
| github.com/modern-go/reflect2 v1.0.2 // indirect | ||
|
|
@@ -58,17 +62,16 @@ require ( | |
| github.com/spf13/afero v1.9.2 // indirect | ||
| github.com/spf13/cobra v1.6.1 // indirect | ||
| github.com/stretchr/objx v0.5.0 // indirect | ||
| golang.org/x/crypto v0.8.0 // indirect | ||
| golang.org/x/net v0.9.0 // indirect | ||
| golang.org/x/oauth2 v0.7.0 // indirect | ||
| golang.org/x/sys v0.7.0 // indirect | ||
| golang.org/x/term v0.7.0 // indirect | ||
| golang.org/x/text v0.9.0 // indirect | ||
| golang.org/x/crypto v0.10.0 // indirect | ||
| golang.org/x/net v0.11.0 // indirect | ||
| golang.org/x/oauth2 v0.9.0 // indirect | ||
| golang.org/x/sys v0.9.0 // indirect | ||
| golang.org/x/term v0.9.0 // indirect | ||
| golang.org/x/text v0.10.0 // indirect | ||
| golang.org/x/time v0.3.0 // indirect | ||
| google.golang.org/appengine v1.6.7 // indirect | ||
| google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect | ||
| google.golang.org/grpc v1.54.0 // indirect | ||
| google.golang.org/protobuf v1.30.0 // indirect | ||
| google.golang.org/grpc v1.56.1 // indirect | ||
| google.golang.org/protobuf v1.31.0 // indirect | ||
| gopkg.in/inf.v0 v0.9.1 // indirect | ||
| gopkg.in/yaml.v2 v2.4.0 // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
|
|
@@ -86,5 +89,7 @@ require ( | |
| // * go list -modfile=go.mod -m -json -mod=mod all: k8s.io/[email protected]: invalid version: unknown revision v0.0.0 | ||
| replace ( | ||
| cloud.google.com/go => cloud.google.com/go v0.104.0 | ||
| // TODO update after the Velero PR merged | ||
| github.com/vmware-tanzu/velero => github.com/ywk253100/velero v0.0.8 | ||
| k8s.io/kubectl => k8s.io/kubectl v0.25.2 | ||
| ) | ||
Oops, something went wrong.