From b6319a6dd9d7d1ef221aa4defc768ee7a2a14367 Mon Sep 17 00:00:00 2001 From: Mauricio Poppe Date: Tue, 15 Jun 2021 17:17:31 +0000 Subject: [PATCH 1/4] Rename /internal to pkg, nested /internal/server//internal to impl --- .github/workflows/windows.yml | 2 +- cmd/csi-proxy-api-gen/generators/api.go | 8 +- .../generators/api_group_generated_gen.go | 4 +- .../generators/groups_and_versions.go | 10 +- .../generators/server_generated_gen.go | 10 +- cmd/csi-proxy/main.go | 28 +- docs/API.md | 42 +- docs/DEVELOPMENT.md | 20 +- .../server/dummy/api_group_generated.go | 12 +- .../server/dummy/impl/types_generated.go | 20 + .../server/dummy/impl/v1/conversion.go | 3 + .../dummy/impl/v1/conversion_generated.go | 3 + .../server/dummy/impl/v1/server_generated.go | 66 +++ .../server/dummy/impl}/v1alpha1/conversion.go | 0 .../impl/v1alpha1/conversion_generated.go | 3 + .../dummy/impl/v1alpha1/server_generated.go | 47 ++ .../server/dummy/impl/v1alpha2/conversion.go | 3 + .../impl/v1alpha2/conversion_generated.go | 3 + .../dummy/impl/v1alpha2/server_generated.go | 47 ++ integrationtests/utils.go | 4 +- .../internal/v1alpha1/conversion_generated.go | 155 ------ .../internal/v1beta1/conversion_generated.go | 211 -------- .../internal/v1beta2/conversion_generated.go | 291 ----------- .../internal/v1beta3/conversion_generated.go | 338 ------------- .../internal/v1alpha1/conversion_generated.go | 206 -------- .../internal/v1beta1/conversion_generated.go | 206 -------- .../internal/v1beta2/conversion_generated.go | 206 -------- .../internal/v1alpha1/conversion_generated.go | 414 ---------------- .../internal/v1alpha2/conversion_generated.go | 452 ------------------ .../internal/v1alpha1/conversion_generated.go | 90 ---- .../internal/v1beta1/conversion_generated.go | 90 ---- .../internal/v1beta2/conversion_generated.go | 90 ---- .../internal/v1alpha1/conversion_generated.go | 168 ------- .../volume/internal/v1alpha1/conversion.go | 49 -- .../internal/v1alpha1/conversion_generated.go | 208 -------- .../volume/internal/v1beta1/conversion.go | 49 -- .../internal/v1beta1/conversion_generated.go | 330 ------------- .../volume/internal/v1beta2/conversion.go | 49 -- .../internal/v1beta2/conversion_generated.go | 368 -------------- .../internal/v1beta3/conversion_generated.go | 410 ---------------- {internal => pkg}/os/disk/api.go | 2 +- {internal => pkg}/os/disk/types.go | 0 {internal => pkg}/os/filesystem/api.go | 0 {internal => pkg}/os/filesystem/api_test.go | 0 {internal => pkg}/os/iscsi/api.go | 0 {internal => pkg}/os/iscsi/types.go | 0 {internal => pkg}/os/smb/api.go | 0 {internal => pkg}/os/system/api.go | 0 {internal => pkg}/os/volume/api.go | 0 .../server/disk/api_group_generated.go | 14 +- .../server/disk/impl}/types.go | 2 +- .../server/disk/impl}/types_generated.go | 2 +- .../server/disk/impl}/v1alpha1/conversion.go | 18 +- .../impl/v1alpha1/conversion_generated.go | 155 ++++++ .../disk/impl}/v1alpha1/server_generated.go | 30 +- .../server/disk/impl}/v1beta1/conversion.go | 20 +- .../disk/impl/v1beta1/conversion_generated.go | 211 ++++++++ pkg/server/disk/impl/v1beta1/doc.go | 4 + .../disk/impl}/v1beta1/server_generated.go | 36 +- .../server/disk/impl}/v1beta2/conversion.go | 20 +- .../disk/impl/v1beta2/conversion_generated.go | 291 +++++++++++ pkg/server/disk/impl/v1beta2/doc.go | 4 + .../disk/impl}/v1beta2/server_generated.go | 48 +- .../server/disk/impl}/v1beta3/conversion.go | 14 +- .../disk/impl/v1beta3/conversion_generated.go | 338 +++++++++++++ .../disk/impl}/v1beta3/server_generated.go | 48 +- {internal => pkg}/server/disk/server.go | 4 +- .../server/filesystem/api_group_generated.go | 12 +- .../server/filesystem/impl}/types.go | 2 +- .../filesystem/impl}/types_generated.go | 2 +- .../filesystem/impl}/v1alpha1/conversion.go | 0 .../impl/v1alpha1/conversion_generated.go | 206 ++++++++ .../impl}/v1alpha1/server_generated.go | 36 +- .../filesystem/impl}/v1beta1/conversion.go | 0 .../impl/v1beta1/conversion_generated.go | 206 ++++++++ .../impl}/v1beta1/server_generated.go | 36 +- .../filesystem/impl}/v1beta2/conversion.go | 0 .../impl/v1beta2/conversion_generated.go | 206 ++++++++ .../impl}/v1beta2/server_generated.go | 36 +- {internal => pkg}/server/filesystem/server.go | 6 +- .../server/filesystem/server_test.go | 4 +- .../server/iscsi/api_group_generated.go | 10 +- .../server/iscsi/impl}/conversion_test.go | 8 +- .../server/iscsi/impl}/types.go | 2 +- .../server/iscsi/impl}/types_generated.go | 2 +- .../server/iscsi/impl}/v1alpha1/conversion.go | 6 +- .../impl/v1alpha1/conversion_generated.go | 414 ++++++++++++++++ .../iscsi/impl}/v1alpha1/server_generated.go | 48 +- .../server/iscsi/impl}/v1alpha2/conversion.go | 6 +- .../impl/v1alpha2/conversion_generated.go | 452 ++++++++++++++++++ pkg/server/iscsi/impl/v1alpha2/doc.go | 4 + .../iscsi/impl}/v1alpha2/server_generated.go | 54 +-- {internal => pkg}/server/iscsi/server.go | 4 +- {internal => pkg}/server/server.go | 2 +- .../server/smb/api_group_generated.go | 12 +- .../internal => pkg/server/smb/impl}/types.go | 2 +- .../server/smb/impl}/types_generated.go | 2 +- .../server/smb/impl}/v1alpha1/conversion.go | 0 .../smb/impl/v1alpha1/conversion_generated.go | 90 ++++ .../smb/impl}/v1alpha1/server_generated.go | 18 +- .../server/smb/impl}/v1beta1/conversion.go | 0 .../smb/impl/v1beta1/conversion_generated.go | 90 ++++ .../smb/impl}/v1beta1/server_generated.go | 18 +- .../server/smb/impl}/v1beta2/conversion.go | 0 .../smb/impl/v1beta2/conversion_generated.go | 90 ++++ .../smb/impl}/v1beta2/server_generated.go | 18 +- {internal => pkg}/server/smb/server.go | 6 +- {internal => pkg}/server/smb/server_test.go | 0 .../server/system/api_group_generated.go | 8 +- .../server/system/impl}/types.go | 2 +- .../server/system/impl}/types_generated.go | 2 +- pkg/server/system/impl/v1alpha1/conversion.go | 3 + .../impl/v1alpha1/conversion_generated.go | 168 +++++++ .../system/impl}/v1alpha1/server_generated.go | 30 +- {internal => pkg}/server/system/server.go | 4 +- {internal => pkg}/server/types/types.go | 0 .../server/volume/api_group_generated.go | 14 +- .../server/volume/impl}/types.go | 2 +- .../server/volume/impl}/types_generated.go | 2 +- pkg/server/volume/impl/v1alpha1/conversion.go | 49 ++ .../impl/v1alpha1/conversion_generated.go | 208 ++++++++ .../volume/impl}/v1alpha1/server_generated.go | 42 +- pkg/server/volume/impl/v1beta1/conversion.go | 49 ++ .../impl/v1beta1/conversion_generated.go | 330 +++++++++++++ .../volume/impl}/v1beta1/server_generated.go | 60 +-- pkg/server/volume/impl/v1beta2/conversion.go | 49 ++ .../impl/v1beta2/conversion_generated.go | 368 ++++++++++++++ .../volume/impl}/v1beta2/server_generated.go | 66 +-- .../server/volume/impl}/v1beta3/conversion.go | 0 .../impl/v1beta3/conversion_generated.go | 410 ++++++++++++++++ .../volume/impl}/v1beta3/server_generated.go | 66 +-- {internal => pkg}/server/volume/server.go | 4 +- .../server/volume/server_test.go | 4 +- {internal => pkg}/shared/disk/types.go | 0 {internal => pkg}/utils/utils.go | 0 135 files changed, 5118 insertions(+), 4908 deletions(-) create mode 100644 integrationtests/apigroups/server/dummy/impl/types_generated.go create mode 100644 integrationtests/apigroups/server/dummy/impl/v1/conversion.go create mode 100644 integrationtests/apigroups/server/dummy/impl/v1/conversion_generated.go create mode 100644 integrationtests/apigroups/server/dummy/impl/v1/server_generated.go rename {internal/server/filesystem/internal => integrationtests/apigroups/server/dummy/impl}/v1alpha1/conversion.go (100%) create mode 100644 integrationtests/apigroups/server/dummy/impl/v1alpha1/conversion_generated.go create mode 100644 integrationtests/apigroups/server/dummy/impl/v1alpha1/server_generated.go create mode 100644 integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion.go create mode 100644 integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion_generated.go create mode 100644 integrationtests/apigroups/server/dummy/impl/v1alpha2/server_generated.go delete mode 100644 internal/server/disk/internal/v1alpha1/conversion_generated.go delete mode 100644 internal/server/disk/internal/v1beta1/conversion_generated.go delete mode 100644 internal/server/disk/internal/v1beta2/conversion_generated.go delete mode 100644 internal/server/disk/internal/v1beta3/conversion_generated.go delete mode 100644 internal/server/filesystem/internal/v1alpha1/conversion_generated.go delete mode 100644 internal/server/filesystem/internal/v1beta1/conversion_generated.go delete mode 100644 internal/server/filesystem/internal/v1beta2/conversion_generated.go delete mode 100644 internal/server/iscsi/internal/v1alpha1/conversion_generated.go delete mode 100644 internal/server/iscsi/internal/v1alpha2/conversion_generated.go delete mode 100644 internal/server/smb/internal/v1alpha1/conversion_generated.go delete mode 100644 internal/server/smb/internal/v1beta1/conversion_generated.go delete mode 100644 internal/server/smb/internal/v1beta2/conversion_generated.go delete mode 100644 internal/server/system/internal/v1alpha1/conversion_generated.go delete mode 100644 internal/server/volume/internal/v1alpha1/conversion.go delete mode 100644 internal/server/volume/internal/v1alpha1/conversion_generated.go delete mode 100644 internal/server/volume/internal/v1beta1/conversion.go delete mode 100644 internal/server/volume/internal/v1beta1/conversion_generated.go delete mode 100644 internal/server/volume/internal/v1beta2/conversion.go delete mode 100644 internal/server/volume/internal/v1beta2/conversion_generated.go delete mode 100644 internal/server/volume/internal/v1beta3/conversion_generated.go rename {internal => pkg}/os/disk/api.go (99%) rename {internal => pkg}/os/disk/types.go (100%) rename {internal => pkg}/os/filesystem/api.go (100%) rename {internal => pkg}/os/filesystem/api_test.go (100%) rename {internal => pkg}/os/iscsi/api.go (100%) rename {internal => pkg}/os/iscsi/types.go (100%) rename {internal => pkg}/os/smb/api.go (100%) rename {internal => pkg}/os/system/api.go (100%) rename {internal => pkg}/os/volume/api.go (100%) rename {internal => pkg}/server/disk/api_group_generated.go (67%) rename {internal/server/disk/internal => pkg/server/disk/impl}/types.go (99%) rename {internal/server/disk/internal => pkg/server/disk/impl}/types_generated.go (98%) rename {internal/server/disk/internal => pkg/server/disk/impl}/v1alpha1/conversion.go (57%) create mode 100644 pkg/server/disk/impl/v1alpha1/conversion_generated.go rename {internal/server/disk/internal => pkg/server/disk/impl}/v1alpha1/server_generated.go (60%) rename {internal/server/disk/internal => pkg/server/disk/impl}/v1beta1/conversion.go (64%) create mode 100644 pkg/server/disk/impl/v1beta1/conversion_generated.go create mode 100644 pkg/server/disk/impl/v1beta1/doc.go rename {internal/server/disk/internal => pkg/server/disk/impl}/v1beta1/server_generated.go (61%) rename {internal/server/disk/internal => pkg/server/disk/impl}/v1beta2/conversion.go (64%) create mode 100644 pkg/server/disk/impl/v1beta2/conversion_generated.go create mode 100644 pkg/server/disk/impl/v1beta2/doc.go rename {internal/server/disk/internal => pkg/server/disk/impl}/v1beta2/server_generated.go (60%) rename {internal/server/disk/internal => pkg/server/disk/impl}/v1beta3/conversion.go (55%) create mode 100644 pkg/server/disk/impl/v1beta3/conversion_generated.go rename {internal/server/disk/internal => pkg/server/disk/impl}/v1beta3/server_generated.go (59%) rename {internal => pkg}/server/disk/server.go (98%) rename {internal => pkg}/server/filesystem/api_group_generated.go (65%) rename {internal/server/filesystem/internal => pkg/server/filesystem/impl}/types.go (99%) rename {internal/server/filesystem/internal => pkg/server/filesystem/impl}/types_generated.go (98%) rename {internal/server/smb/internal => pkg/server/filesystem/impl}/v1alpha1/conversion.go (100%) create mode 100644 pkg/server/filesystem/impl/v1alpha1/conversion_generated.go rename {internal/server/filesystem/internal => pkg/server/filesystem/impl}/v1alpha1/server_generated.go (61%) rename {internal/server/filesystem/internal => pkg/server/filesystem/impl}/v1beta1/conversion.go (100%) create mode 100644 pkg/server/filesystem/impl/v1beta1/conversion_generated.go rename {internal/server/filesystem/internal => pkg/server/filesystem/impl}/v1beta1/server_generated.go (63%) rename {internal/server/filesystem/internal => pkg/server/filesystem/impl}/v1beta2/conversion.go (100%) create mode 100644 pkg/server/filesystem/impl/v1beta2/conversion_generated.go rename {internal/server/filesystem/internal => pkg/server/filesystem/impl}/v1beta2/server_generated.go (60%) rename {internal => pkg}/server/filesystem/server.go (97%) rename {internal => pkg}/server/filesystem/server_test.go (97%) rename {internal => pkg}/server/iscsi/api_group_generated.go (66%) rename {internal/server/iscsi/internal => pkg/server/iscsi/impl}/conversion_test.go (92%) rename {internal/server/iscsi/internal => pkg/server/iscsi/impl}/types.go (99%) rename {internal/server/iscsi/internal => pkg/server/iscsi/impl}/types_generated.go (98%) rename {internal/server/iscsi/internal => pkg/server/iscsi/impl}/v1alpha1/conversion.go (56%) create mode 100644 pkg/server/iscsi/impl/v1alpha1/conversion_generated.go rename {internal/server/iscsi/internal => pkg/server/iscsi/impl}/v1alpha1/server_generated.go (59%) rename {internal/server/iscsi/internal => pkg/server/iscsi/impl}/v1alpha2/conversion.go (56%) create mode 100644 pkg/server/iscsi/impl/v1alpha2/conversion_generated.go create mode 100644 pkg/server/iscsi/impl/v1alpha2/doc.go rename {internal/server/iscsi/internal => pkg/server/iscsi/impl}/v1alpha2/server_generated.go (59%) rename {internal => pkg}/server/iscsi/server.go (98%) rename {internal => pkg}/server/server.go (98%) rename {internal => pkg}/server/smb/api_group_generated.go (67%) rename {internal/server/smb/internal => pkg/server/smb/impl}/types.go (95%) rename {internal/server/smb/internal => pkg/server/smb/impl}/types_generated.go (97%) rename {internal/server/system/internal => pkg/server/smb/impl}/v1alpha1/conversion.go (100%) create mode 100644 pkg/server/smb/impl/v1alpha1/conversion_generated.go rename {internal/server/smb/internal => pkg/server/smb/impl}/v1alpha1/server_generated.go (62%) rename {internal/server/smb/internal => pkg/server/smb/impl}/v1beta1/conversion.go (100%) create mode 100644 pkg/server/smb/impl/v1beta1/conversion_generated.go rename {internal/server/smb/internal => pkg/server/smb/impl}/v1beta1/server_generated.go (62%) rename {internal/server/smb/internal => pkg/server/smb/impl}/v1beta2/conversion.go (100%) create mode 100644 pkg/server/smb/impl/v1beta2/conversion_generated.go rename {internal/server/smb/internal => pkg/server/smb/impl}/v1beta2/server_generated.go (62%) rename {internal => pkg}/server/smb/server.go (93%) rename {internal => pkg}/server/smb/server_test.go (100%) rename {internal => pkg}/server/system/api_group_generated.go (65%) rename {internal/server/system/internal => pkg/server/system/impl}/types.go (98%) rename {internal/server/system/internal => pkg/server/system/impl}/types_generated.go (97%) create mode 100644 pkg/server/system/impl/v1alpha1/conversion.go create mode 100644 pkg/server/system/impl/v1alpha1/conversion_generated.go rename {internal/server/system/internal => pkg/server/system/impl}/v1alpha1/server_generated.go (63%) rename {internal => pkg}/server/system/server.go (94%) rename {internal => pkg}/server/types/types.go (100%) rename {internal => pkg}/server/volume/api_group_generated.go (66%) rename {internal/server/volume/internal => pkg/server/volume/impl}/types.go (99%) rename {internal/server/volume/internal => pkg/server/volume/impl}/types_generated.go (99%) create mode 100644 pkg/server/volume/impl/v1alpha1/conversion.go create mode 100644 pkg/server/volume/impl/v1alpha1/conversion_generated.go rename {internal/server/volume/internal => pkg/server/volume/impl}/v1alpha1/server_generated.go (59%) create mode 100644 pkg/server/volume/impl/v1beta1/conversion.go create mode 100644 pkg/server/volume/impl/v1beta1/conversion_generated.go rename {internal/server/volume/internal => pkg/server/volume/impl}/v1beta1/server_generated.go (59%) create mode 100644 pkg/server/volume/impl/v1beta2/conversion.go create mode 100644 pkg/server/volume/impl/v1beta2/conversion_generated.go rename {internal/server/volume/internal => pkg/server/volume/impl}/v1beta2/server_generated.go (59%) rename {internal/server/volume/internal => pkg/server/volume/impl}/v1beta3/conversion.go (100%) create mode 100644 pkg/server/volume/impl/v1beta3/conversion_generated.go rename {internal/server/volume/internal => pkg/server/volume/impl}/v1beta3/server_generated.go (61%) rename {internal => pkg}/server/volume/server.go (98%) rename {internal => pkg}/server/volume/server_test.go (96%) rename {internal => pkg}/shared/disk/types.go (100%) rename {internal => pkg}/utils/utils.go (100%) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 654e3f8b..089e4d8b 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -47,4 +47,4 @@ jobs: uses: actions/checkout@v2 - name: Run Windows Unit Tests run: | - go test -v -race ./internal/... + go test -v -race ./pkg/... diff --git a/cmd/csi-proxy-api-gen/generators/api.go b/cmd/csi-proxy-api-gen/generators/api.go index bd1a8946..064009a5 100644 --- a/cmd/csi-proxy-api-gen/generators/api.go +++ b/cmd/csi-proxy-api-gen/generators/api.go @@ -32,7 +32,7 @@ const ( csiProxyAPIPath = csiProxyRootPath + "/client/api/" // defaultServerBasePkg is the default output location for generated server files. - defaultServerBasePkg = csiProxyRootPath + "/internal/server" + defaultServerBasePkg = csiProxyRootPath + "/pkg/server" // defaultClientBasePkg is the default output location for generated client files. defaultClientBasePkg = csiProxyRootPath + "/client/groups" @@ -45,7 +45,7 @@ const ( // * +csi-proxy-api-gen=groupName: to set the group's name // - defaults to the package's name // * +csi-proxy-api-gen=serverBasePkg: to set the base output directory - // for generated server files - defaults to github.com/kubernetes-csi/csi-proxy/internal/server + // for generated server files - defaults to github.com/kubernetes-csi/csi-proxy/pkg/server // * +csi-proxy-api-gen=clientBasePkg: to set the base output directory // for generated client files - defaults to github.com/kubernetes-csi/csi-proxy/client/groups tagMarker = "+" @@ -264,7 +264,7 @@ func packagesForGroup(group *groupDefinition, outputBase string) generator.Packa }, &generator.DefaultPackage{ - PackageName: "internal", + PackageName: "impl", PackagePath: group.internalServerPkg(), HeaderText: []byte(headerComment), @@ -299,7 +299,7 @@ func packagesForGroup(group *groupDefinition, outputBase string) generator.Packa // generate types.go if it doesn't exist and the group only has one version if len(group.versions) == 1 && !fileExists(path.Join(outputBase, group.internalServerPkg(), "types.go")) { pkgs = append(pkgs, &generator.DefaultPackage{ - PackageName: "internal", + PackageName: "impl", PackagePath: group.internalServerPkg(), GeneratorList: []generator.Generator{ diff --git a/cmd/csi-proxy-api-gen/generators/api_group_generated_gen.go b/cmd/csi-proxy-api-gen/generators/api_group_generated_gen.go index e8b9eb3c..61058e4a 100644 --- a/cmd/csi-proxy-api-gen/generators/api_group_generated_gen.go +++ b/cmd/csi-proxy-api-gen/generators/api_group_generated_gen.go @@ -23,7 +23,7 @@ func (g *apiGroupGeneratedGenerator) Filter(*generator.Context, *types.Type) boo func (g *apiGroupGeneratedGenerator) Imports(*generator.Context) []string { imports := []string{ "github.com/kubernetes-csi/csi-proxy/client/apiversion", - "srvtypes \"github.com/kubernetes-csi/csi-proxy/internal/server/types\"", + "srvtypes \"github.com/kubernetes-csi/csi-proxy/pkg/server/types\"", g.groupDefinition.internalServerPkg(), } @@ -42,7 +42,7 @@ func (g *apiGroupGeneratedGenerator) Init(context *generator.Context, writer io. snippetWriter.Do(` // ensure the server defines all the required methods -var _ internal.ServerInterface = &Server{} +var _ impl.ServerInterface = &Server{} func (s *Server) VersionedAPIs() []*srvtypes.VersionedAPI { `, nil) diff --git a/cmd/csi-proxy-api-gen/generators/groups_and_versions.go b/cmd/csi-proxy-api-gen/generators/groups_and_versions.go index 04e79d73..6b1e19cf 100644 --- a/cmd/csi-proxy-api-gen/generators/groups_and_versions.go +++ b/cmd/csi-proxy-api-gen/generators/groups_and_versions.go @@ -164,21 +164,21 @@ func (d *groupDefinition) serverInterfaceName() string { } // serverPkg returns the path of the server package, e.g. -// github.com/kubernetes-csi/csi-proxy/internal/server/ +// github.com/kubernetes-csi/csi-proxy/pkg/server/ func (d *groupDefinition) serverPkg() string { return fmt.Sprintf("%s/%s", d.serverBasePkg, d.name) } // internalServerPkg returns the path of the internal server package, e.g. -// github.com/kubernetes-csi/csi-proxy/internal/server//internal +// github.com/kubernetes-csi/csi-proxy/pkg/server//impl func (d *groupDefinition) internalServerPkg() string { - return fmt.Sprintf("%s/%s/internal", d.serverBasePkg, d.name) + return fmt.Sprintf("%s/%s/impl", d.serverBasePkg, d.name) } // versionedServerPkg returns the path of the versioned server package, e.g. -// github.com/kubernetes-csi/csi-proxy/internal/server//internal/ +// github.com/kubernetes-csi/csi-proxy/pkg/server//impl/ func (d *groupDefinition) versionedServerPkg(version string) string { - return fmt.Sprintf("%s/%s/internal/%s", d.serverBasePkg, d.name, version) + return fmt.Sprintf("%s/%s/impl/%s", d.serverBasePkg, d.name, version) } // versionedClientPkg returns the path of the versioned client package, e.g. diff --git a/cmd/csi-proxy-api-gen/generators/server_generated_gen.go b/cmd/csi-proxy-api-gen/generators/server_generated_gen.go index 07ad61b0..42adce66 100644 --- a/cmd/csi-proxy-api-gen/generators/server_generated_gen.go +++ b/cmd/csi-proxy-api-gen/generators/server_generated_gen.go @@ -48,10 +48,10 @@ func (g *serverGeneratedGenerator) Init(context *generator.Context, writer io.Wr snippetWriter.Do(`var version = apiversion.NewVersionOrPanic("$.version$") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -94,8 +94,8 @@ func (g *serverGeneratedGenerator) writeWrapperFunction(callbackName string, cal if !isVersionedVariable(param, g.version) { continue } - snippetWriter.Do("$.|short$ := &internal.$.|removePackage${}\n", param) - snippetWriter.Do("if err := Convert_"+g.version.Name+"_$.|removePackage$_To_internal_$.|removePackage$($.|versionedVariable$, $.|short$); err != nil {\n", param) + snippetWriter.Do("$.|short$ := &impl.$.|removePackage${}\n", param) + snippetWriter.Do("if err := Convert_"+g.version.Name+"_$.|removePackage$_To_impl_$.|removePackage$($.|versionedVariable$, $.|short$); err != nil {\n", param) snippetWriter.Do(returnErrLine+"\n}\n", nil) } snippetWriter.Do("\n", nil) @@ -119,7 +119,7 @@ func (g *serverGeneratedGenerator) writeWrapperFunction(callbackName string, cal continue } snippetWriter.Do("$.|versionedVariable$ := &"+g.version.Name+".$.|removePackage${}\n", returnValue) - snippetWriter.Do("if err := Convert_internal_$.|removePackage$_To_"+g.version.Name+"_$.|removePackage$($.|short$, $.|versionedVariable$); err != nil {\n", returnValue) + snippetWriter.Do("if err := Convert_impl_$.|removePackage$_To_"+g.version.Name+"_$.|removePackage$($.|short$, $.|versionedVariable$); err != nil {\n", returnValue) snippetWriter.Do(returnErrLine+"\n}\n", nil) } snippetWriter.Do("\n", nil) diff --git a/cmd/csi-proxy/main.go b/cmd/csi-proxy/main.go index 0da9f728..37299a4f 100644 --- a/cmd/csi-proxy/main.go +++ b/cmd/csi-proxy/main.go @@ -3,20 +3,20 @@ package main import ( "flag" - diskapi "github.com/kubernetes-csi/csi-proxy/internal/os/disk" - filesystemapi "github.com/kubernetes-csi/csi-proxy/internal/os/filesystem" - iscsiapi "github.com/kubernetes-csi/csi-proxy/internal/os/iscsi" - smbapi "github.com/kubernetes-csi/csi-proxy/internal/os/smb" - sysapi "github.com/kubernetes-csi/csi-proxy/internal/os/system" - volumeapi "github.com/kubernetes-csi/csi-proxy/internal/os/volume" - "github.com/kubernetes-csi/csi-proxy/internal/server" - disksrv "github.com/kubernetes-csi/csi-proxy/internal/server/disk" - filesystemsrv "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem" - iscsisrv "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi" - smbsrv "github.com/kubernetes-csi/csi-proxy/internal/server/smb" - syssrv "github.com/kubernetes-csi/csi-proxy/internal/server/system" - srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types" - volumesrv "github.com/kubernetes-csi/csi-proxy/internal/server/volume" + diskapi "github.com/kubernetes-csi/csi-proxy/pkg/os/disk" + filesystemapi "github.com/kubernetes-csi/csi-proxy/pkg/os/filesystem" + iscsiapi "github.com/kubernetes-csi/csi-proxy/pkg/os/iscsi" + smbapi "github.com/kubernetes-csi/csi-proxy/pkg/os/smb" + sysapi "github.com/kubernetes-csi/csi-proxy/pkg/os/system" + volumeapi "github.com/kubernetes-csi/csi-proxy/pkg/os/volume" + "github.com/kubernetes-csi/csi-proxy/pkg/server" + disksrv "github.com/kubernetes-csi/csi-proxy/pkg/server/disk" + filesystemsrv "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem" + iscsisrv "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi" + smbsrv "github.com/kubernetes-csi/csi-proxy/pkg/server/smb" + syssrv "github.com/kubernetes-csi/csi-proxy/pkg/server/system" + srvtypes "github.com/kubernetes-csi/csi-proxy/pkg/server/types" + volumesrv "github.com/kubernetes-csi/csi-proxy/pkg/server/volume" "golang.org/x/sys/windows" "golang.org/x/sys/windows/svc" "k8s.io/klog/v2" diff --git a/docs/API.md b/docs/API.md index bc538b21..a5325be9 100644 --- a/docs/API.md +++ b/docs/API.md @@ -8,12 +8,12 @@ The server exposes a number of API groups, all independent of each other. Additi APIs are defined by protobuf files; each API group should live in its own directory under `client/api/` in this repo's root (e.g. `client/api/iscsi`), and then define each of its version in `client/api///api.proto` files (e.g. `client/api/iscsi/v1/api.proto`). Each `proto` file should define exactly one RPC service. -Internally, there is only one server `struct` per API group, that handles all the versions for that API group. That server is defined in this repo's `internal/server/` (e.g. `internal/server/iscsi`) go package. This go package should follow the following pattern: +Internally, there is only one server `struct` per API group, that handles all the versions for that API group. That server is defined in this repo's `pkg/server/` (e.g. `pkg/server/iscsi`) go package. This go package should follow the following pattern: ``` -internal/server/ -├── internal +pkg/server/ +├── impl │   └── types.go └── server.go ``` @@ -59,13 +59,13 @@ message ComputeDoubleRequest{ message ComputeDoubleResponse{ int64 response = 2; - + // set to true if the result overflowed bool overflow = 3; } ``` -then `internal/server/dummy/internal/types.go` could look something like: +then `pkg/server/dummy/impl/types.go` could look something like: ```go type ComputeDoubleRequest struct { Input int64 @@ -76,15 +76,15 @@ type ComputeDoubleResponse struct { Overflow bool } ``` -and then the API group's server (`internal/server/dummy/server.go`) needs to define the callbacks to handle requests for all API versions, e.g.: +and then the API group's server (`pkg/server/dummy/server.go`) needs to define the callbacks to handle requests for all API versions, e.g.: ```go type Server struct{} -func (s *Server) ComputeDouble(ctx context.Context, request *internal.ComputeDoubleRequest, version apiversion.Version) (*internal.ComputeDoubleResponse, error) { +func (s *Server) ComputeDouble(ctx context.Context, request *impl.ComputeDoubleRequest, version apiversion.Version) (*impl.ComputeDoubleResponse, error) { in := request.Input64 out := 2 * in - - response := &internal.ComputeDoubleResponse{} + + response := &impl.ComputeDoubleResponse{} if sign(in) != sign(out) { // overflow @@ -114,14 +114,14 @@ All the boilerplate code to: * create clients to talk to the API group and its versions is generated automatically using [gengo](https://github.com/kubernetes/gengo). -The only caveat is that when conversions cannot be made trivially (e.g. when fields from internal and versioned `struct`s have different types), API devs need to define conversion functions. They can do that by creating an (otherwise optional) `internal/server//internal//conversion.go` file, containing functions of the form `func convert_pb__To_internal_(in *pb., out *internal.) error` or `func convert_internal__To_pb_(in *internal., out *pb.) error`; for example, in our `dummy` example above, we need to define a conversion function to account for the different fields in requests and responses from `v1alpha1` to `v1`; so `internal/server/dummy/internal/v1alpha1/conversion.go` could look like: +The only caveat is that when conversions cannot be made trivially (e.g. when fields from internal and versioned `struct`s have different types), API devs need to define conversion functions. They can do that by creating an (otherwise optional) `pkg/server//impl//conversion.go` file, containing functions of the form `func convert_pb__To_impl_(in *pb., out *impl.) error` or `func convert_impl__To_pb_(in *impl., out *pb.) error`; for example, in our `dummy` example above, we need to define a conversion function to account for the different fields in requests and responses from `v1alpha1` to `v1`; so `pkg/server/dummy/impl/v1alpha1/conversion.go` could look like: ```go -func convert_pb_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in *pb.ComputeDoubleRequest, out *internal.ComputeDoubleRequest) error { +func convert_pb_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(in *pb.ComputeDoubleRequest, out *impl.ComputeDoubleRequest) error { out.Input64 = int64(in.Input32) return nil } -func convert_internal_ComputeDoubleResponse_To_pb_ComputeDoubleResponse(in *internal.ComputeDoubleResponse, out *pb.ComputeDoubleResponse) error { +func convert_impl_ComputeDoubleResponse_To_pb_ComputeDoubleResponse(in *impl.ComputeDoubleResponse, out *pb.ComputeDoubleResponse) error { i := in.Response if i > math.MaxInt32 || i < math.MinInt32 { return fmt.Errorf("int32 overflow for %d", i) @@ -220,23 +220,23 @@ First, it looks for all API group definitions, which are either subdirectories o Then for each API group it finds: 1. it iterates through each version subpackage, and in each looks for the `Server` interface, and compiles the list of callbacks that the group's `Server` needs to implement as well as the list of top-level `struct`s (`*Request`s and `*Response`s) -2. it looks for an existing `internal/server//internal/types.go` file: +2. it looks for an existing `pkg/server//impl/types.go` file: * if it exists, it checks that it contains all the expected top-level `struct`s from the previous step * if it doesn't exist, _and_ the API group only defines one version, it auto-generates one that simply copies the protobuf `struct`s (from the previous step) - this is meant to make it easy to bootstrap a new API group -3. it generates the `internal/server//internal/types_generated.go` file, using the list of callbacks from the first step above -4. if `internal/server//server.go` doesn't exist, it generates a skeleton for it - this, too, is meant to make it easy to bootstrap new API groups +3. it generates the `pkg/server//impl/types_generated.go` file, using the list of callbacks from the first step above +4. if `pkg/server//server.go` doesn't exist, it generates a skeleton for it - this, too, is meant to make it easy to bootstrap new API groups 5. then for each version of the API: - 1. it looks for an existing `internal/server//internal//conversion.go`, generates an empty one if it doesn't exist; then looks for existing conversion functions - 2. it generates missing conversion functions to `internal/server//internal//conversion_generated.go` - 3. it generates `internal/server//internal//server_generated.go` -6. it generates `internal/server//internal/api_group_generated.go` to list all the versioned servers it's just created + 1. it looks for an existing `pkg/server//impl//conversion.go`, generates an empty one if it doesn't exist; then looks for existing conversion functions + 2. it generates missing conversion functions to `pkg/server//impl//conversion_generated.go` + 3. it generates `pkg/server//impl//server_generated.go` +6. it generates `pkg/server//impl/api_group_generated.go` to list all the versioned servers it's just created 7. and finally, it generates `client/groups///client_generated.go` for each version When `csi-proxy-api-gen` has successfully run to completion, [our example API group's go package from earlier](#serverPkgTree) will look something like: ``` -internal/server/ +pkg/server/ ├── api_group_generated.go -├── internal +├── impl │   ├── types.go │   ├── types_generated.go │   ├── v1 diff --git a/docs/DEVELOPMENT.md b/docs/DEVELOPMENT.md index db0225c4..a37c1d4f 100644 --- a/docs/DEVELOPMENT.md +++ b/docs/DEVELOPMENT.md @@ -18,11 +18,11 @@ Read the [`Makefile`](./Makefile) for more details and the descriptions below to - `client` - Client module (used by the drivers) - `api` - Client API, versioned and compiled from `api.proto` files - `groups` - Client API factory, the drivers will interact with methods of the wanted group/version from this folder, these methods use the structs defined in `client/api` -- `internal` - Server side code +- `pkg` - Server side code - `server.go` - Server entry point, invoked by the `csi-proxy` binary - - `server//internal//server_generated.go` - First gRPC layer, once the gRPC server receives a request, it'll send it to these GRPC handlers, these handlers will convert a client versioned request e.g. a request from `v1beta2` or `v1beta3` to an internal server representation (see `internal/types.go`) that doesn't have specific information about the version of a client. - - `server//internal/types.go` - All requests regardless of the client version used are converted into the structs declared here, structs of these types are what the server is aware of. - - `server//internal/types_generated.go` - The API exposed by the server API handler, it needs to match requests that may come from any client version. + - `server//impl//server_generated.go` - First gRPC layer, once the gRPC server receives a request, it'll send it to these GRPC handlers, these handlers will convert a client versioned request e.g. a request from `v1beta2` or `v1beta3` to an internal server representation (see `impl/types.go`) that doesn't have specific information about the version of a client. + - `server//impl/types.go` - All requests regardless of the client version used are converted into the structs declared here, structs of these types are what the server is aware of. + - `server//impl/types_generated.go` - The API exposed by the server API handler, it needs to match requests that may come from any client version. - `server//server.go` - Server API handlers that implements `types_generated.go` and perform server side validations, once client requests are converted into the internal server structs they go through methods exposed here and invoke `os/` methods. - `os//` - The internal server implementation of the csi-proxy API. @@ -32,9 +32,9 @@ Additional notes about the API files: Additional notes about some autogenerated files: -- `internal/server//internal//conversion_generated.go` - In the First gRPC layer requests may come from different versioned clients, the server works with internal structs that don't have any info about a specific client request, there's the need of conversion functions that remap properties from a client to the internal server structs, this file has functions with autogenerated mappings (overrides can be specified through `conversion.go` see #138) +- `pkg/server//impl//conversion_generated.go` - In the First gRPC layer requests may come from different versioned clients, the server works with internal structs that don't have any info about a specific client request, there's the need of conversion functions that remap properties from a client to the internal server structs, this file has functions with autogenerated mappings (overrides can be specified through `conversion.go` see #138) - NOTE: some of the functions may be declared but may not be used, this happens if there's an override in `conversion.go` for that function. -- `internal/server//api_group_generated.go` - Creates server handlers for all the known API versions for the `` +- `pkg/server//api_group_generated.go` - Creates server handlers for all the known API versions for the `` ## Making changes to the client module @@ -75,24 +75,24 @@ When there are changes to the server module: making changes to the volume API I deleted all the `_generated.go` files ```shell -find internal/server/volume -name "*_generated.go" | xargs rm +find pkg/server/volume -name "*_generated.go" | xargs rm ``` - Generate the `_generated.go` files with `make generated-csi-proxy-api-gen` -- Update the unit tests in `internal/server//server_test.go` +- Update the unit tests in `pkg/server//server_test.go` - Update the integration tests in `integrationtests/` ## Bumping versions - Copy all the non-generated client files from the desired groups e.g. from `v1beta2` to `v1beta3` and run the compiler (see [#making changes to the client module](#making-changes-to-the-client-module)), **remember not to overwrite old API files!** -- Copy server API handlers for the desired group e.g. `internal/server//internal//conversion.go`, **remember to delete the auto generated files first!** +- Copy server API handlers for the desired group e.g. `pkg/server//impl//conversion.go`, **remember to delete the auto generated files first!** If there are any non-backward compatible changes (for example renaming a parameter or a method) - Make sure that `types.go` reflects what we should know of the internal server structs - Remap old parameters in previous API versions e.g. let's say that we make a remap in `v1beta3` then we need to updated `v1alpha1`, `v1beta1`, etc. using the `conversion.go` file. (see #138) -- Update `internal//server.go` if there are new methods, the old methods should forward the request (see #138) +- Update `pkg//server.go` if there are new methods, the old methods should forward the request (see #138) ## Running E2E tests diff --git a/integrationtests/apigroups/server/dummy/api_group_generated.go b/integrationtests/apigroups/server/dummy/api_group_generated.go index 1bb67d46..a537f3aa 100644 --- a/integrationtests/apigroups/server/dummy/api_group_generated.go +++ b/integrationtests/apigroups/server/dummy/api_group_generated.go @@ -4,17 +4,17 @@ package dummy import ( "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1alpha1" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal/v1alpha2" - srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl/v1" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl/v1alpha1" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl/v1alpha2" + srvtypes "github.com/kubernetes-csi/csi-proxy/pkg/server/types" ) const name = "dummy" // ensure the server defines all the required methods -var _ internal.ServerInterface = &Server{} +var _ impl.ServerInterface = &Server{} func (s *Server) VersionedAPIs() []*srvtypes.VersionedAPI { v1alpha1Server := v1alpha1.NewVersionedServer(s) diff --git a/integrationtests/apigroups/server/dummy/impl/types_generated.go b/integrationtests/apigroups/server/dummy/impl/types_generated.go new file mode 100644 index 00000000..ca220504 --- /dev/null +++ b/integrationtests/apigroups/server/dummy/impl/types_generated.go @@ -0,0 +1,20 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package impl + +import ( + "context" + + "github.com/kubernetes-csi/csi-proxy/client/apiversion" + "google.golang.org/grpc" +) + +type VersionedAPI interface { + Register(grpcServer *grpc.Server) +} + +// All the functions this group's server needs to define. +type ServerInterface interface { + ComputeDouble(context.Context, *ComputeDoubleRequest, apiversion.Version) (*ComputeDoubleResponse, error) + TellMeAPoem(context.Context, *TellMeAPoemRequest, apiversion.Version) (*TellMeAPoemResponse, error) +} diff --git a/integrationtests/apigroups/server/dummy/impl/v1/conversion.go b/integrationtests/apigroups/server/dummy/impl/v1/conversion.go new file mode 100644 index 00000000..7d35c7a3 --- /dev/null +++ b/integrationtests/apigroups/server/dummy/impl/v1/conversion.go @@ -0,0 +1,3 @@ +package v1 + +// Add manual conversion functions here to override automatic conversion functions diff --git a/integrationtests/apigroups/server/dummy/impl/v1/conversion_generated.go b/integrationtests/apigroups/server/dummy/impl/v1/conversion_generated.go new file mode 100644 index 00000000..e0660689 --- /dev/null +++ b/integrationtests/apigroups/server/dummy/impl/v1/conversion_generated.go @@ -0,0 +1,3 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1 diff --git a/integrationtests/apigroups/server/dummy/impl/v1/server_generated.go b/integrationtests/apigroups/server/dummy/impl/v1/server_generated.go new file mode 100644 index 00000000..1d69266c --- /dev/null +++ b/integrationtests/apigroups/server/dummy/impl/v1/server_generated.go @@ -0,0 +1,66 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1 + +import ( + "context" + + "github.com/kubernetes-csi/csi-proxy/client/apiversion" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl" + "google.golang.org/grpc" +) + +var version = apiversion.NewVersionOrPanic("v1") + +type versionedAPI struct { + apiGroupServer impl.ServerInterface +} + +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { + return &versionedAPI{ + apiGroupServer: apiGroupServer, + } +} + +func (s *versionedAPI) Register(grpcServer *grpc.Server) { + v1.RegisterDummyServer(grpcServer, s) +} + +func (s *versionedAPI) ComputeDouble(context context.Context, versionedRequest *v1.ComputeDoubleRequest) (*v1.ComputeDoubleResponse, error) { + request := &impl.ComputeDoubleRequest{} + if err := Convert_v1_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(versionedRequest, request); err != nil { + return nil, err + } + + response, err := s.apiGroupServer.ComputeDouble(context, request, version) + if err != nil { + return nil, err + } + + versionedResponse := &v1.ComputeDoubleResponse{} + if err := Convert_impl_ComputeDoubleResponse_To_v1_ComputeDoubleResponse(response, versionedResponse); err != nil { + return nil, err + } + + return versionedResponse, err +} + +func (s *versionedAPI) TellMeAPoem(context context.Context, versionedRequest *v1.TellMeAPoemRequest) (*v1.TellMeAPoemResponse, error) { + request := &impl.TellMeAPoemRequest{} + if err := Convert_v1_TellMeAPoemRequest_To_impl_TellMeAPoemRequest(versionedRequest, request); err != nil { + return nil, err + } + + response, err := s.apiGroupServer.TellMeAPoem(context, request, version) + if err != nil { + return nil, err + } + + versionedResponse := &v1.TellMeAPoemResponse{} + if err := Convert_impl_TellMeAPoemResponse_To_v1_TellMeAPoemResponse(response, versionedResponse); err != nil { + return nil, err + } + + return versionedResponse, err +} diff --git a/internal/server/filesystem/internal/v1alpha1/conversion.go b/integrationtests/apigroups/server/dummy/impl/v1alpha1/conversion.go similarity index 100% rename from internal/server/filesystem/internal/v1alpha1/conversion.go rename to integrationtests/apigroups/server/dummy/impl/v1alpha1/conversion.go diff --git a/integrationtests/apigroups/server/dummy/impl/v1alpha1/conversion_generated.go b/integrationtests/apigroups/server/dummy/impl/v1alpha1/conversion_generated.go new file mode 100644 index 00000000..3e8b8040 --- /dev/null +++ b/integrationtests/apigroups/server/dummy/impl/v1alpha1/conversion_generated.go @@ -0,0 +1,3 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha1 diff --git a/integrationtests/apigroups/server/dummy/impl/v1alpha1/server_generated.go b/integrationtests/apigroups/server/dummy/impl/v1alpha1/server_generated.go new file mode 100644 index 00000000..c58312bc --- /dev/null +++ b/integrationtests/apigroups/server/dummy/impl/v1alpha1/server_generated.go @@ -0,0 +1,47 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + "context" + + "github.com/kubernetes-csi/csi-proxy/client/apiversion" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha1" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl" + "google.golang.org/grpc" +) + +var version = apiversion.NewVersionOrPanic("v1alpha1") + +type versionedAPI struct { + apiGroupServer impl.ServerInterface +} + +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { + return &versionedAPI{ + apiGroupServer: apiGroupServer, + } +} + +func (s *versionedAPI) Register(grpcServer *grpc.Server) { + v1alpha1.RegisterDummyServer(grpcServer, s) +} + +func (s *versionedAPI) ComputeDouble(context context.Context, versionedRequest *v1alpha1.ComputeDoubleRequest) (*v1alpha1.ComputeDoubleResponse, error) { + request := &impl.ComputeDoubleRequest{} + if err := Convert_v1alpha1_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(versionedRequest, request); err != nil { + return nil, err + } + + response, err := s.apiGroupServer.ComputeDouble(context, request, version) + if err != nil { + return nil, err + } + + versionedResponse := &v1alpha1.ComputeDoubleResponse{} + if err := Convert_impl_ComputeDoubleResponse_To_v1alpha1_ComputeDoubleResponse(response, versionedResponse); err != nil { + return nil, err + } + + return versionedResponse, err +} diff --git a/integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion.go b/integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion.go new file mode 100644 index 00000000..18765345 --- /dev/null +++ b/integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion.go @@ -0,0 +1,3 @@ +package v1alpha2 + +// Add manual conversion functions here to override automatic conversion functions diff --git a/integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion_generated.go b/integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion_generated.go new file mode 100644 index 00000000..97bd7e61 --- /dev/null +++ b/integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion_generated.go @@ -0,0 +1,3 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha2 diff --git a/integrationtests/apigroups/server/dummy/impl/v1alpha2/server_generated.go b/integrationtests/apigroups/server/dummy/impl/v1alpha2/server_generated.go new file mode 100644 index 00000000..a914e12e --- /dev/null +++ b/integrationtests/apigroups/server/dummy/impl/v1alpha2/server_generated.go @@ -0,0 +1,47 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha2 + +import ( + "context" + + "github.com/kubernetes-csi/csi-proxy/client/apiversion" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha2" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl" + "google.golang.org/grpc" +) + +var version = apiversion.NewVersionOrPanic("v1alpha2") + +type versionedAPI struct { + apiGroupServer impl.ServerInterface +} + +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { + return &versionedAPI{ + apiGroupServer: apiGroupServer, + } +} + +func (s *versionedAPI) Register(grpcServer *grpc.Server) { + v1alpha2.RegisterDummyServer(grpcServer, s) +} + +func (s *versionedAPI) ComputeDouble(context context.Context, versionedRequest *v1alpha2.ComputeDoubleRequest) (*v1alpha2.ComputeDoubleResponse, error) { + request := &impl.ComputeDoubleRequest{} + if err := Convert_v1alpha2_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(versionedRequest, request); err != nil { + return nil, err + } + + response, err := s.apiGroupServer.ComputeDouble(context, request, version) + if err != nil { + return nil, err + } + + versionedResponse := &v1alpha2.ComputeDoubleResponse{} + if err := Convert_impl_ComputeDoubleResponse_To_v1alpha2_ComputeDoubleResponse(response, versionedResponse); err != nil { + return nil, err + } + + return versionedResponse, err +} diff --git a/integrationtests/utils.go b/integrationtests/utils.go index 4d41bb9e..a0c50e1e 100644 --- a/integrationtests/utils.go +++ b/integrationtests/utils.go @@ -21,8 +21,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/kubernetes-csi/csi-proxy/internal/server" - srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types" + "github.com/kubernetes-csi/csi-proxy/pkg/server" + srvtypes "github.com/kubernetes-csi/csi-proxy/pkg/server/types" ) // startServer starts the proxy's GRPC servers, and returns a function to shut them down when done with testing diff --git a/internal/server/disk/internal/v1alpha1/conversion_generated.go b/internal/server/disk/internal/v1alpha1/conversion_generated.go deleted file mode 100644 index 72777c45..00000000 --- a/internal/server/disk/internal/v1alpha1/conversion_generated.go +++ /dev/null @@ -1,155 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" -) - -func autoConvert_v1alpha1_DiskLocation_To_internal_DiskLocation(in *v1alpha1.DiskLocation, out *internal.DiskLocation) error { - out.Adapter = in.Adapter - out.Bus = in.Bus - out.Target = in.Target - out.LUNID = in.LUNID - return nil -} - -// Convert_v1alpha1_DiskLocation_To_internal_DiskLocation is an autogenerated conversion function. -func Convert_v1alpha1_DiskLocation_To_internal_DiskLocation(in *v1alpha1.DiskLocation, out *internal.DiskLocation) error { - return autoConvert_v1alpha1_DiskLocation_To_internal_DiskLocation(in, out) -} - -func autoConvert_internal_DiskLocation_To_v1alpha1_DiskLocation(in *internal.DiskLocation, out *v1alpha1.DiskLocation) error { - out.Adapter = in.Adapter - out.Bus = in.Bus - out.Target = in.Target - out.LUNID = in.LUNID - return nil -} - -// Convert_internal_DiskLocation_To_v1alpha1_DiskLocation is an autogenerated conversion function. -func Convert_internal_DiskLocation_To_v1alpha1_DiskLocation(in *internal.DiskLocation, out *v1alpha1.DiskLocation) error { - return autoConvert_internal_DiskLocation_To_v1alpha1_DiskLocation(in, out) -} - -func autoConvert_v1alpha1_GetDiskNumberByNameRequest_To_internal_GetDiskNumberByNameRequest(in *v1alpha1.GetDiskNumberByNameRequest, out *internal.GetDiskNumberByNameRequest) error { - out.DiskName = in.DiskName - return nil -} - -// Convert_v1alpha1_GetDiskNumberByNameRequest_To_internal_GetDiskNumberByNameRequest is an autogenerated conversion function. -func Convert_v1alpha1_GetDiskNumberByNameRequest_To_internal_GetDiskNumberByNameRequest(in *v1alpha1.GetDiskNumberByNameRequest, out *internal.GetDiskNumberByNameRequest) error { - return autoConvert_v1alpha1_GetDiskNumberByNameRequest_To_internal_GetDiskNumberByNameRequest(in, out) -} - -func autoConvert_internal_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByNameRequest(in *internal.GetDiskNumberByNameRequest, out *v1alpha1.GetDiskNumberByNameRequest) error { - out.DiskName = in.DiskName - return nil -} - -// Convert_internal_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByNameRequest is an autogenerated conversion function. -func Convert_internal_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByNameRequest(in *internal.GetDiskNumberByNameRequest, out *v1alpha1.GetDiskNumberByNameRequest) error { - return autoConvert_internal_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByNameRequest(in, out) -} - -// detected external conversion function -// Convert_v1alpha1_GetDiskNumberByNameResponse_To_internal_GetDiskNumberByNameResponse(in *v1alpha1.GetDiskNumberByNameResponse, out *internal.GetDiskNumberByNameResponse) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(in *internal.GetDiskNumberByNameResponse, out *v1alpha1.GetDiskNumberByNameResponse) error -// skipping generation of the auto function - -func autoConvert_v1alpha1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1alpha1.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error { - return nil -} - -// Convert_v1alpha1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest is an autogenerated conversion function. -func Convert_v1alpha1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1alpha1.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error { - return autoConvert_v1alpha1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in, out) -} - -func autoConvert_internal_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequest(in *internal.ListDiskLocationsRequest, out *v1alpha1.ListDiskLocationsRequest) error { - return nil -} - -// Convert_internal_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequest is an autogenerated conversion function. -func Convert_internal_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequest(in *internal.ListDiskLocationsRequest, out *v1alpha1.ListDiskLocationsRequest) error { - return autoConvert_internal_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequest(in, out) -} - -// detected external conversion function -// Convert_v1alpha1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1alpha1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1alpha1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error -// skipping generation of the auto function - -func autoConvert_internal_PartitionDiskRequest_To_v1alpha1_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1alpha1.PartitionDiskRequest) error { - return nil -} - -// Convert_internal_PartitionDiskRequest_To_v1alpha1_PartitionDiskRequest is an autogenerated conversion function. -func Convert_internal_PartitionDiskRequest_To_v1alpha1_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1alpha1.PartitionDiskRequest) error { - return autoConvert_internal_PartitionDiskRequest_To_v1alpha1_PartitionDiskRequest(in, out) -} - -func autoConvert_v1alpha1_PartitionDiskResponse_To_internal_PartitionDiskResponse(in *v1alpha1.PartitionDiskResponse, out *internal.PartitionDiskResponse) error { - return nil -} - -// Convert_v1alpha1_PartitionDiskResponse_To_internal_PartitionDiskResponse is an autogenerated conversion function. -func Convert_v1alpha1_PartitionDiskResponse_To_internal_PartitionDiskResponse(in *v1alpha1.PartitionDiskResponse, out *internal.PartitionDiskResponse) error { - return autoConvert_v1alpha1_PartitionDiskResponse_To_internal_PartitionDiskResponse(in, out) -} - -func autoConvert_internal_PartitionDiskResponse_To_v1alpha1_PartitionDiskResponse(in *internal.PartitionDiskResponse, out *v1alpha1.PartitionDiskResponse) error { - return nil -} - -// Convert_internal_PartitionDiskResponse_To_v1alpha1_PartitionDiskResponse is an autogenerated conversion function. -func Convert_internal_PartitionDiskResponse_To_v1alpha1_PartitionDiskResponse(in *internal.PartitionDiskResponse, out *v1alpha1.PartitionDiskResponse) error { - return autoConvert_internal_PartitionDiskResponse_To_v1alpha1_PartitionDiskResponse(in, out) -} - -func autoConvert_v1alpha1_RescanRequest_To_internal_RescanRequest(in *v1alpha1.RescanRequest, out *internal.RescanRequest) error { - return nil -} - -// Convert_v1alpha1_RescanRequest_To_internal_RescanRequest is an autogenerated conversion function. -func Convert_v1alpha1_RescanRequest_To_internal_RescanRequest(in *v1alpha1.RescanRequest, out *internal.RescanRequest) error { - return autoConvert_v1alpha1_RescanRequest_To_internal_RescanRequest(in, out) -} - -func autoConvert_internal_RescanRequest_To_v1alpha1_RescanRequest(in *internal.RescanRequest, out *v1alpha1.RescanRequest) error { - return nil -} - -// Convert_internal_RescanRequest_To_v1alpha1_RescanRequest is an autogenerated conversion function. -func Convert_internal_RescanRequest_To_v1alpha1_RescanRequest(in *internal.RescanRequest, out *v1alpha1.RescanRequest) error { - return autoConvert_internal_RescanRequest_To_v1alpha1_RescanRequest(in, out) -} - -func autoConvert_v1alpha1_RescanResponse_To_internal_RescanResponse(in *v1alpha1.RescanResponse, out *internal.RescanResponse) error { - return nil -} - -// Convert_v1alpha1_RescanResponse_To_internal_RescanResponse is an autogenerated conversion function. -func Convert_v1alpha1_RescanResponse_To_internal_RescanResponse(in *v1alpha1.RescanResponse, out *internal.RescanResponse) error { - return autoConvert_v1alpha1_RescanResponse_To_internal_RescanResponse(in, out) -} - -func autoConvert_internal_RescanResponse_To_v1alpha1_RescanResponse(in *internal.RescanResponse, out *v1alpha1.RescanResponse) error { - return nil -} - -// Convert_internal_RescanResponse_To_v1alpha1_RescanResponse is an autogenerated conversion function. -func Convert_internal_RescanResponse_To_v1alpha1_RescanResponse(in *internal.RescanResponse, out *v1alpha1.RescanResponse) error { - return autoConvert_internal_RescanResponse_To_v1alpha1_RescanResponse(in, out) -} diff --git a/internal/server/disk/internal/v1beta1/conversion_generated.go b/internal/server/disk/internal/v1beta1/conversion_generated.go deleted file mode 100644 index 1ee910a9..00000000 --- a/internal/server/disk/internal/v1beta1/conversion_generated.go +++ /dev/null @@ -1,211 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1beta1 - -import ( - v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" -) - -func autoConvert_v1beta1_DiskIDs_To_internal_DiskIDs(in *v1beta1.DiskIDs, out *internal.DiskIDs) error { - return nil -} - -// Convert_v1beta1_DiskIDs_To_internal_DiskIDs is an autogenerated conversion function. -func Convert_v1beta1_DiskIDs_To_internal_DiskIDs(in *v1beta1.DiskIDs, out *internal.DiskIDs) error { - return autoConvert_v1beta1_DiskIDs_To_internal_DiskIDs(in, out) -} - -func autoConvert_internal_DiskIDs_To_v1beta1_DiskIDs(in *internal.DiskIDs, out *v1beta1.DiskIDs) error { - return nil -} - -// Convert_internal_DiskIDs_To_v1beta1_DiskIDs is an autogenerated conversion function. -func Convert_internal_DiskIDs_To_v1beta1_DiskIDs(in *internal.DiskIDs, out *v1beta1.DiskIDs) error { - return autoConvert_internal_DiskIDs_To_v1beta1_DiskIDs(in, out) -} - -func autoConvert_v1beta1_DiskLocation_To_internal_DiskLocation(in *v1beta1.DiskLocation, out *internal.DiskLocation) error { - out.Adapter = in.Adapter - out.Bus = in.Bus - out.Target = in.Target - out.LUNID = in.LUNID - return nil -} - -// Convert_v1beta1_DiskLocation_To_internal_DiskLocation is an autogenerated conversion function. -func Convert_v1beta1_DiskLocation_To_internal_DiskLocation(in *v1beta1.DiskLocation, out *internal.DiskLocation) error { - return autoConvert_v1beta1_DiskLocation_To_internal_DiskLocation(in, out) -} - -func autoConvert_internal_DiskLocation_To_v1beta1_DiskLocation(in *internal.DiskLocation, out *v1beta1.DiskLocation) error { - out.Adapter = in.Adapter - out.Bus = in.Bus - out.Target = in.Target - out.LUNID = in.LUNID - return nil -} - -// Convert_internal_DiskLocation_To_v1beta1_DiskLocation is an autogenerated conversion function. -func Convert_internal_DiskLocation_To_v1beta1_DiskLocation(in *internal.DiskLocation, out *v1beta1.DiskLocation) error { - return autoConvert_internal_DiskLocation_To_v1beta1_DiskLocation(in, out) -} - -func autoConvert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta1.DiskStatsRequest, out *internal.DiskStatsRequest) error { - out.DiskID = in.DiskID - return nil -} - -// Convert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest is an autogenerated conversion function. -func Convert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta1.DiskStatsRequest, out *internal.DiskStatsRequest) error { - return autoConvert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest(in, out) -} - -func autoConvert_internal_DiskStatsRequest_To_v1beta1_DiskStatsRequest(in *internal.DiskStatsRequest, out *v1beta1.DiskStatsRequest) error { - out.DiskID = in.DiskID - return nil -} - -// Convert_internal_DiskStatsRequest_To_v1beta1_DiskStatsRequest is an autogenerated conversion function. -func Convert_internal_DiskStatsRequest_To_v1beta1_DiskStatsRequest(in *internal.DiskStatsRequest, out *v1beta1.DiskStatsRequest) error { - return autoConvert_internal_DiskStatsRequest_To_v1beta1_DiskStatsRequest(in, out) -} - -func autoConvert_v1beta1_DiskStatsResponse_To_internal_DiskStatsResponse(in *v1beta1.DiskStatsResponse, out *internal.DiskStatsResponse) error { - out.DiskSize = in.DiskSize - return nil -} - -// Convert_v1beta1_DiskStatsResponse_To_internal_DiskStatsResponse is an autogenerated conversion function. -func Convert_v1beta1_DiskStatsResponse_To_internal_DiskStatsResponse(in *v1beta1.DiskStatsResponse, out *internal.DiskStatsResponse) error { - return autoConvert_v1beta1_DiskStatsResponse_To_internal_DiskStatsResponse(in, out) -} - -func autoConvert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta1.DiskStatsResponse) error { - out.DiskSize = in.DiskSize - return nil -} - -// Convert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse is an autogenerated conversion function. -func Convert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta1.DiskStatsResponse) error { - return autoConvert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in, out) -} - -func autoConvert_v1beta1_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in *v1beta1.ListDiskIDsRequest, out *internal.ListDiskIDsRequest) error { - return nil -} - -// Convert_v1beta1_ListDiskIDsRequest_To_internal_ListDiskIDsRequest is an autogenerated conversion function. -func Convert_v1beta1_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in *v1beta1.ListDiskIDsRequest, out *internal.ListDiskIDsRequest) error { - return autoConvert_v1beta1_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in, out) -} - -func autoConvert_internal_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest(in *internal.ListDiskIDsRequest, out *v1beta1.ListDiskIDsRequest) error { - return nil -} - -// Convert_internal_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest is an autogenerated conversion function. -func Convert_internal_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest(in *internal.ListDiskIDsRequest, out *v1beta1.ListDiskIDsRequest) error { - return autoConvert_internal_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest(in, out) -} - -// detected external conversion function -// Convert_v1beta1_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta1.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error -// skipping generation of the auto function - -func autoConvert_v1beta1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta1.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error { - return nil -} - -// Convert_v1beta1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest is an autogenerated conversion function. -func Convert_v1beta1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta1.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error { - return autoConvert_v1beta1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in, out) -} - -func autoConvert_internal_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsRequest(in *internal.ListDiskLocationsRequest, out *v1beta1.ListDiskLocationsRequest) error { - return nil -} - -// Convert_internal_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsRequest is an autogenerated conversion function. -func Convert_internal_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsRequest(in *internal.ListDiskLocationsRequest, out *v1beta1.ListDiskLocationsRequest) error { - return autoConvert_internal_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsRequest(in, out) -} - -// detected external conversion function -// Convert_v1beta1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error -// skipping generation of the auto function - -func autoConvert_internal_PartitionDiskRequest_To_v1beta1_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta1.PartitionDiskRequest) error { - return nil -} - -// Convert_internal_PartitionDiskRequest_To_v1beta1_PartitionDiskRequest is an autogenerated conversion function. -func Convert_internal_PartitionDiskRequest_To_v1beta1_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta1.PartitionDiskRequest) error { - return autoConvert_internal_PartitionDiskRequest_To_v1beta1_PartitionDiskRequest(in, out) -} - -func autoConvert_v1beta1_PartitionDiskResponse_To_internal_PartitionDiskResponse(in *v1beta1.PartitionDiskResponse, out *internal.PartitionDiskResponse) error { - return nil -} - -// Convert_v1beta1_PartitionDiskResponse_To_internal_PartitionDiskResponse is an autogenerated conversion function. -func Convert_v1beta1_PartitionDiskResponse_To_internal_PartitionDiskResponse(in *v1beta1.PartitionDiskResponse, out *internal.PartitionDiskResponse) error { - return autoConvert_v1beta1_PartitionDiskResponse_To_internal_PartitionDiskResponse(in, out) -} - -func autoConvert_internal_PartitionDiskResponse_To_v1beta1_PartitionDiskResponse(in *internal.PartitionDiskResponse, out *v1beta1.PartitionDiskResponse) error { - return nil -} - -// Convert_internal_PartitionDiskResponse_To_v1beta1_PartitionDiskResponse is an autogenerated conversion function. -func Convert_internal_PartitionDiskResponse_To_v1beta1_PartitionDiskResponse(in *internal.PartitionDiskResponse, out *v1beta1.PartitionDiskResponse) error { - return autoConvert_internal_PartitionDiskResponse_To_v1beta1_PartitionDiskResponse(in, out) -} - -func autoConvert_v1beta1_RescanRequest_To_internal_RescanRequest(in *v1beta1.RescanRequest, out *internal.RescanRequest) error { - return nil -} - -// Convert_v1beta1_RescanRequest_To_internal_RescanRequest is an autogenerated conversion function. -func Convert_v1beta1_RescanRequest_To_internal_RescanRequest(in *v1beta1.RescanRequest, out *internal.RescanRequest) error { - return autoConvert_v1beta1_RescanRequest_To_internal_RescanRequest(in, out) -} - -func autoConvert_internal_RescanRequest_To_v1beta1_RescanRequest(in *internal.RescanRequest, out *v1beta1.RescanRequest) error { - return nil -} - -// Convert_internal_RescanRequest_To_v1beta1_RescanRequest is an autogenerated conversion function. -func Convert_internal_RescanRequest_To_v1beta1_RescanRequest(in *internal.RescanRequest, out *v1beta1.RescanRequest) error { - return autoConvert_internal_RescanRequest_To_v1beta1_RescanRequest(in, out) -} - -func autoConvert_v1beta1_RescanResponse_To_internal_RescanResponse(in *v1beta1.RescanResponse, out *internal.RescanResponse) error { - return nil -} - -// Convert_v1beta1_RescanResponse_To_internal_RescanResponse is an autogenerated conversion function. -func Convert_v1beta1_RescanResponse_To_internal_RescanResponse(in *v1beta1.RescanResponse, out *internal.RescanResponse) error { - return autoConvert_v1beta1_RescanResponse_To_internal_RescanResponse(in, out) -} - -func autoConvert_internal_RescanResponse_To_v1beta1_RescanResponse(in *internal.RescanResponse, out *v1beta1.RescanResponse) error { - return nil -} - -// Convert_internal_RescanResponse_To_v1beta1_RescanResponse is an autogenerated conversion function. -func Convert_internal_RescanResponse_To_v1beta1_RescanResponse(in *internal.RescanResponse, out *v1beta1.RescanResponse) error { - return autoConvert_internal_RescanResponse_To_v1beta1_RescanResponse(in, out) -} diff --git a/internal/server/disk/internal/v1beta2/conversion_generated.go b/internal/server/disk/internal/v1beta2/conversion_generated.go deleted file mode 100644 index 749c533c..00000000 --- a/internal/server/disk/internal/v1beta2/conversion_generated.go +++ /dev/null @@ -1,291 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1beta2 - -import ( - v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" -) - -func autoConvert_v1beta2_DiskIDs_To_internal_DiskIDs(in *v1beta2.DiskIDs, out *internal.DiskIDs) error { - return nil -} - -// Convert_v1beta2_DiskIDs_To_internal_DiskIDs is an autogenerated conversion function. -func Convert_v1beta2_DiskIDs_To_internal_DiskIDs(in *v1beta2.DiskIDs, out *internal.DiskIDs) error { - return autoConvert_v1beta2_DiskIDs_To_internal_DiskIDs(in, out) -} - -func autoConvert_internal_DiskIDs_To_v1beta2_DiskIDs(in *internal.DiskIDs, out *v1beta2.DiskIDs) error { - return nil -} - -// Convert_internal_DiskIDs_To_v1beta2_DiskIDs is an autogenerated conversion function. -func Convert_internal_DiskIDs_To_v1beta2_DiskIDs(in *internal.DiskIDs, out *v1beta2.DiskIDs) error { - return autoConvert_internal_DiskIDs_To_v1beta2_DiskIDs(in, out) -} - -func autoConvert_v1beta2_DiskLocation_To_internal_DiskLocation(in *v1beta2.DiskLocation, out *internal.DiskLocation) error { - out.Adapter = in.Adapter - out.Bus = in.Bus - out.Target = in.Target - out.LUNID = in.LUNID - return nil -} - -// Convert_v1beta2_DiskLocation_To_internal_DiskLocation is an autogenerated conversion function. -func Convert_v1beta2_DiskLocation_To_internal_DiskLocation(in *v1beta2.DiskLocation, out *internal.DiskLocation) error { - return autoConvert_v1beta2_DiskLocation_To_internal_DiskLocation(in, out) -} - -func autoConvert_internal_DiskLocation_To_v1beta2_DiskLocation(in *internal.DiskLocation, out *v1beta2.DiskLocation) error { - out.Adapter = in.Adapter - out.Bus = in.Bus - out.Target = in.Target - out.LUNID = in.LUNID - return nil -} - -// Convert_internal_DiskLocation_To_v1beta2_DiskLocation is an autogenerated conversion function. -func Convert_internal_DiskLocation_To_v1beta2_DiskLocation(in *internal.DiskLocation, out *v1beta2.DiskLocation) error { - return autoConvert_internal_DiskLocation_To_v1beta2_DiskLocation(in, out) -} - -func autoConvert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta2.DiskStatsRequest, out *internal.DiskStatsRequest) error { - out.DiskID = in.DiskID - return nil -} - -// Convert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest is an autogenerated conversion function. -func Convert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest(in *v1beta2.DiskStatsRequest, out *internal.DiskStatsRequest) error { - return autoConvert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest(in, out) -} - -func autoConvert_internal_DiskStatsRequest_To_v1beta2_DiskStatsRequest(in *internal.DiskStatsRequest, out *v1beta2.DiskStatsRequest) error { - out.DiskID = in.DiskID - return nil -} - -// Convert_internal_DiskStatsRequest_To_v1beta2_DiskStatsRequest is an autogenerated conversion function. -func Convert_internal_DiskStatsRequest_To_v1beta2_DiskStatsRequest(in *internal.DiskStatsRequest, out *v1beta2.DiskStatsRequest) error { - return autoConvert_internal_DiskStatsRequest_To_v1beta2_DiskStatsRequest(in, out) -} - -func autoConvert_v1beta2_DiskStatsResponse_To_internal_DiskStatsResponse(in *v1beta2.DiskStatsResponse, out *internal.DiskStatsResponse) error { - out.DiskSize = in.DiskSize - return nil -} - -// Convert_v1beta2_DiskStatsResponse_To_internal_DiskStatsResponse is an autogenerated conversion function. -func Convert_v1beta2_DiskStatsResponse_To_internal_DiskStatsResponse(in *v1beta2.DiskStatsResponse, out *internal.DiskStatsResponse) error { - return autoConvert_v1beta2_DiskStatsResponse_To_internal_DiskStatsResponse(in, out) -} - -func autoConvert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta2.DiskStatsResponse) error { - out.DiskSize = in.DiskSize - return nil -} - -// Convert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse is an autogenerated conversion function. -func Convert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in *internal.DiskStatsResponse, out *v1beta2.DiskStatsResponse) error { - return autoConvert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in, out) -} - -func autoConvert_v1beta2_GetAttachStateRequest_To_internal_GetAttachStateRequest(in *v1beta2.GetAttachStateRequest, out *internal.GetAttachStateRequest) error { - out.DiskID = in.DiskID - return nil -} - -// Convert_v1beta2_GetAttachStateRequest_To_internal_GetAttachStateRequest is an autogenerated conversion function. -func Convert_v1beta2_GetAttachStateRequest_To_internal_GetAttachStateRequest(in *v1beta2.GetAttachStateRequest, out *internal.GetAttachStateRequest) error { - return autoConvert_v1beta2_GetAttachStateRequest_To_internal_GetAttachStateRequest(in, out) -} - -func autoConvert_internal_GetAttachStateRequest_To_v1beta2_GetAttachStateRequest(in *internal.GetAttachStateRequest, out *v1beta2.GetAttachStateRequest) error { - out.DiskID = in.DiskID - return nil -} - -// Convert_internal_GetAttachStateRequest_To_v1beta2_GetAttachStateRequest is an autogenerated conversion function. -func Convert_internal_GetAttachStateRequest_To_v1beta2_GetAttachStateRequest(in *internal.GetAttachStateRequest, out *v1beta2.GetAttachStateRequest) error { - return autoConvert_internal_GetAttachStateRequest_To_v1beta2_GetAttachStateRequest(in, out) -} - -func autoConvert_v1beta2_GetAttachStateResponse_To_internal_GetAttachStateResponse(in *v1beta2.GetAttachStateResponse, out *internal.GetAttachStateResponse) error { - out.IsOnline = in.IsOnline - return nil -} - -// Convert_v1beta2_GetAttachStateResponse_To_internal_GetAttachStateResponse is an autogenerated conversion function. -func Convert_v1beta2_GetAttachStateResponse_To_internal_GetAttachStateResponse(in *v1beta2.GetAttachStateResponse, out *internal.GetAttachStateResponse) error { - return autoConvert_v1beta2_GetAttachStateResponse_To_internal_GetAttachStateResponse(in, out) -} - -func autoConvert_internal_GetAttachStateResponse_To_v1beta2_GetAttachStateResponse(in *internal.GetAttachStateResponse, out *v1beta2.GetAttachStateResponse) error { - out.IsOnline = in.IsOnline - return nil -} - -// Convert_internal_GetAttachStateResponse_To_v1beta2_GetAttachStateResponse is an autogenerated conversion function. -func Convert_internal_GetAttachStateResponse_To_v1beta2_GetAttachStateResponse(in *internal.GetAttachStateResponse, out *v1beta2.GetAttachStateResponse) error { - return autoConvert_internal_GetAttachStateResponse_To_v1beta2_GetAttachStateResponse(in, out) -} - -func autoConvert_v1beta2_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in *v1beta2.ListDiskIDsRequest, out *internal.ListDiskIDsRequest) error { - return nil -} - -// Convert_v1beta2_ListDiskIDsRequest_To_internal_ListDiskIDsRequest is an autogenerated conversion function. -func Convert_v1beta2_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in *v1beta2.ListDiskIDsRequest, out *internal.ListDiskIDsRequest) error { - return autoConvert_v1beta2_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in, out) -} - -func autoConvert_internal_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest(in *internal.ListDiskIDsRequest, out *v1beta2.ListDiskIDsRequest) error { - return nil -} - -// Convert_internal_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest is an autogenerated conversion function. -func Convert_internal_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest(in *internal.ListDiskIDsRequest, out *v1beta2.ListDiskIDsRequest) error { - return autoConvert_internal_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest(in, out) -} - -// detected external conversion function -// Convert_v1beta2_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta2.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error -// skipping generation of the auto function - -func autoConvert_v1beta2_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta2.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error { - return nil -} - -// Convert_v1beta2_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest is an autogenerated conversion function. -func Convert_v1beta2_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta2.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error { - return autoConvert_v1beta2_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in, out) -} - -func autoConvert_internal_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsRequest(in *internal.ListDiskLocationsRequest, out *v1beta2.ListDiskLocationsRequest) error { - return nil -} - -// Convert_internal_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsRequest is an autogenerated conversion function. -func Convert_internal_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsRequest(in *internal.ListDiskLocationsRequest, out *v1beta2.ListDiskLocationsRequest) error { - return autoConvert_internal_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsRequest(in, out) -} - -// detected external conversion function -// Convert_v1beta2_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta2.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta2.PartitionDiskRequest, out *internal.PartitionDiskRequest) error -// skipping generation of the auto function - -func autoConvert_internal_PartitionDiskRequest_To_v1beta2_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta2.PartitionDiskRequest) error { - return nil -} - -// Convert_internal_PartitionDiskRequest_To_v1beta2_PartitionDiskRequest is an autogenerated conversion function. -func Convert_internal_PartitionDiskRequest_To_v1beta2_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta2.PartitionDiskRequest) error { - return autoConvert_internal_PartitionDiskRequest_To_v1beta2_PartitionDiskRequest(in, out) -} - -func autoConvert_v1beta2_PartitionDiskResponse_To_internal_PartitionDiskResponse(in *v1beta2.PartitionDiskResponse, out *internal.PartitionDiskResponse) error { - return nil -} - -// Convert_v1beta2_PartitionDiskResponse_To_internal_PartitionDiskResponse is an autogenerated conversion function. -func Convert_v1beta2_PartitionDiskResponse_To_internal_PartitionDiskResponse(in *v1beta2.PartitionDiskResponse, out *internal.PartitionDiskResponse) error { - return autoConvert_v1beta2_PartitionDiskResponse_To_internal_PartitionDiskResponse(in, out) -} - -func autoConvert_internal_PartitionDiskResponse_To_v1beta2_PartitionDiskResponse(in *internal.PartitionDiskResponse, out *v1beta2.PartitionDiskResponse) error { - return nil -} - -// Convert_internal_PartitionDiskResponse_To_v1beta2_PartitionDiskResponse is an autogenerated conversion function. -func Convert_internal_PartitionDiskResponse_To_v1beta2_PartitionDiskResponse(in *internal.PartitionDiskResponse, out *v1beta2.PartitionDiskResponse) error { - return autoConvert_internal_PartitionDiskResponse_To_v1beta2_PartitionDiskResponse(in, out) -} - -func autoConvert_v1beta2_RescanRequest_To_internal_RescanRequest(in *v1beta2.RescanRequest, out *internal.RescanRequest) error { - return nil -} - -// Convert_v1beta2_RescanRequest_To_internal_RescanRequest is an autogenerated conversion function. -func Convert_v1beta2_RescanRequest_To_internal_RescanRequest(in *v1beta2.RescanRequest, out *internal.RescanRequest) error { - return autoConvert_v1beta2_RescanRequest_To_internal_RescanRequest(in, out) -} - -func autoConvert_internal_RescanRequest_To_v1beta2_RescanRequest(in *internal.RescanRequest, out *v1beta2.RescanRequest) error { - return nil -} - -// Convert_internal_RescanRequest_To_v1beta2_RescanRequest is an autogenerated conversion function. -func Convert_internal_RescanRequest_To_v1beta2_RescanRequest(in *internal.RescanRequest, out *v1beta2.RescanRequest) error { - return autoConvert_internal_RescanRequest_To_v1beta2_RescanRequest(in, out) -} - -func autoConvert_v1beta2_RescanResponse_To_internal_RescanResponse(in *v1beta2.RescanResponse, out *internal.RescanResponse) error { - return nil -} - -// Convert_v1beta2_RescanResponse_To_internal_RescanResponse is an autogenerated conversion function. -func Convert_v1beta2_RescanResponse_To_internal_RescanResponse(in *v1beta2.RescanResponse, out *internal.RescanResponse) error { - return autoConvert_v1beta2_RescanResponse_To_internal_RescanResponse(in, out) -} - -func autoConvert_internal_RescanResponse_To_v1beta2_RescanResponse(in *internal.RescanResponse, out *v1beta2.RescanResponse) error { - return nil -} - -// Convert_internal_RescanResponse_To_v1beta2_RescanResponse is an autogenerated conversion function. -func Convert_internal_RescanResponse_To_v1beta2_RescanResponse(in *internal.RescanResponse, out *v1beta2.RescanResponse) error { - return autoConvert_internal_RescanResponse_To_v1beta2_RescanResponse(in, out) -} - -func autoConvert_v1beta2_SetAttachStateRequest_To_internal_SetAttachStateRequest(in *v1beta2.SetAttachStateRequest, out *internal.SetAttachStateRequest) error { - out.DiskID = in.DiskID - out.IsOnline = in.IsOnline - return nil -} - -// Convert_v1beta2_SetAttachStateRequest_To_internal_SetAttachStateRequest is an autogenerated conversion function. -func Convert_v1beta2_SetAttachStateRequest_To_internal_SetAttachStateRequest(in *v1beta2.SetAttachStateRequest, out *internal.SetAttachStateRequest) error { - return autoConvert_v1beta2_SetAttachStateRequest_To_internal_SetAttachStateRequest(in, out) -} - -func autoConvert_internal_SetAttachStateRequest_To_v1beta2_SetAttachStateRequest(in *internal.SetAttachStateRequest, out *v1beta2.SetAttachStateRequest) error { - out.DiskID = in.DiskID - out.IsOnline = in.IsOnline - return nil -} - -// Convert_internal_SetAttachStateRequest_To_v1beta2_SetAttachStateRequest is an autogenerated conversion function. -func Convert_internal_SetAttachStateRequest_To_v1beta2_SetAttachStateRequest(in *internal.SetAttachStateRequest, out *v1beta2.SetAttachStateRequest) error { - return autoConvert_internal_SetAttachStateRequest_To_v1beta2_SetAttachStateRequest(in, out) -} - -func autoConvert_v1beta2_SetAttachStateResponse_To_internal_SetAttachStateResponse(in *v1beta2.SetAttachStateResponse, out *internal.SetAttachStateResponse) error { - return nil -} - -// Convert_v1beta2_SetAttachStateResponse_To_internal_SetAttachStateResponse is an autogenerated conversion function. -func Convert_v1beta2_SetAttachStateResponse_To_internal_SetAttachStateResponse(in *v1beta2.SetAttachStateResponse, out *internal.SetAttachStateResponse) error { - return autoConvert_v1beta2_SetAttachStateResponse_To_internal_SetAttachStateResponse(in, out) -} - -func autoConvert_internal_SetAttachStateResponse_To_v1beta2_SetAttachStateResponse(in *internal.SetAttachStateResponse, out *v1beta2.SetAttachStateResponse) error { - return nil -} - -// Convert_internal_SetAttachStateResponse_To_v1beta2_SetAttachStateResponse is an autogenerated conversion function. -func Convert_internal_SetAttachStateResponse_To_v1beta2_SetAttachStateResponse(in *internal.SetAttachStateResponse, out *v1beta2.SetAttachStateResponse) error { - return autoConvert_internal_SetAttachStateResponse_To_v1beta2_SetAttachStateResponse(in, out) -} diff --git a/internal/server/disk/internal/v1beta3/conversion_generated.go b/internal/server/disk/internal/v1beta3/conversion_generated.go deleted file mode 100644 index 5b94c78f..00000000 --- a/internal/server/disk/internal/v1beta3/conversion_generated.go +++ /dev/null @@ -1,338 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1beta3 - -import ( - v1beta3 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" -) - -func autoConvert_v1beta3_DiskIDs_To_internal_DiskIDs(in *v1beta3.DiskIDs, out *internal.DiskIDs) error { - out.Page83 = in.Page83 - out.SerialNumber = in.SerialNumber - return nil -} - -// Convert_v1beta3_DiskIDs_To_internal_DiskIDs is an autogenerated conversion function. -func Convert_v1beta3_DiskIDs_To_internal_DiskIDs(in *v1beta3.DiskIDs, out *internal.DiskIDs) error { - return autoConvert_v1beta3_DiskIDs_To_internal_DiskIDs(in, out) -} - -func autoConvert_internal_DiskIDs_To_v1beta3_DiskIDs(in *internal.DiskIDs, out *v1beta3.DiskIDs) error { - out.Page83 = in.Page83 - out.SerialNumber = in.SerialNumber - return nil -} - -// Convert_internal_DiskIDs_To_v1beta3_DiskIDs is an autogenerated conversion function. -func Convert_internal_DiskIDs_To_v1beta3_DiskIDs(in *internal.DiskIDs, out *v1beta3.DiskIDs) error { - return autoConvert_internal_DiskIDs_To_v1beta3_DiskIDs(in, out) -} - -func autoConvert_v1beta3_DiskLocation_To_internal_DiskLocation(in *v1beta3.DiskLocation, out *internal.DiskLocation) error { - out.Adapter = in.Adapter - out.Bus = in.Bus - out.Target = in.Target - out.LUNID = in.LUNID - return nil -} - -// Convert_v1beta3_DiskLocation_To_internal_DiskLocation is an autogenerated conversion function. -func Convert_v1beta3_DiskLocation_To_internal_DiskLocation(in *v1beta3.DiskLocation, out *internal.DiskLocation) error { - return autoConvert_v1beta3_DiskLocation_To_internal_DiskLocation(in, out) -} - -func autoConvert_internal_DiskLocation_To_v1beta3_DiskLocation(in *internal.DiskLocation, out *v1beta3.DiskLocation) error { - out.Adapter = in.Adapter - out.Bus = in.Bus - out.Target = in.Target - out.LUNID = in.LUNID - return nil -} - -// Convert_internal_DiskLocation_To_v1beta3_DiskLocation is an autogenerated conversion function. -func Convert_internal_DiskLocation_To_v1beta3_DiskLocation(in *internal.DiskLocation, out *v1beta3.DiskLocation) error { - return autoConvert_internal_DiskLocation_To_v1beta3_DiskLocation(in, out) -} - -func autoConvert_v1beta3_GetDiskStateRequest_To_internal_GetDiskStateRequest(in *v1beta3.GetDiskStateRequest, out *internal.GetDiskStateRequest) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_v1beta3_GetDiskStateRequest_To_internal_GetDiskStateRequest is an autogenerated conversion function. -func Convert_v1beta3_GetDiskStateRequest_To_internal_GetDiskStateRequest(in *v1beta3.GetDiskStateRequest, out *internal.GetDiskStateRequest) error { - return autoConvert_v1beta3_GetDiskStateRequest_To_internal_GetDiskStateRequest(in, out) -} - -func autoConvert_internal_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest(in *internal.GetDiskStateRequest, out *v1beta3.GetDiskStateRequest) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_internal_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest is an autogenerated conversion function. -func Convert_internal_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest(in *internal.GetDiskStateRequest, out *v1beta3.GetDiskStateRequest) error { - return autoConvert_internal_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest(in, out) -} - -func autoConvert_v1beta3_GetDiskStateResponse_To_internal_GetDiskStateResponse(in *v1beta3.GetDiskStateResponse, out *internal.GetDiskStateResponse) error { - out.IsOnline = in.IsOnline - return nil -} - -// Convert_v1beta3_GetDiskStateResponse_To_internal_GetDiskStateResponse is an autogenerated conversion function. -func Convert_v1beta3_GetDiskStateResponse_To_internal_GetDiskStateResponse(in *v1beta3.GetDiskStateResponse, out *internal.GetDiskStateResponse) error { - return autoConvert_v1beta3_GetDiskStateResponse_To_internal_GetDiskStateResponse(in, out) -} - -func autoConvert_internal_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(in *internal.GetDiskStateResponse, out *v1beta3.GetDiskStateResponse) error { - out.IsOnline = in.IsOnline - return nil -} - -// Convert_internal_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse is an autogenerated conversion function. -func Convert_internal_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(in *internal.GetDiskStateResponse, out *v1beta3.GetDiskStateResponse) error { - return autoConvert_internal_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(in, out) -} - -func autoConvert_v1beta3_GetDiskStatsRequest_To_internal_GetDiskStatsRequest(in *v1beta3.GetDiskStatsRequest, out *internal.GetDiskStatsRequest) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_v1beta3_GetDiskStatsRequest_To_internal_GetDiskStatsRequest is an autogenerated conversion function. -func Convert_v1beta3_GetDiskStatsRequest_To_internal_GetDiskStatsRequest(in *v1beta3.GetDiskStatsRequest, out *internal.GetDiskStatsRequest) error { - return autoConvert_v1beta3_GetDiskStatsRequest_To_internal_GetDiskStatsRequest(in, out) -} - -func autoConvert_internal_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest(in *internal.GetDiskStatsRequest, out *v1beta3.GetDiskStatsRequest) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_internal_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest is an autogenerated conversion function. -func Convert_internal_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest(in *internal.GetDiskStatsRequest, out *v1beta3.GetDiskStatsRequest) error { - return autoConvert_internal_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest(in, out) -} - -func autoConvert_v1beta3_GetDiskStatsResponse_To_internal_GetDiskStatsResponse(in *v1beta3.GetDiskStatsResponse, out *internal.GetDiskStatsResponse) error { - out.TotalBytes = in.TotalBytes - return nil -} - -// Convert_v1beta3_GetDiskStatsResponse_To_internal_GetDiskStatsResponse is an autogenerated conversion function. -func Convert_v1beta3_GetDiskStatsResponse_To_internal_GetDiskStatsResponse(in *v1beta3.GetDiskStatsResponse, out *internal.GetDiskStatsResponse) error { - return autoConvert_v1beta3_GetDiskStatsResponse_To_internal_GetDiskStatsResponse(in, out) -} - -func autoConvert_internal_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(in *internal.GetDiskStatsResponse, out *v1beta3.GetDiskStatsResponse) error { - out.TotalBytes = in.TotalBytes - return nil -} - -// Convert_internal_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse is an autogenerated conversion function. -func Convert_internal_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(in *internal.GetDiskStatsResponse, out *v1beta3.GetDiskStatsResponse) error { - return autoConvert_internal_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(in, out) -} - -func autoConvert_v1beta3_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in *v1beta3.ListDiskIDsRequest, out *internal.ListDiskIDsRequest) error { - return nil -} - -// Convert_v1beta3_ListDiskIDsRequest_To_internal_ListDiskIDsRequest is an autogenerated conversion function. -func Convert_v1beta3_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in *v1beta3.ListDiskIDsRequest, out *internal.ListDiskIDsRequest) error { - return autoConvert_v1beta3_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(in, out) -} - -func autoConvert_internal_ListDiskIDsRequest_To_v1beta3_ListDiskIDsRequest(in *internal.ListDiskIDsRequest, out *v1beta3.ListDiskIDsRequest) error { - return nil -} - -// Convert_internal_ListDiskIDsRequest_To_v1beta3_ListDiskIDsRequest is an autogenerated conversion function. -func Convert_internal_ListDiskIDsRequest_To_v1beta3_ListDiskIDsRequest(in *internal.ListDiskIDsRequest, out *v1beta3.ListDiskIDsRequest) error { - return autoConvert_internal_ListDiskIDsRequest_To_v1beta3_ListDiskIDsRequest(in, out) -} - -func autoConvert_v1beta3_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta3.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error { - if in.DiskIDs != nil { - in, out := &in.DiskIDs, &out.DiskIDs - *out = make(map[uint32]*internal.DiskIDs, len(*in)) - for key, val := range *in { - newVal := new(*internal.DiskIDs) - if err := Convert_v1beta3_DiskIDs_To_internal_DiskIDs(*&val, *newVal); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.DiskIDs = nil - } - return nil -} - -// Convert_v1beta3_ListDiskIDsResponse_To_internal_ListDiskIDsResponse is an autogenerated conversion function. -func Convert_v1beta3_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta3.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error { - return autoConvert_v1beta3_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in, out) -} - -// detected external conversion function -// Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error -// skipping generation of the auto function - -func autoConvert_v1beta3_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta3.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error { - return nil -} - -// Convert_v1beta3_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest is an autogenerated conversion function. -func Convert_v1beta3_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in *v1beta3.ListDiskLocationsRequest, out *internal.ListDiskLocationsRequest) error { - return autoConvert_v1beta3_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(in, out) -} - -func autoConvert_internal_ListDiskLocationsRequest_To_v1beta3_ListDiskLocationsRequest(in *internal.ListDiskLocationsRequest, out *v1beta3.ListDiskLocationsRequest) error { - return nil -} - -// Convert_internal_ListDiskLocationsRequest_To_v1beta3_ListDiskLocationsRequest is an autogenerated conversion function. -func Convert_internal_ListDiskLocationsRequest_To_v1beta3_ListDiskLocationsRequest(in *internal.ListDiskLocationsRequest, out *v1beta3.ListDiskLocationsRequest) error { - return autoConvert_internal_ListDiskLocationsRequest_To_v1beta3_ListDiskLocationsRequest(in, out) -} - -func autoConvert_v1beta3_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta3.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error { - if in.DiskLocations != nil { - in, out := &in.DiskLocations, &out.DiskLocations - *out = make(map[uint32]*internal.DiskLocation, len(*in)) - for key, val := range *in { - newVal := new(*internal.DiskLocation) - if err := Convert_v1beta3_DiskLocation_To_internal_DiskLocation(*&val, *newVal); err != nil { - return err - } - (*out)[key] = *newVal - } - } else { - out.DiskLocations = nil - } - return nil -} - -// Convert_v1beta3_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse is an autogenerated conversion function. -func Convert_v1beta3_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta3.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error { - return autoConvert_v1beta3_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in, out) -} - -// detected external conversion function -// Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error -// skipping generation of the auto function - -func autoConvert_v1beta3_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta3.PartitionDiskRequest, out *internal.PartitionDiskRequest) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_v1beta3_PartitionDiskRequest_To_internal_PartitionDiskRequest is an autogenerated conversion function. -func Convert_v1beta3_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta3.PartitionDiskRequest, out *internal.PartitionDiskRequest) error { - return autoConvert_v1beta3_PartitionDiskRequest_To_internal_PartitionDiskRequest(in, out) -} - -func autoConvert_internal_PartitionDiskRequest_To_v1beta3_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta3.PartitionDiskRequest) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_internal_PartitionDiskRequest_To_v1beta3_PartitionDiskRequest is an autogenerated conversion function. -func Convert_internal_PartitionDiskRequest_To_v1beta3_PartitionDiskRequest(in *internal.PartitionDiskRequest, out *v1beta3.PartitionDiskRequest) error { - return autoConvert_internal_PartitionDiskRequest_To_v1beta3_PartitionDiskRequest(in, out) -} - -func autoConvert_v1beta3_PartitionDiskResponse_To_internal_PartitionDiskResponse(in *v1beta3.PartitionDiskResponse, out *internal.PartitionDiskResponse) error { - return nil -} - -// Convert_v1beta3_PartitionDiskResponse_To_internal_PartitionDiskResponse is an autogenerated conversion function. -func Convert_v1beta3_PartitionDiskResponse_To_internal_PartitionDiskResponse(in *v1beta3.PartitionDiskResponse, out *internal.PartitionDiskResponse) error { - return autoConvert_v1beta3_PartitionDiskResponse_To_internal_PartitionDiskResponse(in, out) -} - -func autoConvert_internal_PartitionDiskResponse_To_v1beta3_PartitionDiskResponse(in *internal.PartitionDiskResponse, out *v1beta3.PartitionDiskResponse) error { - return nil -} - -// Convert_internal_PartitionDiskResponse_To_v1beta3_PartitionDiskResponse is an autogenerated conversion function. -func Convert_internal_PartitionDiskResponse_To_v1beta3_PartitionDiskResponse(in *internal.PartitionDiskResponse, out *v1beta3.PartitionDiskResponse) error { - return autoConvert_internal_PartitionDiskResponse_To_v1beta3_PartitionDiskResponse(in, out) -} - -func autoConvert_v1beta3_RescanRequest_To_internal_RescanRequest(in *v1beta3.RescanRequest, out *internal.RescanRequest) error { - return nil -} - -// Convert_v1beta3_RescanRequest_To_internal_RescanRequest is an autogenerated conversion function. -func Convert_v1beta3_RescanRequest_To_internal_RescanRequest(in *v1beta3.RescanRequest, out *internal.RescanRequest) error { - return autoConvert_v1beta3_RescanRequest_To_internal_RescanRequest(in, out) -} - -func autoConvert_internal_RescanRequest_To_v1beta3_RescanRequest(in *internal.RescanRequest, out *v1beta3.RescanRequest) error { - return nil -} - -// Convert_internal_RescanRequest_To_v1beta3_RescanRequest is an autogenerated conversion function. -func Convert_internal_RescanRequest_To_v1beta3_RescanRequest(in *internal.RescanRequest, out *v1beta3.RescanRequest) error { - return autoConvert_internal_RescanRequest_To_v1beta3_RescanRequest(in, out) -} - -func autoConvert_v1beta3_RescanResponse_To_internal_RescanResponse(in *v1beta3.RescanResponse, out *internal.RescanResponse) error { - return nil -} - -// Convert_v1beta3_RescanResponse_To_internal_RescanResponse is an autogenerated conversion function. -func Convert_v1beta3_RescanResponse_To_internal_RescanResponse(in *v1beta3.RescanResponse, out *internal.RescanResponse) error { - return autoConvert_v1beta3_RescanResponse_To_internal_RescanResponse(in, out) -} - -func autoConvert_internal_RescanResponse_To_v1beta3_RescanResponse(in *internal.RescanResponse, out *v1beta3.RescanResponse) error { - return nil -} - -// Convert_internal_RescanResponse_To_v1beta3_RescanResponse is an autogenerated conversion function. -func Convert_internal_RescanResponse_To_v1beta3_RescanResponse(in *internal.RescanResponse, out *v1beta3.RescanResponse) error { - return autoConvert_internal_RescanResponse_To_v1beta3_RescanResponse(in, out) -} - -func autoConvert_v1beta3_SetDiskStateRequest_To_internal_SetDiskStateRequest(in *v1beta3.SetDiskStateRequest, out *internal.SetDiskStateRequest) error { - out.DiskNumber = in.DiskNumber - out.IsOnline = in.IsOnline - return nil -} - -// Convert_v1beta3_SetDiskStateRequest_To_internal_SetDiskStateRequest is an autogenerated conversion function. -func Convert_v1beta3_SetDiskStateRequest_To_internal_SetDiskStateRequest(in *v1beta3.SetDiskStateRequest, out *internal.SetDiskStateRequest) error { - return autoConvert_v1beta3_SetDiskStateRequest_To_internal_SetDiskStateRequest(in, out) -} - -func autoConvert_internal_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest(in *internal.SetDiskStateRequest, out *v1beta3.SetDiskStateRequest) error { - out.DiskNumber = in.DiskNumber - out.IsOnline = in.IsOnline - return nil -} - -// Convert_internal_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest is an autogenerated conversion function. -func Convert_internal_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest(in *internal.SetDiskStateRequest, out *v1beta3.SetDiskStateRequest) error { - return autoConvert_internal_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest(in, out) -} - -func autoConvert_v1beta3_SetDiskStateResponse_To_internal_SetDiskStateResponse(in *v1beta3.SetDiskStateResponse, out *internal.SetDiskStateResponse) error { - return nil -} - -// Convert_v1beta3_SetDiskStateResponse_To_internal_SetDiskStateResponse is an autogenerated conversion function. -func Convert_v1beta3_SetDiskStateResponse_To_internal_SetDiskStateResponse(in *v1beta3.SetDiskStateResponse, out *internal.SetDiskStateResponse) error { - return autoConvert_v1beta3_SetDiskStateResponse_To_internal_SetDiskStateResponse(in, out) -} - -func autoConvert_internal_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(in *internal.SetDiskStateResponse, out *v1beta3.SetDiskStateResponse) error { - return nil -} - -// Convert_internal_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse is an autogenerated conversion function. -func Convert_internal_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(in *internal.SetDiskStateResponse, out *v1beta3.SetDiskStateResponse) error { - return autoConvert_internal_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(in, out) -} diff --git a/internal/server/filesystem/internal/v1alpha1/conversion_generated.go b/internal/server/filesystem/internal/v1alpha1/conversion_generated.go deleted file mode 100644 index 19833d1c..00000000 --- a/internal/server/filesystem/internal/v1alpha1/conversion_generated.go +++ /dev/null @@ -1,206 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal" -) - -func autoConvert_v1alpha1_IsMountPointRequest_To_internal_IsMountPointRequest(in *v1alpha1.IsMountPointRequest, out *internal.IsMountPointRequest) error { - out.Path = in.Path - return nil -} - -// Convert_v1alpha1_IsMountPointRequest_To_internal_IsMountPointRequest is an autogenerated conversion function. -func Convert_v1alpha1_IsMountPointRequest_To_internal_IsMountPointRequest(in *v1alpha1.IsMountPointRequest, out *internal.IsMountPointRequest) error { - return autoConvert_v1alpha1_IsMountPointRequest_To_internal_IsMountPointRequest(in, out) -} - -func autoConvert_internal_IsMountPointRequest_To_v1alpha1_IsMountPointRequest(in *internal.IsMountPointRequest, out *v1alpha1.IsMountPointRequest) error { - out.Path = in.Path - return nil -} - -// Convert_internal_IsMountPointRequest_To_v1alpha1_IsMountPointRequest is an autogenerated conversion function. -func Convert_internal_IsMountPointRequest_To_v1alpha1_IsMountPointRequest(in *internal.IsMountPointRequest, out *v1alpha1.IsMountPointRequest) error { - return autoConvert_internal_IsMountPointRequest_To_v1alpha1_IsMountPointRequest(in, out) -} - -func autoConvert_v1alpha1_IsMountPointResponse_To_internal_IsMountPointResponse(in *v1alpha1.IsMountPointResponse, out *internal.IsMountPointResponse) error { - out.IsMountPoint = in.IsMountPoint - return nil -} - -// Convert_v1alpha1_IsMountPointResponse_To_internal_IsMountPointResponse is an autogenerated conversion function. -func Convert_v1alpha1_IsMountPointResponse_To_internal_IsMountPointResponse(in *v1alpha1.IsMountPointResponse, out *internal.IsMountPointResponse) error { - return autoConvert_v1alpha1_IsMountPointResponse_To_internal_IsMountPointResponse(in, out) -} - -func autoConvert_internal_IsMountPointResponse_To_v1alpha1_IsMountPointResponse(in *internal.IsMountPointResponse, out *v1alpha1.IsMountPointResponse) error { - out.IsMountPoint = in.IsMountPoint - return nil -} - -// Convert_internal_IsMountPointResponse_To_v1alpha1_IsMountPointResponse is an autogenerated conversion function. -func Convert_internal_IsMountPointResponse_To_v1alpha1_IsMountPointResponse(in *internal.IsMountPointResponse, out *v1alpha1.IsMountPointResponse) error { - return autoConvert_internal_IsMountPointResponse_To_v1alpha1_IsMountPointResponse(in, out) -} - -func autoConvert_v1alpha1_LinkPathRequest_To_internal_LinkPathRequest(in *v1alpha1.LinkPathRequest, out *internal.LinkPathRequest) error { - out.SourcePath = in.SourcePath - out.TargetPath = in.TargetPath - return nil -} - -// Convert_v1alpha1_LinkPathRequest_To_internal_LinkPathRequest is an autogenerated conversion function. -func Convert_v1alpha1_LinkPathRequest_To_internal_LinkPathRequest(in *v1alpha1.LinkPathRequest, out *internal.LinkPathRequest) error { - return autoConvert_v1alpha1_LinkPathRequest_To_internal_LinkPathRequest(in, out) -} - -func autoConvert_internal_LinkPathRequest_To_v1alpha1_LinkPathRequest(in *internal.LinkPathRequest, out *v1alpha1.LinkPathRequest) error { - out.SourcePath = in.SourcePath - out.TargetPath = in.TargetPath - return nil -} - -// Convert_internal_LinkPathRequest_To_v1alpha1_LinkPathRequest is an autogenerated conversion function. -func Convert_internal_LinkPathRequest_To_v1alpha1_LinkPathRequest(in *internal.LinkPathRequest, out *v1alpha1.LinkPathRequest) error { - return autoConvert_internal_LinkPathRequest_To_v1alpha1_LinkPathRequest(in, out) -} - -func autoConvert_v1alpha1_LinkPathResponse_To_internal_LinkPathResponse(in *v1alpha1.LinkPathResponse, out *internal.LinkPathResponse) error { - return nil -} - -// Convert_v1alpha1_LinkPathResponse_To_internal_LinkPathResponse is an autogenerated conversion function. -func Convert_v1alpha1_LinkPathResponse_To_internal_LinkPathResponse(in *v1alpha1.LinkPathResponse, out *internal.LinkPathResponse) error { - return autoConvert_v1alpha1_LinkPathResponse_To_internal_LinkPathResponse(in, out) -} - -func autoConvert_internal_LinkPathResponse_To_v1alpha1_LinkPathResponse(in *internal.LinkPathResponse, out *v1alpha1.LinkPathResponse) error { - return nil -} - -// Convert_internal_LinkPathResponse_To_v1alpha1_LinkPathResponse is an autogenerated conversion function. -func Convert_internal_LinkPathResponse_To_v1alpha1_LinkPathResponse(in *internal.LinkPathResponse, out *v1alpha1.LinkPathResponse) error { - return autoConvert_internal_LinkPathResponse_To_v1alpha1_LinkPathResponse(in, out) -} - -func autoConvert_v1alpha1_MkdirRequest_To_internal_MkdirRequest(in *v1alpha1.MkdirRequest, out *internal.MkdirRequest) error { - out.Path = in.Path - return nil -} - -// Convert_v1alpha1_MkdirRequest_To_internal_MkdirRequest is an autogenerated conversion function. -func Convert_v1alpha1_MkdirRequest_To_internal_MkdirRequest(in *v1alpha1.MkdirRequest, out *internal.MkdirRequest) error { - return autoConvert_v1alpha1_MkdirRequest_To_internal_MkdirRequest(in, out) -} - -func autoConvert_internal_MkdirRequest_To_v1alpha1_MkdirRequest(in *internal.MkdirRequest, out *v1alpha1.MkdirRequest) error { - out.Path = in.Path - return nil -} - -// Convert_internal_MkdirRequest_To_v1alpha1_MkdirRequest is an autogenerated conversion function. -func Convert_internal_MkdirRequest_To_v1alpha1_MkdirRequest(in *internal.MkdirRequest, out *v1alpha1.MkdirRequest) error { - return autoConvert_internal_MkdirRequest_To_v1alpha1_MkdirRequest(in, out) -} - -func autoConvert_v1alpha1_MkdirResponse_To_internal_MkdirResponse(in *v1alpha1.MkdirResponse, out *internal.MkdirResponse) error { - return nil -} - -// Convert_v1alpha1_MkdirResponse_To_internal_MkdirResponse is an autogenerated conversion function. -func Convert_v1alpha1_MkdirResponse_To_internal_MkdirResponse(in *v1alpha1.MkdirResponse, out *internal.MkdirResponse) error { - return autoConvert_v1alpha1_MkdirResponse_To_internal_MkdirResponse(in, out) -} - -func autoConvert_internal_MkdirResponse_To_v1alpha1_MkdirResponse(in *internal.MkdirResponse, out *v1alpha1.MkdirResponse) error { - return nil -} - -// Convert_internal_MkdirResponse_To_v1alpha1_MkdirResponse is an autogenerated conversion function. -func Convert_internal_MkdirResponse_To_v1alpha1_MkdirResponse(in *internal.MkdirResponse, out *v1alpha1.MkdirResponse) error { - return autoConvert_internal_MkdirResponse_To_v1alpha1_MkdirResponse(in, out) -} - -func autoConvert_v1alpha1_PathExistsRequest_To_internal_PathExistsRequest(in *v1alpha1.PathExistsRequest, out *internal.PathExistsRequest) error { - out.Path = in.Path - return nil -} - -// Convert_v1alpha1_PathExistsRequest_To_internal_PathExistsRequest is an autogenerated conversion function. -func Convert_v1alpha1_PathExistsRequest_To_internal_PathExistsRequest(in *v1alpha1.PathExistsRequest, out *internal.PathExistsRequest) error { - return autoConvert_v1alpha1_PathExistsRequest_To_internal_PathExistsRequest(in, out) -} - -func autoConvert_internal_PathExistsRequest_To_v1alpha1_PathExistsRequest(in *internal.PathExistsRequest, out *v1alpha1.PathExistsRequest) error { - out.Path = in.Path - return nil -} - -// Convert_internal_PathExistsRequest_To_v1alpha1_PathExistsRequest is an autogenerated conversion function. -func Convert_internal_PathExistsRequest_To_v1alpha1_PathExistsRequest(in *internal.PathExistsRequest, out *v1alpha1.PathExistsRequest) error { - return autoConvert_internal_PathExistsRequest_To_v1alpha1_PathExistsRequest(in, out) -} - -func autoConvert_v1alpha1_PathExistsResponse_To_internal_PathExistsResponse(in *v1alpha1.PathExistsResponse, out *internal.PathExistsResponse) error { - out.Exists = in.Exists - return nil -} - -// Convert_v1alpha1_PathExistsResponse_To_internal_PathExistsResponse is an autogenerated conversion function. -func Convert_v1alpha1_PathExistsResponse_To_internal_PathExistsResponse(in *v1alpha1.PathExistsResponse, out *internal.PathExistsResponse) error { - return autoConvert_v1alpha1_PathExistsResponse_To_internal_PathExistsResponse(in, out) -} - -func autoConvert_internal_PathExistsResponse_To_v1alpha1_PathExistsResponse(in *internal.PathExistsResponse, out *v1alpha1.PathExistsResponse) error { - out.Exists = in.Exists - return nil -} - -// Convert_internal_PathExistsResponse_To_v1alpha1_PathExistsResponse is an autogenerated conversion function. -func Convert_internal_PathExistsResponse_To_v1alpha1_PathExistsResponse(in *internal.PathExistsResponse, out *v1alpha1.PathExistsResponse) error { - return autoConvert_internal_PathExistsResponse_To_v1alpha1_PathExistsResponse(in, out) -} - -func autoConvert_v1alpha1_RmdirRequest_To_internal_RmdirRequest(in *v1alpha1.RmdirRequest, out *internal.RmdirRequest) error { - out.Path = in.Path - out.Force = in.Force - return nil -} - -// Convert_v1alpha1_RmdirRequest_To_internal_RmdirRequest is an autogenerated conversion function. -func Convert_v1alpha1_RmdirRequest_To_internal_RmdirRequest(in *v1alpha1.RmdirRequest, out *internal.RmdirRequest) error { - return autoConvert_v1alpha1_RmdirRequest_To_internal_RmdirRequest(in, out) -} - -func autoConvert_internal_RmdirRequest_To_v1alpha1_RmdirRequest(in *internal.RmdirRequest, out *v1alpha1.RmdirRequest) error { - out.Path = in.Path - out.Force = in.Force - return nil -} - -// Convert_internal_RmdirRequest_To_v1alpha1_RmdirRequest is an autogenerated conversion function. -func Convert_internal_RmdirRequest_To_v1alpha1_RmdirRequest(in *internal.RmdirRequest, out *v1alpha1.RmdirRequest) error { - return autoConvert_internal_RmdirRequest_To_v1alpha1_RmdirRequest(in, out) -} - -func autoConvert_v1alpha1_RmdirResponse_To_internal_RmdirResponse(in *v1alpha1.RmdirResponse, out *internal.RmdirResponse) error { - return nil -} - -// Convert_v1alpha1_RmdirResponse_To_internal_RmdirResponse is an autogenerated conversion function. -func Convert_v1alpha1_RmdirResponse_To_internal_RmdirResponse(in *v1alpha1.RmdirResponse, out *internal.RmdirResponse) error { - return autoConvert_v1alpha1_RmdirResponse_To_internal_RmdirResponse(in, out) -} - -func autoConvert_internal_RmdirResponse_To_v1alpha1_RmdirResponse(in *internal.RmdirResponse, out *v1alpha1.RmdirResponse) error { - return nil -} - -// Convert_internal_RmdirResponse_To_v1alpha1_RmdirResponse is an autogenerated conversion function. -func Convert_internal_RmdirResponse_To_v1alpha1_RmdirResponse(in *internal.RmdirResponse, out *v1alpha1.RmdirResponse) error { - return autoConvert_internal_RmdirResponse_To_v1alpha1_RmdirResponse(in, out) -} diff --git a/internal/server/filesystem/internal/v1beta1/conversion_generated.go b/internal/server/filesystem/internal/v1beta1/conversion_generated.go deleted file mode 100644 index 9d42e91d..00000000 --- a/internal/server/filesystem/internal/v1beta1/conversion_generated.go +++ /dev/null @@ -1,206 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1beta1 - -import ( - v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal" -) - -func autoConvert_v1beta1_IsMountPointRequest_To_internal_IsMountPointRequest(in *v1beta1.IsMountPointRequest, out *internal.IsMountPointRequest) error { - out.Path = in.Path - return nil -} - -// Convert_v1beta1_IsMountPointRequest_To_internal_IsMountPointRequest is an autogenerated conversion function. -func Convert_v1beta1_IsMountPointRequest_To_internal_IsMountPointRequest(in *v1beta1.IsMountPointRequest, out *internal.IsMountPointRequest) error { - return autoConvert_v1beta1_IsMountPointRequest_To_internal_IsMountPointRequest(in, out) -} - -func autoConvert_internal_IsMountPointRequest_To_v1beta1_IsMountPointRequest(in *internal.IsMountPointRequest, out *v1beta1.IsMountPointRequest) error { - out.Path = in.Path - return nil -} - -// Convert_internal_IsMountPointRequest_To_v1beta1_IsMountPointRequest is an autogenerated conversion function. -func Convert_internal_IsMountPointRequest_To_v1beta1_IsMountPointRequest(in *internal.IsMountPointRequest, out *v1beta1.IsMountPointRequest) error { - return autoConvert_internal_IsMountPointRequest_To_v1beta1_IsMountPointRequest(in, out) -} - -func autoConvert_v1beta1_IsMountPointResponse_To_internal_IsMountPointResponse(in *v1beta1.IsMountPointResponse, out *internal.IsMountPointResponse) error { - out.IsMountPoint = in.IsMountPoint - return nil -} - -// Convert_v1beta1_IsMountPointResponse_To_internal_IsMountPointResponse is an autogenerated conversion function. -func Convert_v1beta1_IsMountPointResponse_To_internal_IsMountPointResponse(in *v1beta1.IsMountPointResponse, out *internal.IsMountPointResponse) error { - return autoConvert_v1beta1_IsMountPointResponse_To_internal_IsMountPointResponse(in, out) -} - -func autoConvert_internal_IsMountPointResponse_To_v1beta1_IsMountPointResponse(in *internal.IsMountPointResponse, out *v1beta1.IsMountPointResponse) error { - out.IsMountPoint = in.IsMountPoint - return nil -} - -// Convert_internal_IsMountPointResponse_To_v1beta1_IsMountPointResponse is an autogenerated conversion function. -func Convert_internal_IsMountPointResponse_To_v1beta1_IsMountPointResponse(in *internal.IsMountPointResponse, out *v1beta1.IsMountPointResponse) error { - return autoConvert_internal_IsMountPointResponse_To_v1beta1_IsMountPointResponse(in, out) -} - -func autoConvert_v1beta1_LinkPathRequest_To_internal_LinkPathRequest(in *v1beta1.LinkPathRequest, out *internal.LinkPathRequest) error { - out.SourcePath = in.SourcePath - out.TargetPath = in.TargetPath - return nil -} - -// Convert_v1beta1_LinkPathRequest_To_internal_LinkPathRequest is an autogenerated conversion function. -func Convert_v1beta1_LinkPathRequest_To_internal_LinkPathRequest(in *v1beta1.LinkPathRequest, out *internal.LinkPathRequest) error { - return autoConvert_v1beta1_LinkPathRequest_To_internal_LinkPathRequest(in, out) -} - -func autoConvert_internal_LinkPathRequest_To_v1beta1_LinkPathRequest(in *internal.LinkPathRequest, out *v1beta1.LinkPathRequest) error { - out.SourcePath = in.SourcePath - out.TargetPath = in.TargetPath - return nil -} - -// Convert_internal_LinkPathRequest_To_v1beta1_LinkPathRequest is an autogenerated conversion function. -func Convert_internal_LinkPathRequest_To_v1beta1_LinkPathRequest(in *internal.LinkPathRequest, out *v1beta1.LinkPathRequest) error { - return autoConvert_internal_LinkPathRequest_To_v1beta1_LinkPathRequest(in, out) -} - -func autoConvert_v1beta1_LinkPathResponse_To_internal_LinkPathResponse(in *v1beta1.LinkPathResponse, out *internal.LinkPathResponse) error { - return nil -} - -// Convert_v1beta1_LinkPathResponse_To_internal_LinkPathResponse is an autogenerated conversion function. -func Convert_v1beta1_LinkPathResponse_To_internal_LinkPathResponse(in *v1beta1.LinkPathResponse, out *internal.LinkPathResponse) error { - return autoConvert_v1beta1_LinkPathResponse_To_internal_LinkPathResponse(in, out) -} - -func autoConvert_internal_LinkPathResponse_To_v1beta1_LinkPathResponse(in *internal.LinkPathResponse, out *v1beta1.LinkPathResponse) error { - return nil -} - -// Convert_internal_LinkPathResponse_To_v1beta1_LinkPathResponse is an autogenerated conversion function. -func Convert_internal_LinkPathResponse_To_v1beta1_LinkPathResponse(in *internal.LinkPathResponse, out *v1beta1.LinkPathResponse) error { - return autoConvert_internal_LinkPathResponse_To_v1beta1_LinkPathResponse(in, out) -} - -func autoConvert_v1beta1_MkdirRequest_To_internal_MkdirRequest(in *v1beta1.MkdirRequest, out *internal.MkdirRequest) error { - out.Path = in.Path - return nil -} - -// Convert_v1beta1_MkdirRequest_To_internal_MkdirRequest is an autogenerated conversion function. -func Convert_v1beta1_MkdirRequest_To_internal_MkdirRequest(in *v1beta1.MkdirRequest, out *internal.MkdirRequest) error { - return autoConvert_v1beta1_MkdirRequest_To_internal_MkdirRequest(in, out) -} - -func autoConvert_internal_MkdirRequest_To_v1beta1_MkdirRequest(in *internal.MkdirRequest, out *v1beta1.MkdirRequest) error { - out.Path = in.Path - return nil -} - -// Convert_internal_MkdirRequest_To_v1beta1_MkdirRequest is an autogenerated conversion function. -func Convert_internal_MkdirRequest_To_v1beta1_MkdirRequest(in *internal.MkdirRequest, out *v1beta1.MkdirRequest) error { - return autoConvert_internal_MkdirRequest_To_v1beta1_MkdirRequest(in, out) -} - -func autoConvert_v1beta1_MkdirResponse_To_internal_MkdirResponse(in *v1beta1.MkdirResponse, out *internal.MkdirResponse) error { - return nil -} - -// Convert_v1beta1_MkdirResponse_To_internal_MkdirResponse is an autogenerated conversion function. -func Convert_v1beta1_MkdirResponse_To_internal_MkdirResponse(in *v1beta1.MkdirResponse, out *internal.MkdirResponse) error { - return autoConvert_v1beta1_MkdirResponse_To_internal_MkdirResponse(in, out) -} - -func autoConvert_internal_MkdirResponse_To_v1beta1_MkdirResponse(in *internal.MkdirResponse, out *v1beta1.MkdirResponse) error { - return nil -} - -// Convert_internal_MkdirResponse_To_v1beta1_MkdirResponse is an autogenerated conversion function. -func Convert_internal_MkdirResponse_To_v1beta1_MkdirResponse(in *internal.MkdirResponse, out *v1beta1.MkdirResponse) error { - return autoConvert_internal_MkdirResponse_To_v1beta1_MkdirResponse(in, out) -} - -func autoConvert_v1beta1_PathExistsRequest_To_internal_PathExistsRequest(in *v1beta1.PathExistsRequest, out *internal.PathExistsRequest) error { - out.Path = in.Path - return nil -} - -// Convert_v1beta1_PathExistsRequest_To_internal_PathExistsRequest is an autogenerated conversion function. -func Convert_v1beta1_PathExistsRequest_To_internal_PathExistsRequest(in *v1beta1.PathExistsRequest, out *internal.PathExistsRequest) error { - return autoConvert_v1beta1_PathExistsRequest_To_internal_PathExistsRequest(in, out) -} - -func autoConvert_internal_PathExistsRequest_To_v1beta1_PathExistsRequest(in *internal.PathExistsRequest, out *v1beta1.PathExistsRequest) error { - out.Path = in.Path - return nil -} - -// Convert_internal_PathExistsRequest_To_v1beta1_PathExistsRequest is an autogenerated conversion function. -func Convert_internal_PathExistsRequest_To_v1beta1_PathExistsRequest(in *internal.PathExistsRequest, out *v1beta1.PathExistsRequest) error { - return autoConvert_internal_PathExistsRequest_To_v1beta1_PathExistsRequest(in, out) -} - -func autoConvert_v1beta1_PathExistsResponse_To_internal_PathExistsResponse(in *v1beta1.PathExistsResponse, out *internal.PathExistsResponse) error { - out.Exists = in.Exists - return nil -} - -// Convert_v1beta1_PathExistsResponse_To_internal_PathExistsResponse is an autogenerated conversion function. -func Convert_v1beta1_PathExistsResponse_To_internal_PathExistsResponse(in *v1beta1.PathExistsResponse, out *internal.PathExistsResponse) error { - return autoConvert_v1beta1_PathExistsResponse_To_internal_PathExistsResponse(in, out) -} - -func autoConvert_internal_PathExistsResponse_To_v1beta1_PathExistsResponse(in *internal.PathExistsResponse, out *v1beta1.PathExistsResponse) error { - out.Exists = in.Exists - return nil -} - -// Convert_internal_PathExistsResponse_To_v1beta1_PathExistsResponse is an autogenerated conversion function. -func Convert_internal_PathExistsResponse_To_v1beta1_PathExistsResponse(in *internal.PathExistsResponse, out *v1beta1.PathExistsResponse) error { - return autoConvert_internal_PathExistsResponse_To_v1beta1_PathExistsResponse(in, out) -} - -func autoConvert_v1beta1_RmdirRequest_To_internal_RmdirRequest(in *v1beta1.RmdirRequest, out *internal.RmdirRequest) error { - out.Path = in.Path - out.Force = in.Force - return nil -} - -// Convert_v1beta1_RmdirRequest_To_internal_RmdirRequest is an autogenerated conversion function. -func Convert_v1beta1_RmdirRequest_To_internal_RmdirRequest(in *v1beta1.RmdirRequest, out *internal.RmdirRequest) error { - return autoConvert_v1beta1_RmdirRequest_To_internal_RmdirRequest(in, out) -} - -func autoConvert_internal_RmdirRequest_To_v1beta1_RmdirRequest(in *internal.RmdirRequest, out *v1beta1.RmdirRequest) error { - out.Path = in.Path - out.Force = in.Force - return nil -} - -// Convert_internal_RmdirRequest_To_v1beta1_RmdirRequest is an autogenerated conversion function. -func Convert_internal_RmdirRequest_To_v1beta1_RmdirRequest(in *internal.RmdirRequest, out *v1beta1.RmdirRequest) error { - return autoConvert_internal_RmdirRequest_To_v1beta1_RmdirRequest(in, out) -} - -func autoConvert_v1beta1_RmdirResponse_To_internal_RmdirResponse(in *v1beta1.RmdirResponse, out *internal.RmdirResponse) error { - return nil -} - -// Convert_v1beta1_RmdirResponse_To_internal_RmdirResponse is an autogenerated conversion function. -func Convert_v1beta1_RmdirResponse_To_internal_RmdirResponse(in *v1beta1.RmdirResponse, out *internal.RmdirResponse) error { - return autoConvert_v1beta1_RmdirResponse_To_internal_RmdirResponse(in, out) -} - -func autoConvert_internal_RmdirResponse_To_v1beta1_RmdirResponse(in *internal.RmdirResponse, out *v1beta1.RmdirResponse) error { - return nil -} - -// Convert_internal_RmdirResponse_To_v1beta1_RmdirResponse is an autogenerated conversion function. -func Convert_internal_RmdirResponse_To_v1beta1_RmdirResponse(in *internal.RmdirResponse, out *v1beta1.RmdirResponse) error { - return autoConvert_internal_RmdirResponse_To_v1beta1_RmdirResponse(in, out) -} diff --git a/internal/server/filesystem/internal/v1beta2/conversion_generated.go b/internal/server/filesystem/internal/v1beta2/conversion_generated.go deleted file mode 100644 index 874cc6ea..00000000 --- a/internal/server/filesystem/internal/v1beta2/conversion_generated.go +++ /dev/null @@ -1,206 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1beta2 - -import ( - v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta2" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal" -) - -func autoConvert_v1beta2_CreateSymlinkRequest_To_internal_CreateSymlinkRequest(in *v1beta2.CreateSymlinkRequest, out *internal.CreateSymlinkRequest) error { - out.SourcePath = in.SourcePath - out.TargetPath = in.TargetPath - return nil -} - -// Convert_v1beta2_CreateSymlinkRequest_To_internal_CreateSymlinkRequest is an autogenerated conversion function. -func Convert_v1beta2_CreateSymlinkRequest_To_internal_CreateSymlinkRequest(in *v1beta2.CreateSymlinkRequest, out *internal.CreateSymlinkRequest) error { - return autoConvert_v1beta2_CreateSymlinkRequest_To_internal_CreateSymlinkRequest(in, out) -} - -func autoConvert_internal_CreateSymlinkRequest_To_v1beta2_CreateSymlinkRequest(in *internal.CreateSymlinkRequest, out *v1beta2.CreateSymlinkRequest) error { - out.SourcePath = in.SourcePath - out.TargetPath = in.TargetPath - return nil -} - -// Convert_internal_CreateSymlinkRequest_To_v1beta2_CreateSymlinkRequest is an autogenerated conversion function. -func Convert_internal_CreateSymlinkRequest_To_v1beta2_CreateSymlinkRequest(in *internal.CreateSymlinkRequest, out *v1beta2.CreateSymlinkRequest) error { - return autoConvert_internal_CreateSymlinkRequest_To_v1beta2_CreateSymlinkRequest(in, out) -} - -func autoConvert_v1beta2_CreateSymlinkResponse_To_internal_CreateSymlinkResponse(in *v1beta2.CreateSymlinkResponse, out *internal.CreateSymlinkResponse) error { - return nil -} - -// Convert_v1beta2_CreateSymlinkResponse_To_internal_CreateSymlinkResponse is an autogenerated conversion function. -func Convert_v1beta2_CreateSymlinkResponse_To_internal_CreateSymlinkResponse(in *v1beta2.CreateSymlinkResponse, out *internal.CreateSymlinkResponse) error { - return autoConvert_v1beta2_CreateSymlinkResponse_To_internal_CreateSymlinkResponse(in, out) -} - -func autoConvert_internal_CreateSymlinkResponse_To_v1beta2_CreateSymlinkResponse(in *internal.CreateSymlinkResponse, out *v1beta2.CreateSymlinkResponse) error { - return nil -} - -// Convert_internal_CreateSymlinkResponse_To_v1beta2_CreateSymlinkResponse is an autogenerated conversion function. -func Convert_internal_CreateSymlinkResponse_To_v1beta2_CreateSymlinkResponse(in *internal.CreateSymlinkResponse, out *v1beta2.CreateSymlinkResponse) error { - return autoConvert_internal_CreateSymlinkResponse_To_v1beta2_CreateSymlinkResponse(in, out) -} - -func autoConvert_v1beta2_IsSymlinkRequest_To_internal_IsSymlinkRequest(in *v1beta2.IsSymlinkRequest, out *internal.IsSymlinkRequest) error { - out.Path = in.Path - return nil -} - -// Convert_v1beta2_IsSymlinkRequest_To_internal_IsSymlinkRequest is an autogenerated conversion function. -func Convert_v1beta2_IsSymlinkRequest_To_internal_IsSymlinkRequest(in *v1beta2.IsSymlinkRequest, out *internal.IsSymlinkRequest) error { - return autoConvert_v1beta2_IsSymlinkRequest_To_internal_IsSymlinkRequest(in, out) -} - -func autoConvert_internal_IsSymlinkRequest_To_v1beta2_IsSymlinkRequest(in *internal.IsSymlinkRequest, out *v1beta2.IsSymlinkRequest) error { - out.Path = in.Path - return nil -} - -// Convert_internal_IsSymlinkRequest_To_v1beta2_IsSymlinkRequest is an autogenerated conversion function. -func Convert_internal_IsSymlinkRequest_To_v1beta2_IsSymlinkRequest(in *internal.IsSymlinkRequest, out *v1beta2.IsSymlinkRequest) error { - return autoConvert_internal_IsSymlinkRequest_To_v1beta2_IsSymlinkRequest(in, out) -} - -func autoConvert_v1beta2_IsSymlinkResponse_To_internal_IsSymlinkResponse(in *v1beta2.IsSymlinkResponse, out *internal.IsSymlinkResponse) error { - out.IsSymlink = in.IsSymlink - return nil -} - -// Convert_v1beta2_IsSymlinkResponse_To_internal_IsSymlinkResponse is an autogenerated conversion function. -func Convert_v1beta2_IsSymlinkResponse_To_internal_IsSymlinkResponse(in *v1beta2.IsSymlinkResponse, out *internal.IsSymlinkResponse) error { - return autoConvert_v1beta2_IsSymlinkResponse_To_internal_IsSymlinkResponse(in, out) -} - -func autoConvert_internal_IsSymlinkResponse_To_v1beta2_IsSymlinkResponse(in *internal.IsSymlinkResponse, out *v1beta2.IsSymlinkResponse) error { - out.IsSymlink = in.IsSymlink - return nil -} - -// Convert_internal_IsSymlinkResponse_To_v1beta2_IsSymlinkResponse is an autogenerated conversion function. -func Convert_internal_IsSymlinkResponse_To_v1beta2_IsSymlinkResponse(in *internal.IsSymlinkResponse, out *v1beta2.IsSymlinkResponse) error { - return autoConvert_internal_IsSymlinkResponse_To_v1beta2_IsSymlinkResponse(in, out) -} - -func autoConvert_v1beta2_MkdirRequest_To_internal_MkdirRequest(in *v1beta2.MkdirRequest, out *internal.MkdirRequest) error { - out.Path = in.Path - return nil -} - -// Convert_v1beta2_MkdirRequest_To_internal_MkdirRequest is an autogenerated conversion function. -func Convert_v1beta2_MkdirRequest_To_internal_MkdirRequest(in *v1beta2.MkdirRequest, out *internal.MkdirRequest) error { - return autoConvert_v1beta2_MkdirRequest_To_internal_MkdirRequest(in, out) -} - -func autoConvert_internal_MkdirRequest_To_v1beta2_MkdirRequest(in *internal.MkdirRequest, out *v1beta2.MkdirRequest) error { - out.Path = in.Path - return nil -} - -// Convert_internal_MkdirRequest_To_v1beta2_MkdirRequest is an autogenerated conversion function. -func Convert_internal_MkdirRequest_To_v1beta2_MkdirRequest(in *internal.MkdirRequest, out *v1beta2.MkdirRequest) error { - return autoConvert_internal_MkdirRequest_To_v1beta2_MkdirRequest(in, out) -} - -func autoConvert_v1beta2_MkdirResponse_To_internal_MkdirResponse(in *v1beta2.MkdirResponse, out *internal.MkdirResponse) error { - return nil -} - -// Convert_v1beta2_MkdirResponse_To_internal_MkdirResponse is an autogenerated conversion function. -func Convert_v1beta2_MkdirResponse_To_internal_MkdirResponse(in *v1beta2.MkdirResponse, out *internal.MkdirResponse) error { - return autoConvert_v1beta2_MkdirResponse_To_internal_MkdirResponse(in, out) -} - -func autoConvert_internal_MkdirResponse_To_v1beta2_MkdirResponse(in *internal.MkdirResponse, out *v1beta2.MkdirResponse) error { - return nil -} - -// Convert_internal_MkdirResponse_To_v1beta2_MkdirResponse is an autogenerated conversion function. -func Convert_internal_MkdirResponse_To_v1beta2_MkdirResponse(in *internal.MkdirResponse, out *v1beta2.MkdirResponse) error { - return autoConvert_internal_MkdirResponse_To_v1beta2_MkdirResponse(in, out) -} - -func autoConvert_v1beta2_PathExistsRequest_To_internal_PathExistsRequest(in *v1beta2.PathExistsRequest, out *internal.PathExistsRequest) error { - out.Path = in.Path - return nil -} - -// Convert_v1beta2_PathExistsRequest_To_internal_PathExistsRequest is an autogenerated conversion function. -func Convert_v1beta2_PathExistsRequest_To_internal_PathExistsRequest(in *v1beta2.PathExistsRequest, out *internal.PathExistsRequest) error { - return autoConvert_v1beta2_PathExistsRequest_To_internal_PathExistsRequest(in, out) -} - -func autoConvert_internal_PathExistsRequest_To_v1beta2_PathExistsRequest(in *internal.PathExistsRequest, out *v1beta2.PathExistsRequest) error { - out.Path = in.Path - return nil -} - -// Convert_internal_PathExistsRequest_To_v1beta2_PathExistsRequest is an autogenerated conversion function. -func Convert_internal_PathExistsRequest_To_v1beta2_PathExistsRequest(in *internal.PathExistsRequest, out *v1beta2.PathExistsRequest) error { - return autoConvert_internal_PathExistsRequest_To_v1beta2_PathExistsRequest(in, out) -} - -func autoConvert_v1beta2_PathExistsResponse_To_internal_PathExistsResponse(in *v1beta2.PathExistsResponse, out *internal.PathExistsResponse) error { - out.Exists = in.Exists - return nil -} - -// Convert_v1beta2_PathExistsResponse_To_internal_PathExistsResponse is an autogenerated conversion function. -func Convert_v1beta2_PathExistsResponse_To_internal_PathExistsResponse(in *v1beta2.PathExistsResponse, out *internal.PathExistsResponse) error { - return autoConvert_v1beta2_PathExistsResponse_To_internal_PathExistsResponse(in, out) -} - -func autoConvert_internal_PathExistsResponse_To_v1beta2_PathExistsResponse(in *internal.PathExistsResponse, out *v1beta2.PathExistsResponse) error { - out.Exists = in.Exists - return nil -} - -// Convert_internal_PathExistsResponse_To_v1beta2_PathExistsResponse is an autogenerated conversion function. -func Convert_internal_PathExistsResponse_To_v1beta2_PathExistsResponse(in *internal.PathExistsResponse, out *v1beta2.PathExistsResponse) error { - return autoConvert_internal_PathExistsResponse_To_v1beta2_PathExistsResponse(in, out) -} - -func autoConvert_v1beta2_RmdirRequest_To_internal_RmdirRequest(in *v1beta2.RmdirRequest, out *internal.RmdirRequest) error { - out.Path = in.Path - out.Force = in.Force - return nil -} - -// Convert_v1beta2_RmdirRequest_To_internal_RmdirRequest is an autogenerated conversion function. -func Convert_v1beta2_RmdirRequest_To_internal_RmdirRequest(in *v1beta2.RmdirRequest, out *internal.RmdirRequest) error { - return autoConvert_v1beta2_RmdirRequest_To_internal_RmdirRequest(in, out) -} - -func autoConvert_internal_RmdirRequest_To_v1beta2_RmdirRequest(in *internal.RmdirRequest, out *v1beta2.RmdirRequest) error { - out.Path = in.Path - out.Force = in.Force - return nil -} - -// Convert_internal_RmdirRequest_To_v1beta2_RmdirRequest is an autogenerated conversion function. -func Convert_internal_RmdirRequest_To_v1beta2_RmdirRequest(in *internal.RmdirRequest, out *v1beta2.RmdirRequest) error { - return autoConvert_internal_RmdirRequest_To_v1beta2_RmdirRequest(in, out) -} - -func autoConvert_v1beta2_RmdirResponse_To_internal_RmdirResponse(in *v1beta2.RmdirResponse, out *internal.RmdirResponse) error { - return nil -} - -// Convert_v1beta2_RmdirResponse_To_internal_RmdirResponse is an autogenerated conversion function. -func Convert_v1beta2_RmdirResponse_To_internal_RmdirResponse(in *v1beta2.RmdirResponse, out *internal.RmdirResponse) error { - return autoConvert_v1beta2_RmdirResponse_To_internal_RmdirResponse(in, out) -} - -func autoConvert_internal_RmdirResponse_To_v1beta2_RmdirResponse(in *internal.RmdirResponse, out *v1beta2.RmdirResponse) error { - return nil -} - -// Convert_internal_RmdirResponse_To_v1beta2_RmdirResponse is an autogenerated conversion function. -func Convert_internal_RmdirResponse_To_v1beta2_RmdirResponse(in *internal.RmdirResponse, out *v1beta2.RmdirResponse) error { - return autoConvert_internal_RmdirResponse_To_v1beta2_RmdirResponse(in, out) -} diff --git a/internal/server/iscsi/internal/v1alpha1/conversion_generated.go b/internal/server/iscsi/internal/v1alpha1/conversion_generated.go deleted file mode 100644 index 0b2402d7..00000000 --- a/internal/server/iscsi/internal/v1alpha1/conversion_generated.go +++ /dev/null @@ -1,414 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - unsafe "unsafe" - - v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal" -) - -func autoConvert_v1alpha1_AddTargetPortalRequest_To_internal_AddTargetPortalRequest(in *v1alpha1.AddTargetPortalRequest, out *internal.AddTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha1_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_v1alpha1_AddTargetPortalRequest_To_internal_AddTargetPortalRequest is an autogenerated conversion function. -func Convert_v1alpha1_AddTargetPortalRequest_To_internal_AddTargetPortalRequest(in *v1alpha1.AddTargetPortalRequest, out *internal.AddTargetPortalRequest) error { - return autoConvert_v1alpha1_AddTargetPortalRequest_To_internal_AddTargetPortalRequest(in, out) -} - -func autoConvert_internal_AddTargetPortalRequest_To_v1alpha1_AddTargetPortalRequest(in *internal.AddTargetPortalRequest, out *v1alpha1.AddTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha1.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_internal_AddTargetPortalRequest_To_v1alpha1_AddTargetPortalRequest is an autogenerated conversion function. -func Convert_internal_AddTargetPortalRequest_To_v1alpha1_AddTargetPortalRequest(in *internal.AddTargetPortalRequest, out *v1alpha1.AddTargetPortalRequest) error { - return autoConvert_internal_AddTargetPortalRequest_To_v1alpha1_AddTargetPortalRequest(in, out) -} - -func autoConvert_v1alpha1_AddTargetPortalResponse_To_internal_AddTargetPortalResponse(in *v1alpha1.AddTargetPortalResponse, out *internal.AddTargetPortalResponse) error { - return nil -} - -// Convert_v1alpha1_AddTargetPortalResponse_To_internal_AddTargetPortalResponse is an autogenerated conversion function. -func Convert_v1alpha1_AddTargetPortalResponse_To_internal_AddTargetPortalResponse(in *v1alpha1.AddTargetPortalResponse, out *internal.AddTargetPortalResponse) error { - return autoConvert_v1alpha1_AddTargetPortalResponse_To_internal_AddTargetPortalResponse(in, out) -} - -func autoConvert_internal_AddTargetPortalResponse_To_v1alpha1_AddTargetPortalResponse(in *internal.AddTargetPortalResponse, out *v1alpha1.AddTargetPortalResponse) error { - return nil -} - -// Convert_internal_AddTargetPortalResponse_To_v1alpha1_AddTargetPortalResponse is an autogenerated conversion function. -func Convert_internal_AddTargetPortalResponse_To_v1alpha1_AddTargetPortalResponse(in *internal.AddTargetPortalResponse, out *v1alpha1.AddTargetPortalResponse) error { - return autoConvert_internal_AddTargetPortalResponse_To_v1alpha1_AddTargetPortalResponse(in, out) -} - -func autoConvert_v1alpha1_ConnectTargetRequest_To_internal_ConnectTargetRequest(in *v1alpha1.ConnectTargetRequest, out *internal.ConnectTargetRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha1_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - out.AuthType = internal.AuthenticationType(in.AuthType) - out.ChapUsername = in.ChapUsername - out.ChapSecret = in.ChapSecret - return nil -} - -// Convert_v1alpha1_ConnectTargetRequest_To_internal_ConnectTargetRequest is an autogenerated conversion function. -func Convert_v1alpha1_ConnectTargetRequest_To_internal_ConnectTargetRequest(in *v1alpha1.ConnectTargetRequest, out *internal.ConnectTargetRequest) error { - return autoConvert_v1alpha1_ConnectTargetRequest_To_internal_ConnectTargetRequest(in, out) -} - -func autoConvert_internal_ConnectTargetRequest_To_v1alpha1_ConnectTargetRequest(in *internal.ConnectTargetRequest, out *v1alpha1.ConnectTargetRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha1.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - out.AuthType = v1alpha1.AuthenticationType(in.AuthType) - out.ChapUsername = in.ChapUsername - out.ChapSecret = in.ChapSecret - return nil -} - -// Convert_internal_ConnectTargetRequest_To_v1alpha1_ConnectTargetRequest is an autogenerated conversion function. -func Convert_internal_ConnectTargetRequest_To_v1alpha1_ConnectTargetRequest(in *internal.ConnectTargetRequest, out *v1alpha1.ConnectTargetRequest) error { - return autoConvert_internal_ConnectTargetRequest_To_v1alpha1_ConnectTargetRequest(in, out) -} - -func autoConvert_v1alpha1_ConnectTargetResponse_To_internal_ConnectTargetResponse(in *v1alpha1.ConnectTargetResponse, out *internal.ConnectTargetResponse) error { - return nil -} - -// Convert_v1alpha1_ConnectTargetResponse_To_internal_ConnectTargetResponse is an autogenerated conversion function. -func Convert_v1alpha1_ConnectTargetResponse_To_internal_ConnectTargetResponse(in *v1alpha1.ConnectTargetResponse, out *internal.ConnectTargetResponse) error { - return autoConvert_v1alpha1_ConnectTargetResponse_To_internal_ConnectTargetResponse(in, out) -} - -func autoConvert_internal_ConnectTargetResponse_To_v1alpha1_ConnectTargetResponse(in *internal.ConnectTargetResponse, out *v1alpha1.ConnectTargetResponse) error { - return nil -} - -// Convert_internal_ConnectTargetResponse_To_v1alpha1_ConnectTargetResponse is an autogenerated conversion function. -func Convert_internal_ConnectTargetResponse_To_v1alpha1_ConnectTargetResponse(in *internal.ConnectTargetResponse, out *v1alpha1.ConnectTargetResponse) error { - return autoConvert_internal_ConnectTargetResponse_To_v1alpha1_ConnectTargetResponse(in, out) -} - -func autoConvert_v1alpha1_DisconnectTargetRequest_To_internal_DisconnectTargetRequest(in *v1alpha1.DisconnectTargetRequest, out *internal.DisconnectTargetRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha1_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - return nil -} - -// Convert_v1alpha1_DisconnectTargetRequest_To_internal_DisconnectTargetRequest is an autogenerated conversion function. -func Convert_v1alpha1_DisconnectTargetRequest_To_internal_DisconnectTargetRequest(in *v1alpha1.DisconnectTargetRequest, out *internal.DisconnectTargetRequest) error { - return autoConvert_v1alpha1_DisconnectTargetRequest_To_internal_DisconnectTargetRequest(in, out) -} - -func autoConvert_internal_DisconnectTargetRequest_To_v1alpha1_DisconnectTargetRequest(in *internal.DisconnectTargetRequest, out *v1alpha1.DisconnectTargetRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha1.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - return nil -} - -// Convert_internal_DisconnectTargetRequest_To_v1alpha1_DisconnectTargetRequest is an autogenerated conversion function. -func Convert_internal_DisconnectTargetRequest_To_v1alpha1_DisconnectTargetRequest(in *internal.DisconnectTargetRequest, out *v1alpha1.DisconnectTargetRequest) error { - return autoConvert_internal_DisconnectTargetRequest_To_v1alpha1_DisconnectTargetRequest(in, out) -} - -func autoConvert_v1alpha1_DisconnectTargetResponse_To_internal_DisconnectTargetResponse(in *v1alpha1.DisconnectTargetResponse, out *internal.DisconnectTargetResponse) error { - return nil -} - -// Convert_v1alpha1_DisconnectTargetResponse_To_internal_DisconnectTargetResponse is an autogenerated conversion function. -func Convert_v1alpha1_DisconnectTargetResponse_To_internal_DisconnectTargetResponse(in *v1alpha1.DisconnectTargetResponse, out *internal.DisconnectTargetResponse) error { - return autoConvert_v1alpha1_DisconnectTargetResponse_To_internal_DisconnectTargetResponse(in, out) -} - -func autoConvert_internal_DisconnectTargetResponse_To_v1alpha1_DisconnectTargetResponse(in *internal.DisconnectTargetResponse, out *v1alpha1.DisconnectTargetResponse) error { - return nil -} - -// Convert_internal_DisconnectTargetResponse_To_v1alpha1_DisconnectTargetResponse is an autogenerated conversion function. -func Convert_internal_DisconnectTargetResponse_To_v1alpha1_DisconnectTargetResponse(in *internal.DisconnectTargetResponse, out *v1alpha1.DisconnectTargetResponse) error { - return autoConvert_internal_DisconnectTargetResponse_To_v1alpha1_DisconnectTargetResponse(in, out) -} - -func autoConvert_v1alpha1_DiscoverTargetPortalRequest_To_internal_DiscoverTargetPortalRequest(in *v1alpha1.DiscoverTargetPortalRequest, out *internal.DiscoverTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha1_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_v1alpha1_DiscoverTargetPortalRequest_To_internal_DiscoverTargetPortalRequest is an autogenerated conversion function. -func Convert_v1alpha1_DiscoverTargetPortalRequest_To_internal_DiscoverTargetPortalRequest(in *v1alpha1.DiscoverTargetPortalRequest, out *internal.DiscoverTargetPortalRequest) error { - return autoConvert_v1alpha1_DiscoverTargetPortalRequest_To_internal_DiscoverTargetPortalRequest(in, out) -} - -func autoConvert_internal_DiscoverTargetPortalRequest_To_v1alpha1_DiscoverTargetPortalRequest(in *internal.DiscoverTargetPortalRequest, out *v1alpha1.DiscoverTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha1.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_internal_DiscoverTargetPortalRequest_To_v1alpha1_DiscoverTargetPortalRequest is an autogenerated conversion function. -func Convert_internal_DiscoverTargetPortalRequest_To_v1alpha1_DiscoverTargetPortalRequest(in *internal.DiscoverTargetPortalRequest, out *v1alpha1.DiscoverTargetPortalRequest) error { - return autoConvert_internal_DiscoverTargetPortalRequest_To_v1alpha1_DiscoverTargetPortalRequest(in, out) -} - -func autoConvert_v1alpha1_DiscoverTargetPortalResponse_To_internal_DiscoverTargetPortalResponse(in *v1alpha1.DiscoverTargetPortalResponse, out *internal.DiscoverTargetPortalResponse) error { - out.Iqns = *(*[]string)(unsafe.Pointer(&in.Iqns)) - return nil -} - -// Convert_v1alpha1_DiscoverTargetPortalResponse_To_internal_DiscoverTargetPortalResponse is an autogenerated conversion function. -func Convert_v1alpha1_DiscoverTargetPortalResponse_To_internal_DiscoverTargetPortalResponse(in *v1alpha1.DiscoverTargetPortalResponse, out *internal.DiscoverTargetPortalResponse) error { - return autoConvert_v1alpha1_DiscoverTargetPortalResponse_To_internal_DiscoverTargetPortalResponse(in, out) -} - -func autoConvert_internal_DiscoverTargetPortalResponse_To_v1alpha1_DiscoverTargetPortalResponse(in *internal.DiscoverTargetPortalResponse, out *v1alpha1.DiscoverTargetPortalResponse) error { - out.Iqns = *(*[]string)(unsafe.Pointer(&in.Iqns)) - return nil -} - -// Convert_internal_DiscoverTargetPortalResponse_To_v1alpha1_DiscoverTargetPortalResponse is an autogenerated conversion function. -func Convert_internal_DiscoverTargetPortalResponse_To_v1alpha1_DiscoverTargetPortalResponse(in *internal.DiscoverTargetPortalResponse, out *v1alpha1.DiscoverTargetPortalResponse) error { - return autoConvert_internal_DiscoverTargetPortalResponse_To_v1alpha1_DiscoverTargetPortalResponse(in, out) -} - -func autoConvert_v1alpha1_GetTargetDisksRequest_To_internal_GetTargetDisksRequest(in *v1alpha1.GetTargetDisksRequest, out *internal.GetTargetDisksRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha1_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - return nil -} - -// Convert_v1alpha1_GetTargetDisksRequest_To_internal_GetTargetDisksRequest is an autogenerated conversion function. -func Convert_v1alpha1_GetTargetDisksRequest_To_internal_GetTargetDisksRequest(in *v1alpha1.GetTargetDisksRequest, out *internal.GetTargetDisksRequest) error { - return autoConvert_v1alpha1_GetTargetDisksRequest_To_internal_GetTargetDisksRequest(in, out) -} - -func autoConvert_internal_GetTargetDisksRequest_To_v1alpha1_GetTargetDisksRequest(in *internal.GetTargetDisksRequest, out *v1alpha1.GetTargetDisksRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha1.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - return nil -} - -// Convert_internal_GetTargetDisksRequest_To_v1alpha1_GetTargetDisksRequest is an autogenerated conversion function. -func Convert_internal_GetTargetDisksRequest_To_v1alpha1_GetTargetDisksRequest(in *internal.GetTargetDisksRequest, out *v1alpha1.GetTargetDisksRequest) error { - return autoConvert_internal_GetTargetDisksRequest_To_v1alpha1_GetTargetDisksRequest(in, out) -} - -func autoConvert_v1alpha1_GetTargetDisksResponse_To_internal_GetTargetDisksResponse(in *v1alpha1.GetTargetDisksResponse, out *internal.GetTargetDisksResponse) error { - out.DiskIDs = *(*[]string)(unsafe.Pointer(&in.DiskIDs)) - return nil -} - -// Convert_v1alpha1_GetTargetDisksResponse_To_internal_GetTargetDisksResponse is an autogenerated conversion function. -func Convert_v1alpha1_GetTargetDisksResponse_To_internal_GetTargetDisksResponse(in *v1alpha1.GetTargetDisksResponse, out *internal.GetTargetDisksResponse) error { - return autoConvert_v1alpha1_GetTargetDisksResponse_To_internal_GetTargetDisksResponse(in, out) -} - -func autoConvert_internal_GetTargetDisksResponse_To_v1alpha1_GetTargetDisksResponse(in *internal.GetTargetDisksResponse, out *v1alpha1.GetTargetDisksResponse) error { - out.DiskIDs = *(*[]string)(unsafe.Pointer(&in.DiskIDs)) - return nil -} - -// Convert_internal_GetTargetDisksResponse_To_v1alpha1_GetTargetDisksResponse is an autogenerated conversion function. -func Convert_internal_GetTargetDisksResponse_To_v1alpha1_GetTargetDisksResponse(in *internal.GetTargetDisksResponse, out *v1alpha1.GetTargetDisksResponse) error { - return autoConvert_internal_GetTargetDisksResponse_To_v1alpha1_GetTargetDisksResponse(in, out) -} - -func autoConvert_v1alpha1_ListTargetPortalsRequest_To_internal_ListTargetPortalsRequest(in *v1alpha1.ListTargetPortalsRequest, out *internal.ListTargetPortalsRequest) error { - return nil -} - -// Convert_v1alpha1_ListTargetPortalsRequest_To_internal_ListTargetPortalsRequest is an autogenerated conversion function. -func Convert_v1alpha1_ListTargetPortalsRequest_To_internal_ListTargetPortalsRequest(in *v1alpha1.ListTargetPortalsRequest, out *internal.ListTargetPortalsRequest) error { - return autoConvert_v1alpha1_ListTargetPortalsRequest_To_internal_ListTargetPortalsRequest(in, out) -} - -func autoConvert_internal_ListTargetPortalsRequest_To_v1alpha1_ListTargetPortalsRequest(in *internal.ListTargetPortalsRequest, out *v1alpha1.ListTargetPortalsRequest) error { - return nil -} - -// Convert_internal_ListTargetPortalsRequest_To_v1alpha1_ListTargetPortalsRequest is an autogenerated conversion function. -func Convert_internal_ListTargetPortalsRequest_To_v1alpha1_ListTargetPortalsRequest(in *internal.ListTargetPortalsRequest, out *v1alpha1.ListTargetPortalsRequest) error { - return autoConvert_internal_ListTargetPortalsRequest_To_v1alpha1_ListTargetPortalsRequest(in, out) -} - -func autoConvert_v1alpha1_ListTargetPortalsResponse_To_internal_ListTargetPortalsResponse(in *v1alpha1.ListTargetPortalsResponse, out *internal.ListTargetPortalsResponse) error { - if in.TargetPortals != nil { - in, out := &in.TargetPortals, &out.TargetPortals - *out = make([]*internal.TargetPortal, len(*in)) - for i := range *in { - if err := Convert_v1alpha1_TargetPortal_To_internal_TargetPortal(*&(*in)[i], *&(*out)[i]); err != nil { - return err - } - } - } else { - out.TargetPortals = nil - } - return nil -} - -// Convert_v1alpha1_ListTargetPortalsResponse_To_internal_ListTargetPortalsResponse is an autogenerated conversion function. -func Convert_v1alpha1_ListTargetPortalsResponse_To_internal_ListTargetPortalsResponse(in *v1alpha1.ListTargetPortalsResponse, out *internal.ListTargetPortalsResponse) error { - return autoConvert_v1alpha1_ListTargetPortalsResponse_To_internal_ListTargetPortalsResponse(in, out) -} - -// detected external conversion function -// Convert_internal_ListTargetPortalsResponse_To_v1alpha1_ListTargetPortalsResponse(in *internal.ListTargetPortalsResponse, out *v1alpha1.ListTargetPortalsResponse) error -// skipping generation of the auto function - -func autoConvert_v1alpha1_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest(in *v1alpha1.RemoveTargetPortalRequest, out *internal.RemoveTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha1_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_v1alpha1_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest is an autogenerated conversion function. -func Convert_v1alpha1_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest(in *v1alpha1.RemoveTargetPortalRequest, out *internal.RemoveTargetPortalRequest) error { - return autoConvert_v1alpha1_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest(in, out) -} - -func autoConvert_internal_RemoveTargetPortalRequest_To_v1alpha1_RemoveTargetPortalRequest(in *internal.RemoveTargetPortalRequest, out *v1alpha1.RemoveTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha1.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_internal_RemoveTargetPortalRequest_To_v1alpha1_RemoveTargetPortalRequest is an autogenerated conversion function. -func Convert_internal_RemoveTargetPortalRequest_To_v1alpha1_RemoveTargetPortalRequest(in *internal.RemoveTargetPortalRequest, out *v1alpha1.RemoveTargetPortalRequest) error { - return autoConvert_internal_RemoveTargetPortalRequest_To_v1alpha1_RemoveTargetPortalRequest(in, out) -} - -func autoConvert_v1alpha1_RemoveTargetPortalResponse_To_internal_RemoveTargetPortalResponse(in *v1alpha1.RemoveTargetPortalResponse, out *internal.RemoveTargetPortalResponse) error { - return nil -} - -// Convert_v1alpha1_RemoveTargetPortalResponse_To_internal_RemoveTargetPortalResponse is an autogenerated conversion function. -func Convert_v1alpha1_RemoveTargetPortalResponse_To_internal_RemoveTargetPortalResponse(in *v1alpha1.RemoveTargetPortalResponse, out *internal.RemoveTargetPortalResponse) error { - return autoConvert_v1alpha1_RemoveTargetPortalResponse_To_internal_RemoveTargetPortalResponse(in, out) -} - -func autoConvert_internal_RemoveTargetPortalResponse_To_v1alpha1_RemoveTargetPortalResponse(in *internal.RemoveTargetPortalResponse, out *v1alpha1.RemoveTargetPortalResponse) error { - return nil -} - -// Convert_internal_RemoveTargetPortalResponse_To_v1alpha1_RemoveTargetPortalResponse is an autogenerated conversion function. -func Convert_internal_RemoveTargetPortalResponse_To_v1alpha1_RemoveTargetPortalResponse(in *internal.RemoveTargetPortalResponse, out *v1alpha1.RemoveTargetPortalResponse) error { - return autoConvert_internal_RemoveTargetPortalResponse_To_v1alpha1_RemoveTargetPortalResponse(in, out) -} - -func autoConvert_v1alpha1_TargetPortal_To_internal_TargetPortal(in *v1alpha1.TargetPortal, out *internal.TargetPortal) error { - out.TargetAddress = in.TargetAddress - out.TargetPort = in.TargetPort - return nil -} - -// Convert_v1alpha1_TargetPortal_To_internal_TargetPortal is an autogenerated conversion function. -func Convert_v1alpha1_TargetPortal_To_internal_TargetPortal(in *v1alpha1.TargetPortal, out *internal.TargetPortal) error { - return autoConvert_v1alpha1_TargetPortal_To_internal_TargetPortal(in, out) -} - -func autoConvert_internal_TargetPortal_To_v1alpha1_TargetPortal(in *internal.TargetPortal, out *v1alpha1.TargetPortal) error { - out.TargetAddress = in.TargetAddress - out.TargetPort = in.TargetPort - return nil -} - -// Convert_internal_TargetPortal_To_v1alpha1_TargetPortal is an autogenerated conversion function. -func Convert_internal_TargetPortal_To_v1alpha1_TargetPortal(in *internal.TargetPortal, out *v1alpha1.TargetPortal) error { - return autoConvert_internal_TargetPortal_To_v1alpha1_TargetPortal(in, out) -} diff --git a/internal/server/iscsi/internal/v1alpha2/conversion_generated.go b/internal/server/iscsi/internal/v1alpha2/conversion_generated.go deleted file mode 100644 index c2821908..00000000 --- a/internal/server/iscsi/internal/v1alpha2/conversion_generated.go +++ /dev/null @@ -1,452 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha2 - -import ( - unsafe "unsafe" - - v1alpha2 "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha2" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal" -) - -func autoConvert_v1alpha2_AddTargetPortalRequest_To_internal_AddTargetPortalRequest(in *v1alpha2.AddTargetPortalRequest, out *internal.AddTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha2_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_v1alpha2_AddTargetPortalRequest_To_internal_AddTargetPortalRequest is an autogenerated conversion function. -func Convert_v1alpha2_AddTargetPortalRequest_To_internal_AddTargetPortalRequest(in *v1alpha2.AddTargetPortalRequest, out *internal.AddTargetPortalRequest) error { - return autoConvert_v1alpha2_AddTargetPortalRequest_To_internal_AddTargetPortalRequest(in, out) -} - -func autoConvert_internal_AddTargetPortalRequest_To_v1alpha2_AddTargetPortalRequest(in *internal.AddTargetPortalRequest, out *v1alpha2.AddTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha2.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_internal_AddTargetPortalRequest_To_v1alpha2_AddTargetPortalRequest is an autogenerated conversion function. -func Convert_internal_AddTargetPortalRequest_To_v1alpha2_AddTargetPortalRequest(in *internal.AddTargetPortalRequest, out *v1alpha2.AddTargetPortalRequest) error { - return autoConvert_internal_AddTargetPortalRequest_To_v1alpha2_AddTargetPortalRequest(in, out) -} - -func autoConvert_v1alpha2_AddTargetPortalResponse_To_internal_AddTargetPortalResponse(in *v1alpha2.AddTargetPortalResponse, out *internal.AddTargetPortalResponse) error { - return nil -} - -// Convert_v1alpha2_AddTargetPortalResponse_To_internal_AddTargetPortalResponse is an autogenerated conversion function. -func Convert_v1alpha2_AddTargetPortalResponse_To_internal_AddTargetPortalResponse(in *v1alpha2.AddTargetPortalResponse, out *internal.AddTargetPortalResponse) error { - return autoConvert_v1alpha2_AddTargetPortalResponse_To_internal_AddTargetPortalResponse(in, out) -} - -func autoConvert_internal_AddTargetPortalResponse_To_v1alpha2_AddTargetPortalResponse(in *internal.AddTargetPortalResponse, out *v1alpha2.AddTargetPortalResponse) error { - return nil -} - -// Convert_internal_AddTargetPortalResponse_To_v1alpha2_AddTargetPortalResponse is an autogenerated conversion function. -func Convert_internal_AddTargetPortalResponse_To_v1alpha2_AddTargetPortalResponse(in *internal.AddTargetPortalResponse, out *v1alpha2.AddTargetPortalResponse) error { - return autoConvert_internal_AddTargetPortalResponse_To_v1alpha2_AddTargetPortalResponse(in, out) -} - -func autoConvert_v1alpha2_ConnectTargetRequest_To_internal_ConnectTargetRequest(in *v1alpha2.ConnectTargetRequest, out *internal.ConnectTargetRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha2_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - out.AuthType = internal.AuthenticationType(in.AuthType) - out.ChapUsername = in.ChapUsername - out.ChapSecret = in.ChapSecret - return nil -} - -// Convert_v1alpha2_ConnectTargetRequest_To_internal_ConnectTargetRequest is an autogenerated conversion function. -func Convert_v1alpha2_ConnectTargetRequest_To_internal_ConnectTargetRequest(in *v1alpha2.ConnectTargetRequest, out *internal.ConnectTargetRequest) error { - return autoConvert_v1alpha2_ConnectTargetRequest_To_internal_ConnectTargetRequest(in, out) -} - -func autoConvert_internal_ConnectTargetRequest_To_v1alpha2_ConnectTargetRequest(in *internal.ConnectTargetRequest, out *v1alpha2.ConnectTargetRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha2.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - out.AuthType = v1alpha2.AuthenticationType(in.AuthType) - out.ChapUsername = in.ChapUsername - out.ChapSecret = in.ChapSecret - return nil -} - -// Convert_internal_ConnectTargetRequest_To_v1alpha2_ConnectTargetRequest is an autogenerated conversion function. -func Convert_internal_ConnectTargetRequest_To_v1alpha2_ConnectTargetRequest(in *internal.ConnectTargetRequest, out *v1alpha2.ConnectTargetRequest) error { - return autoConvert_internal_ConnectTargetRequest_To_v1alpha2_ConnectTargetRequest(in, out) -} - -func autoConvert_v1alpha2_ConnectTargetResponse_To_internal_ConnectTargetResponse(in *v1alpha2.ConnectTargetResponse, out *internal.ConnectTargetResponse) error { - return nil -} - -// Convert_v1alpha2_ConnectTargetResponse_To_internal_ConnectTargetResponse is an autogenerated conversion function. -func Convert_v1alpha2_ConnectTargetResponse_To_internal_ConnectTargetResponse(in *v1alpha2.ConnectTargetResponse, out *internal.ConnectTargetResponse) error { - return autoConvert_v1alpha2_ConnectTargetResponse_To_internal_ConnectTargetResponse(in, out) -} - -func autoConvert_internal_ConnectTargetResponse_To_v1alpha2_ConnectTargetResponse(in *internal.ConnectTargetResponse, out *v1alpha2.ConnectTargetResponse) error { - return nil -} - -// Convert_internal_ConnectTargetResponse_To_v1alpha2_ConnectTargetResponse is an autogenerated conversion function. -func Convert_internal_ConnectTargetResponse_To_v1alpha2_ConnectTargetResponse(in *internal.ConnectTargetResponse, out *v1alpha2.ConnectTargetResponse) error { - return autoConvert_internal_ConnectTargetResponse_To_v1alpha2_ConnectTargetResponse(in, out) -} - -func autoConvert_v1alpha2_DisconnectTargetRequest_To_internal_DisconnectTargetRequest(in *v1alpha2.DisconnectTargetRequest, out *internal.DisconnectTargetRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha2_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - return nil -} - -// Convert_v1alpha2_DisconnectTargetRequest_To_internal_DisconnectTargetRequest is an autogenerated conversion function. -func Convert_v1alpha2_DisconnectTargetRequest_To_internal_DisconnectTargetRequest(in *v1alpha2.DisconnectTargetRequest, out *internal.DisconnectTargetRequest) error { - return autoConvert_v1alpha2_DisconnectTargetRequest_To_internal_DisconnectTargetRequest(in, out) -} - -func autoConvert_internal_DisconnectTargetRequest_To_v1alpha2_DisconnectTargetRequest(in *internal.DisconnectTargetRequest, out *v1alpha2.DisconnectTargetRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha2.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - return nil -} - -// Convert_internal_DisconnectTargetRequest_To_v1alpha2_DisconnectTargetRequest is an autogenerated conversion function. -func Convert_internal_DisconnectTargetRequest_To_v1alpha2_DisconnectTargetRequest(in *internal.DisconnectTargetRequest, out *v1alpha2.DisconnectTargetRequest) error { - return autoConvert_internal_DisconnectTargetRequest_To_v1alpha2_DisconnectTargetRequest(in, out) -} - -func autoConvert_v1alpha2_DisconnectTargetResponse_To_internal_DisconnectTargetResponse(in *v1alpha2.DisconnectTargetResponse, out *internal.DisconnectTargetResponse) error { - return nil -} - -// Convert_v1alpha2_DisconnectTargetResponse_To_internal_DisconnectTargetResponse is an autogenerated conversion function. -func Convert_v1alpha2_DisconnectTargetResponse_To_internal_DisconnectTargetResponse(in *v1alpha2.DisconnectTargetResponse, out *internal.DisconnectTargetResponse) error { - return autoConvert_v1alpha2_DisconnectTargetResponse_To_internal_DisconnectTargetResponse(in, out) -} - -func autoConvert_internal_DisconnectTargetResponse_To_v1alpha2_DisconnectTargetResponse(in *internal.DisconnectTargetResponse, out *v1alpha2.DisconnectTargetResponse) error { - return nil -} - -// Convert_internal_DisconnectTargetResponse_To_v1alpha2_DisconnectTargetResponse is an autogenerated conversion function. -func Convert_internal_DisconnectTargetResponse_To_v1alpha2_DisconnectTargetResponse(in *internal.DisconnectTargetResponse, out *v1alpha2.DisconnectTargetResponse) error { - return autoConvert_internal_DisconnectTargetResponse_To_v1alpha2_DisconnectTargetResponse(in, out) -} - -func autoConvert_v1alpha2_DiscoverTargetPortalRequest_To_internal_DiscoverTargetPortalRequest(in *v1alpha2.DiscoverTargetPortalRequest, out *internal.DiscoverTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha2_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_v1alpha2_DiscoverTargetPortalRequest_To_internal_DiscoverTargetPortalRequest is an autogenerated conversion function. -func Convert_v1alpha2_DiscoverTargetPortalRequest_To_internal_DiscoverTargetPortalRequest(in *v1alpha2.DiscoverTargetPortalRequest, out *internal.DiscoverTargetPortalRequest) error { - return autoConvert_v1alpha2_DiscoverTargetPortalRequest_To_internal_DiscoverTargetPortalRequest(in, out) -} - -func autoConvert_internal_DiscoverTargetPortalRequest_To_v1alpha2_DiscoverTargetPortalRequest(in *internal.DiscoverTargetPortalRequest, out *v1alpha2.DiscoverTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha2.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_internal_DiscoverTargetPortalRequest_To_v1alpha2_DiscoverTargetPortalRequest is an autogenerated conversion function. -func Convert_internal_DiscoverTargetPortalRequest_To_v1alpha2_DiscoverTargetPortalRequest(in *internal.DiscoverTargetPortalRequest, out *v1alpha2.DiscoverTargetPortalRequest) error { - return autoConvert_internal_DiscoverTargetPortalRequest_To_v1alpha2_DiscoverTargetPortalRequest(in, out) -} - -func autoConvert_v1alpha2_DiscoverTargetPortalResponse_To_internal_DiscoverTargetPortalResponse(in *v1alpha2.DiscoverTargetPortalResponse, out *internal.DiscoverTargetPortalResponse) error { - out.Iqns = *(*[]string)(unsafe.Pointer(&in.Iqns)) - return nil -} - -// Convert_v1alpha2_DiscoverTargetPortalResponse_To_internal_DiscoverTargetPortalResponse is an autogenerated conversion function. -func Convert_v1alpha2_DiscoverTargetPortalResponse_To_internal_DiscoverTargetPortalResponse(in *v1alpha2.DiscoverTargetPortalResponse, out *internal.DiscoverTargetPortalResponse) error { - return autoConvert_v1alpha2_DiscoverTargetPortalResponse_To_internal_DiscoverTargetPortalResponse(in, out) -} - -func autoConvert_internal_DiscoverTargetPortalResponse_To_v1alpha2_DiscoverTargetPortalResponse(in *internal.DiscoverTargetPortalResponse, out *v1alpha2.DiscoverTargetPortalResponse) error { - out.Iqns = *(*[]string)(unsafe.Pointer(&in.Iqns)) - return nil -} - -// Convert_internal_DiscoverTargetPortalResponse_To_v1alpha2_DiscoverTargetPortalResponse is an autogenerated conversion function. -func Convert_internal_DiscoverTargetPortalResponse_To_v1alpha2_DiscoverTargetPortalResponse(in *internal.DiscoverTargetPortalResponse, out *v1alpha2.DiscoverTargetPortalResponse) error { - return autoConvert_internal_DiscoverTargetPortalResponse_To_v1alpha2_DiscoverTargetPortalResponse(in, out) -} - -func autoConvert_v1alpha2_GetTargetDisksRequest_To_internal_GetTargetDisksRequest(in *v1alpha2.GetTargetDisksRequest, out *internal.GetTargetDisksRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha2_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - return nil -} - -// Convert_v1alpha2_GetTargetDisksRequest_To_internal_GetTargetDisksRequest is an autogenerated conversion function. -func Convert_v1alpha2_GetTargetDisksRequest_To_internal_GetTargetDisksRequest(in *v1alpha2.GetTargetDisksRequest, out *internal.GetTargetDisksRequest) error { - return autoConvert_v1alpha2_GetTargetDisksRequest_To_internal_GetTargetDisksRequest(in, out) -} - -func autoConvert_internal_GetTargetDisksRequest_To_v1alpha2_GetTargetDisksRequest(in *internal.GetTargetDisksRequest, out *v1alpha2.GetTargetDisksRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha2.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - out.Iqn = in.Iqn - return nil -} - -// Convert_internal_GetTargetDisksRequest_To_v1alpha2_GetTargetDisksRequest is an autogenerated conversion function. -func Convert_internal_GetTargetDisksRequest_To_v1alpha2_GetTargetDisksRequest(in *internal.GetTargetDisksRequest, out *v1alpha2.GetTargetDisksRequest) error { - return autoConvert_internal_GetTargetDisksRequest_To_v1alpha2_GetTargetDisksRequest(in, out) -} - -func autoConvert_v1alpha2_GetTargetDisksResponse_To_internal_GetTargetDisksResponse(in *v1alpha2.GetTargetDisksResponse, out *internal.GetTargetDisksResponse) error { - out.DiskIDs = *(*[]string)(unsafe.Pointer(&in.DiskIDs)) - return nil -} - -// Convert_v1alpha2_GetTargetDisksResponse_To_internal_GetTargetDisksResponse is an autogenerated conversion function. -func Convert_v1alpha2_GetTargetDisksResponse_To_internal_GetTargetDisksResponse(in *v1alpha2.GetTargetDisksResponse, out *internal.GetTargetDisksResponse) error { - return autoConvert_v1alpha2_GetTargetDisksResponse_To_internal_GetTargetDisksResponse(in, out) -} - -func autoConvert_internal_GetTargetDisksResponse_To_v1alpha2_GetTargetDisksResponse(in *internal.GetTargetDisksResponse, out *v1alpha2.GetTargetDisksResponse) error { - out.DiskIDs = *(*[]string)(unsafe.Pointer(&in.DiskIDs)) - return nil -} - -// Convert_internal_GetTargetDisksResponse_To_v1alpha2_GetTargetDisksResponse is an autogenerated conversion function. -func Convert_internal_GetTargetDisksResponse_To_v1alpha2_GetTargetDisksResponse(in *internal.GetTargetDisksResponse, out *v1alpha2.GetTargetDisksResponse) error { - return autoConvert_internal_GetTargetDisksResponse_To_v1alpha2_GetTargetDisksResponse(in, out) -} - -func autoConvert_v1alpha2_ListTargetPortalsRequest_To_internal_ListTargetPortalsRequest(in *v1alpha2.ListTargetPortalsRequest, out *internal.ListTargetPortalsRequest) error { - return nil -} - -// Convert_v1alpha2_ListTargetPortalsRequest_To_internal_ListTargetPortalsRequest is an autogenerated conversion function. -func Convert_v1alpha2_ListTargetPortalsRequest_To_internal_ListTargetPortalsRequest(in *v1alpha2.ListTargetPortalsRequest, out *internal.ListTargetPortalsRequest) error { - return autoConvert_v1alpha2_ListTargetPortalsRequest_To_internal_ListTargetPortalsRequest(in, out) -} - -func autoConvert_internal_ListTargetPortalsRequest_To_v1alpha2_ListTargetPortalsRequest(in *internal.ListTargetPortalsRequest, out *v1alpha2.ListTargetPortalsRequest) error { - return nil -} - -// Convert_internal_ListTargetPortalsRequest_To_v1alpha2_ListTargetPortalsRequest is an autogenerated conversion function. -func Convert_internal_ListTargetPortalsRequest_To_v1alpha2_ListTargetPortalsRequest(in *internal.ListTargetPortalsRequest, out *v1alpha2.ListTargetPortalsRequest) error { - return autoConvert_internal_ListTargetPortalsRequest_To_v1alpha2_ListTargetPortalsRequest(in, out) -} - -func autoConvert_v1alpha2_ListTargetPortalsResponse_To_internal_ListTargetPortalsResponse(in *v1alpha2.ListTargetPortalsResponse, out *internal.ListTargetPortalsResponse) error { - if in.TargetPortals != nil { - in, out := &in.TargetPortals, &out.TargetPortals - *out = make([]*internal.TargetPortal, len(*in)) - for i := range *in { - if err := Convert_v1alpha2_TargetPortal_To_internal_TargetPortal(*&(*in)[i], *&(*out)[i]); err != nil { - return err - } - } - } else { - out.TargetPortals = nil - } - return nil -} - -// Convert_v1alpha2_ListTargetPortalsResponse_To_internal_ListTargetPortalsResponse is an autogenerated conversion function. -func Convert_v1alpha2_ListTargetPortalsResponse_To_internal_ListTargetPortalsResponse(in *v1alpha2.ListTargetPortalsResponse, out *internal.ListTargetPortalsResponse) error { - return autoConvert_v1alpha2_ListTargetPortalsResponse_To_internal_ListTargetPortalsResponse(in, out) -} - -// detected external conversion function -// Convert_internal_ListTargetPortalsResponse_To_v1alpha2_ListTargetPortalsResponse(in *internal.ListTargetPortalsResponse, out *v1alpha2.ListTargetPortalsResponse) error -// skipping generation of the auto function - -func autoConvert_v1alpha2_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest(in *v1alpha2.RemoveTargetPortalRequest, out *internal.RemoveTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(internal.TargetPortal) - if err := Convert_v1alpha2_TargetPortal_To_internal_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_v1alpha2_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest is an autogenerated conversion function. -func Convert_v1alpha2_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest(in *v1alpha2.RemoveTargetPortalRequest, out *internal.RemoveTargetPortalRequest) error { - return autoConvert_v1alpha2_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest(in, out) -} - -func autoConvert_internal_RemoveTargetPortalRequest_To_v1alpha2_RemoveTargetPortalRequest(in *internal.RemoveTargetPortalRequest, out *v1alpha2.RemoveTargetPortalRequest) error { - if in.TargetPortal != nil { - in, out := &in.TargetPortal, &out.TargetPortal - *out = new(v1alpha2.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { - return err - } - } else { - out.TargetPortal = nil - } - return nil -} - -// Convert_internal_RemoveTargetPortalRequest_To_v1alpha2_RemoveTargetPortalRequest is an autogenerated conversion function. -func Convert_internal_RemoveTargetPortalRequest_To_v1alpha2_RemoveTargetPortalRequest(in *internal.RemoveTargetPortalRequest, out *v1alpha2.RemoveTargetPortalRequest) error { - return autoConvert_internal_RemoveTargetPortalRequest_To_v1alpha2_RemoveTargetPortalRequest(in, out) -} - -func autoConvert_v1alpha2_RemoveTargetPortalResponse_To_internal_RemoveTargetPortalResponse(in *v1alpha2.RemoveTargetPortalResponse, out *internal.RemoveTargetPortalResponse) error { - return nil -} - -// Convert_v1alpha2_RemoveTargetPortalResponse_To_internal_RemoveTargetPortalResponse is an autogenerated conversion function. -func Convert_v1alpha2_RemoveTargetPortalResponse_To_internal_RemoveTargetPortalResponse(in *v1alpha2.RemoveTargetPortalResponse, out *internal.RemoveTargetPortalResponse) error { - return autoConvert_v1alpha2_RemoveTargetPortalResponse_To_internal_RemoveTargetPortalResponse(in, out) -} - -func autoConvert_internal_RemoveTargetPortalResponse_To_v1alpha2_RemoveTargetPortalResponse(in *internal.RemoveTargetPortalResponse, out *v1alpha2.RemoveTargetPortalResponse) error { - return nil -} - -// Convert_internal_RemoveTargetPortalResponse_To_v1alpha2_RemoveTargetPortalResponse is an autogenerated conversion function. -func Convert_internal_RemoveTargetPortalResponse_To_v1alpha2_RemoveTargetPortalResponse(in *internal.RemoveTargetPortalResponse, out *v1alpha2.RemoveTargetPortalResponse) error { - return autoConvert_internal_RemoveTargetPortalResponse_To_v1alpha2_RemoveTargetPortalResponse(in, out) -} - -func autoConvert_v1alpha2_SetMutualChapSecretRequest_To_internal_SetMutualChapSecretRequest(in *v1alpha2.SetMutualChapSecretRequest, out *internal.SetMutualChapSecretRequest) error { - out.MutualChapSecret = in.MutualChapSecret - return nil -} - -// Convert_v1alpha2_SetMutualChapSecretRequest_To_internal_SetMutualChapSecretRequest is an autogenerated conversion function. -func Convert_v1alpha2_SetMutualChapSecretRequest_To_internal_SetMutualChapSecretRequest(in *v1alpha2.SetMutualChapSecretRequest, out *internal.SetMutualChapSecretRequest) error { - return autoConvert_v1alpha2_SetMutualChapSecretRequest_To_internal_SetMutualChapSecretRequest(in, out) -} - -func autoConvert_internal_SetMutualChapSecretRequest_To_v1alpha2_SetMutualChapSecretRequest(in *internal.SetMutualChapSecretRequest, out *v1alpha2.SetMutualChapSecretRequest) error { - out.MutualChapSecret = in.MutualChapSecret - return nil -} - -// Convert_internal_SetMutualChapSecretRequest_To_v1alpha2_SetMutualChapSecretRequest is an autogenerated conversion function. -func Convert_internal_SetMutualChapSecretRequest_To_v1alpha2_SetMutualChapSecretRequest(in *internal.SetMutualChapSecretRequest, out *v1alpha2.SetMutualChapSecretRequest) error { - return autoConvert_internal_SetMutualChapSecretRequest_To_v1alpha2_SetMutualChapSecretRequest(in, out) -} - -func autoConvert_v1alpha2_SetMutualChapSecretResponse_To_internal_SetMutualChapSecretResponse(in *v1alpha2.SetMutualChapSecretResponse, out *internal.SetMutualChapSecretResponse) error { - return nil -} - -// Convert_v1alpha2_SetMutualChapSecretResponse_To_internal_SetMutualChapSecretResponse is an autogenerated conversion function. -func Convert_v1alpha2_SetMutualChapSecretResponse_To_internal_SetMutualChapSecretResponse(in *v1alpha2.SetMutualChapSecretResponse, out *internal.SetMutualChapSecretResponse) error { - return autoConvert_v1alpha2_SetMutualChapSecretResponse_To_internal_SetMutualChapSecretResponse(in, out) -} - -func autoConvert_internal_SetMutualChapSecretResponse_To_v1alpha2_SetMutualChapSecretResponse(in *internal.SetMutualChapSecretResponse, out *v1alpha2.SetMutualChapSecretResponse) error { - return nil -} - -// Convert_internal_SetMutualChapSecretResponse_To_v1alpha2_SetMutualChapSecretResponse is an autogenerated conversion function. -func Convert_internal_SetMutualChapSecretResponse_To_v1alpha2_SetMutualChapSecretResponse(in *internal.SetMutualChapSecretResponse, out *v1alpha2.SetMutualChapSecretResponse) error { - return autoConvert_internal_SetMutualChapSecretResponse_To_v1alpha2_SetMutualChapSecretResponse(in, out) -} - -func autoConvert_v1alpha2_TargetPortal_To_internal_TargetPortal(in *v1alpha2.TargetPortal, out *internal.TargetPortal) error { - out.TargetAddress = in.TargetAddress - out.TargetPort = in.TargetPort - return nil -} - -// Convert_v1alpha2_TargetPortal_To_internal_TargetPortal is an autogenerated conversion function. -func Convert_v1alpha2_TargetPortal_To_internal_TargetPortal(in *v1alpha2.TargetPortal, out *internal.TargetPortal) error { - return autoConvert_v1alpha2_TargetPortal_To_internal_TargetPortal(in, out) -} - -func autoConvert_internal_TargetPortal_To_v1alpha2_TargetPortal(in *internal.TargetPortal, out *v1alpha2.TargetPortal) error { - out.TargetAddress = in.TargetAddress - out.TargetPort = in.TargetPort - return nil -} - -// Convert_internal_TargetPortal_To_v1alpha2_TargetPortal is an autogenerated conversion function. -func Convert_internal_TargetPortal_To_v1alpha2_TargetPortal(in *internal.TargetPortal, out *v1alpha2.TargetPortal) error { - return autoConvert_internal_TargetPortal_To_v1alpha2_TargetPortal(in, out) -} diff --git a/internal/server/smb/internal/v1alpha1/conversion_generated.go b/internal/server/smb/internal/v1alpha1/conversion_generated.go deleted file mode 100644 index 1101e468..00000000 --- a/internal/server/smb/internal/v1alpha1/conversion_generated.go +++ /dev/null @@ -1,90 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1alpha1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal" -) - -func autoConvert_v1alpha1_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(in *v1alpha1.NewSmbGlobalMappingRequest, out *internal.NewSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - out.LocalPath = in.LocalPath - out.Username = in.Username - out.Password = in.Password - return nil -} - -// Convert_v1alpha1_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_v1alpha1_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(in *v1alpha1.NewSmbGlobalMappingRequest, out *internal.NewSmbGlobalMappingRequest) error { - return autoConvert_v1alpha1_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(in, out) -} - -func autoConvert_internal_NewSmbGlobalMappingRequest_To_v1alpha1_NewSmbGlobalMappingRequest(in *internal.NewSmbGlobalMappingRequest, out *v1alpha1.NewSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - out.LocalPath = in.LocalPath - out.Username = in.Username - out.Password = in.Password - return nil -} - -// Convert_internal_NewSmbGlobalMappingRequest_To_v1alpha1_NewSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_internal_NewSmbGlobalMappingRequest_To_v1alpha1_NewSmbGlobalMappingRequest(in *internal.NewSmbGlobalMappingRequest, out *v1alpha1.NewSmbGlobalMappingRequest) error { - return autoConvert_internal_NewSmbGlobalMappingRequest_To_v1alpha1_NewSmbGlobalMappingRequest(in, out) -} - -func autoConvert_v1alpha1_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse(in *v1alpha1.NewSmbGlobalMappingResponse, out *internal.NewSmbGlobalMappingResponse) error { - return nil -} - -// Convert_v1alpha1_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_v1alpha1_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse(in *v1alpha1.NewSmbGlobalMappingResponse, out *internal.NewSmbGlobalMappingResponse) error { - return autoConvert_v1alpha1_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse(in, out) -} - -func autoConvert_internal_NewSmbGlobalMappingResponse_To_v1alpha1_NewSmbGlobalMappingResponse(in *internal.NewSmbGlobalMappingResponse, out *v1alpha1.NewSmbGlobalMappingResponse) error { - return nil -} - -// Convert_internal_NewSmbGlobalMappingResponse_To_v1alpha1_NewSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_internal_NewSmbGlobalMappingResponse_To_v1alpha1_NewSmbGlobalMappingResponse(in *internal.NewSmbGlobalMappingResponse, out *v1alpha1.NewSmbGlobalMappingResponse) error { - return autoConvert_internal_NewSmbGlobalMappingResponse_To_v1alpha1_NewSmbGlobalMappingResponse(in, out) -} - -func autoConvert_v1alpha1_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(in *v1alpha1.RemoveSmbGlobalMappingRequest, out *internal.RemoveSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - return nil -} - -// Convert_v1alpha1_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_v1alpha1_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(in *v1alpha1.RemoveSmbGlobalMappingRequest, out *internal.RemoveSmbGlobalMappingRequest) error { - return autoConvert_v1alpha1_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(in, out) -} - -func autoConvert_internal_RemoveSmbGlobalMappingRequest_To_v1alpha1_RemoveSmbGlobalMappingRequest(in *internal.RemoveSmbGlobalMappingRequest, out *v1alpha1.RemoveSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - return nil -} - -// Convert_internal_RemoveSmbGlobalMappingRequest_To_v1alpha1_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_internal_RemoveSmbGlobalMappingRequest_To_v1alpha1_RemoveSmbGlobalMappingRequest(in *internal.RemoveSmbGlobalMappingRequest, out *v1alpha1.RemoveSmbGlobalMappingRequest) error { - return autoConvert_internal_RemoveSmbGlobalMappingRequest_To_v1alpha1_RemoveSmbGlobalMappingRequest(in, out) -} - -func autoConvert_v1alpha1_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse(in *v1alpha1.RemoveSmbGlobalMappingResponse, out *internal.RemoveSmbGlobalMappingResponse) error { - return nil -} - -// Convert_v1alpha1_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_v1alpha1_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse(in *v1alpha1.RemoveSmbGlobalMappingResponse, out *internal.RemoveSmbGlobalMappingResponse) error { - return autoConvert_v1alpha1_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse(in, out) -} - -func autoConvert_internal_RemoveSmbGlobalMappingResponse_To_v1alpha1_RemoveSmbGlobalMappingResponse(in *internal.RemoveSmbGlobalMappingResponse, out *v1alpha1.RemoveSmbGlobalMappingResponse) error { - return nil -} - -// Convert_internal_RemoveSmbGlobalMappingResponse_To_v1alpha1_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_internal_RemoveSmbGlobalMappingResponse_To_v1alpha1_RemoveSmbGlobalMappingResponse(in *internal.RemoveSmbGlobalMappingResponse, out *v1alpha1.RemoveSmbGlobalMappingResponse) error { - return autoConvert_internal_RemoveSmbGlobalMappingResponse_To_v1alpha1_RemoveSmbGlobalMappingResponse(in, out) -} diff --git a/internal/server/smb/internal/v1beta1/conversion_generated.go b/internal/server/smb/internal/v1beta1/conversion_generated.go deleted file mode 100644 index b348e524..00000000 --- a/internal/server/smb/internal/v1beta1/conversion_generated.go +++ /dev/null @@ -1,90 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1beta1 - -import ( - v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1beta1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal" -) - -func autoConvert_v1beta1_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(in *v1beta1.NewSmbGlobalMappingRequest, out *internal.NewSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - out.LocalPath = in.LocalPath - out.Username = in.Username - out.Password = in.Password - return nil -} - -// Convert_v1beta1_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_v1beta1_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(in *v1beta1.NewSmbGlobalMappingRequest, out *internal.NewSmbGlobalMappingRequest) error { - return autoConvert_v1beta1_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(in, out) -} - -func autoConvert_internal_NewSmbGlobalMappingRequest_To_v1beta1_NewSmbGlobalMappingRequest(in *internal.NewSmbGlobalMappingRequest, out *v1beta1.NewSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - out.LocalPath = in.LocalPath - out.Username = in.Username - out.Password = in.Password - return nil -} - -// Convert_internal_NewSmbGlobalMappingRequest_To_v1beta1_NewSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_internal_NewSmbGlobalMappingRequest_To_v1beta1_NewSmbGlobalMappingRequest(in *internal.NewSmbGlobalMappingRequest, out *v1beta1.NewSmbGlobalMappingRequest) error { - return autoConvert_internal_NewSmbGlobalMappingRequest_To_v1beta1_NewSmbGlobalMappingRequest(in, out) -} - -func autoConvert_v1beta1_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse(in *v1beta1.NewSmbGlobalMappingResponse, out *internal.NewSmbGlobalMappingResponse) error { - return nil -} - -// Convert_v1beta1_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_v1beta1_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse(in *v1beta1.NewSmbGlobalMappingResponse, out *internal.NewSmbGlobalMappingResponse) error { - return autoConvert_v1beta1_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse(in, out) -} - -func autoConvert_internal_NewSmbGlobalMappingResponse_To_v1beta1_NewSmbGlobalMappingResponse(in *internal.NewSmbGlobalMappingResponse, out *v1beta1.NewSmbGlobalMappingResponse) error { - return nil -} - -// Convert_internal_NewSmbGlobalMappingResponse_To_v1beta1_NewSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_internal_NewSmbGlobalMappingResponse_To_v1beta1_NewSmbGlobalMappingResponse(in *internal.NewSmbGlobalMappingResponse, out *v1beta1.NewSmbGlobalMappingResponse) error { - return autoConvert_internal_NewSmbGlobalMappingResponse_To_v1beta1_NewSmbGlobalMappingResponse(in, out) -} - -func autoConvert_v1beta1_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(in *v1beta1.RemoveSmbGlobalMappingRequest, out *internal.RemoveSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - return nil -} - -// Convert_v1beta1_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_v1beta1_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(in *v1beta1.RemoveSmbGlobalMappingRequest, out *internal.RemoveSmbGlobalMappingRequest) error { - return autoConvert_v1beta1_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(in, out) -} - -func autoConvert_internal_RemoveSmbGlobalMappingRequest_To_v1beta1_RemoveSmbGlobalMappingRequest(in *internal.RemoveSmbGlobalMappingRequest, out *v1beta1.RemoveSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - return nil -} - -// Convert_internal_RemoveSmbGlobalMappingRequest_To_v1beta1_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_internal_RemoveSmbGlobalMappingRequest_To_v1beta1_RemoveSmbGlobalMappingRequest(in *internal.RemoveSmbGlobalMappingRequest, out *v1beta1.RemoveSmbGlobalMappingRequest) error { - return autoConvert_internal_RemoveSmbGlobalMappingRequest_To_v1beta1_RemoveSmbGlobalMappingRequest(in, out) -} - -func autoConvert_v1beta1_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse(in *v1beta1.RemoveSmbGlobalMappingResponse, out *internal.RemoveSmbGlobalMappingResponse) error { - return nil -} - -// Convert_v1beta1_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_v1beta1_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse(in *v1beta1.RemoveSmbGlobalMappingResponse, out *internal.RemoveSmbGlobalMappingResponse) error { - return autoConvert_v1beta1_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse(in, out) -} - -func autoConvert_internal_RemoveSmbGlobalMappingResponse_To_v1beta1_RemoveSmbGlobalMappingResponse(in *internal.RemoveSmbGlobalMappingResponse, out *v1beta1.RemoveSmbGlobalMappingResponse) error { - return nil -} - -// Convert_internal_RemoveSmbGlobalMappingResponse_To_v1beta1_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_internal_RemoveSmbGlobalMappingResponse_To_v1beta1_RemoveSmbGlobalMappingResponse(in *internal.RemoveSmbGlobalMappingResponse, out *v1beta1.RemoveSmbGlobalMappingResponse) error { - return autoConvert_internal_RemoveSmbGlobalMappingResponse_To_v1beta1_RemoveSmbGlobalMappingResponse(in, out) -} diff --git a/internal/server/smb/internal/v1beta2/conversion_generated.go b/internal/server/smb/internal/v1beta2/conversion_generated.go deleted file mode 100644 index 0ccdb67b..00000000 --- a/internal/server/smb/internal/v1beta2/conversion_generated.go +++ /dev/null @@ -1,90 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1beta2 - -import ( - v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1beta2" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal" -) - -func autoConvert_v1beta2_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(in *v1beta2.NewSmbGlobalMappingRequest, out *internal.NewSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - out.LocalPath = in.LocalPath - out.Username = in.Username - out.Password = in.Password - return nil -} - -// Convert_v1beta2_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_v1beta2_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(in *v1beta2.NewSmbGlobalMappingRequest, out *internal.NewSmbGlobalMappingRequest) error { - return autoConvert_v1beta2_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(in, out) -} - -func autoConvert_internal_NewSmbGlobalMappingRequest_To_v1beta2_NewSmbGlobalMappingRequest(in *internal.NewSmbGlobalMappingRequest, out *v1beta2.NewSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - out.LocalPath = in.LocalPath - out.Username = in.Username - out.Password = in.Password - return nil -} - -// Convert_internal_NewSmbGlobalMappingRequest_To_v1beta2_NewSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_internal_NewSmbGlobalMappingRequest_To_v1beta2_NewSmbGlobalMappingRequest(in *internal.NewSmbGlobalMappingRequest, out *v1beta2.NewSmbGlobalMappingRequest) error { - return autoConvert_internal_NewSmbGlobalMappingRequest_To_v1beta2_NewSmbGlobalMappingRequest(in, out) -} - -func autoConvert_v1beta2_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse(in *v1beta2.NewSmbGlobalMappingResponse, out *internal.NewSmbGlobalMappingResponse) error { - return nil -} - -// Convert_v1beta2_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_v1beta2_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse(in *v1beta2.NewSmbGlobalMappingResponse, out *internal.NewSmbGlobalMappingResponse) error { - return autoConvert_v1beta2_NewSmbGlobalMappingResponse_To_internal_NewSmbGlobalMappingResponse(in, out) -} - -func autoConvert_internal_NewSmbGlobalMappingResponse_To_v1beta2_NewSmbGlobalMappingResponse(in *internal.NewSmbGlobalMappingResponse, out *v1beta2.NewSmbGlobalMappingResponse) error { - return nil -} - -// Convert_internal_NewSmbGlobalMappingResponse_To_v1beta2_NewSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_internal_NewSmbGlobalMappingResponse_To_v1beta2_NewSmbGlobalMappingResponse(in *internal.NewSmbGlobalMappingResponse, out *v1beta2.NewSmbGlobalMappingResponse) error { - return autoConvert_internal_NewSmbGlobalMappingResponse_To_v1beta2_NewSmbGlobalMappingResponse(in, out) -} - -func autoConvert_v1beta2_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(in *v1beta2.RemoveSmbGlobalMappingRequest, out *internal.RemoveSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - return nil -} - -// Convert_v1beta2_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_v1beta2_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(in *v1beta2.RemoveSmbGlobalMappingRequest, out *internal.RemoveSmbGlobalMappingRequest) error { - return autoConvert_v1beta2_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(in, out) -} - -func autoConvert_internal_RemoveSmbGlobalMappingRequest_To_v1beta2_RemoveSmbGlobalMappingRequest(in *internal.RemoveSmbGlobalMappingRequest, out *v1beta2.RemoveSmbGlobalMappingRequest) error { - out.RemotePath = in.RemotePath - return nil -} - -// Convert_internal_RemoveSmbGlobalMappingRequest_To_v1beta2_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. -func Convert_internal_RemoveSmbGlobalMappingRequest_To_v1beta2_RemoveSmbGlobalMappingRequest(in *internal.RemoveSmbGlobalMappingRequest, out *v1beta2.RemoveSmbGlobalMappingRequest) error { - return autoConvert_internal_RemoveSmbGlobalMappingRequest_To_v1beta2_RemoveSmbGlobalMappingRequest(in, out) -} - -func autoConvert_v1beta2_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse(in *v1beta2.RemoveSmbGlobalMappingResponse, out *internal.RemoveSmbGlobalMappingResponse) error { - return nil -} - -// Convert_v1beta2_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_v1beta2_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse(in *v1beta2.RemoveSmbGlobalMappingResponse, out *internal.RemoveSmbGlobalMappingResponse) error { - return autoConvert_v1beta2_RemoveSmbGlobalMappingResponse_To_internal_RemoveSmbGlobalMappingResponse(in, out) -} - -func autoConvert_internal_RemoveSmbGlobalMappingResponse_To_v1beta2_RemoveSmbGlobalMappingResponse(in *internal.RemoveSmbGlobalMappingResponse, out *v1beta2.RemoveSmbGlobalMappingResponse) error { - return nil -} - -// Convert_internal_RemoveSmbGlobalMappingResponse_To_v1beta2_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. -func Convert_internal_RemoveSmbGlobalMappingResponse_To_v1beta2_RemoveSmbGlobalMappingResponse(in *internal.RemoveSmbGlobalMappingResponse, out *v1beta2.RemoveSmbGlobalMappingResponse) error { - return autoConvert_internal_RemoveSmbGlobalMappingResponse_To_v1beta2_RemoveSmbGlobalMappingResponse(in, out) -} diff --git a/internal/server/system/internal/v1alpha1/conversion_generated.go b/internal/server/system/internal/v1alpha1/conversion_generated.go deleted file mode 100644 index 7976306c..00000000 --- a/internal/server/system/internal/v1alpha1/conversion_generated.go +++ /dev/null @@ -1,168 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/system/v1alpha1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/system/internal" -) - -func autoConvert_v1alpha1_GetBIOSSerialNumberRequest_To_internal_GetBIOSSerialNumberRequest(in *v1alpha1.GetBIOSSerialNumberRequest, out *internal.GetBIOSSerialNumberRequest) error { - return nil -} - -// Convert_v1alpha1_GetBIOSSerialNumberRequest_To_internal_GetBIOSSerialNumberRequest is an autogenerated conversion function. -func Convert_v1alpha1_GetBIOSSerialNumberRequest_To_internal_GetBIOSSerialNumberRequest(in *v1alpha1.GetBIOSSerialNumberRequest, out *internal.GetBIOSSerialNumberRequest) error { - return autoConvert_v1alpha1_GetBIOSSerialNumberRequest_To_internal_GetBIOSSerialNumberRequest(in, out) -} - -func autoConvert_internal_GetBIOSSerialNumberRequest_To_v1alpha1_GetBIOSSerialNumberRequest(in *internal.GetBIOSSerialNumberRequest, out *v1alpha1.GetBIOSSerialNumberRequest) error { - return nil -} - -// Convert_internal_GetBIOSSerialNumberRequest_To_v1alpha1_GetBIOSSerialNumberRequest is an autogenerated conversion function. -func Convert_internal_GetBIOSSerialNumberRequest_To_v1alpha1_GetBIOSSerialNumberRequest(in *internal.GetBIOSSerialNumberRequest, out *v1alpha1.GetBIOSSerialNumberRequest) error { - return autoConvert_internal_GetBIOSSerialNumberRequest_To_v1alpha1_GetBIOSSerialNumberRequest(in, out) -} - -func autoConvert_v1alpha1_GetBIOSSerialNumberResponse_To_internal_GetBIOSSerialNumberResponse(in *v1alpha1.GetBIOSSerialNumberResponse, out *internal.GetBIOSSerialNumberResponse) error { - out.SerialNumber = in.SerialNumber - return nil -} - -// Convert_v1alpha1_GetBIOSSerialNumberResponse_To_internal_GetBIOSSerialNumberResponse is an autogenerated conversion function. -func Convert_v1alpha1_GetBIOSSerialNumberResponse_To_internal_GetBIOSSerialNumberResponse(in *v1alpha1.GetBIOSSerialNumberResponse, out *internal.GetBIOSSerialNumberResponse) error { - return autoConvert_v1alpha1_GetBIOSSerialNumberResponse_To_internal_GetBIOSSerialNumberResponse(in, out) -} - -func autoConvert_internal_GetBIOSSerialNumberResponse_To_v1alpha1_GetBIOSSerialNumberResponse(in *internal.GetBIOSSerialNumberResponse, out *v1alpha1.GetBIOSSerialNumberResponse) error { - out.SerialNumber = in.SerialNumber - return nil -} - -// Convert_internal_GetBIOSSerialNumberResponse_To_v1alpha1_GetBIOSSerialNumberResponse is an autogenerated conversion function. -func Convert_internal_GetBIOSSerialNumberResponse_To_v1alpha1_GetBIOSSerialNumberResponse(in *internal.GetBIOSSerialNumberResponse, out *v1alpha1.GetBIOSSerialNumberResponse) error { - return autoConvert_internal_GetBIOSSerialNumberResponse_To_v1alpha1_GetBIOSSerialNumberResponse(in, out) -} - -func autoConvert_v1alpha1_GetServiceRequest_To_internal_GetServiceRequest(in *v1alpha1.GetServiceRequest, out *internal.GetServiceRequest) error { - out.Name = in.Name - return nil -} - -// Convert_v1alpha1_GetServiceRequest_To_internal_GetServiceRequest is an autogenerated conversion function. -func Convert_v1alpha1_GetServiceRequest_To_internal_GetServiceRequest(in *v1alpha1.GetServiceRequest, out *internal.GetServiceRequest) error { - return autoConvert_v1alpha1_GetServiceRequest_To_internal_GetServiceRequest(in, out) -} - -func autoConvert_internal_GetServiceRequest_To_v1alpha1_GetServiceRequest(in *internal.GetServiceRequest, out *v1alpha1.GetServiceRequest) error { - out.Name = in.Name - return nil -} - -// Convert_internal_GetServiceRequest_To_v1alpha1_GetServiceRequest is an autogenerated conversion function. -func Convert_internal_GetServiceRequest_To_v1alpha1_GetServiceRequest(in *internal.GetServiceRequest, out *v1alpha1.GetServiceRequest) error { - return autoConvert_internal_GetServiceRequest_To_v1alpha1_GetServiceRequest(in, out) -} - -func autoConvert_v1alpha1_GetServiceResponse_To_internal_GetServiceResponse(in *v1alpha1.GetServiceResponse, out *internal.GetServiceResponse) error { - out.DisplayName = in.DisplayName - out.StartType = internal.Startype(in.StartType) - out.Status = internal.ServiceStatus(in.Status) - return nil -} - -// Convert_v1alpha1_GetServiceResponse_To_internal_GetServiceResponse is an autogenerated conversion function. -func Convert_v1alpha1_GetServiceResponse_To_internal_GetServiceResponse(in *v1alpha1.GetServiceResponse, out *internal.GetServiceResponse) error { - return autoConvert_v1alpha1_GetServiceResponse_To_internal_GetServiceResponse(in, out) -} - -func autoConvert_internal_GetServiceResponse_To_v1alpha1_GetServiceResponse(in *internal.GetServiceResponse, out *v1alpha1.GetServiceResponse) error { - out.DisplayName = in.DisplayName - out.StartType = v1alpha1.StartType(in.StartType) - out.Status = v1alpha1.ServiceStatus(in.Status) - return nil -} - -// Convert_internal_GetServiceResponse_To_v1alpha1_GetServiceResponse is an autogenerated conversion function. -func Convert_internal_GetServiceResponse_To_v1alpha1_GetServiceResponse(in *internal.GetServiceResponse, out *v1alpha1.GetServiceResponse) error { - return autoConvert_internal_GetServiceResponse_To_v1alpha1_GetServiceResponse(in, out) -} - -func autoConvert_v1alpha1_StartServiceRequest_To_internal_StartServiceRequest(in *v1alpha1.StartServiceRequest, out *internal.StartServiceRequest) error { - out.Name = in.Name - return nil -} - -// Convert_v1alpha1_StartServiceRequest_To_internal_StartServiceRequest is an autogenerated conversion function. -func Convert_v1alpha1_StartServiceRequest_To_internal_StartServiceRequest(in *v1alpha1.StartServiceRequest, out *internal.StartServiceRequest) error { - return autoConvert_v1alpha1_StartServiceRequest_To_internal_StartServiceRequest(in, out) -} - -func autoConvert_internal_StartServiceRequest_To_v1alpha1_StartServiceRequest(in *internal.StartServiceRequest, out *v1alpha1.StartServiceRequest) error { - out.Name = in.Name - return nil -} - -// Convert_internal_StartServiceRequest_To_v1alpha1_StartServiceRequest is an autogenerated conversion function. -func Convert_internal_StartServiceRequest_To_v1alpha1_StartServiceRequest(in *internal.StartServiceRequest, out *v1alpha1.StartServiceRequest) error { - return autoConvert_internal_StartServiceRequest_To_v1alpha1_StartServiceRequest(in, out) -} - -func autoConvert_v1alpha1_StartServiceResponse_To_internal_StartServiceResponse(in *v1alpha1.StartServiceResponse, out *internal.StartServiceResponse) error { - return nil -} - -// Convert_v1alpha1_StartServiceResponse_To_internal_StartServiceResponse is an autogenerated conversion function. -func Convert_v1alpha1_StartServiceResponse_To_internal_StartServiceResponse(in *v1alpha1.StartServiceResponse, out *internal.StartServiceResponse) error { - return autoConvert_v1alpha1_StartServiceResponse_To_internal_StartServiceResponse(in, out) -} - -func autoConvert_internal_StartServiceResponse_To_v1alpha1_StartServiceResponse(in *internal.StartServiceResponse, out *v1alpha1.StartServiceResponse) error { - return nil -} - -// Convert_internal_StartServiceResponse_To_v1alpha1_StartServiceResponse is an autogenerated conversion function. -func Convert_internal_StartServiceResponse_To_v1alpha1_StartServiceResponse(in *internal.StartServiceResponse, out *v1alpha1.StartServiceResponse) error { - return autoConvert_internal_StartServiceResponse_To_v1alpha1_StartServiceResponse(in, out) -} - -func autoConvert_v1alpha1_StopServiceRequest_To_internal_StopServiceRequest(in *v1alpha1.StopServiceRequest, out *internal.StopServiceRequest) error { - out.Name = in.Name - out.Force = in.Force - return nil -} - -// Convert_v1alpha1_StopServiceRequest_To_internal_StopServiceRequest is an autogenerated conversion function. -func Convert_v1alpha1_StopServiceRequest_To_internal_StopServiceRequest(in *v1alpha1.StopServiceRequest, out *internal.StopServiceRequest) error { - return autoConvert_v1alpha1_StopServiceRequest_To_internal_StopServiceRequest(in, out) -} - -func autoConvert_internal_StopServiceRequest_To_v1alpha1_StopServiceRequest(in *internal.StopServiceRequest, out *v1alpha1.StopServiceRequest) error { - out.Name = in.Name - out.Force = in.Force - return nil -} - -// Convert_internal_StopServiceRequest_To_v1alpha1_StopServiceRequest is an autogenerated conversion function. -func Convert_internal_StopServiceRequest_To_v1alpha1_StopServiceRequest(in *internal.StopServiceRequest, out *v1alpha1.StopServiceRequest) error { - return autoConvert_internal_StopServiceRequest_To_v1alpha1_StopServiceRequest(in, out) -} - -func autoConvert_v1alpha1_StopServiceResponse_To_internal_StopServiceResponse(in *v1alpha1.StopServiceResponse, out *internal.StopServiceResponse) error { - return nil -} - -// Convert_v1alpha1_StopServiceResponse_To_internal_StopServiceResponse is an autogenerated conversion function. -func Convert_v1alpha1_StopServiceResponse_To_internal_StopServiceResponse(in *v1alpha1.StopServiceResponse, out *internal.StopServiceResponse) error { - return autoConvert_v1alpha1_StopServiceResponse_To_internal_StopServiceResponse(in, out) -} - -func autoConvert_internal_StopServiceResponse_To_v1alpha1_StopServiceResponse(in *internal.StopServiceResponse, out *v1alpha1.StopServiceResponse) error { - return nil -} - -// Convert_internal_StopServiceResponse_To_v1alpha1_StopServiceResponse is an autogenerated conversion function. -func Convert_internal_StopServiceResponse_To_v1alpha1_StopServiceResponse(in *internal.StopServiceResponse, out *v1alpha1.StopServiceResponse) error { - return autoConvert_internal_StopServiceResponse_To_v1alpha1_StopServiceResponse(in, out) -} diff --git a/internal/server/volume/internal/v1alpha1/conversion.go b/internal/server/volume/internal/v1alpha1/conversion.go deleted file mode 100644 index f187962a..00000000 --- a/internal/server/volume/internal/v1alpha1/conversion.go +++ /dev/null @@ -1,49 +0,0 @@ -package v1alpha1 - -import ( - "fmt" - "strconv" - - "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1alpha1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" -) - -// Add manual conversion functions here to override automatic conversion functions - -func Convert_v1alpha1_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(in *v1alpha1.ListVolumesOnDiskRequest, out *internal.ListVolumesOnDiskRequest) error { - diskIDUint, err := strconv.ParseUint(in.DiskId, 10, 64) - if err != nil { - return fmt.Errorf("Failed to parse diskId: err=%+v", err) - } - out.DiskNumber = uint32(diskIDUint) - return nil -} - -func Convert_internal_ListVolumesOnDiskRequest_To_v1alpha1_ListVolumesOnDiskRequest(in *internal.ListVolumesOnDiskRequest, out *v1alpha1.ListVolumesOnDiskRequest) error { - out.DiskId = strconv.FormatUint(uint64(in.DiskNumber), 10) - return nil -} - -func Convert_v1alpha1_MountVolumeRequest_To_internal_MountVolumeRequest(in *v1alpha1.MountVolumeRequest, out *internal.MountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.TargetPath = in.Path - return nil -} - -func Convert_internal_MountVolumeRequest_To_v1alpha1_MountVolumeRequest(in *internal.MountVolumeRequest, out *v1alpha1.MountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Path = in.TargetPath - return nil -} - -func Convert_v1alpha1_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(in *v1alpha1.ResizeVolumeRequest, out *internal.ResizeVolumeRequest) error { - out.VolumeId = in.VolumeId - out.SizeBytes = in.Size - return nil -} - -func Convert_internal_ResizeVolumeRequest_To_v1alpha1_ResizeVolumeRequest(in *internal.ResizeVolumeRequest, out *v1alpha1.ResizeVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Size = in.SizeBytes - return nil -} diff --git a/internal/server/volume/internal/v1alpha1/conversion_generated.go b/internal/server/volume/internal/v1alpha1/conversion_generated.go deleted file mode 100644 index 61d62f8d..00000000 --- a/internal/server/volume/internal/v1alpha1/conversion_generated.go +++ /dev/null @@ -1,208 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - unsafe "unsafe" - - v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1alpha1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" -) - -func autoConvert_v1alpha1_DismountVolumeRequest_To_internal_DismountVolumeRequest(in *v1alpha1.DismountVolumeRequest, out *internal.DismountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Path = in.Path - return nil -} - -// Convert_v1alpha1_DismountVolumeRequest_To_internal_DismountVolumeRequest is an autogenerated conversion function. -func Convert_v1alpha1_DismountVolumeRequest_To_internal_DismountVolumeRequest(in *v1alpha1.DismountVolumeRequest, out *internal.DismountVolumeRequest) error { - return autoConvert_v1alpha1_DismountVolumeRequest_To_internal_DismountVolumeRequest(in, out) -} - -func autoConvert_internal_DismountVolumeRequest_To_v1alpha1_DismountVolumeRequest(in *internal.DismountVolumeRequest, out *v1alpha1.DismountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Path = in.Path - return nil -} - -// Convert_internal_DismountVolumeRequest_To_v1alpha1_DismountVolumeRequest is an autogenerated conversion function. -func Convert_internal_DismountVolumeRequest_To_v1alpha1_DismountVolumeRequest(in *internal.DismountVolumeRequest, out *v1alpha1.DismountVolumeRequest) error { - return autoConvert_internal_DismountVolumeRequest_To_v1alpha1_DismountVolumeRequest(in, out) -} - -func autoConvert_v1alpha1_DismountVolumeResponse_To_internal_DismountVolumeResponse(in *v1alpha1.DismountVolumeResponse, out *internal.DismountVolumeResponse) error { - return nil -} - -// Convert_v1alpha1_DismountVolumeResponse_To_internal_DismountVolumeResponse is an autogenerated conversion function. -func Convert_v1alpha1_DismountVolumeResponse_To_internal_DismountVolumeResponse(in *v1alpha1.DismountVolumeResponse, out *internal.DismountVolumeResponse) error { - return autoConvert_v1alpha1_DismountVolumeResponse_To_internal_DismountVolumeResponse(in, out) -} - -func autoConvert_internal_DismountVolumeResponse_To_v1alpha1_DismountVolumeResponse(in *internal.DismountVolumeResponse, out *v1alpha1.DismountVolumeResponse) error { - return nil -} - -// Convert_internal_DismountVolumeResponse_To_v1alpha1_DismountVolumeResponse is an autogenerated conversion function. -func Convert_internal_DismountVolumeResponse_To_v1alpha1_DismountVolumeResponse(in *internal.DismountVolumeResponse, out *v1alpha1.DismountVolumeResponse) error { - return autoConvert_internal_DismountVolumeResponse_To_v1alpha1_DismountVolumeResponse(in, out) -} - -func autoConvert_v1alpha1_FormatVolumeRequest_To_internal_FormatVolumeRequest(in *v1alpha1.FormatVolumeRequest, out *internal.FormatVolumeRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1alpha1_FormatVolumeRequest_To_internal_FormatVolumeRequest is an autogenerated conversion function. -func Convert_v1alpha1_FormatVolumeRequest_To_internal_FormatVolumeRequest(in *v1alpha1.FormatVolumeRequest, out *internal.FormatVolumeRequest) error { - return autoConvert_v1alpha1_FormatVolumeRequest_To_internal_FormatVolumeRequest(in, out) -} - -func autoConvert_internal_FormatVolumeRequest_To_v1alpha1_FormatVolumeRequest(in *internal.FormatVolumeRequest, out *v1alpha1.FormatVolumeRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_FormatVolumeRequest_To_v1alpha1_FormatVolumeRequest is an autogenerated conversion function. -func Convert_internal_FormatVolumeRequest_To_v1alpha1_FormatVolumeRequest(in *internal.FormatVolumeRequest, out *v1alpha1.FormatVolumeRequest) error { - return autoConvert_internal_FormatVolumeRequest_To_v1alpha1_FormatVolumeRequest(in, out) -} - -func autoConvert_v1alpha1_FormatVolumeResponse_To_internal_FormatVolumeResponse(in *v1alpha1.FormatVolumeResponse, out *internal.FormatVolumeResponse) error { - return nil -} - -// Convert_v1alpha1_FormatVolumeResponse_To_internal_FormatVolumeResponse is an autogenerated conversion function. -func Convert_v1alpha1_FormatVolumeResponse_To_internal_FormatVolumeResponse(in *v1alpha1.FormatVolumeResponse, out *internal.FormatVolumeResponse) error { - return autoConvert_v1alpha1_FormatVolumeResponse_To_internal_FormatVolumeResponse(in, out) -} - -func autoConvert_internal_FormatVolumeResponse_To_v1alpha1_FormatVolumeResponse(in *internal.FormatVolumeResponse, out *v1alpha1.FormatVolumeResponse) error { - return nil -} - -// Convert_internal_FormatVolumeResponse_To_v1alpha1_FormatVolumeResponse is an autogenerated conversion function. -func Convert_internal_FormatVolumeResponse_To_v1alpha1_FormatVolumeResponse(in *internal.FormatVolumeResponse, out *v1alpha1.FormatVolumeResponse) error { - return autoConvert_internal_FormatVolumeResponse_To_v1alpha1_FormatVolumeResponse(in, out) -} - -func autoConvert_v1alpha1_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in *v1alpha1.IsVolumeFormattedRequest, out *internal.IsVolumeFormattedRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1alpha1_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest is an autogenerated conversion function. -func Convert_v1alpha1_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in *v1alpha1.IsVolumeFormattedRequest, out *internal.IsVolumeFormattedRequest) error { - return autoConvert_v1alpha1_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in, out) -} - -func autoConvert_internal_IsVolumeFormattedRequest_To_v1alpha1_IsVolumeFormattedRequest(in *internal.IsVolumeFormattedRequest, out *v1alpha1.IsVolumeFormattedRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_IsVolumeFormattedRequest_To_v1alpha1_IsVolumeFormattedRequest is an autogenerated conversion function. -func Convert_internal_IsVolumeFormattedRequest_To_v1alpha1_IsVolumeFormattedRequest(in *internal.IsVolumeFormattedRequest, out *v1alpha1.IsVolumeFormattedRequest) error { - return autoConvert_internal_IsVolumeFormattedRequest_To_v1alpha1_IsVolumeFormattedRequest(in, out) -} - -func autoConvert_v1alpha1_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in *v1alpha1.IsVolumeFormattedResponse, out *internal.IsVolumeFormattedResponse) error { - out.Formatted = in.Formatted - return nil -} - -// Convert_v1alpha1_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse is an autogenerated conversion function. -func Convert_v1alpha1_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in *v1alpha1.IsVolumeFormattedResponse, out *internal.IsVolumeFormattedResponse) error { - return autoConvert_v1alpha1_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in, out) -} - -func autoConvert_internal_IsVolumeFormattedResponse_To_v1alpha1_IsVolumeFormattedResponse(in *internal.IsVolumeFormattedResponse, out *v1alpha1.IsVolumeFormattedResponse) error { - out.Formatted = in.Formatted - return nil -} - -// Convert_internal_IsVolumeFormattedResponse_To_v1alpha1_IsVolumeFormattedResponse is an autogenerated conversion function. -func Convert_internal_IsVolumeFormattedResponse_To_v1alpha1_IsVolumeFormattedResponse(in *internal.IsVolumeFormattedResponse, out *v1alpha1.IsVolumeFormattedResponse) error { - return autoConvert_internal_IsVolumeFormattedResponse_To_v1alpha1_IsVolumeFormattedResponse(in, out) -} - -// detected external conversion function -// Convert_v1alpha1_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(in *v1alpha1.ListVolumesOnDiskRequest, out *internal.ListVolumesOnDiskRequest) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ListVolumesOnDiskRequest_To_v1alpha1_ListVolumesOnDiskRequest(in *internal.ListVolumesOnDiskRequest, out *v1alpha1.ListVolumesOnDiskRequest) error -// skipping generation of the auto function - -func autoConvert_v1alpha1_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in *v1alpha1.ListVolumesOnDiskResponse, out *internal.ListVolumesOnDiskResponse) error { - out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) - return nil -} - -// Convert_v1alpha1_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse is an autogenerated conversion function. -func Convert_v1alpha1_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in *v1alpha1.ListVolumesOnDiskResponse, out *internal.ListVolumesOnDiskResponse) error { - return autoConvert_v1alpha1_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in, out) -} - -func autoConvert_internal_ListVolumesOnDiskResponse_To_v1alpha1_ListVolumesOnDiskResponse(in *internal.ListVolumesOnDiskResponse, out *v1alpha1.ListVolumesOnDiskResponse) error { - out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) - return nil -} - -// Convert_internal_ListVolumesOnDiskResponse_To_v1alpha1_ListVolumesOnDiskResponse is an autogenerated conversion function. -func Convert_internal_ListVolumesOnDiskResponse_To_v1alpha1_ListVolumesOnDiskResponse(in *internal.ListVolumesOnDiskResponse, out *v1alpha1.ListVolumesOnDiskResponse) error { - return autoConvert_internal_ListVolumesOnDiskResponse_To_v1alpha1_ListVolumesOnDiskResponse(in, out) -} - -// detected external conversion function -// Convert_v1alpha1_MountVolumeRequest_To_internal_MountVolumeRequest(in *v1alpha1.MountVolumeRequest, out *internal.MountVolumeRequest) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_MountVolumeRequest_To_v1alpha1_MountVolumeRequest(in *internal.MountVolumeRequest, out *v1alpha1.MountVolumeRequest) error -// skipping generation of the auto function - -func autoConvert_v1alpha1_MountVolumeResponse_To_internal_MountVolumeResponse(in *v1alpha1.MountVolumeResponse, out *internal.MountVolumeResponse) error { - return nil -} - -// Convert_v1alpha1_MountVolumeResponse_To_internal_MountVolumeResponse is an autogenerated conversion function. -func Convert_v1alpha1_MountVolumeResponse_To_internal_MountVolumeResponse(in *v1alpha1.MountVolumeResponse, out *internal.MountVolumeResponse) error { - return autoConvert_v1alpha1_MountVolumeResponse_To_internal_MountVolumeResponse(in, out) -} - -func autoConvert_internal_MountVolumeResponse_To_v1alpha1_MountVolumeResponse(in *internal.MountVolumeResponse, out *v1alpha1.MountVolumeResponse) error { - return nil -} - -// Convert_internal_MountVolumeResponse_To_v1alpha1_MountVolumeResponse is an autogenerated conversion function. -func Convert_internal_MountVolumeResponse_To_v1alpha1_MountVolumeResponse(in *internal.MountVolumeResponse, out *v1alpha1.MountVolumeResponse) error { - return autoConvert_internal_MountVolumeResponse_To_v1alpha1_MountVolumeResponse(in, out) -} - -// detected external conversion function -// Convert_v1alpha1_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(in *v1alpha1.ResizeVolumeRequest, out *internal.ResizeVolumeRequest) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ResizeVolumeRequest_To_v1alpha1_ResizeVolumeRequest(in *internal.ResizeVolumeRequest, out *v1alpha1.ResizeVolumeRequest) error -// skipping generation of the auto function - -func autoConvert_v1alpha1_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in *v1alpha1.ResizeVolumeResponse, out *internal.ResizeVolumeResponse) error { - return nil -} - -// Convert_v1alpha1_ResizeVolumeResponse_To_internal_ResizeVolumeResponse is an autogenerated conversion function. -func Convert_v1alpha1_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in *v1alpha1.ResizeVolumeResponse, out *internal.ResizeVolumeResponse) error { - return autoConvert_v1alpha1_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in, out) -} - -func autoConvert_internal_ResizeVolumeResponse_To_v1alpha1_ResizeVolumeResponse(in *internal.ResizeVolumeResponse, out *v1alpha1.ResizeVolumeResponse) error { - return nil -} - -// Convert_internal_ResizeVolumeResponse_To_v1alpha1_ResizeVolumeResponse is an autogenerated conversion function. -func Convert_internal_ResizeVolumeResponse_To_v1alpha1_ResizeVolumeResponse(in *internal.ResizeVolumeResponse, out *v1alpha1.ResizeVolumeResponse) error { - return autoConvert_internal_ResizeVolumeResponse_To_v1alpha1_ResizeVolumeResponse(in, out) -} diff --git a/internal/server/volume/internal/v1beta1/conversion.go b/internal/server/volume/internal/v1beta1/conversion.go deleted file mode 100644 index 60c34320..00000000 --- a/internal/server/volume/internal/v1beta1/conversion.go +++ /dev/null @@ -1,49 +0,0 @@ -package v1beta1 - -import ( - "fmt" - "strconv" - - "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" -) - -// Add manual conversion functions here to override automatic conversion functions - -func Convert_v1beta1_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(in *v1beta1.ListVolumesOnDiskRequest, out *internal.ListVolumesOnDiskRequest) error { - diskIDUint, err := strconv.ParseUint(in.DiskId, 10, 64) - if err != nil { - return fmt.Errorf("Failed to parse diskId: err=%+v", err) - } - out.DiskNumber = uint32(diskIDUint) - return nil -} - -func Convert_internal_ListVolumesOnDiskRequest_To_v1beta1_ListVolumesOnDiskRequest(in *internal.ListVolumesOnDiskRequest, out *v1beta1.ListVolumesOnDiskRequest) error { - out.DiskId = strconv.FormatUint(uint64(in.DiskNumber), 10) - return nil -} - -func Convert_v1beta1_MountVolumeRequest_To_internal_MountVolumeRequest(in *v1beta1.MountVolumeRequest, out *internal.MountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.TargetPath = in.Path - return nil -} - -func Convert_internal_MountVolumeRequest_To_v1beta1_MountVolumeRequest(in *internal.MountVolumeRequest, out *v1beta1.MountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Path = in.TargetPath - return nil -} - -func Convert_v1beta1_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(in *v1beta1.ResizeVolumeRequest, out *internal.ResizeVolumeRequest) error { - out.VolumeId = in.VolumeId - out.SizeBytes = in.Size - return nil -} - -func Convert_internal_ResizeVolumeRequest_To_v1beta1_ResizeVolumeRequest(in *internal.ResizeVolumeRequest, out *v1beta1.ResizeVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Size = in.SizeBytes - return nil -} diff --git a/internal/server/volume/internal/v1beta1/conversion_generated.go b/internal/server/volume/internal/v1beta1/conversion_generated.go deleted file mode 100644 index 3ea2ddd2..00000000 --- a/internal/server/volume/internal/v1beta1/conversion_generated.go +++ /dev/null @@ -1,330 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1beta1 - -import ( - unsafe "unsafe" - - v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" -) - -func autoConvert_v1beta1_DismountVolumeRequest_To_internal_DismountVolumeRequest(in *v1beta1.DismountVolumeRequest, out *internal.DismountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Path = in.Path - return nil -} - -// Convert_v1beta1_DismountVolumeRequest_To_internal_DismountVolumeRequest is an autogenerated conversion function. -func Convert_v1beta1_DismountVolumeRequest_To_internal_DismountVolumeRequest(in *v1beta1.DismountVolumeRequest, out *internal.DismountVolumeRequest) error { - return autoConvert_v1beta1_DismountVolumeRequest_To_internal_DismountVolumeRequest(in, out) -} - -func autoConvert_internal_DismountVolumeRequest_To_v1beta1_DismountVolumeRequest(in *internal.DismountVolumeRequest, out *v1beta1.DismountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Path = in.Path - return nil -} - -// Convert_internal_DismountVolumeRequest_To_v1beta1_DismountVolumeRequest is an autogenerated conversion function. -func Convert_internal_DismountVolumeRequest_To_v1beta1_DismountVolumeRequest(in *internal.DismountVolumeRequest, out *v1beta1.DismountVolumeRequest) error { - return autoConvert_internal_DismountVolumeRequest_To_v1beta1_DismountVolumeRequest(in, out) -} - -func autoConvert_v1beta1_DismountVolumeResponse_To_internal_DismountVolumeResponse(in *v1beta1.DismountVolumeResponse, out *internal.DismountVolumeResponse) error { - return nil -} - -// Convert_v1beta1_DismountVolumeResponse_To_internal_DismountVolumeResponse is an autogenerated conversion function. -func Convert_v1beta1_DismountVolumeResponse_To_internal_DismountVolumeResponse(in *v1beta1.DismountVolumeResponse, out *internal.DismountVolumeResponse) error { - return autoConvert_v1beta1_DismountVolumeResponse_To_internal_DismountVolumeResponse(in, out) -} - -func autoConvert_internal_DismountVolumeResponse_To_v1beta1_DismountVolumeResponse(in *internal.DismountVolumeResponse, out *v1beta1.DismountVolumeResponse) error { - return nil -} - -// Convert_internal_DismountVolumeResponse_To_v1beta1_DismountVolumeResponse is an autogenerated conversion function. -func Convert_internal_DismountVolumeResponse_To_v1beta1_DismountVolumeResponse(in *internal.DismountVolumeResponse, out *v1beta1.DismountVolumeResponse) error { - return autoConvert_internal_DismountVolumeResponse_To_v1beta1_DismountVolumeResponse(in, out) -} - -func autoConvert_v1beta1_FormatVolumeRequest_To_internal_FormatVolumeRequest(in *v1beta1.FormatVolumeRequest, out *internal.FormatVolumeRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta1_FormatVolumeRequest_To_internal_FormatVolumeRequest is an autogenerated conversion function. -func Convert_v1beta1_FormatVolumeRequest_To_internal_FormatVolumeRequest(in *v1beta1.FormatVolumeRequest, out *internal.FormatVolumeRequest) error { - return autoConvert_v1beta1_FormatVolumeRequest_To_internal_FormatVolumeRequest(in, out) -} - -func autoConvert_internal_FormatVolumeRequest_To_v1beta1_FormatVolumeRequest(in *internal.FormatVolumeRequest, out *v1beta1.FormatVolumeRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_FormatVolumeRequest_To_v1beta1_FormatVolumeRequest is an autogenerated conversion function. -func Convert_internal_FormatVolumeRequest_To_v1beta1_FormatVolumeRequest(in *internal.FormatVolumeRequest, out *v1beta1.FormatVolumeRequest) error { - return autoConvert_internal_FormatVolumeRequest_To_v1beta1_FormatVolumeRequest(in, out) -} - -func autoConvert_v1beta1_FormatVolumeResponse_To_internal_FormatVolumeResponse(in *v1beta1.FormatVolumeResponse, out *internal.FormatVolumeResponse) error { - return nil -} - -// Convert_v1beta1_FormatVolumeResponse_To_internal_FormatVolumeResponse is an autogenerated conversion function. -func Convert_v1beta1_FormatVolumeResponse_To_internal_FormatVolumeResponse(in *v1beta1.FormatVolumeResponse, out *internal.FormatVolumeResponse) error { - return autoConvert_v1beta1_FormatVolumeResponse_To_internal_FormatVolumeResponse(in, out) -} - -func autoConvert_internal_FormatVolumeResponse_To_v1beta1_FormatVolumeResponse(in *internal.FormatVolumeResponse, out *v1beta1.FormatVolumeResponse) error { - return nil -} - -// Convert_internal_FormatVolumeResponse_To_v1beta1_FormatVolumeResponse is an autogenerated conversion function. -func Convert_internal_FormatVolumeResponse_To_v1beta1_FormatVolumeResponse(in *internal.FormatVolumeResponse, out *v1beta1.FormatVolumeResponse) error { - return autoConvert_internal_FormatVolumeResponse_To_v1beta1_FormatVolumeResponse(in, out) -} - -func autoConvert_v1beta1_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in *v1beta1.IsVolumeFormattedRequest, out *internal.IsVolumeFormattedRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta1_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest is an autogenerated conversion function. -func Convert_v1beta1_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in *v1beta1.IsVolumeFormattedRequest, out *internal.IsVolumeFormattedRequest) error { - return autoConvert_v1beta1_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in, out) -} - -func autoConvert_internal_IsVolumeFormattedRequest_To_v1beta1_IsVolumeFormattedRequest(in *internal.IsVolumeFormattedRequest, out *v1beta1.IsVolumeFormattedRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_IsVolumeFormattedRequest_To_v1beta1_IsVolumeFormattedRequest is an autogenerated conversion function. -func Convert_internal_IsVolumeFormattedRequest_To_v1beta1_IsVolumeFormattedRequest(in *internal.IsVolumeFormattedRequest, out *v1beta1.IsVolumeFormattedRequest) error { - return autoConvert_internal_IsVolumeFormattedRequest_To_v1beta1_IsVolumeFormattedRequest(in, out) -} - -func autoConvert_v1beta1_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in *v1beta1.IsVolumeFormattedResponse, out *internal.IsVolumeFormattedResponse) error { - out.Formatted = in.Formatted - return nil -} - -// Convert_v1beta1_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse is an autogenerated conversion function. -func Convert_v1beta1_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in *v1beta1.IsVolumeFormattedResponse, out *internal.IsVolumeFormattedResponse) error { - return autoConvert_v1beta1_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in, out) -} - -func autoConvert_internal_IsVolumeFormattedResponse_To_v1beta1_IsVolumeFormattedResponse(in *internal.IsVolumeFormattedResponse, out *v1beta1.IsVolumeFormattedResponse) error { - out.Formatted = in.Formatted - return nil -} - -// Convert_internal_IsVolumeFormattedResponse_To_v1beta1_IsVolumeFormattedResponse is an autogenerated conversion function. -func Convert_internal_IsVolumeFormattedResponse_To_v1beta1_IsVolumeFormattedResponse(in *internal.IsVolumeFormattedResponse, out *v1beta1.IsVolumeFormattedResponse) error { - return autoConvert_internal_IsVolumeFormattedResponse_To_v1beta1_IsVolumeFormattedResponse(in, out) -} - -// detected external conversion function -// Convert_v1beta1_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(in *v1beta1.ListVolumesOnDiskRequest, out *internal.ListVolumesOnDiskRequest) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ListVolumesOnDiskRequest_To_v1beta1_ListVolumesOnDiskRequest(in *internal.ListVolumesOnDiskRequest, out *v1beta1.ListVolumesOnDiskRequest) error -// skipping generation of the auto function - -func autoConvert_v1beta1_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in *v1beta1.ListVolumesOnDiskResponse, out *internal.ListVolumesOnDiskResponse) error { - out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) - return nil -} - -// Convert_v1beta1_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse is an autogenerated conversion function. -func Convert_v1beta1_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in *v1beta1.ListVolumesOnDiskResponse, out *internal.ListVolumesOnDiskResponse) error { - return autoConvert_v1beta1_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in, out) -} - -func autoConvert_internal_ListVolumesOnDiskResponse_To_v1beta1_ListVolumesOnDiskResponse(in *internal.ListVolumesOnDiskResponse, out *v1beta1.ListVolumesOnDiskResponse) error { - out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) - return nil -} - -// Convert_internal_ListVolumesOnDiskResponse_To_v1beta1_ListVolumesOnDiskResponse is an autogenerated conversion function. -func Convert_internal_ListVolumesOnDiskResponse_To_v1beta1_ListVolumesOnDiskResponse(in *internal.ListVolumesOnDiskResponse, out *v1beta1.ListVolumesOnDiskResponse) error { - return autoConvert_internal_ListVolumesOnDiskResponse_To_v1beta1_ListVolumesOnDiskResponse(in, out) -} - -// detected external conversion function -// Convert_v1beta1_MountVolumeRequest_To_internal_MountVolumeRequest(in *v1beta1.MountVolumeRequest, out *internal.MountVolumeRequest) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_MountVolumeRequest_To_v1beta1_MountVolumeRequest(in *internal.MountVolumeRequest, out *v1beta1.MountVolumeRequest) error -// skipping generation of the auto function - -func autoConvert_v1beta1_MountVolumeResponse_To_internal_MountVolumeResponse(in *v1beta1.MountVolumeResponse, out *internal.MountVolumeResponse) error { - return nil -} - -// Convert_v1beta1_MountVolumeResponse_To_internal_MountVolumeResponse is an autogenerated conversion function. -func Convert_v1beta1_MountVolumeResponse_To_internal_MountVolumeResponse(in *v1beta1.MountVolumeResponse, out *internal.MountVolumeResponse) error { - return autoConvert_v1beta1_MountVolumeResponse_To_internal_MountVolumeResponse(in, out) -} - -func autoConvert_internal_MountVolumeResponse_To_v1beta1_MountVolumeResponse(in *internal.MountVolumeResponse, out *v1beta1.MountVolumeResponse) error { - return nil -} - -// Convert_internal_MountVolumeResponse_To_v1beta1_MountVolumeResponse is an autogenerated conversion function. -func Convert_internal_MountVolumeResponse_To_v1beta1_MountVolumeResponse(in *internal.MountVolumeResponse, out *v1beta1.MountVolumeResponse) error { - return autoConvert_internal_MountVolumeResponse_To_v1beta1_MountVolumeResponse(in, out) -} - -// detected external conversion function -// Convert_v1beta1_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(in *v1beta1.ResizeVolumeRequest, out *internal.ResizeVolumeRequest) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ResizeVolumeRequest_To_v1beta1_ResizeVolumeRequest(in *internal.ResizeVolumeRequest, out *v1beta1.ResizeVolumeRequest) error -// skipping generation of the auto function - -func autoConvert_v1beta1_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in *v1beta1.ResizeVolumeResponse, out *internal.ResizeVolumeResponse) error { - return nil -} - -// Convert_v1beta1_ResizeVolumeResponse_To_internal_ResizeVolumeResponse is an autogenerated conversion function. -func Convert_v1beta1_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in *v1beta1.ResizeVolumeResponse, out *internal.ResizeVolumeResponse) error { - return autoConvert_v1beta1_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in, out) -} - -func autoConvert_internal_ResizeVolumeResponse_To_v1beta1_ResizeVolumeResponse(in *internal.ResizeVolumeResponse, out *v1beta1.ResizeVolumeResponse) error { - return nil -} - -// Convert_internal_ResizeVolumeResponse_To_v1beta1_ResizeVolumeResponse is an autogenerated conversion function. -func Convert_internal_ResizeVolumeResponse_To_v1beta1_ResizeVolumeResponse(in *internal.ResizeVolumeResponse, out *v1beta1.ResizeVolumeResponse) error { - return autoConvert_internal_ResizeVolumeResponse_To_v1beta1_ResizeVolumeResponse(in, out) -} - -func autoConvert_v1beta1_VolumeDiskNumberRequest_To_internal_VolumeDiskNumberRequest(in *v1beta1.VolumeDiskNumberRequest, out *internal.VolumeDiskNumberRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta1_VolumeDiskNumberRequest_To_internal_VolumeDiskNumberRequest is an autogenerated conversion function. -func Convert_v1beta1_VolumeDiskNumberRequest_To_internal_VolumeDiskNumberRequest(in *v1beta1.VolumeDiskNumberRequest, out *internal.VolumeDiskNumberRequest) error { - return autoConvert_v1beta1_VolumeDiskNumberRequest_To_internal_VolumeDiskNumberRequest(in, out) -} - -func autoConvert_internal_VolumeDiskNumberRequest_To_v1beta1_VolumeDiskNumberRequest(in *internal.VolumeDiskNumberRequest, out *v1beta1.VolumeDiskNumberRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_VolumeDiskNumberRequest_To_v1beta1_VolumeDiskNumberRequest is an autogenerated conversion function. -func Convert_internal_VolumeDiskNumberRequest_To_v1beta1_VolumeDiskNumberRequest(in *internal.VolumeDiskNumberRequest, out *v1beta1.VolumeDiskNumberRequest) error { - return autoConvert_internal_VolumeDiskNumberRequest_To_v1beta1_VolumeDiskNumberRequest(in, out) -} - -func autoConvert_v1beta1_VolumeDiskNumberResponse_To_internal_VolumeDiskNumberResponse(in *v1beta1.VolumeDiskNumberResponse, out *internal.VolumeDiskNumberResponse) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_v1beta1_VolumeDiskNumberResponse_To_internal_VolumeDiskNumberResponse is an autogenerated conversion function. -func Convert_v1beta1_VolumeDiskNumberResponse_To_internal_VolumeDiskNumberResponse(in *v1beta1.VolumeDiskNumberResponse, out *internal.VolumeDiskNumberResponse) error { - return autoConvert_v1beta1_VolumeDiskNumberResponse_To_internal_VolumeDiskNumberResponse(in, out) -} - -func autoConvert_internal_VolumeDiskNumberResponse_To_v1beta1_VolumeDiskNumberResponse(in *internal.VolumeDiskNumberResponse, out *v1beta1.VolumeDiskNumberResponse) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_internal_VolumeDiskNumberResponse_To_v1beta1_VolumeDiskNumberResponse is an autogenerated conversion function. -func Convert_internal_VolumeDiskNumberResponse_To_v1beta1_VolumeDiskNumberResponse(in *internal.VolumeDiskNumberResponse, out *v1beta1.VolumeDiskNumberResponse) error { - return autoConvert_internal_VolumeDiskNumberResponse_To_v1beta1_VolumeDiskNumberResponse(in, out) -} - -func autoConvert_v1beta1_VolumeIDFromMountRequest_To_internal_VolumeIDFromMountRequest(in *v1beta1.VolumeIDFromMountRequest, out *internal.VolumeIDFromMountRequest) error { - out.Mount = in.Mount - return nil -} - -// Convert_v1beta1_VolumeIDFromMountRequest_To_internal_VolumeIDFromMountRequest is an autogenerated conversion function. -func Convert_v1beta1_VolumeIDFromMountRequest_To_internal_VolumeIDFromMountRequest(in *v1beta1.VolumeIDFromMountRequest, out *internal.VolumeIDFromMountRequest) error { - return autoConvert_v1beta1_VolumeIDFromMountRequest_To_internal_VolumeIDFromMountRequest(in, out) -} - -func autoConvert_internal_VolumeIDFromMountRequest_To_v1beta1_VolumeIDFromMountRequest(in *internal.VolumeIDFromMountRequest, out *v1beta1.VolumeIDFromMountRequest) error { - out.Mount = in.Mount - return nil -} - -// Convert_internal_VolumeIDFromMountRequest_To_v1beta1_VolumeIDFromMountRequest is an autogenerated conversion function. -func Convert_internal_VolumeIDFromMountRequest_To_v1beta1_VolumeIDFromMountRequest(in *internal.VolumeIDFromMountRequest, out *v1beta1.VolumeIDFromMountRequest) error { - return autoConvert_internal_VolumeIDFromMountRequest_To_v1beta1_VolumeIDFromMountRequest(in, out) -} - -func autoConvert_v1beta1_VolumeIDFromMountResponse_To_internal_VolumeIDFromMountResponse(in *v1beta1.VolumeIDFromMountResponse, out *internal.VolumeIDFromMountResponse) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta1_VolumeIDFromMountResponse_To_internal_VolumeIDFromMountResponse is an autogenerated conversion function. -func Convert_v1beta1_VolumeIDFromMountResponse_To_internal_VolumeIDFromMountResponse(in *v1beta1.VolumeIDFromMountResponse, out *internal.VolumeIDFromMountResponse) error { - return autoConvert_v1beta1_VolumeIDFromMountResponse_To_internal_VolumeIDFromMountResponse(in, out) -} - -func autoConvert_internal_VolumeIDFromMountResponse_To_v1beta1_VolumeIDFromMountResponse(in *internal.VolumeIDFromMountResponse, out *v1beta1.VolumeIDFromMountResponse) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_VolumeIDFromMountResponse_To_v1beta1_VolumeIDFromMountResponse is an autogenerated conversion function. -func Convert_internal_VolumeIDFromMountResponse_To_v1beta1_VolumeIDFromMountResponse(in *internal.VolumeIDFromMountResponse, out *v1beta1.VolumeIDFromMountResponse) error { - return autoConvert_internal_VolumeIDFromMountResponse_To_v1beta1_VolumeIDFromMountResponse(in, out) -} - -func autoConvert_v1beta1_VolumeStatsRequest_To_internal_VolumeStatsRequest(in *v1beta1.VolumeStatsRequest, out *internal.VolumeStatsRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta1_VolumeStatsRequest_To_internal_VolumeStatsRequest is an autogenerated conversion function. -func Convert_v1beta1_VolumeStatsRequest_To_internal_VolumeStatsRequest(in *v1beta1.VolumeStatsRequest, out *internal.VolumeStatsRequest) error { - return autoConvert_v1beta1_VolumeStatsRequest_To_internal_VolumeStatsRequest(in, out) -} - -func autoConvert_internal_VolumeStatsRequest_To_v1beta1_VolumeStatsRequest(in *internal.VolumeStatsRequest, out *v1beta1.VolumeStatsRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_VolumeStatsRequest_To_v1beta1_VolumeStatsRequest is an autogenerated conversion function. -func Convert_internal_VolumeStatsRequest_To_v1beta1_VolumeStatsRequest(in *internal.VolumeStatsRequest, out *v1beta1.VolumeStatsRequest) error { - return autoConvert_internal_VolumeStatsRequest_To_v1beta1_VolumeStatsRequest(in, out) -} - -func autoConvert_v1beta1_VolumeStatsResponse_To_internal_VolumeStatsResponse(in *v1beta1.VolumeStatsResponse, out *internal.VolumeStatsResponse) error { - out.VolumeSize = in.VolumeSize - out.VolumeUsedSize = in.VolumeUsedSize - return nil -} - -// Convert_v1beta1_VolumeStatsResponse_To_internal_VolumeStatsResponse is an autogenerated conversion function. -func Convert_v1beta1_VolumeStatsResponse_To_internal_VolumeStatsResponse(in *v1beta1.VolumeStatsResponse, out *internal.VolumeStatsResponse) error { - return autoConvert_v1beta1_VolumeStatsResponse_To_internal_VolumeStatsResponse(in, out) -} - -func autoConvert_internal_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse(in *internal.VolumeStatsResponse, out *v1beta1.VolumeStatsResponse) error { - out.VolumeSize = in.VolumeSize - out.VolumeUsedSize = in.VolumeUsedSize - return nil -} - -// Convert_internal_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse is an autogenerated conversion function. -func Convert_internal_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse(in *internal.VolumeStatsResponse, out *v1beta1.VolumeStatsResponse) error { - return autoConvert_internal_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse(in, out) -} diff --git a/internal/server/volume/internal/v1beta2/conversion.go b/internal/server/volume/internal/v1beta2/conversion.go deleted file mode 100644 index 07c48d5e..00000000 --- a/internal/server/volume/internal/v1beta2/conversion.go +++ /dev/null @@ -1,49 +0,0 @@ -package v1beta2 - -import ( - "fmt" - "strconv" - - "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta2" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" -) - -// Add manual conversion functions here to override automatic conversion functions - -func Convert_v1beta2_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(in *v1beta2.ListVolumesOnDiskRequest, out *internal.ListVolumesOnDiskRequest) error { - diskIDUint, err := strconv.ParseUint(in.DiskId, 10, 64) - if err != nil { - return fmt.Errorf("Failed to parse diskId: err=%+v", err) - } - out.DiskNumber = uint32(diskIDUint) - return nil -} - -func Convert_internal_ListVolumesOnDiskRequest_To_v1beta2_ListVolumesOnDiskRequest(in *internal.ListVolumesOnDiskRequest, out *v1beta2.ListVolumesOnDiskRequest) error { - out.DiskId = strconv.FormatUint(uint64(in.DiskNumber), 10) - return nil -} - -func Convert_v1beta2_MountVolumeRequest_To_internal_MountVolumeRequest(in *v1beta2.MountVolumeRequest, out *internal.MountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.TargetPath = in.Path - return nil -} - -func Convert_internal_MountVolumeRequest_To_v1beta2_MountVolumeRequest(in *internal.MountVolumeRequest, out *v1beta2.MountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Path = in.TargetPath - return nil -} - -func Convert_v1beta2_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(in *v1beta2.ResizeVolumeRequest, out *internal.ResizeVolumeRequest) error { - out.VolumeId = in.VolumeId - out.SizeBytes = in.Size - return nil -} - -func Convert_internal_ResizeVolumeRequest_To_v1beta2_ResizeVolumeRequest(in *internal.ResizeVolumeRequest, out *v1beta2.ResizeVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Size = in.SizeBytes - return nil -} diff --git a/internal/server/volume/internal/v1beta2/conversion_generated.go b/internal/server/volume/internal/v1beta2/conversion_generated.go deleted file mode 100644 index 209c6426..00000000 --- a/internal/server/volume/internal/v1beta2/conversion_generated.go +++ /dev/null @@ -1,368 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1beta2 - -import ( - unsafe "unsafe" - - v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta2" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" -) - -func autoConvert_v1beta2_DismountVolumeRequest_To_internal_DismountVolumeRequest(in *v1beta2.DismountVolumeRequest, out *internal.DismountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Path = in.Path - return nil -} - -// Convert_v1beta2_DismountVolumeRequest_To_internal_DismountVolumeRequest is an autogenerated conversion function. -func Convert_v1beta2_DismountVolumeRequest_To_internal_DismountVolumeRequest(in *v1beta2.DismountVolumeRequest, out *internal.DismountVolumeRequest) error { - return autoConvert_v1beta2_DismountVolumeRequest_To_internal_DismountVolumeRequest(in, out) -} - -func autoConvert_internal_DismountVolumeRequest_To_v1beta2_DismountVolumeRequest(in *internal.DismountVolumeRequest, out *v1beta2.DismountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.Path = in.Path - return nil -} - -// Convert_internal_DismountVolumeRequest_To_v1beta2_DismountVolumeRequest is an autogenerated conversion function. -func Convert_internal_DismountVolumeRequest_To_v1beta2_DismountVolumeRequest(in *internal.DismountVolumeRequest, out *v1beta2.DismountVolumeRequest) error { - return autoConvert_internal_DismountVolumeRequest_To_v1beta2_DismountVolumeRequest(in, out) -} - -func autoConvert_v1beta2_DismountVolumeResponse_To_internal_DismountVolumeResponse(in *v1beta2.DismountVolumeResponse, out *internal.DismountVolumeResponse) error { - return nil -} - -// Convert_v1beta2_DismountVolumeResponse_To_internal_DismountVolumeResponse is an autogenerated conversion function. -func Convert_v1beta2_DismountVolumeResponse_To_internal_DismountVolumeResponse(in *v1beta2.DismountVolumeResponse, out *internal.DismountVolumeResponse) error { - return autoConvert_v1beta2_DismountVolumeResponse_To_internal_DismountVolumeResponse(in, out) -} - -func autoConvert_internal_DismountVolumeResponse_To_v1beta2_DismountVolumeResponse(in *internal.DismountVolumeResponse, out *v1beta2.DismountVolumeResponse) error { - return nil -} - -// Convert_internal_DismountVolumeResponse_To_v1beta2_DismountVolumeResponse is an autogenerated conversion function. -func Convert_internal_DismountVolumeResponse_To_v1beta2_DismountVolumeResponse(in *internal.DismountVolumeResponse, out *v1beta2.DismountVolumeResponse) error { - return autoConvert_internal_DismountVolumeResponse_To_v1beta2_DismountVolumeResponse(in, out) -} - -func autoConvert_v1beta2_FormatVolumeRequest_To_internal_FormatVolumeRequest(in *v1beta2.FormatVolumeRequest, out *internal.FormatVolumeRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta2_FormatVolumeRequest_To_internal_FormatVolumeRequest is an autogenerated conversion function. -func Convert_v1beta2_FormatVolumeRequest_To_internal_FormatVolumeRequest(in *v1beta2.FormatVolumeRequest, out *internal.FormatVolumeRequest) error { - return autoConvert_v1beta2_FormatVolumeRequest_To_internal_FormatVolumeRequest(in, out) -} - -func autoConvert_internal_FormatVolumeRequest_To_v1beta2_FormatVolumeRequest(in *internal.FormatVolumeRequest, out *v1beta2.FormatVolumeRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_FormatVolumeRequest_To_v1beta2_FormatVolumeRequest is an autogenerated conversion function. -func Convert_internal_FormatVolumeRequest_To_v1beta2_FormatVolumeRequest(in *internal.FormatVolumeRequest, out *v1beta2.FormatVolumeRequest) error { - return autoConvert_internal_FormatVolumeRequest_To_v1beta2_FormatVolumeRequest(in, out) -} - -func autoConvert_v1beta2_FormatVolumeResponse_To_internal_FormatVolumeResponse(in *v1beta2.FormatVolumeResponse, out *internal.FormatVolumeResponse) error { - return nil -} - -// Convert_v1beta2_FormatVolumeResponse_To_internal_FormatVolumeResponse is an autogenerated conversion function. -func Convert_v1beta2_FormatVolumeResponse_To_internal_FormatVolumeResponse(in *v1beta2.FormatVolumeResponse, out *internal.FormatVolumeResponse) error { - return autoConvert_v1beta2_FormatVolumeResponse_To_internal_FormatVolumeResponse(in, out) -} - -func autoConvert_internal_FormatVolumeResponse_To_v1beta2_FormatVolumeResponse(in *internal.FormatVolumeResponse, out *v1beta2.FormatVolumeResponse) error { - return nil -} - -// Convert_internal_FormatVolumeResponse_To_v1beta2_FormatVolumeResponse is an autogenerated conversion function. -func Convert_internal_FormatVolumeResponse_To_v1beta2_FormatVolumeResponse(in *internal.FormatVolumeResponse, out *v1beta2.FormatVolumeResponse) error { - return autoConvert_internal_FormatVolumeResponse_To_v1beta2_FormatVolumeResponse(in, out) -} - -func autoConvert_v1beta2_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in *v1beta2.IsVolumeFormattedRequest, out *internal.IsVolumeFormattedRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta2_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest is an autogenerated conversion function. -func Convert_v1beta2_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in *v1beta2.IsVolumeFormattedRequest, out *internal.IsVolumeFormattedRequest) error { - return autoConvert_v1beta2_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in, out) -} - -func autoConvert_internal_IsVolumeFormattedRequest_To_v1beta2_IsVolumeFormattedRequest(in *internal.IsVolumeFormattedRequest, out *v1beta2.IsVolumeFormattedRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_IsVolumeFormattedRequest_To_v1beta2_IsVolumeFormattedRequest is an autogenerated conversion function. -func Convert_internal_IsVolumeFormattedRequest_To_v1beta2_IsVolumeFormattedRequest(in *internal.IsVolumeFormattedRequest, out *v1beta2.IsVolumeFormattedRequest) error { - return autoConvert_internal_IsVolumeFormattedRequest_To_v1beta2_IsVolumeFormattedRequest(in, out) -} - -func autoConvert_v1beta2_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in *v1beta2.IsVolumeFormattedResponse, out *internal.IsVolumeFormattedResponse) error { - out.Formatted = in.Formatted - return nil -} - -// Convert_v1beta2_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse is an autogenerated conversion function. -func Convert_v1beta2_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in *v1beta2.IsVolumeFormattedResponse, out *internal.IsVolumeFormattedResponse) error { - return autoConvert_v1beta2_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in, out) -} - -func autoConvert_internal_IsVolumeFormattedResponse_To_v1beta2_IsVolumeFormattedResponse(in *internal.IsVolumeFormattedResponse, out *v1beta2.IsVolumeFormattedResponse) error { - out.Formatted = in.Formatted - return nil -} - -// Convert_internal_IsVolumeFormattedResponse_To_v1beta2_IsVolumeFormattedResponse is an autogenerated conversion function. -func Convert_internal_IsVolumeFormattedResponse_To_v1beta2_IsVolumeFormattedResponse(in *internal.IsVolumeFormattedResponse, out *v1beta2.IsVolumeFormattedResponse) error { - return autoConvert_internal_IsVolumeFormattedResponse_To_v1beta2_IsVolumeFormattedResponse(in, out) -} - -// detected external conversion function -// Convert_v1beta2_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(in *v1beta2.ListVolumesOnDiskRequest, out *internal.ListVolumesOnDiskRequest) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ListVolumesOnDiskRequest_To_v1beta2_ListVolumesOnDiskRequest(in *internal.ListVolumesOnDiskRequest, out *v1beta2.ListVolumesOnDiskRequest) error -// skipping generation of the auto function - -func autoConvert_v1beta2_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in *v1beta2.ListVolumesOnDiskResponse, out *internal.ListVolumesOnDiskResponse) error { - out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) - return nil -} - -// Convert_v1beta2_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse is an autogenerated conversion function. -func Convert_v1beta2_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in *v1beta2.ListVolumesOnDiskResponse, out *internal.ListVolumesOnDiskResponse) error { - return autoConvert_v1beta2_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in, out) -} - -func autoConvert_internal_ListVolumesOnDiskResponse_To_v1beta2_ListVolumesOnDiskResponse(in *internal.ListVolumesOnDiskResponse, out *v1beta2.ListVolumesOnDiskResponse) error { - out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) - return nil -} - -// Convert_internal_ListVolumesOnDiskResponse_To_v1beta2_ListVolumesOnDiskResponse is an autogenerated conversion function. -func Convert_internal_ListVolumesOnDiskResponse_To_v1beta2_ListVolumesOnDiskResponse(in *internal.ListVolumesOnDiskResponse, out *v1beta2.ListVolumesOnDiskResponse) error { - return autoConvert_internal_ListVolumesOnDiskResponse_To_v1beta2_ListVolumesOnDiskResponse(in, out) -} - -// detected external conversion function -// Convert_v1beta2_MountVolumeRequest_To_internal_MountVolumeRequest(in *v1beta2.MountVolumeRequest, out *internal.MountVolumeRequest) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_MountVolumeRequest_To_v1beta2_MountVolumeRequest(in *internal.MountVolumeRequest, out *v1beta2.MountVolumeRequest) error -// skipping generation of the auto function - -func autoConvert_v1beta2_MountVolumeResponse_To_internal_MountVolumeResponse(in *v1beta2.MountVolumeResponse, out *internal.MountVolumeResponse) error { - return nil -} - -// Convert_v1beta2_MountVolumeResponse_To_internal_MountVolumeResponse is an autogenerated conversion function. -func Convert_v1beta2_MountVolumeResponse_To_internal_MountVolumeResponse(in *v1beta2.MountVolumeResponse, out *internal.MountVolumeResponse) error { - return autoConvert_v1beta2_MountVolumeResponse_To_internal_MountVolumeResponse(in, out) -} - -func autoConvert_internal_MountVolumeResponse_To_v1beta2_MountVolumeResponse(in *internal.MountVolumeResponse, out *v1beta2.MountVolumeResponse) error { - return nil -} - -// Convert_internal_MountVolumeResponse_To_v1beta2_MountVolumeResponse is an autogenerated conversion function. -func Convert_internal_MountVolumeResponse_To_v1beta2_MountVolumeResponse(in *internal.MountVolumeResponse, out *v1beta2.MountVolumeResponse) error { - return autoConvert_internal_MountVolumeResponse_To_v1beta2_MountVolumeResponse(in, out) -} - -// detected external conversion function -// Convert_v1beta2_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(in *v1beta2.ResizeVolumeRequest, out *internal.ResizeVolumeRequest) error -// skipping generation of the auto function - -// detected external conversion function -// Convert_internal_ResizeVolumeRequest_To_v1beta2_ResizeVolumeRequest(in *internal.ResizeVolumeRequest, out *v1beta2.ResizeVolumeRequest) error -// skipping generation of the auto function - -func autoConvert_v1beta2_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in *v1beta2.ResizeVolumeResponse, out *internal.ResizeVolumeResponse) error { - return nil -} - -// Convert_v1beta2_ResizeVolumeResponse_To_internal_ResizeVolumeResponse is an autogenerated conversion function. -func Convert_v1beta2_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in *v1beta2.ResizeVolumeResponse, out *internal.ResizeVolumeResponse) error { - return autoConvert_v1beta2_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in, out) -} - -func autoConvert_internal_ResizeVolumeResponse_To_v1beta2_ResizeVolumeResponse(in *internal.ResizeVolumeResponse, out *v1beta2.ResizeVolumeResponse) error { - return nil -} - -// Convert_internal_ResizeVolumeResponse_To_v1beta2_ResizeVolumeResponse is an autogenerated conversion function. -func Convert_internal_ResizeVolumeResponse_To_v1beta2_ResizeVolumeResponse(in *internal.ResizeVolumeResponse, out *v1beta2.ResizeVolumeResponse) error { - return autoConvert_internal_ResizeVolumeResponse_To_v1beta2_ResizeVolumeResponse(in, out) -} - -func autoConvert_v1beta2_VolumeDiskNumberRequest_To_internal_VolumeDiskNumberRequest(in *v1beta2.VolumeDiskNumberRequest, out *internal.VolumeDiskNumberRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta2_VolumeDiskNumberRequest_To_internal_VolumeDiskNumberRequest is an autogenerated conversion function. -func Convert_v1beta2_VolumeDiskNumberRequest_To_internal_VolumeDiskNumberRequest(in *v1beta2.VolumeDiskNumberRequest, out *internal.VolumeDiskNumberRequest) error { - return autoConvert_v1beta2_VolumeDiskNumberRequest_To_internal_VolumeDiskNumberRequest(in, out) -} - -func autoConvert_internal_VolumeDiskNumberRequest_To_v1beta2_VolumeDiskNumberRequest(in *internal.VolumeDiskNumberRequest, out *v1beta2.VolumeDiskNumberRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_VolumeDiskNumberRequest_To_v1beta2_VolumeDiskNumberRequest is an autogenerated conversion function. -func Convert_internal_VolumeDiskNumberRequest_To_v1beta2_VolumeDiskNumberRequest(in *internal.VolumeDiskNumberRequest, out *v1beta2.VolumeDiskNumberRequest) error { - return autoConvert_internal_VolumeDiskNumberRequest_To_v1beta2_VolumeDiskNumberRequest(in, out) -} - -func autoConvert_v1beta2_VolumeDiskNumberResponse_To_internal_VolumeDiskNumberResponse(in *v1beta2.VolumeDiskNumberResponse, out *internal.VolumeDiskNumberResponse) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_v1beta2_VolumeDiskNumberResponse_To_internal_VolumeDiskNumberResponse is an autogenerated conversion function. -func Convert_v1beta2_VolumeDiskNumberResponse_To_internal_VolumeDiskNumberResponse(in *v1beta2.VolumeDiskNumberResponse, out *internal.VolumeDiskNumberResponse) error { - return autoConvert_v1beta2_VolumeDiskNumberResponse_To_internal_VolumeDiskNumberResponse(in, out) -} - -func autoConvert_internal_VolumeDiskNumberResponse_To_v1beta2_VolumeDiskNumberResponse(in *internal.VolumeDiskNumberResponse, out *v1beta2.VolumeDiskNumberResponse) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_internal_VolumeDiskNumberResponse_To_v1beta2_VolumeDiskNumberResponse is an autogenerated conversion function. -func Convert_internal_VolumeDiskNumberResponse_To_v1beta2_VolumeDiskNumberResponse(in *internal.VolumeDiskNumberResponse, out *v1beta2.VolumeDiskNumberResponse) error { - return autoConvert_internal_VolumeDiskNumberResponse_To_v1beta2_VolumeDiskNumberResponse(in, out) -} - -func autoConvert_v1beta2_VolumeIDFromMountRequest_To_internal_VolumeIDFromMountRequest(in *v1beta2.VolumeIDFromMountRequest, out *internal.VolumeIDFromMountRequest) error { - out.Mount = in.Mount - return nil -} - -// Convert_v1beta2_VolumeIDFromMountRequest_To_internal_VolumeIDFromMountRequest is an autogenerated conversion function. -func Convert_v1beta2_VolumeIDFromMountRequest_To_internal_VolumeIDFromMountRequest(in *v1beta2.VolumeIDFromMountRequest, out *internal.VolumeIDFromMountRequest) error { - return autoConvert_v1beta2_VolumeIDFromMountRequest_To_internal_VolumeIDFromMountRequest(in, out) -} - -func autoConvert_internal_VolumeIDFromMountRequest_To_v1beta2_VolumeIDFromMountRequest(in *internal.VolumeIDFromMountRequest, out *v1beta2.VolumeIDFromMountRequest) error { - out.Mount = in.Mount - return nil -} - -// Convert_internal_VolumeIDFromMountRequest_To_v1beta2_VolumeIDFromMountRequest is an autogenerated conversion function. -func Convert_internal_VolumeIDFromMountRequest_To_v1beta2_VolumeIDFromMountRequest(in *internal.VolumeIDFromMountRequest, out *v1beta2.VolumeIDFromMountRequest) error { - return autoConvert_internal_VolumeIDFromMountRequest_To_v1beta2_VolumeIDFromMountRequest(in, out) -} - -func autoConvert_v1beta2_VolumeIDFromMountResponse_To_internal_VolumeIDFromMountResponse(in *v1beta2.VolumeIDFromMountResponse, out *internal.VolumeIDFromMountResponse) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta2_VolumeIDFromMountResponse_To_internal_VolumeIDFromMountResponse is an autogenerated conversion function. -func Convert_v1beta2_VolumeIDFromMountResponse_To_internal_VolumeIDFromMountResponse(in *v1beta2.VolumeIDFromMountResponse, out *internal.VolumeIDFromMountResponse) error { - return autoConvert_v1beta2_VolumeIDFromMountResponse_To_internal_VolumeIDFromMountResponse(in, out) -} - -func autoConvert_internal_VolumeIDFromMountResponse_To_v1beta2_VolumeIDFromMountResponse(in *internal.VolumeIDFromMountResponse, out *v1beta2.VolumeIDFromMountResponse) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_VolumeIDFromMountResponse_To_v1beta2_VolumeIDFromMountResponse is an autogenerated conversion function. -func Convert_internal_VolumeIDFromMountResponse_To_v1beta2_VolumeIDFromMountResponse(in *internal.VolumeIDFromMountResponse, out *v1beta2.VolumeIDFromMountResponse) error { - return autoConvert_internal_VolumeIDFromMountResponse_To_v1beta2_VolumeIDFromMountResponse(in, out) -} - -func autoConvert_v1beta2_VolumeStatsRequest_To_internal_VolumeStatsRequest(in *v1beta2.VolumeStatsRequest, out *internal.VolumeStatsRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta2_VolumeStatsRequest_To_internal_VolumeStatsRequest is an autogenerated conversion function. -func Convert_v1beta2_VolumeStatsRequest_To_internal_VolumeStatsRequest(in *v1beta2.VolumeStatsRequest, out *internal.VolumeStatsRequest) error { - return autoConvert_v1beta2_VolumeStatsRequest_To_internal_VolumeStatsRequest(in, out) -} - -func autoConvert_internal_VolumeStatsRequest_To_v1beta2_VolumeStatsRequest(in *internal.VolumeStatsRequest, out *v1beta2.VolumeStatsRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_VolumeStatsRequest_To_v1beta2_VolumeStatsRequest is an autogenerated conversion function. -func Convert_internal_VolumeStatsRequest_To_v1beta2_VolumeStatsRequest(in *internal.VolumeStatsRequest, out *v1beta2.VolumeStatsRequest) error { - return autoConvert_internal_VolumeStatsRequest_To_v1beta2_VolumeStatsRequest(in, out) -} - -func autoConvert_v1beta2_VolumeStatsResponse_To_internal_VolumeStatsResponse(in *v1beta2.VolumeStatsResponse, out *internal.VolumeStatsResponse) error { - out.VolumeSize = in.VolumeSize - out.VolumeUsedSize = in.VolumeUsedSize - return nil -} - -// Convert_v1beta2_VolumeStatsResponse_To_internal_VolumeStatsResponse is an autogenerated conversion function. -func Convert_v1beta2_VolumeStatsResponse_To_internal_VolumeStatsResponse(in *v1beta2.VolumeStatsResponse, out *internal.VolumeStatsResponse) error { - return autoConvert_v1beta2_VolumeStatsResponse_To_internal_VolumeStatsResponse(in, out) -} - -func autoConvert_internal_VolumeStatsResponse_To_v1beta2_VolumeStatsResponse(in *internal.VolumeStatsResponse, out *v1beta2.VolumeStatsResponse) error { - out.VolumeSize = in.VolumeSize - out.VolumeUsedSize = in.VolumeUsedSize - return nil -} - -// Convert_internal_VolumeStatsResponse_To_v1beta2_VolumeStatsResponse is an autogenerated conversion function. -func Convert_internal_VolumeStatsResponse_To_v1beta2_VolumeStatsResponse(in *internal.VolumeStatsResponse, out *v1beta2.VolumeStatsResponse) error { - return autoConvert_internal_VolumeStatsResponse_To_v1beta2_VolumeStatsResponse(in, out) -} - -func autoConvert_v1beta2_WriteVolumeCacheRequest_To_internal_WriteVolumeCacheRequest(in *v1beta2.WriteVolumeCacheRequest, out *internal.WriteVolumeCacheRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta2_WriteVolumeCacheRequest_To_internal_WriteVolumeCacheRequest is an autogenerated conversion function. -func Convert_v1beta2_WriteVolumeCacheRequest_To_internal_WriteVolumeCacheRequest(in *v1beta2.WriteVolumeCacheRequest, out *internal.WriteVolumeCacheRequest) error { - return autoConvert_v1beta2_WriteVolumeCacheRequest_To_internal_WriteVolumeCacheRequest(in, out) -} - -func autoConvert_internal_WriteVolumeCacheRequest_To_v1beta2_WriteVolumeCacheRequest(in *internal.WriteVolumeCacheRequest, out *v1beta2.WriteVolumeCacheRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_WriteVolumeCacheRequest_To_v1beta2_WriteVolumeCacheRequest is an autogenerated conversion function. -func Convert_internal_WriteVolumeCacheRequest_To_v1beta2_WriteVolumeCacheRequest(in *internal.WriteVolumeCacheRequest, out *v1beta2.WriteVolumeCacheRequest) error { - return autoConvert_internal_WriteVolumeCacheRequest_To_v1beta2_WriteVolumeCacheRequest(in, out) -} - -func autoConvert_v1beta2_WriteVolumeCacheResponse_To_internal_WriteVolumeCacheResponse(in *v1beta2.WriteVolumeCacheResponse, out *internal.WriteVolumeCacheResponse) error { - return nil -} - -// Convert_v1beta2_WriteVolumeCacheResponse_To_internal_WriteVolumeCacheResponse is an autogenerated conversion function. -func Convert_v1beta2_WriteVolumeCacheResponse_To_internal_WriteVolumeCacheResponse(in *v1beta2.WriteVolumeCacheResponse, out *internal.WriteVolumeCacheResponse) error { - return autoConvert_v1beta2_WriteVolumeCacheResponse_To_internal_WriteVolumeCacheResponse(in, out) -} - -func autoConvert_internal_WriteVolumeCacheResponse_To_v1beta2_WriteVolumeCacheResponse(in *internal.WriteVolumeCacheResponse, out *v1beta2.WriteVolumeCacheResponse) error { - return nil -} - -// Convert_internal_WriteVolumeCacheResponse_To_v1beta2_WriteVolumeCacheResponse is an autogenerated conversion function. -func Convert_internal_WriteVolumeCacheResponse_To_v1beta2_WriteVolumeCacheResponse(in *internal.WriteVolumeCacheResponse, out *v1beta2.WriteVolumeCacheResponse) error { - return autoConvert_internal_WriteVolumeCacheResponse_To_v1beta2_WriteVolumeCacheResponse(in, out) -} diff --git a/internal/server/volume/internal/v1beta3/conversion_generated.go b/internal/server/volume/internal/v1beta3/conversion_generated.go deleted file mode 100644 index 40f20fef..00000000 --- a/internal/server/volume/internal/v1beta3/conversion_generated.go +++ /dev/null @@ -1,410 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1beta3 - -import ( - unsafe "unsafe" - - v1beta3 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" -) - -func autoConvert_v1beta3_FormatVolumeRequest_To_internal_FormatVolumeRequest(in *v1beta3.FormatVolumeRequest, out *internal.FormatVolumeRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta3_FormatVolumeRequest_To_internal_FormatVolumeRequest is an autogenerated conversion function. -func Convert_v1beta3_FormatVolumeRequest_To_internal_FormatVolumeRequest(in *v1beta3.FormatVolumeRequest, out *internal.FormatVolumeRequest) error { - return autoConvert_v1beta3_FormatVolumeRequest_To_internal_FormatVolumeRequest(in, out) -} - -func autoConvert_internal_FormatVolumeRequest_To_v1beta3_FormatVolumeRequest(in *internal.FormatVolumeRequest, out *v1beta3.FormatVolumeRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_FormatVolumeRequest_To_v1beta3_FormatVolumeRequest is an autogenerated conversion function. -func Convert_internal_FormatVolumeRequest_To_v1beta3_FormatVolumeRequest(in *internal.FormatVolumeRequest, out *v1beta3.FormatVolumeRequest) error { - return autoConvert_internal_FormatVolumeRequest_To_v1beta3_FormatVolumeRequest(in, out) -} - -func autoConvert_v1beta3_FormatVolumeResponse_To_internal_FormatVolumeResponse(in *v1beta3.FormatVolumeResponse, out *internal.FormatVolumeResponse) error { - return nil -} - -// Convert_v1beta3_FormatVolumeResponse_To_internal_FormatVolumeResponse is an autogenerated conversion function. -func Convert_v1beta3_FormatVolumeResponse_To_internal_FormatVolumeResponse(in *v1beta3.FormatVolumeResponse, out *internal.FormatVolumeResponse) error { - return autoConvert_v1beta3_FormatVolumeResponse_To_internal_FormatVolumeResponse(in, out) -} - -func autoConvert_internal_FormatVolumeResponse_To_v1beta3_FormatVolumeResponse(in *internal.FormatVolumeResponse, out *v1beta3.FormatVolumeResponse) error { - return nil -} - -// Convert_internal_FormatVolumeResponse_To_v1beta3_FormatVolumeResponse is an autogenerated conversion function. -func Convert_internal_FormatVolumeResponse_To_v1beta3_FormatVolumeResponse(in *internal.FormatVolumeResponse, out *v1beta3.FormatVolumeResponse) error { - return autoConvert_internal_FormatVolumeResponse_To_v1beta3_FormatVolumeResponse(in, out) -} - -func autoConvert_v1beta3_GetDiskNumberFromVolumeIDRequest_To_internal_GetDiskNumberFromVolumeIDRequest(in *v1beta3.GetDiskNumberFromVolumeIDRequest, out *internal.GetDiskNumberFromVolumeIDRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta3_GetDiskNumberFromVolumeIDRequest_To_internal_GetDiskNumberFromVolumeIDRequest is an autogenerated conversion function. -func Convert_v1beta3_GetDiskNumberFromVolumeIDRequest_To_internal_GetDiskNumberFromVolumeIDRequest(in *v1beta3.GetDiskNumberFromVolumeIDRequest, out *internal.GetDiskNumberFromVolumeIDRequest) error { - return autoConvert_v1beta3_GetDiskNumberFromVolumeIDRequest_To_internal_GetDiskNumberFromVolumeIDRequest(in, out) -} - -func autoConvert_internal_GetDiskNumberFromVolumeIDRequest_To_v1beta3_GetDiskNumberFromVolumeIDRequest(in *internal.GetDiskNumberFromVolumeIDRequest, out *v1beta3.GetDiskNumberFromVolumeIDRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_GetDiskNumberFromVolumeIDRequest_To_v1beta3_GetDiskNumberFromVolumeIDRequest is an autogenerated conversion function. -func Convert_internal_GetDiskNumberFromVolumeIDRequest_To_v1beta3_GetDiskNumberFromVolumeIDRequest(in *internal.GetDiskNumberFromVolumeIDRequest, out *v1beta3.GetDiskNumberFromVolumeIDRequest) error { - return autoConvert_internal_GetDiskNumberFromVolumeIDRequest_To_v1beta3_GetDiskNumberFromVolumeIDRequest(in, out) -} - -func autoConvert_v1beta3_GetDiskNumberFromVolumeIDResponse_To_internal_GetDiskNumberFromVolumeIDResponse(in *v1beta3.GetDiskNumberFromVolumeIDResponse, out *internal.GetDiskNumberFromVolumeIDResponse) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_v1beta3_GetDiskNumberFromVolumeIDResponse_To_internal_GetDiskNumberFromVolumeIDResponse is an autogenerated conversion function. -func Convert_v1beta3_GetDiskNumberFromVolumeIDResponse_To_internal_GetDiskNumberFromVolumeIDResponse(in *v1beta3.GetDiskNumberFromVolumeIDResponse, out *internal.GetDiskNumberFromVolumeIDResponse) error { - return autoConvert_v1beta3_GetDiskNumberFromVolumeIDResponse_To_internal_GetDiskNumberFromVolumeIDResponse(in, out) -} - -func autoConvert_internal_GetDiskNumberFromVolumeIDResponse_To_v1beta3_GetDiskNumberFromVolumeIDResponse(in *internal.GetDiskNumberFromVolumeIDResponse, out *v1beta3.GetDiskNumberFromVolumeIDResponse) error { - out.DiskNumber = in.DiskNumber - return nil -} - -// Convert_internal_GetDiskNumberFromVolumeIDResponse_To_v1beta3_GetDiskNumberFromVolumeIDResponse is an autogenerated conversion function. -func Convert_internal_GetDiskNumberFromVolumeIDResponse_To_v1beta3_GetDiskNumberFromVolumeIDResponse(in *internal.GetDiskNumberFromVolumeIDResponse, out *v1beta3.GetDiskNumberFromVolumeIDResponse) error { - return autoConvert_internal_GetDiskNumberFromVolumeIDResponse_To_v1beta3_GetDiskNumberFromVolumeIDResponse(in, out) -} - -func autoConvert_v1beta3_GetVolumeIDFromTargetPathRequest_To_internal_GetVolumeIDFromTargetPathRequest(in *v1beta3.GetVolumeIDFromTargetPathRequest, out *internal.GetVolumeIDFromTargetPathRequest) error { - out.TargetPath = in.TargetPath - return nil -} - -// Convert_v1beta3_GetVolumeIDFromTargetPathRequest_To_internal_GetVolumeIDFromTargetPathRequest is an autogenerated conversion function. -func Convert_v1beta3_GetVolumeIDFromTargetPathRequest_To_internal_GetVolumeIDFromTargetPathRequest(in *v1beta3.GetVolumeIDFromTargetPathRequest, out *internal.GetVolumeIDFromTargetPathRequest) error { - return autoConvert_v1beta3_GetVolumeIDFromTargetPathRequest_To_internal_GetVolumeIDFromTargetPathRequest(in, out) -} - -func autoConvert_internal_GetVolumeIDFromTargetPathRequest_To_v1beta3_GetVolumeIDFromTargetPathRequest(in *internal.GetVolumeIDFromTargetPathRequest, out *v1beta3.GetVolumeIDFromTargetPathRequest) error { - out.TargetPath = in.TargetPath - return nil -} - -// Convert_internal_GetVolumeIDFromTargetPathRequest_To_v1beta3_GetVolumeIDFromTargetPathRequest is an autogenerated conversion function. -func Convert_internal_GetVolumeIDFromTargetPathRequest_To_v1beta3_GetVolumeIDFromTargetPathRequest(in *internal.GetVolumeIDFromTargetPathRequest, out *v1beta3.GetVolumeIDFromTargetPathRequest) error { - return autoConvert_internal_GetVolumeIDFromTargetPathRequest_To_v1beta3_GetVolumeIDFromTargetPathRequest(in, out) -} - -func autoConvert_v1beta3_GetVolumeIDFromTargetPathResponse_To_internal_GetVolumeIDFromTargetPathResponse(in *v1beta3.GetVolumeIDFromTargetPathResponse, out *internal.GetVolumeIDFromTargetPathResponse) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta3_GetVolumeIDFromTargetPathResponse_To_internal_GetVolumeIDFromTargetPathResponse is an autogenerated conversion function. -func Convert_v1beta3_GetVolumeIDFromTargetPathResponse_To_internal_GetVolumeIDFromTargetPathResponse(in *v1beta3.GetVolumeIDFromTargetPathResponse, out *internal.GetVolumeIDFromTargetPathResponse) error { - return autoConvert_v1beta3_GetVolumeIDFromTargetPathResponse_To_internal_GetVolumeIDFromTargetPathResponse(in, out) -} - -func autoConvert_internal_GetVolumeIDFromTargetPathResponse_To_v1beta3_GetVolumeIDFromTargetPathResponse(in *internal.GetVolumeIDFromTargetPathResponse, out *v1beta3.GetVolumeIDFromTargetPathResponse) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_GetVolumeIDFromTargetPathResponse_To_v1beta3_GetVolumeIDFromTargetPathResponse is an autogenerated conversion function. -func Convert_internal_GetVolumeIDFromTargetPathResponse_To_v1beta3_GetVolumeIDFromTargetPathResponse(in *internal.GetVolumeIDFromTargetPathResponse, out *v1beta3.GetVolumeIDFromTargetPathResponse) error { - return autoConvert_internal_GetVolumeIDFromTargetPathResponse_To_v1beta3_GetVolumeIDFromTargetPathResponse(in, out) -} - -func autoConvert_v1beta3_GetVolumeStatsRequest_To_internal_GetVolumeStatsRequest(in *v1beta3.GetVolumeStatsRequest, out *internal.GetVolumeStatsRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta3_GetVolumeStatsRequest_To_internal_GetVolumeStatsRequest is an autogenerated conversion function. -func Convert_v1beta3_GetVolumeStatsRequest_To_internal_GetVolumeStatsRequest(in *v1beta3.GetVolumeStatsRequest, out *internal.GetVolumeStatsRequest) error { - return autoConvert_v1beta3_GetVolumeStatsRequest_To_internal_GetVolumeStatsRequest(in, out) -} - -func autoConvert_internal_GetVolumeStatsRequest_To_v1beta3_GetVolumeStatsRequest(in *internal.GetVolumeStatsRequest, out *v1beta3.GetVolumeStatsRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_GetVolumeStatsRequest_To_v1beta3_GetVolumeStatsRequest is an autogenerated conversion function. -func Convert_internal_GetVolumeStatsRequest_To_v1beta3_GetVolumeStatsRequest(in *internal.GetVolumeStatsRequest, out *v1beta3.GetVolumeStatsRequest) error { - return autoConvert_internal_GetVolumeStatsRequest_To_v1beta3_GetVolumeStatsRequest(in, out) -} - -func autoConvert_v1beta3_GetVolumeStatsResponse_To_internal_GetVolumeStatsResponse(in *v1beta3.GetVolumeStatsResponse, out *internal.GetVolumeStatsResponse) error { - out.TotalBytes = in.TotalBytes - out.UsedBytes = in.UsedBytes - return nil -} - -// Convert_v1beta3_GetVolumeStatsResponse_To_internal_GetVolumeStatsResponse is an autogenerated conversion function. -func Convert_v1beta3_GetVolumeStatsResponse_To_internal_GetVolumeStatsResponse(in *v1beta3.GetVolumeStatsResponse, out *internal.GetVolumeStatsResponse) error { - return autoConvert_v1beta3_GetVolumeStatsResponse_To_internal_GetVolumeStatsResponse(in, out) -} - -func autoConvert_internal_GetVolumeStatsResponse_To_v1beta3_GetVolumeStatsResponse(in *internal.GetVolumeStatsResponse, out *v1beta3.GetVolumeStatsResponse) error { - out.TotalBytes = in.TotalBytes - out.UsedBytes = in.UsedBytes - return nil -} - -// Convert_internal_GetVolumeStatsResponse_To_v1beta3_GetVolumeStatsResponse is an autogenerated conversion function. -func Convert_internal_GetVolumeStatsResponse_To_v1beta3_GetVolumeStatsResponse(in *internal.GetVolumeStatsResponse, out *v1beta3.GetVolumeStatsResponse) error { - return autoConvert_internal_GetVolumeStatsResponse_To_v1beta3_GetVolumeStatsResponse(in, out) -} - -func autoConvert_v1beta3_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in *v1beta3.IsVolumeFormattedRequest, out *internal.IsVolumeFormattedRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta3_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest is an autogenerated conversion function. -func Convert_v1beta3_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in *v1beta3.IsVolumeFormattedRequest, out *internal.IsVolumeFormattedRequest) error { - return autoConvert_v1beta3_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(in, out) -} - -func autoConvert_internal_IsVolumeFormattedRequest_To_v1beta3_IsVolumeFormattedRequest(in *internal.IsVolumeFormattedRequest, out *v1beta3.IsVolumeFormattedRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_IsVolumeFormattedRequest_To_v1beta3_IsVolumeFormattedRequest is an autogenerated conversion function. -func Convert_internal_IsVolumeFormattedRequest_To_v1beta3_IsVolumeFormattedRequest(in *internal.IsVolumeFormattedRequest, out *v1beta3.IsVolumeFormattedRequest) error { - return autoConvert_internal_IsVolumeFormattedRequest_To_v1beta3_IsVolumeFormattedRequest(in, out) -} - -func autoConvert_v1beta3_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in *v1beta3.IsVolumeFormattedResponse, out *internal.IsVolumeFormattedResponse) error { - out.Formatted = in.Formatted - return nil -} - -// Convert_v1beta3_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse is an autogenerated conversion function. -func Convert_v1beta3_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in *v1beta3.IsVolumeFormattedResponse, out *internal.IsVolumeFormattedResponse) error { - return autoConvert_v1beta3_IsVolumeFormattedResponse_To_internal_IsVolumeFormattedResponse(in, out) -} - -func autoConvert_internal_IsVolumeFormattedResponse_To_v1beta3_IsVolumeFormattedResponse(in *internal.IsVolumeFormattedResponse, out *v1beta3.IsVolumeFormattedResponse) error { - out.Formatted = in.Formatted - return nil -} - -// Convert_internal_IsVolumeFormattedResponse_To_v1beta3_IsVolumeFormattedResponse is an autogenerated conversion function. -func Convert_internal_IsVolumeFormattedResponse_To_v1beta3_IsVolumeFormattedResponse(in *internal.IsVolumeFormattedResponse, out *v1beta3.IsVolumeFormattedResponse) error { - return autoConvert_internal_IsVolumeFormattedResponse_To_v1beta3_IsVolumeFormattedResponse(in, out) -} - -func autoConvert_v1beta3_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(in *v1beta3.ListVolumesOnDiskRequest, out *internal.ListVolumesOnDiskRequest) error { - out.DiskNumber = in.DiskNumber - out.PartitionNumber = in.PartitionNumber - return nil -} - -// Convert_v1beta3_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest is an autogenerated conversion function. -func Convert_v1beta3_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(in *v1beta3.ListVolumesOnDiskRequest, out *internal.ListVolumesOnDiskRequest) error { - return autoConvert_v1beta3_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(in, out) -} - -func autoConvert_internal_ListVolumesOnDiskRequest_To_v1beta3_ListVolumesOnDiskRequest(in *internal.ListVolumesOnDiskRequest, out *v1beta3.ListVolumesOnDiskRequest) error { - out.DiskNumber = in.DiskNumber - out.PartitionNumber = in.PartitionNumber - return nil -} - -// Convert_internal_ListVolumesOnDiskRequest_To_v1beta3_ListVolumesOnDiskRequest is an autogenerated conversion function. -func Convert_internal_ListVolumesOnDiskRequest_To_v1beta3_ListVolumesOnDiskRequest(in *internal.ListVolumesOnDiskRequest, out *v1beta3.ListVolumesOnDiskRequest) error { - return autoConvert_internal_ListVolumesOnDiskRequest_To_v1beta3_ListVolumesOnDiskRequest(in, out) -} - -func autoConvert_v1beta3_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in *v1beta3.ListVolumesOnDiskResponse, out *internal.ListVolumesOnDiskResponse) error { - out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) - return nil -} - -// Convert_v1beta3_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse is an autogenerated conversion function. -func Convert_v1beta3_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in *v1beta3.ListVolumesOnDiskResponse, out *internal.ListVolumesOnDiskResponse) error { - return autoConvert_v1beta3_ListVolumesOnDiskResponse_To_internal_ListVolumesOnDiskResponse(in, out) -} - -func autoConvert_internal_ListVolumesOnDiskResponse_To_v1beta3_ListVolumesOnDiskResponse(in *internal.ListVolumesOnDiskResponse, out *v1beta3.ListVolumesOnDiskResponse) error { - out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) - return nil -} - -// Convert_internal_ListVolumesOnDiskResponse_To_v1beta3_ListVolumesOnDiskResponse is an autogenerated conversion function. -func Convert_internal_ListVolumesOnDiskResponse_To_v1beta3_ListVolumesOnDiskResponse(in *internal.ListVolumesOnDiskResponse, out *v1beta3.ListVolumesOnDiskResponse) error { - return autoConvert_internal_ListVolumesOnDiskResponse_To_v1beta3_ListVolumesOnDiskResponse(in, out) -} - -func autoConvert_v1beta3_MountVolumeRequest_To_internal_MountVolumeRequest(in *v1beta3.MountVolumeRequest, out *internal.MountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.TargetPath = in.TargetPath - return nil -} - -// Convert_v1beta3_MountVolumeRequest_To_internal_MountVolumeRequest is an autogenerated conversion function. -func Convert_v1beta3_MountVolumeRequest_To_internal_MountVolumeRequest(in *v1beta3.MountVolumeRequest, out *internal.MountVolumeRequest) error { - return autoConvert_v1beta3_MountVolumeRequest_To_internal_MountVolumeRequest(in, out) -} - -func autoConvert_internal_MountVolumeRequest_To_v1beta3_MountVolumeRequest(in *internal.MountVolumeRequest, out *v1beta3.MountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.TargetPath = in.TargetPath - return nil -} - -// Convert_internal_MountVolumeRequest_To_v1beta3_MountVolumeRequest is an autogenerated conversion function. -func Convert_internal_MountVolumeRequest_To_v1beta3_MountVolumeRequest(in *internal.MountVolumeRequest, out *v1beta3.MountVolumeRequest) error { - return autoConvert_internal_MountVolumeRequest_To_v1beta3_MountVolumeRequest(in, out) -} - -func autoConvert_v1beta3_MountVolumeResponse_To_internal_MountVolumeResponse(in *v1beta3.MountVolumeResponse, out *internal.MountVolumeResponse) error { - return nil -} - -// Convert_v1beta3_MountVolumeResponse_To_internal_MountVolumeResponse is an autogenerated conversion function. -func Convert_v1beta3_MountVolumeResponse_To_internal_MountVolumeResponse(in *v1beta3.MountVolumeResponse, out *internal.MountVolumeResponse) error { - return autoConvert_v1beta3_MountVolumeResponse_To_internal_MountVolumeResponse(in, out) -} - -func autoConvert_internal_MountVolumeResponse_To_v1beta3_MountVolumeResponse(in *internal.MountVolumeResponse, out *v1beta3.MountVolumeResponse) error { - return nil -} - -// Convert_internal_MountVolumeResponse_To_v1beta3_MountVolumeResponse is an autogenerated conversion function. -func Convert_internal_MountVolumeResponse_To_v1beta3_MountVolumeResponse(in *internal.MountVolumeResponse, out *v1beta3.MountVolumeResponse) error { - return autoConvert_internal_MountVolumeResponse_To_v1beta3_MountVolumeResponse(in, out) -} - -func autoConvert_v1beta3_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(in *v1beta3.ResizeVolumeRequest, out *internal.ResizeVolumeRequest) error { - out.VolumeId = in.VolumeId - out.SizeBytes = in.SizeBytes - return nil -} - -// Convert_v1beta3_ResizeVolumeRequest_To_internal_ResizeVolumeRequest is an autogenerated conversion function. -func Convert_v1beta3_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(in *v1beta3.ResizeVolumeRequest, out *internal.ResizeVolumeRequest) error { - return autoConvert_v1beta3_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(in, out) -} - -func autoConvert_internal_ResizeVolumeRequest_To_v1beta3_ResizeVolumeRequest(in *internal.ResizeVolumeRequest, out *v1beta3.ResizeVolumeRequest) error { - out.VolumeId = in.VolumeId - out.SizeBytes = in.SizeBytes - return nil -} - -// Convert_internal_ResizeVolumeRequest_To_v1beta3_ResizeVolumeRequest is an autogenerated conversion function. -func Convert_internal_ResizeVolumeRequest_To_v1beta3_ResizeVolumeRequest(in *internal.ResizeVolumeRequest, out *v1beta3.ResizeVolumeRequest) error { - return autoConvert_internal_ResizeVolumeRequest_To_v1beta3_ResizeVolumeRequest(in, out) -} - -func autoConvert_v1beta3_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in *v1beta3.ResizeVolumeResponse, out *internal.ResizeVolumeResponse) error { - return nil -} - -// Convert_v1beta3_ResizeVolumeResponse_To_internal_ResizeVolumeResponse is an autogenerated conversion function. -func Convert_v1beta3_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in *v1beta3.ResizeVolumeResponse, out *internal.ResizeVolumeResponse) error { - return autoConvert_v1beta3_ResizeVolumeResponse_To_internal_ResizeVolumeResponse(in, out) -} - -func autoConvert_internal_ResizeVolumeResponse_To_v1beta3_ResizeVolumeResponse(in *internal.ResizeVolumeResponse, out *v1beta3.ResizeVolumeResponse) error { - return nil -} - -// Convert_internal_ResizeVolumeResponse_To_v1beta3_ResizeVolumeResponse is an autogenerated conversion function. -func Convert_internal_ResizeVolumeResponse_To_v1beta3_ResizeVolumeResponse(in *internal.ResizeVolumeResponse, out *v1beta3.ResizeVolumeResponse) error { - return autoConvert_internal_ResizeVolumeResponse_To_v1beta3_ResizeVolumeResponse(in, out) -} - -func autoConvert_v1beta3_UnmountVolumeRequest_To_internal_UnmountVolumeRequest(in *v1beta3.UnmountVolumeRequest, out *internal.UnmountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.TargetPath = in.TargetPath - return nil -} - -// Convert_v1beta3_UnmountVolumeRequest_To_internal_UnmountVolumeRequest is an autogenerated conversion function. -func Convert_v1beta3_UnmountVolumeRequest_To_internal_UnmountVolumeRequest(in *v1beta3.UnmountVolumeRequest, out *internal.UnmountVolumeRequest) error { - return autoConvert_v1beta3_UnmountVolumeRequest_To_internal_UnmountVolumeRequest(in, out) -} - -func autoConvert_internal_UnmountVolumeRequest_To_v1beta3_UnmountVolumeRequest(in *internal.UnmountVolumeRequest, out *v1beta3.UnmountVolumeRequest) error { - out.VolumeId = in.VolumeId - out.TargetPath = in.TargetPath - return nil -} - -// Convert_internal_UnmountVolumeRequest_To_v1beta3_UnmountVolumeRequest is an autogenerated conversion function. -func Convert_internal_UnmountVolumeRequest_To_v1beta3_UnmountVolumeRequest(in *internal.UnmountVolumeRequest, out *v1beta3.UnmountVolumeRequest) error { - return autoConvert_internal_UnmountVolumeRequest_To_v1beta3_UnmountVolumeRequest(in, out) -} - -func autoConvert_v1beta3_UnmountVolumeResponse_To_internal_UnmountVolumeResponse(in *v1beta3.UnmountVolumeResponse, out *internal.UnmountVolumeResponse) error { - return nil -} - -// Convert_v1beta3_UnmountVolumeResponse_To_internal_UnmountVolumeResponse is an autogenerated conversion function. -func Convert_v1beta3_UnmountVolumeResponse_To_internal_UnmountVolumeResponse(in *v1beta3.UnmountVolumeResponse, out *internal.UnmountVolumeResponse) error { - return autoConvert_v1beta3_UnmountVolumeResponse_To_internal_UnmountVolumeResponse(in, out) -} - -func autoConvert_internal_UnmountVolumeResponse_To_v1beta3_UnmountVolumeResponse(in *internal.UnmountVolumeResponse, out *v1beta3.UnmountVolumeResponse) error { - return nil -} - -// Convert_internal_UnmountVolumeResponse_To_v1beta3_UnmountVolumeResponse is an autogenerated conversion function. -func Convert_internal_UnmountVolumeResponse_To_v1beta3_UnmountVolumeResponse(in *internal.UnmountVolumeResponse, out *v1beta3.UnmountVolumeResponse) error { - return autoConvert_internal_UnmountVolumeResponse_To_v1beta3_UnmountVolumeResponse(in, out) -} - -func autoConvert_v1beta3_WriteVolumeCacheRequest_To_internal_WriteVolumeCacheRequest(in *v1beta3.WriteVolumeCacheRequest, out *internal.WriteVolumeCacheRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_v1beta3_WriteVolumeCacheRequest_To_internal_WriteVolumeCacheRequest is an autogenerated conversion function. -func Convert_v1beta3_WriteVolumeCacheRequest_To_internal_WriteVolumeCacheRequest(in *v1beta3.WriteVolumeCacheRequest, out *internal.WriteVolumeCacheRequest) error { - return autoConvert_v1beta3_WriteVolumeCacheRequest_To_internal_WriteVolumeCacheRequest(in, out) -} - -func autoConvert_internal_WriteVolumeCacheRequest_To_v1beta3_WriteVolumeCacheRequest(in *internal.WriteVolumeCacheRequest, out *v1beta3.WriteVolumeCacheRequest) error { - out.VolumeId = in.VolumeId - return nil -} - -// Convert_internal_WriteVolumeCacheRequest_To_v1beta3_WriteVolumeCacheRequest is an autogenerated conversion function. -func Convert_internal_WriteVolumeCacheRequest_To_v1beta3_WriteVolumeCacheRequest(in *internal.WriteVolumeCacheRequest, out *v1beta3.WriteVolumeCacheRequest) error { - return autoConvert_internal_WriteVolumeCacheRequest_To_v1beta3_WriteVolumeCacheRequest(in, out) -} - -func autoConvert_v1beta3_WriteVolumeCacheResponse_To_internal_WriteVolumeCacheResponse(in *v1beta3.WriteVolumeCacheResponse, out *internal.WriteVolumeCacheResponse) error { - return nil -} - -// Convert_v1beta3_WriteVolumeCacheResponse_To_internal_WriteVolumeCacheResponse is an autogenerated conversion function. -func Convert_v1beta3_WriteVolumeCacheResponse_To_internal_WriteVolumeCacheResponse(in *v1beta3.WriteVolumeCacheResponse, out *internal.WriteVolumeCacheResponse) error { - return autoConvert_v1beta3_WriteVolumeCacheResponse_To_internal_WriteVolumeCacheResponse(in, out) -} - -func autoConvert_internal_WriteVolumeCacheResponse_To_v1beta3_WriteVolumeCacheResponse(in *internal.WriteVolumeCacheResponse, out *v1beta3.WriteVolumeCacheResponse) error { - return nil -} - -// Convert_internal_WriteVolumeCacheResponse_To_v1beta3_WriteVolumeCacheResponse is an autogenerated conversion function. -func Convert_internal_WriteVolumeCacheResponse_To_v1beta3_WriteVolumeCacheResponse(in *internal.WriteVolumeCacheResponse, out *v1beta3.WriteVolumeCacheResponse) error { - return autoConvert_internal_WriteVolumeCacheResponse_To_v1beta3_WriteVolumeCacheResponse(in, out) -} diff --git a/internal/os/disk/api.go b/pkg/os/disk/api.go similarity index 99% rename from internal/os/disk/api.go rename to pkg/os/disk/api.go index 7e0be008..1da769d9 100644 --- a/internal/os/disk/api.go +++ b/pkg/os/disk/api.go @@ -11,7 +11,7 @@ import ( "syscall" "unsafe" - shared "github.com/kubernetes-csi/csi-proxy/internal/shared/disk" + shared "github.com/kubernetes-csi/csi-proxy/pkg/shared/disk" "k8s.io/klog/v2" ) diff --git a/internal/os/disk/types.go b/pkg/os/disk/types.go similarity index 100% rename from internal/os/disk/types.go rename to pkg/os/disk/types.go diff --git a/internal/os/filesystem/api.go b/pkg/os/filesystem/api.go similarity index 100% rename from internal/os/filesystem/api.go rename to pkg/os/filesystem/api.go diff --git a/internal/os/filesystem/api_test.go b/pkg/os/filesystem/api_test.go similarity index 100% rename from internal/os/filesystem/api_test.go rename to pkg/os/filesystem/api_test.go diff --git a/internal/os/iscsi/api.go b/pkg/os/iscsi/api.go similarity index 100% rename from internal/os/iscsi/api.go rename to pkg/os/iscsi/api.go diff --git a/internal/os/iscsi/types.go b/pkg/os/iscsi/types.go similarity index 100% rename from internal/os/iscsi/types.go rename to pkg/os/iscsi/types.go diff --git a/internal/os/smb/api.go b/pkg/os/smb/api.go similarity index 100% rename from internal/os/smb/api.go rename to pkg/os/smb/api.go diff --git a/internal/os/system/api.go b/pkg/os/system/api.go similarity index 100% rename from internal/os/system/api.go rename to pkg/os/system/api.go diff --git a/internal/os/volume/api.go b/pkg/os/volume/api.go similarity index 100% rename from internal/os/volume/api.go rename to pkg/os/volume/api.go diff --git a/internal/server/disk/api_group_generated.go b/pkg/server/disk/api_group_generated.go similarity index 67% rename from internal/server/disk/api_group_generated.go rename to pkg/server/disk/api_group_generated.go index b6942b18..da244c4c 100644 --- a/internal/server/disk/api_group_generated.go +++ b/pkg/server/disk/api_group_generated.go @@ -4,18 +4,18 @@ package disk import ( "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal/v1alpha1" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal/v1beta1" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal/v1beta2" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal/v1beta3" - srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types" + "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" + "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl/v1alpha1" + "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl/v1beta1" + "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl/v1beta2" + "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl/v1beta3" + srvtypes "github.com/kubernetes-csi/csi-proxy/pkg/server/types" ) const name = "disk" // ensure the server defines all the required methods -var _ internal.ServerInterface = &Server{} +var _ impl.ServerInterface = &Server{} func (s *Server) VersionedAPIs() []*srvtypes.VersionedAPI { v1alpha1Server := v1alpha1.NewVersionedServer(s) diff --git a/internal/server/disk/internal/types.go b/pkg/server/disk/impl/types.go similarity index 99% rename from internal/server/disk/internal/types.go rename to pkg/server/disk/impl/types.go index 9d95b555..33197ccf 100644 --- a/internal/server/disk/internal/types.go +++ b/pkg/server/disk/impl/types.go @@ -1,4 +1,4 @@ -package internal +package impl type DiskLocation struct { Adapter string diff --git a/internal/server/disk/internal/types_generated.go b/pkg/server/disk/impl/types_generated.go similarity index 98% rename from internal/server/disk/internal/types_generated.go rename to pkg/server/disk/impl/types_generated.go index 1cb032c3..d3a7d3bd 100644 --- a/internal/server/disk/internal/types_generated.go +++ b/pkg/server/disk/impl/types_generated.go @@ -1,6 +1,6 @@ // Code generated by csi-proxy-api-gen. DO NOT EDIT. -package internal +package impl import ( "context" diff --git a/internal/server/disk/internal/v1alpha1/conversion.go b/pkg/server/disk/impl/v1alpha1/conversion.go similarity index 57% rename from internal/server/disk/internal/v1alpha1/conversion.go rename to pkg/server/disk/impl/v1alpha1/conversion.go index d0bb557c..128afe24 100644 --- a/internal/server/disk/internal/v1alpha1/conversion.go +++ b/pkg/server/disk/impl/v1alpha1/conversion.go @@ -5,12 +5,12 @@ import ( "strconv" "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" ) // Add manual conversion functions here to override automatic conversion functions -func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error { +func Convert_impl_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *impl.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error { // conversion function added in v1beta3, the disk_locations map key was changed from string to uint32 // v1alpha1 is expecting a string so convert the uint32 to string if in.DiskLocations != nil { @@ -18,7 +18,7 @@ func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsRes *out = make(map[string]*v1alpha1.DiskLocation, len(*in)) for key, val := range *in { newVal := new(v1alpha1.DiskLocation) - if err := Convert_internal_DiskLocation_To_v1alpha1_DiskLocation(val, newVal); err != nil { + if err := Convert_impl_DiskLocation_To_v1alpha1_DiskLocation(val, newVal); err != nil { return err } (*out)[strconv.FormatUint(uint64(key), 10)] = newVal @@ -29,14 +29,14 @@ func Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsRes return nil } -func Convert_v1alpha1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1alpha1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error { - // there's no need to implement this function because it's never used (we only convert an internal response to a client response) +func Convert_v1alpha1_ListDiskLocationsResponse_To_impl_ListDiskLocationsResponse(in *v1alpha1.ListDiskLocationsResponse, out *impl.ListDiskLocationsResponse) error { + // there's no need to implement this function because it's never used (we only convert an impl response to a client response) // however we need to override it so that the generator doesn't generate the wrong implementation // see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400 return nil } -func Convert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1alpha1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error { +func Convert_v1alpha1_PartitionDiskRequest_To_impl_PartitionDiskRequest(in *v1alpha1.PartitionDiskRequest, out *impl.PartitionDiskRequest) error { diskNumber, err := strconv.ParseUint(in.DiskID, 10, 64) if err != nil { return fmt.Errorf("Failed to convert v1alpha1.PartitionDiskRequest.DiskID to uint32: %w", err) @@ -47,14 +47,14 @@ func Convert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in * // no need to override PartitionDiskResponse because the request doesn't return anything -func Convert_v1alpha1_GetDiskNumberByNameResponse_To_internal_GetDiskNumberByNameResponse(in *v1alpha1.GetDiskNumberByNameResponse, out *internal.GetDiskNumberByNameResponse) error { - // there's no need to implement this function because it's never used (we only convert an internal response to a client response) +func Convert_v1alpha1_GetDiskNumberByNameResponse_To_impl_GetDiskNumberByNameResponse(in *v1alpha1.GetDiskNumberByNameResponse, out *impl.GetDiskNumberByNameResponse) error { + // there's no need to implement this function because it's never used (we only convert an impl response to a client response) // however we need to override it so that the generator doesn't generate the wrong implementation // see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400 return nil } -func Convert_internal_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(in *internal.GetDiskNumberByNameResponse, out *v1alpha1.GetDiskNumberByNameResponse) error { +func Convert_impl_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(in *impl.GetDiskNumberByNameResponse, out *v1alpha1.GetDiskNumberByNameResponse) error { out.DiskNumber = strconv.FormatUint(uint64(in.DiskNumber), 10) return nil } diff --git a/pkg/server/disk/impl/v1alpha1/conversion_generated.go b/pkg/server/disk/impl/v1alpha1/conversion_generated.go new file mode 100644 index 00000000..6d2b6173 --- /dev/null +++ b/pkg/server/disk/impl/v1alpha1/conversion_generated.go @@ -0,0 +1,155 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" +) + +func autoConvert_v1alpha1_DiskLocation_To_impl_DiskLocation(in *v1alpha1.DiskLocation, out *impl.DiskLocation) error { + out.Adapter = in.Adapter + out.Bus = in.Bus + out.Target = in.Target + out.LUNID = in.LUNID + return nil +} + +// Convert_v1alpha1_DiskLocation_To_impl_DiskLocation is an autogenerated conversion function. +func Convert_v1alpha1_DiskLocation_To_impl_DiskLocation(in *v1alpha1.DiskLocation, out *impl.DiskLocation) error { + return autoConvert_v1alpha1_DiskLocation_To_impl_DiskLocation(in, out) +} + +func autoConvert_impl_DiskLocation_To_v1alpha1_DiskLocation(in *impl.DiskLocation, out *v1alpha1.DiskLocation) error { + out.Adapter = in.Adapter + out.Bus = in.Bus + out.Target = in.Target + out.LUNID = in.LUNID + return nil +} + +// Convert_impl_DiskLocation_To_v1alpha1_DiskLocation is an autogenerated conversion function. +func Convert_impl_DiskLocation_To_v1alpha1_DiskLocation(in *impl.DiskLocation, out *v1alpha1.DiskLocation) error { + return autoConvert_impl_DiskLocation_To_v1alpha1_DiskLocation(in, out) +} + +func autoConvert_v1alpha1_GetDiskNumberByNameRequest_To_impl_GetDiskNumberByNameRequest(in *v1alpha1.GetDiskNumberByNameRequest, out *impl.GetDiskNumberByNameRequest) error { + out.DiskName = in.DiskName + return nil +} + +// Convert_v1alpha1_GetDiskNumberByNameRequest_To_impl_GetDiskNumberByNameRequest is an autogenerated conversion function. +func Convert_v1alpha1_GetDiskNumberByNameRequest_To_impl_GetDiskNumberByNameRequest(in *v1alpha1.GetDiskNumberByNameRequest, out *impl.GetDiskNumberByNameRequest) error { + return autoConvert_v1alpha1_GetDiskNumberByNameRequest_To_impl_GetDiskNumberByNameRequest(in, out) +} + +func autoConvert_impl_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByNameRequest(in *impl.GetDiskNumberByNameRequest, out *v1alpha1.GetDiskNumberByNameRequest) error { + out.DiskName = in.DiskName + return nil +} + +// Convert_impl_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByNameRequest is an autogenerated conversion function. +func Convert_impl_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByNameRequest(in *impl.GetDiskNumberByNameRequest, out *v1alpha1.GetDiskNumberByNameRequest) error { + return autoConvert_impl_GetDiskNumberByNameRequest_To_v1alpha1_GetDiskNumberByNameRequest(in, out) +} + +// detected external conversion function +// Convert_v1alpha1_GetDiskNumberByNameResponse_To_impl_GetDiskNumberByNameResponse(in *v1alpha1.GetDiskNumberByNameResponse, out *impl.GetDiskNumberByNameResponse) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(in *impl.GetDiskNumberByNameResponse, out *v1alpha1.GetDiskNumberByNameResponse) error +// skipping generation of the auto function + +func autoConvert_v1alpha1_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in *v1alpha1.ListDiskLocationsRequest, out *impl.ListDiskLocationsRequest) error { + return nil +} + +// Convert_v1alpha1_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest is an autogenerated conversion function. +func Convert_v1alpha1_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in *v1alpha1.ListDiskLocationsRequest, out *impl.ListDiskLocationsRequest) error { + return autoConvert_v1alpha1_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in, out) +} + +func autoConvert_impl_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequest(in *impl.ListDiskLocationsRequest, out *v1alpha1.ListDiskLocationsRequest) error { + return nil +} + +// Convert_impl_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequest is an autogenerated conversion function. +func Convert_impl_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequest(in *impl.ListDiskLocationsRequest, out *v1alpha1.ListDiskLocationsRequest) error { + return autoConvert_impl_ListDiskLocationsRequest_To_v1alpha1_ListDiskLocationsRequest(in, out) +} + +// detected external conversion function +// Convert_v1alpha1_ListDiskLocationsResponse_To_impl_ListDiskLocationsResponse(in *v1alpha1.ListDiskLocationsResponse, out *impl.ListDiskLocationsResponse) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(in *impl.ListDiskLocationsResponse, out *v1alpha1.ListDiskLocationsResponse) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_v1alpha1_PartitionDiskRequest_To_impl_PartitionDiskRequest(in *v1alpha1.PartitionDiskRequest, out *impl.PartitionDiskRequest) error +// skipping generation of the auto function + +func autoConvert_impl_PartitionDiskRequest_To_v1alpha1_PartitionDiskRequest(in *impl.PartitionDiskRequest, out *v1alpha1.PartitionDiskRequest) error { + return nil +} + +// Convert_impl_PartitionDiskRequest_To_v1alpha1_PartitionDiskRequest is an autogenerated conversion function. +func Convert_impl_PartitionDiskRequest_To_v1alpha1_PartitionDiskRequest(in *impl.PartitionDiskRequest, out *v1alpha1.PartitionDiskRequest) error { + return autoConvert_impl_PartitionDiskRequest_To_v1alpha1_PartitionDiskRequest(in, out) +} + +func autoConvert_v1alpha1_PartitionDiskResponse_To_impl_PartitionDiskResponse(in *v1alpha1.PartitionDiskResponse, out *impl.PartitionDiskResponse) error { + return nil +} + +// Convert_v1alpha1_PartitionDiskResponse_To_impl_PartitionDiskResponse is an autogenerated conversion function. +func Convert_v1alpha1_PartitionDiskResponse_To_impl_PartitionDiskResponse(in *v1alpha1.PartitionDiskResponse, out *impl.PartitionDiskResponse) error { + return autoConvert_v1alpha1_PartitionDiskResponse_To_impl_PartitionDiskResponse(in, out) +} + +func autoConvert_impl_PartitionDiskResponse_To_v1alpha1_PartitionDiskResponse(in *impl.PartitionDiskResponse, out *v1alpha1.PartitionDiskResponse) error { + return nil +} + +// Convert_impl_PartitionDiskResponse_To_v1alpha1_PartitionDiskResponse is an autogenerated conversion function. +func Convert_impl_PartitionDiskResponse_To_v1alpha1_PartitionDiskResponse(in *impl.PartitionDiskResponse, out *v1alpha1.PartitionDiskResponse) error { + return autoConvert_impl_PartitionDiskResponse_To_v1alpha1_PartitionDiskResponse(in, out) +} + +func autoConvert_v1alpha1_RescanRequest_To_impl_RescanRequest(in *v1alpha1.RescanRequest, out *impl.RescanRequest) error { + return nil +} + +// Convert_v1alpha1_RescanRequest_To_impl_RescanRequest is an autogenerated conversion function. +func Convert_v1alpha1_RescanRequest_To_impl_RescanRequest(in *v1alpha1.RescanRequest, out *impl.RescanRequest) error { + return autoConvert_v1alpha1_RescanRequest_To_impl_RescanRequest(in, out) +} + +func autoConvert_impl_RescanRequest_To_v1alpha1_RescanRequest(in *impl.RescanRequest, out *v1alpha1.RescanRequest) error { + return nil +} + +// Convert_impl_RescanRequest_To_v1alpha1_RescanRequest is an autogenerated conversion function. +func Convert_impl_RescanRequest_To_v1alpha1_RescanRequest(in *impl.RescanRequest, out *v1alpha1.RescanRequest) error { + return autoConvert_impl_RescanRequest_To_v1alpha1_RescanRequest(in, out) +} + +func autoConvert_v1alpha1_RescanResponse_To_impl_RescanResponse(in *v1alpha1.RescanResponse, out *impl.RescanResponse) error { + return nil +} + +// Convert_v1alpha1_RescanResponse_To_impl_RescanResponse is an autogenerated conversion function. +func Convert_v1alpha1_RescanResponse_To_impl_RescanResponse(in *v1alpha1.RescanResponse, out *impl.RescanResponse) error { + return autoConvert_v1alpha1_RescanResponse_To_impl_RescanResponse(in, out) +} + +func autoConvert_impl_RescanResponse_To_v1alpha1_RescanResponse(in *impl.RescanResponse, out *v1alpha1.RescanResponse) error { + return nil +} + +// Convert_impl_RescanResponse_To_v1alpha1_RescanResponse is an autogenerated conversion function. +func Convert_impl_RescanResponse_To_v1alpha1_RescanResponse(in *impl.RescanResponse, out *v1alpha1.RescanResponse) error { + return autoConvert_impl_RescanResponse_To_v1alpha1_RescanResponse(in, out) +} diff --git a/internal/server/disk/internal/v1alpha1/server_generated.go b/pkg/server/disk/impl/v1alpha1/server_generated.go similarity index 60% rename from internal/server/disk/internal/v1alpha1/server_generated.go rename to pkg/server/disk/impl/v1alpha1/server_generated.go index 1580dc2e..4dbe7ac7 100644 --- a/internal/server/disk/internal/v1alpha1/server_generated.go +++ b/pkg/server/disk/impl/v1alpha1/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1alpha1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1alpha1") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) GetDiskNumberByName(context context.Context, versionedRequest *v1alpha1.GetDiskNumberByNameRequest) (*v1alpha1.GetDiskNumberByNameResponse, error) { - request := &internal.GetDiskNumberByNameRequest{} - if err := Convert_v1alpha1_GetDiskNumberByNameRequest_To_internal_GetDiskNumberByNameRequest(versionedRequest, request); err != nil { + request := &impl.GetDiskNumberByNameRequest{} + if err := Convert_v1alpha1_GetDiskNumberByNameRequest_To_impl_GetDiskNumberByNameRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) GetDiskNumberByName(context context.Context, versionedReq } versionedResponse := &v1alpha1.GetDiskNumberByNameResponse{} - if err := Convert_internal_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetDiskNumberByNameResponse_To_v1alpha1_GetDiskNumberByNameResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) GetDiskNumberByName(context context.Context, versionedReq } func (s *versionedAPI) ListDiskLocations(context context.Context, versionedRequest *v1alpha1.ListDiskLocationsRequest) (*v1alpha1.ListDiskLocationsResponse, error) { - request := &internal.ListDiskLocationsRequest{} - if err := Convert_v1alpha1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(versionedRequest, request); err != nil { + request := &impl.ListDiskLocationsRequest{} + if err := Convert_v1alpha1_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) ListDiskLocations(context context.Context, versionedReque } versionedResponse := &v1alpha1.ListDiskLocationsResponse{} - if err := Convert_internal_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListDiskLocationsResponse_To_v1alpha1_ListDiskLocationsResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) ListDiskLocations(context context.Context, versionedReque } func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest *v1alpha1.PartitionDiskRequest) (*v1alpha1.PartitionDiskResponse, error) { - request := &internal.PartitionDiskRequest{} - if err := Convert_v1alpha1_PartitionDiskRequest_To_internal_PartitionDiskRequest(versionedRequest, request); err != nil { + request := &impl.PartitionDiskRequest{} + if err := Convert_v1alpha1_PartitionDiskRequest_To_impl_PartitionDiskRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest * } versionedResponse := &v1alpha1.PartitionDiskResponse{} - if err := Convert_internal_PartitionDiskResponse_To_v1alpha1_PartitionDiskResponse(response, versionedResponse); err != nil { + if err := Convert_impl_PartitionDiskResponse_To_v1alpha1_PartitionDiskResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest * } func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1alpha1.RescanRequest) (*v1alpha1.RescanResponse, error) { - request := &internal.RescanRequest{} - if err := Convert_v1alpha1_RescanRequest_To_internal_RescanRequest(versionedRequest, request); err != nil { + request := &impl.RescanRequest{} + if err := Convert_v1alpha1_RescanRequest_To_impl_RescanRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1alpha } versionedResponse := &v1alpha1.RescanResponse{} - if err := Convert_internal_RescanResponse_To_v1alpha1_RescanResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RescanResponse_To_v1alpha1_RescanResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/disk/internal/v1beta1/conversion.go b/pkg/server/disk/impl/v1beta1/conversion.go similarity index 64% rename from internal/server/disk/internal/v1beta1/conversion.go rename to pkg/server/disk/impl/v1beta1/conversion.go index 7f60934b..2aae5348 100644 --- a/internal/server/disk/internal/v1beta1/conversion.go +++ b/pkg/server/disk/impl/v1beta1/conversion.go @@ -5,12 +5,12 @@ import ( "strconv" "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" ) // Add manual conversion functions here to override automatic conversion functions -func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error { +func Convert_impl_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *impl.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error { // conversion function added in v1beta3, the disk_locations map key was changed from string to uint32 // v1beta1 is expecting a string so convert the uint32 to string if in.DiskLocations != nil { @@ -18,7 +18,7 @@ func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResp *out = make(map[string]*v1beta1.DiskLocation, len(*in)) for key, val := range *in { newVal := new(v1beta1.DiskLocation) - if err := Convert_internal_DiskLocation_To_v1beta1_DiskLocation(val, newVal); err != nil { + if err := Convert_impl_DiskLocation_To_v1beta1_DiskLocation(val, newVal); err != nil { return err } (*out)[strconv.FormatUint(uint64(key), 10)] = newVal @@ -29,14 +29,14 @@ func Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResp return nil } -func Convert_v1beta1_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta1.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error { - // there's no need to implement this function because it's never used (we only convert an internal response to a client response) +func Convert_v1beta1_ListDiskLocationsResponse_To_impl_ListDiskLocationsResponse(in *v1beta1.ListDiskLocationsResponse, out *impl.ListDiskLocationsResponse) error { + // there's no need to implement this function because it's never used (we only convert an impl response to a client response) // however we need to override it so that the generator doesn't generate the wrong implementation // see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400 return nil } -func Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error { +func Convert_impl_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *impl.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error { // conversion function added in v1beta3, diskIDs was renamed to disk_ids, also the disk_ids map key was converted from string to uint32 // v1beta1 is expecting diskIDs to have a key of the type string instead of uint32 if in.DiskIDs != nil { @@ -45,7 +45,7 @@ func Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *int for key, val := range *in { newVal := new(v1beta1.DiskIDs) - // copy internal.DiskIDs struct to a map by known keys (page83 and serialNumber) + // copy impl.DiskIDs struct to a map by known keys (page83 and serialNumber) newVal.Identifiers = make(map[string]string) newVal.Identifiers["page83"] = val.Page83 newVal.Identifiers["serialNumber"] = val.SerialNumber @@ -57,14 +57,14 @@ func Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *int return nil } -func Convert_v1beta1_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta1.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error { - // there's no need to implement this function because it's never used (we only convert an internal response to a client response) +func Convert_v1beta1_ListDiskIDsResponse_To_impl_ListDiskIDsResponse(in *v1beta1.ListDiskIDsResponse, out *impl.ListDiskIDsResponse) error { + // there's no need to implement this function because it's never used (we only convert an impl response to a client response) // however we need to override it so that the generator doesn't generate the wrong implementation // see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400 return nil } -func Convert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta1.PartitionDiskRequest, out *internal.PartitionDiskRequest) error { +func Convert_v1beta1_PartitionDiskRequest_To_impl_PartitionDiskRequest(in *v1beta1.PartitionDiskRequest, out *impl.PartitionDiskRequest) error { diskNumber, err := strconv.ParseUint(in.DiskID, 10, 64) if err != nil { return fmt.Errorf("Failed to convert v1beta1.PartitionDiskRequest.DiskID to uint32: %w", err) diff --git a/pkg/server/disk/impl/v1beta1/conversion_generated.go b/pkg/server/disk/impl/v1beta1/conversion_generated.go new file mode 100644 index 00000000..07db27a9 --- /dev/null +++ b/pkg/server/disk/impl/v1beta1/conversion_generated.go @@ -0,0 +1,211 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1beta1 + +import ( + v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" +) + +func autoConvert_v1beta1_DiskIDs_To_impl_DiskIDs(in *v1beta1.DiskIDs, out *impl.DiskIDs) error { + return nil +} + +// Convert_v1beta1_DiskIDs_To_impl_DiskIDs is an autogenerated conversion function. +func Convert_v1beta1_DiskIDs_To_impl_DiskIDs(in *v1beta1.DiskIDs, out *impl.DiskIDs) error { + return autoConvert_v1beta1_DiskIDs_To_impl_DiskIDs(in, out) +} + +func autoConvert_impl_DiskIDs_To_v1beta1_DiskIDs(in *impl.DiskIDs, out *v1beta1.DiskIDs) error { + return nil +} + +// Convert_impl_DiskIDs_To_v1beta1_DiskIDs is an autogenerated conversion function. +func Convert_impl_DiskIDs_To_v1beta1_DiskIDs(in *impl.DiskIDs, out *v1beta1.DiskIDs) error { + return autoConvert_impl_DiskIDs_To_v1beta1_DiskIDs(in, out) +} + +func autoConvert_v1beta1_DiskLocation_To_impl_DiskLocation(in *v1beta1.DiskLocation, out *impl.DiskLocation) error { + out.Adapter = in.Adapter + out.Bus = in.Bus + out.Target = in.Target + out.LUNID = in.LUNID + return nil +} + +// Convert_v1beta1_DiskLocation_To_impl_DiskLocation is an autogenerated conversion function. +func Convert_v1beta1_DiskLocation_To_impl_DiskLocation(in *v1beta1.DiskLocation, out *impl.DiskLocation) error { + return autoConvert_v1beta1_DiskLocation_To_impl_DiskLocation(in, out) +} + +func autoConvert_impl_DiskLocation_To_v1beta1_DiskLocation(in *impl.DiskLocation, out *v1beta1.DiskLocation) error { + out.Adapter = in.Adapter + out.Bus = in.Bus + out.Target = in.Target + out.LUNID = in.LUNID + return nil +} + +// Convert_impl_DiskLocation_To_v1beta1_DiskLocation is an autogenerated conversion function. +func Convert_impl_DiskLocation_To_v1beta1_DiskLocation(in *impl.DiskLocation, out *v1beta1.DiskLocation) error { + return autoConvert_impl_DiskLocation_To_v1beta1_DiskLocation(in, out) +} + +func autoConvert_v1beta1_DiskStatsRequest_To_impl_DiskStatsRequest(in *v1beta1.DiskStatsRequest, out *impl.DiskStatsRequest) error { + out.DiskID = in.DiskID + return nil +} + +// Convert_v1beta1_DiskStatsRequest_To_impl_DiskStatsRequest is an autogenerated conversion function. +func Convert_v1beta1_DiskStatsRequest_To_impl_DiskStatsRequest(in *v1beta1.DiskStatsRequest, out *impl.DiskStatsRequest) error { + return autoConvert_v1beta1_DiskStatsRequest_To_impl_DiskStatsRequest(in, out) +} + +func autoConvert_impl_DiskStatsRequest_To_v1beta1_DiskStatsRequest(in *impl.DiskStatsRequest, out *v1beta1.DiskStatsRequest) error { + out.DiskID = in.DiskID + return nil +} + +// Convert_impl_DiskStatsRequest_To_v1beta1_DiskStatsRequest is an autogenerated conversion function. +func Convert_impl_DiskStatsRequest_To_v1beta1_DiskStatsRequest(in *impl.DiskStatsRequest, out *v1beta1.DiskStatsRequest) error { + return autoConvert_impl_DiskStatsRequest_To_v1beta1_DiskStatsRequest(in, out) +} + +func autoConvert_v1beta1_DiskStatsResponse_To_impl_DiskStatsResponse(in *v1beta1.DiskStatsResponse, out *impl.DiskStatsResponse) error { + out.DiskSize = in.DiskSize + return nil +} + +// Convert_v1beta1_DiskStatsResponse_To_impl_DiskStatsResponse is an autogenerated conversion function. +func Convert_v1beta1_DiskStatsResponse_To_impl_DiskStatsResponse(in *v1beta1.DiskStatsResponse, out *impl.DiskStatsResponse) error { + return autoConvert_v1beta1_DiskStatsResponse_To_impl_DiskStatsResponse(in, out) +} + +func autoConvert_impl_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in *impl.DiskStatsResponse, out *v1beta1.DiskStatsResponse) error { + out.DiskSize = in.DiskSize + return nil +} + +// Convert_impl_DiskStatsResponse_To_v1beta1_DiskStatsResponse is an autogenerated conversion function. +func Convert_impl_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in *impl.DiskStatsResponse, out *v1beta1.DiskStatsResponse) error { + return autoConvert_impl_DiskStatsResponse_To_v1beta1_DiskStatsResponse(in, out) +} + +func autoConvert_v1beta1_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(in *v1beta1.ListDiskIDsRequest, out *impl.ListDiskIDsRequest) error { + return nil +} + +// Convert_v1beta1_ListDiskIDsRequest_To_impl_ListDiskIDsRequest is an autogenerated conversion function. +func Convert_v1beta1_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(in *v1beta1.ListDiskIDsRequest, out *impl.ListDiskIDsRequest) error { + return autoConvert_v1beta1_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(in, out) +} + +func autoConvert_impl_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest(in *impl.ListDiskIDsRequest, out *v1beta1.ListDiskIDsRequest) error { + return nil +} + +// Convert_impl_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest is an autogenerated conversion function. +func Convert_impl_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest(in *impl.ListDiskIDsRequest, out *v1beta1.ListDiskIDsRequest) error { + return autoConvert_impl_ListDiskIDsRequest_To_v1beta1_ListDiskIDsRequest(in, out) +} + +// detected external conversion function +// Convert_v1beta1_ListDiskIDsResponse_To_impl_ListDiskIDsResponse(in *v1beta1.ListDiskIDsResponse, out *impl.ListDiskIDsResponse) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(in *impl.ListDiskIDsResponse, out *v1beta1.ListDiskIDsResponse) error +// skipping generation of the auto function + +func autoConvert_v1beta1_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in *v1beta1.ListDiskLocationsRequest, out *impl.ListDiskLocationsRequest) error { + return nil +} + +// Convert_v1beta1_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest is an autogenerated conversion function. +func Convert_v1beta1_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in *v1beta1.ListDiskLocationsRequest, out *impl.ListDiskLocationsRequest) error { + return autoConvert_v1beta1_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in, out) +} + +func autoConvert_impl_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsRequest(in *impl.ListDiskLocationsRequest, out *v1beta1.ListDiskLocationsRequest) error { + return nil +} + +// Convert_impl_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsRequest is an autogenerated conversion function. +func Convert_impl_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsRequest(in *impl.ListDiskLocationsRequest, out *v1beta1.ListDiskLocationsRequest) error { + return autoConvert_impl_ListDiskLocationsRequest_To_v1beta1_ListDiskLocationsRequest(in, out) +} + +// detected external conversion function +// Convert_v1beta1_ListDiskLocationsResponse_To_impl_ListDiskLocationsResponse(in *v1beta1.ListDiskLocationsResponse, out *impl.ListDiskLocationsResponse) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(in *impl.ListDiskLocationsResponse, out *v1beta1.ListDiskLocationsResponse) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_v1beta1_PartitionDiskRequest_To_impl_PartitionDiskRequest(in *v1beta1.PartitionDiskRequest, out *impl.PartitionDiskRequest) error +// skipping generation of the auto function + +func autoConvert_impl_PartitionDiskRequest_To_v1beta1_PartitionDiskRequest(in *impl.PartitionDiskRequest, out *v1beta1.PartitionDiskRequest) error { + return nil +} + +// Convert_impl_PartitionDiskRequest_To_v1beta1_PartitionDiskRequest is an autogenerated conversion function. +func Convert_impl_PartitionDiskRequest_To_v1beta1_PartitionDiskRequest(in *impl.PartitionDiskRequest, out *v1beta1.PartitionDiskRequest) error { + return autoConvert_impl_PartitionDiskRequest_To_v1beta1_PartitionDiskRequest(in, out) +} + +func autoConvert_v1beta1_PartitionDiskResponse_To_impl_PartitionDiskResponse(in *v1beta1.PartitionDiskResponse, out *impl.PartitionDiskResponse) error { + return nil +} + +// Convert_v1beta1_PartitionDiskResponse_To_impl_PartitionDiskResponse is an autogenerated conversion function. +func Convert_v1beta1_PartitionDiskResponse_To_impl_PartitionDiskResponse(in *v1beta1.PartitionDiskResponse, out *impl.PartitionDiskResponse) error { + return autoConvert_v1beta1_PartitionDiskResponse_To_impl_PartitionDiskResponse(in, out) +} + +func autoConvert_impl_PartitionDiskResponse_To_v1beta1_PartitionDiskResponse(in *impl.PartitionDiskResponse, out *v1beta1.PartitionDiskResponse) error { + return nil +} + +// Convert_impl_PartitionDiskResponse_To_v1beta1_PartitionDiskResponse is an autogenerated conversion function. +func Convert_impl_PartitionDiskResponse_To_v1beta1_PartitionDiskResponse(in *impl.PartitionDiskResponse, out *v1beta1.PartitionDiskResponse) error { + return autoConvert_impl_PartitionDiskResponse_To_v1beta1_PartitionDiskResponse(in, out) +} + +func autoConvert_v1beta1_RescanRequest_To_impl_RescanRequest(in *v1beta1.RescanRequest, out *impl.RescanRequest) error { + return nil +} + +// Convert_v1beta1_RescanRequest_To_impl_RescanRequest is an autogenerated conversion function. +func Convert_v1beta1_RescanRequest_To_impl_RescanRequest(in *v1beta1.RescanRequest, out *impl.RescanRequest) error { + return autoConvert_v1beta1_RescanRequest_To_impl_RescanRequest(in, out) +} + +func autoConvert_impl_RescanRequest_To_v1beta1_RescanRequest(in *impl.RescanRequest, out *v1beta1.RescanRequest) error { + return nil +} + +// Convert_impl_RescanRequest_To_v1beta1_RescanRequest is an autogenerated conversion function. +func Convert_impl_RescanRequest_To_v1beta1_RescanRequest(in *impl.RescanRequest, out *v1beta1.RescanRequest) error { + return autoConvert_impl_RescanRequest_To_v1beta1_RescanRequest(in, out) +} + +func autoConvert_v1beta1_RescanResponse_To_impl_RescanResponse(in *v1beta1.RescanResponse, out *impl.RescanResponse) error { + return nil +} + +// Convert_v1beta1_RescanResponse_To_impl_RescanResponse is an autogenerated conversion function. +func Convert_v1beta1_RescanResponse_To_impl_RescanResponse(in *v1beta1.RescanResponse, out *impl.RescanResponse) error { + return autoConvert_v1beta1_RescanResponse_To_impl_RescanResponse(in, out) +} + +func autoConvert_impl_RescanResponse_To_v1beta1_RescanResponse(in *impl.RescanResponse, out *v1beta1.RescanResponse) error { + return nil +} + +// Convert_impl_RescanResponse_To_v1beta1_RescanResponse is an autogenerated conversion function. +func Convert_impl_RescanResponse_To_v1beta1_RescanResponse(in *impl.RescanResponse, out *v1beta1.RescanResponse) error { + return autoConvert_impl_RescanResponse_To_v1beta1_RescanResponse(in, out) +} diff --git a/pkg/server/disk/impl/v1beta1/doc.go b/pkg/server/disk/impl/v1beta1/doc.go new file mode 100644 index 00000000..8e77c492 --- /dev/null +++ b/pkg/server/disk/impl/v1beta1/doc.go @@ -0,0 +1,4 @@ +// Temporary code generated by csi-proxy-api-gen. DO NOT COMMIT. +// Should be removed automatically, but please remove manually otherwise. + +package v1beta1 diff --git a/internal/server/disk/internal/v1beta1/server_generated.go b/pkg/server/disk/impl/v1beta1/server_generated.go similarity index 61% rename from internal/server/disk/internal/v1beta1/server_generated.go rename to pkg/server/disk/impl/v1beta1/server_generated.go index 699cd164..2e1d0bd7 100644 --- a/internal/server/disk/internal/v1beta1/server_generated.go +++ b/pkg/server/disk/impl/v1beta1/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1beta1") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) DiskStats(context context.Context, versionedRequest *v1beta1.DiskStatsRequest) (*v1beta1.DiskStatsResponse, error) { - request := &internal.DiskStatsRequest{} - if err := Convert_v1beta1_DiskStatsRequest_To_internal_DiskStatsRequest(versionedRequest, request); err != nil { + request := &impl.DiskStatsRequest{} + if err := Convert_v1beta1_DiskStatsRequest_To_impl_DiskStatsRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) DiskStats(context context.Context, versionedRequest *v1be } versionedResponse := &v1beta1.DiskStatsResponse{} - if err := Convert_internal_DiskStatsResponse_To_v1beta1_DiskStatsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_DiskStatsResponse_To_v1beta1_DiskStatsResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) DiskStats(context context.Context, versionedRequest *v1be } func (s *versionedAPI) ListDiskIDs(context context.Context, versionedRequest *v1beta1.ListDiskIDsRequest) (*v1beta1.ListDiskIDsResponse, error) { - request := &internal.ListDiskIDsRequest{} - if err := Convert_v1beta1_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(versionedRequest, request); err != nil { + request := &impl.ListDiskIDsRequest{} + if err := Convert_v1beta1_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) ListDiskIDs(context context.Context, versionedRequest *v1 } versionedResponse := &v1beta1.ListDiskIDsResponse{} - if err := Convert_internal_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListDiskIDsResponse_To_v1beta1_ListDiskIDsResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) ListDiskIDs(context context.Context, versionedRequest *v1 } func (s *versionedAPI) ListDiskLocations(context context.Context, versionedRequest *v1beta1.ListDiskLocationsRequest) (*v1beta1.ListDiskLocationsResponse, error) { - request := &internal.ListDiskLocationsRequest{} - if err := Convert_v1beta1_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(versionedRequest, request); err != nil { + request := &impl.ListDiskLocationsRequest{} + if err := Convert_v1beta1_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) ListDiskLocations(context context.Context, versionedReque } versionedResponse := &v1beta1.ListDiskLocationsResponse{} - if err := Convert_internal_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListDiskLocationsResponse_To_v1beta1_ListDiskLocationsResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) ListDiskLocations(context context.Context, versionedReque } func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest *v1beta1.PartitionDiskRequest) (*v1beta1.PartitionDiskResponse, error) { - request := &internal.PartitionDiskRequest{} - if err := Convert_v1beta1_PartitionDiskRequest_To_internal_PartitionDiskRequest(versionedRequest, request); err != nil { + request := &impl.PartitionDiskRequest{} + if err := Convert_v1beta1_PartitionDiskRequest_To_impl_PartitionDiskRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest * } versionedResponse := &v1beta1.PartitionDiskResponse{} - if err := Convert_internal_PartitionDiskResponse_To_v1beta1_PartitionDiskResponse(response, versionedResponse); err != nil { + if err := Convert_impl_PartitionDiskResponse_To_v1beta1_PartitionDiskResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest * } func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1beta1.RescanRequest) (*v1beta1.RescanResponse, error) { - request := &internal.RescanRequest{} - if err := Convert_v1beta1_RescanRequest_To_internal_RescanRequest(versionedRequest, request); err != nil { + request := &impl.RescanRequest{} + if err := Convert_v1beta1_RescanRequest_To_impl_RescanRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1beta1 } versionedResponse := &v1beta1.RescanResponse{} - if err := Convert_internal_RescanResponse_To_v1beta1_RescanResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RescanResponse_To_v1beta1_RescanResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/disk/internal/v1beta2/conversion.go b/pkg/server/disk/impl/v1beta2/conversion.go similarity index 64% rename from internal/server/disk/internal/v1beta2/conversion.go rename to pkg/server/disk/impl/v1beta2/conversion.go index 474e7b63..b9c051d8 100644 --- a/internal/server/disk/internal/v1beta2/conversion.go +++ b/pkg/server/disk/impl/v1beta2/conversion.go @@ -5,12 +5,12 @@ import ( "strconv" "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" ) // Add manual conversion functions here to override automatic conversion functions -func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error { +func Convert_impl_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *impl.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error { // conversion function added in v1beta3, the disk_locations map key was changed from string to uint32 // v1beta2 is expecting a string so convert the uint32 to string if in.DiskLocations != nil { @@ -18,7 +18,7 @@ func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResp *out = make(map[string]*v1beta2.DiskLocation, len(*in)) for key, val := range *in { newVal := new(v1beta2.DiskLocation) - if err := Convert_internal_DiskLocation_To_v1beta2_DiskLocation(val, newVal); err != nil { + if err := Convert_impl_DiskLocation_To_v1beta2_DiskLocation(val, newVal); err != nil { return err } (*out)[strconv.FormatUint(uint64(key), 10)] = newVal @@ -29,14 +29,14 @@ func Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResp return nil } -func Convert_v1beta2_ListDiskLocationsResponse_To_internal_ListDiskLocationsResponse(in *v1beta2.ListDiskLocationsResponse, out *internal.ListDiskLocationsResponse) error { - // there's no need to implement this function because it's never used (we only convert an internal response to a client response) +func Convert_v1beta2_ListDiskLocationsResponse_To_impl_ListDiskLocationsResponse(in *v1beta2.ListDiskLocationsResponse, out *impl.ListDiskLocationsResponse) error { + // there's no need to implement this function because it's never used (we only convert an impl response to a client response) // however we need to override it so that the generator doesn't generate the wrong implementation // see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400 return nil } -func Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error { +func Convert_impl_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *impl.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error { // conversion function added in v1beta3, diskIDs was renamed to disk_ids, also the disk_ids map key was converted from string to uint32 // v1beta2 is expecting diskIDs to have a key of the type string instead of uint32 if in.DiskIDs != nil { @@ -45,7 +45,7 @@ func Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *int for key, val := range *in { newVal := new(v1beta2.DiskIDs) - // copy internal.DiskIDs struct to a map by known keys (page83 and serialNumber) + // copy impl.DiskIDs struct to a map by known keys (page83 and serialNumber) newVal.Identifiers = make(map[string]string) newVal.Identifiers["page83"] = val.Page83 newVal.Identifiers["serialNumber"] = val.SerialNumber @@ -57,14 +57,14 @@ func Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *int return nil } -func Convert_v1beta2_ListDiskIDsResponse_To_internal_ListDiskIDsResponse(in *v1beta2.ListDiskIDsResponse, out *internal.ListDiskIDsResponse) error { - // there's no need to implement this function because it's never used (we only convert an internal response to a client response) +func Convert_v1beta2_ListDiskIDsResponse_To_impl_ListDiskIDsResponse(in *v1beta2.ListDiskIDsResponse, out *impl.ListDiskIDsResponse) error { + // there's no need to implement this function because it's never used (we only convert an impl response to a client response) // however we need to override it so that the generator doesn't generate the wrong implementation // see https://kubernetes.slack.com/archives/CN5JCCW31/p1621979489011400 return nil } -func Convert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest(in *v1beta2.PartitionDiskRequest, out *internal.PartitionDiskRequest) error { +func Convert_v1beta2_PartitionDiskRequest_To_impl_PartitionDiskRequest(in *v1beta2.PartitionDiskRequest, out *impl.PartitionDiskRequest) error { diskNumber, err := strconv.ParseUint(in.DiskID, 10, 64) if err != nil { return fmt.Errorf("Failed to convert v1beta2.PartitionDiskRequest.DiskID to uint32: %w", err) diff --git a/pkg/server/disk/impl/v1beta2/conversion_generated.go b/pkg/server/disk/impl/v1beta2/conversion_generated.go new file mode 100644 index 00000000..4e4d7a1b --- /dev/null +++ b/pkg/server/disk/impl/v1beta2/conversion_generated.go @@ -0,0 +1,291 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1beta2 + +import ( + v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" +) + +func autoConvert_v1beta2_DiskIDs_To_impl_DiskIDs(in *v1beta2.DiskIDs, out *impl.DiskIDs) error { + return nil +} + +// Convert_v1beta2_DiskIDs_To_impl_DiskIDs is an autogenerated conversion function. +func Convert_v1beta2_DiskIDs_To_impl_DiskIDs(in *v1beta2.DiskIDs, out *impl.DiskIDs) error { + return autoConvert_v1beta2_DiskIDs_To_impl_DiskIDs(in, out) +} + +func autoConvert_impl_DiskIDs_To_v1beta2_DiskIDs(in *impl.DiskIDs, out *v1beta2.DiskIDs) error { + return nil +} + +// Convert_impl_DiskIDs_To_v1beta2_DiskIDs is an autogenerated conversion function. +func Convert_impl_DiskIDs_To_v1beta2_DiskIDs(in *impl.DiskIDs, out *v1beta2.DiskIDs) error { + return autoConvert_impl_DiskIDs_To_v1beta2_DiskIDs(in, out) +} + +func autoConvert_v1beta2_DiskLocation_To_impl_DiskLocation(in *v1beta2.DiskLocation, out *impl.DiskLocation) error { + out.Adapter = in.Adapter + out.Bus = in.Bus + out.Target = in.Target + out.LUNID = in.LUNID + return nil +} + +// Convert_v1beta2_DiskLocation_To_impl_DiskLocation is an autogenerated conversion function. +func Convert_v1beta2_DiskLocation_To_impl_DiskLocation(in *v1beta2.DiskLocation, out *impl.DiskLocation) error { + return autoConvert_v1beta2_DiskLocation_To_impl_DiskLocation(in, out) +} + +func autoConvert_impl_DiskLocation_To_v1beta2_DiskLocation(in *impl.DiskLocation, out *v1beta2.DiskLocation) error { + out.Adapter = in.Adapter + out.Bus = in.Bus + out.Target = in.Target + out.LUNID = in.LUNID + return nil +} + +// Convert_impl_DiskLocation_To_v1beta2_DiskLocation is an autogenerated conversion function. +func Convert_impl_DiskLocation_To_v1beta2_DiskLocation(in *impl.DiskLocation, out *v1beta2.DiskLocation) error { + return autoConvert_impl_DiskLocation_To_v1beta2_DiskLocation(in, out) +} + +func autoConvert_v1beta2_DiskStatsRequest_To_impl_DiskStatsRequest(in *v1beta2.DiskStatsRequest, out *impl.DiskStatsRequest) error { + out.DiskID = in.DiskID + return nil +} + +// Convert_v1beta2_DiskStatsRequest_To_impl_DiskStatsRequest is an autogenerated conversion function. +func Convert_v1beta2_DiskStatsRequest_To_impl_DiskStatsRequest(in *v1beta2.DiskStatsRequest, out *impl.DiskStatsRequest) error { + return autoConvert_v1beta2_DiskStatsRequest_To_impl_DiskStatsRequest(in, out) +} + +func autoConvert_impl_DiskStatsRequest_To_v1beta2_DiskStatsRequest(in *impl.DiskStatsRequest, out *v1beta2.DiskStatsRequest) error { + out.DiskID = in.DiskID + return nil +} + +// Convert_impl_DiskStatsRequest_To_v1beta2_DiskStatsRequest is an autogenerated conversion function. +func Convert_impl_DiskStatsRequest_To_v1beta2_DiskStatsRequest(in *impl.DiskStatsRequest, out *v1beta2.DiskStatsRequest) error { + return autoConvert_impl_DiskStatsRequest_To_v1beta2_DiskStatsRequest(in, out) +} + +func autoConvert_v1beta2_DiskStatsResponse_To_impl_DiskStatsResponse(in *v1beta2.DiskStatsResponse, out *impl.DiskStatsResponse) error { + out.DiskSize = in.DiskSize + return nil +} + +// Convert_v1beta2_DiskStatsResponse_To_impl_DiskStatsResponse is an autogenerated conversion function. +func Convert_v1beta2_DiskStatsResponse_To_impl_DiskStatsResponse(in *v1beta2.DiskStatsResponse, out *impl.DiskStatsResponse) error { + return autoConvert_v1beta2_DiskStatsResponse_To_impl_DiskStatsResponse(in, out) +} + +func autoConvert_impl_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in *impl.DiskStatsResponse, out *v1beta2.DiskStatsResponse) error { + out.DiskSize = in.DiskSize + return nil +} + +// Convert_impl_DiskStatsResponse_To_v1beta2_DiskStatsResponse is an autogenerated conversion function. +func Convert_impl_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in *impl.DiskStatsResponse, out *v1beta2.DiskStatsResponse) error { + return autoConvert_impl_DiskStatsResponse_To_v1beta2_DiskStatsResponse(in, out) +} + +func autoConvert_v1beta2_GetAttachStateRequest_To_impl_GetAttachStateRequest(in *v1beta2.GetAttachStateRequest, out *impl.GetAttachStateRequest) error { + out.DiskID = in.DiskID + return nil +} + +// Convert_v1beta2_GetAttachStateRequest_To_impl_GetAttachStateRequest is an autogenerated conversion function. +func Convert_v1beta2_GetAttachStateRequest_To_impl_GetAttachStateRequest(in *v1beta2.GetAttachStateRequest, out *impl.GetAttachStateRequest) error { + return autoConvert_v1beta2_GetAttachStateRequest_To_impl_GetAttachStateRequest(in, out) +} + +func autoConvert_impl_GetAttachStateRequest_To_v1beta2_GetAttachStateRequest(in *impl.GetAttachStateRequest, out *v1beta2.GetAttachStateRequest) error { + out.DiskID = in.DiskID + return nil +} + +// Convert_impl_GetAttachStateRequest_To_v1beta2_GetAttachStateRequest is an autogenerated conversion function. +func Convert_impl_GetAttachStateRequest_To_v1beta2_GetAttachStateRequest(in *impl.GetAttachStateRequest, out *v1beta2.GetAttachStateRequest) error { + return autoConvert_impl_GetAttachStateRequest_To_v1beta2_GetAttachStateRequest(in, out) +} + +func autoConvert_v1beta2_GetAttachStateResponse_To_impl_GetAttachStateResponse(in *v1beta2.GetAttachStateResponse, out *impl.GetAttachStateResponse) error { + out.IsOnline = in.IsOnline + return nil +} + +// Convert_v1beta2_GetAttachStateResponse_To_impl_GetAttachStateResponse is an autogenerated conversion function. +func Convert_v1beta2_GetAttachStateResponse_To_impl_GetAttachStateResponse(in *v1beta2.GetAttachStateResponse, out *impl.GetAttachStateResponse) error { + return autoConvert_v1beta2_GetAttachStateResponse_To_impl_GetAttachStateResponse(in, out) +} + +func autoConvert_impl_GetAttachStateResponse_To_v1beta2_GetAttachStateResponse(in *impl.GetAttachStateResponse, out *v1beta2.GetAttachStateResponse) error { + out.IsOnline = in.IsOnline + return nil +} + +// Convert_impl_GetAttachStateResponse_To_v1beta2_GetAttachStateResponse is an autogenerated conversion function. +func Convert_impl_GetAttachStateResponse_To_v1beta2_GetAttachStateResponse(in *impl.GetAttachStateResponse, out *v1beta2.GetAttachStateResponse) error { + return autoConvert_impl_GetAttachStateResponse_To_v1beta2_GetAttachStateResponse(in, out) +} + +func autoConvert_v1beta2_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(in *v1beta2.ListDiskIDsRequest, out *impl.ListDiskIDsRequest) error { + return nil +} + +// Convert_v1beta2_ListDiskIDsRequest_To_impl_ListDiskIDsRequest is an autogenerated conversion function. +func Convert_v1beta2_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(in *v1beta2.ListDiskIDsRequest, out *impl.ListDiskIDsRequest) error { + return autoConvert_v1beta2_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(in, out) +} + +func autoConvert_impl_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest(in *impl.ListDiskIDsRequest, out *v1beta2.ListDiskIDsRequest) error { + return nil +} + +// Convert_impl_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest is an autogenerated conversion function. +func Convert_impl_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest(in *impl.ListDiskIDsRequest, out *v1beta2.ListDiskIDsRequest) error { + return autoConvert_impl_ListDiskIDsRequest_To_v1beta2_ListDiskIDsRequest(in, out) +} + +// detected external conversion function +// Convert_v1beta2_ListDiskIDsResponse_To_impl_ListDiskIDsResponse(in *v1beta2.ListDiskIDsResponse, out *impl.ListDiskIDsResponse) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(in *impl.ListDiskIDsResponse, out *v1beta2.ListDiskIDsResponse) error +// skipping generation of the auto function + +func autoConvert_v1beta2_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in *v1beta2.ListDiskLocationsRequest, out *impl.ListDiskLocationsRequest) error { + return nil +} + +// Convert_v1beta2_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest is an autogenerated conversion function. +func Convert_v1beta2_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in *v1beta2.ListDiskLocationsRequest, out *impl.ListDiskLocationsRequest) error { + return autoConvert_v1beta2_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in, out) +} + +func autoConvert_impl_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsRequest(in *impl.ListDiskLocationsRequest, out *v1beta2.ListDiskLocationsRequest) error { + return nil +} + +// Convert_impl_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsRequest is an autogenerated conversion function. +func Convert_impl_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsRequest(in *impl.ListDiskLocationsRequest, out *v1beta2.ListDiskLocationsRequest) error { + return autoConvert_impl_ListDiskLocationsRequest_To_v1beta2_ListDiskLocationsRequest(in, out) +} + +// detected external conversion function +// Convert_v1beta2_ListDiskLocationsResponse_To_impl_ListDiskLocationsResponse(in *v1beta2.ListDiskLocationsResponse, out *impl.ListDiskLocationsResponse) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(in *impl.ListDiskLocationsResponse, out *v1beta2.ListDiskLocationsResponse) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_v1beta2_PartitionDiskRequest_To_impl_PartitionDiskRequest(in *v1beta2.PartitionDiskRequest, out *impl.PartitionDiskRequest) error +// skipping generation of the auto function + +func autoConvert_impl_PartitionDiskRequest_To_v1beta2_PartitionDiskRequest(in *impl.PartitionDiskRequest, out *v1beta2.PartitionDiskRequest) error { + return nil +} + +// Convert_impl_PartitionDiskRequest_To_v1beta2_PartitionDiskRequest is an autogenerated conversion function. +func Convert_impl_PartitionDiskRequest_To_v1beta2_PartitionDiskRequest(in *impl.PartitionDiskRequest, out *v1beta2.PartitionDiskRequest) error { + return autoConvert_impl_PartitionDiskRequest_To_v1beta2_PartitionDiskRequest(in, out) +} + +func autoConvert_v1beta2_PartitionDiskResponse_To_impl_PartitionDiskResponse(in *v1beta2.PartitionDiskResponse, out *impl.PartitionDiskResponse) error { + return nil +} + +// Convert_v1beta2_PartitionDiskResponse_To_impl_PartitionDiskResponse is an autogenerated conversion function. +func Convert_v1beta2_PartitionDiskResponse_To_impl_PartitionDiskResponse(in *v1beta2.PartitionDiskResponse, out *impl.PartitionDiskResponse) error { + return autoConvert_v1beta2_PartitionDiskResponse_To_impl_PartitionDiskResponse(in, out) +} + +func autoConvert_impl_PartitionDiskResponse_To_v1beta2_PartitionDiskResponse(in *impl.PartitionDiskResponse, out *v1beta2.PartitionDiskResponse) error { + return nil +} + +// Convert_impl_PartitionDiskResponse_To_v1beta2_PartitionDiskResponse is an autogenerated conversion function. +func Convert_impl_PartitionDiskResponse_To_v1beta2_PartitionDiskResponse(in *impl.PartitionDiskResponse, out *v1beta2.PartitionDiskResponse) error { + return autoConvert_impl_PartitionDiskResponse_To_v1beta2_PartitionDiskResponse(in, out) +} + +func autoConvert_v1beta2_RescanRequest_To_impl_RescanRequest(in *v1beta2.RescanRequest, out *impl.RescanRequest) error { + return nil +} + +// Convert_v1beta2_RescanRequest_To_impl_RescanRequest is an autogenerated conversion function. +func Convert_v1beta2_RescanRequest_To_impl_RescanRequest(in *v1beta2.RescanRequest, out *impl.RescanRequest) error { + return autoConvert_v1beta2_RescanRequest_To_impl_RescanRequest(in, out) +} + +func autoConvert_impl_RescanRequest_To_v1beta2_RescanRequest(in *impl.RescanRequest, out *v1beta2.RescanRequest) error { + return nil +} + +// Convert_impl_RescanRequest_To_v1beta2_RescanRequest is an autogenerated conversion function. +func Convert_impl_RescanRequest_To_v1beta2_RescanRequest(in *impl.RescanRequest, out *v1beta2.RescanRequest) error { + return autoConvert_impl_RescanRequest_To_v1beta2_RescanRequest(in, out) +} + +func autoConvert_v1beta2_RescanResponse_To_impl_RescanResponse(in *v1beta2.RescanResponse, out *impl.RescanResponse) error { + return nil +} + +// Convert_v1beta2_RescanResponse_To_impl_RescanResponse is an autogenerated conversion function. +func Convert_v1beta2_RescanResponse_To_impl_RescanResponse(in *v1beta2.RescanResponse, out *impl.RescanResponse) error { + return autoConvert_v1beta2_RescanResponse_To_impl_RescanResponse(in, out) +} + +func autoConvert_impl_RescanResponse_To_v1beta2_RescanResponse(in *impl.RescanResponse, out *v1beta2.RescanResponse) error { + return nil +} + +// Convert_impl_RescanResponse_To_v1beta2_RescanResponse is an autogenerated conversion function. +func Convert_impl_RescanResponse_To_v1beta2_RescanResponse(in *impl.RescanResponse, out *v1beta2.RescanResponse) error { + return autoConvert_impl_RescanResponse_To_v1beta2_RescanResponse(in, out) +} + +func autoConvert_v1beta2_SetAttachStateRequest_To_impl_SetAttachStateRequest(in *v1beta2.SetAttachStateRequest, out *impl.SetAttachStateRequest) error { + out.DiskID = in.DiskID + out.IsOnline = in.IsOnline + return nil +} + +// Convert_v1beta2_SetAttachStateRequest_To_impl_SetAttachStateRequest is an autogenerated conversion function. +func Convert_v1beta2_SetAttachStateRequest_To_impl_SetAttachStateRequest(in *v1beta2.SetAttachStateRequest, out *impl.SetAttachStateRequest) error { + return autoConvert_v1beta2_SetAttachStateRequest_To_impl_SetAttachStateRequest(in, out) +} + +func autoConvert_impl_SetAttachStateRequest_To_v1beta2_SetAttachStateRequest(in *impl.SetAttachStateRequest, out *v1beta2.SetAttachStateRequest) error { + out.DiskID = in.DiskID + out.IsOnline = in.IsOnline + return nil +} + +// Convert_impl_SetAttachStateRequest_To_v1beta2_SetAttachStateRequest is an autogenerated conversion function. +func Convert_impl_SetAttachStateRequest_To_v1beta2_SetAttachStateRequest(in *impl.SetAttachStateRequest, out *v1beta2.SetAttachStateRequest) error { + return autoConvert_impl_SetAttachStateRequest_To_v1beta2_SetAttachStateRequest(in, out) +} + +func autoConvert_v1beta2_SetAttachStateResponse_To_impl_SetAttachStateResponse(in *v1beta2.SetAttachStateResponse, out *impl.SetAttachStateResponse) error { + return nil +} + +// Convert_v1beta2_SetAttachStateResponse_To_impl_SetAttachStateResponse is an autogenerated conversion function. +func Convert_v1beta2_SetAttachStateResponse_To_impl_SetAttachStateResponse(in *v1beta2.SetAttachStateResponse, out *impl.SetAttachStateResponse) error { + return autoConvert_v1beta2_SetAttachStateResponse_To_impl_SetAttachStateResponse(in, out) +} + +func autoConvert_impl_SetAttachStateResponse_To_v1beta2_SetAttachStateResponse(in *impl.SetAttachStateResponse, out *v1beta2.SetAttachStateResponse) error { + return nil +} + +// Convert_impl_SetAttachStateResponse_To_v1beta2_SetAttachStateResponse is an autogenerated conversion function. +func Convert_impl_SetAttachStateResponse_To_v1beta2_SetAttachStateResponse(in *impl.SetAttachStateResponse, out *v1beta2.SetAttachStateResponse) error { + return autoConvert_impl_SetAttachStateResponse_To_v1beta2_SetAttachStateResponse(in, out) +} diff --git a/pkg/server/disk/impl/v1beta2/doc.go b/pkg/server/disk/impl/v1beta2/doc.go new file mode 100644 index 00000000..eadb7748 --- /dev/null +++ b/pkg/server/disk/impl/v1beta2/doc.go @@ -0,0 +1,4 @@ +// Temporary code generated by csi-proxy-api-gen. DO NOT COMMIT. +// Should be removed automatically, but please remove manually otherwise. + +package v1beta2 diff --git a/internal/server/disk/internal/v1beta2/server_generated.go b/pkg/server/disk/impl/v1beta2/server_generated.go similarity index 60% rename from internal/server/disk/internal/v1beta2/server_generated.go rename to pkg/server/disk/impl/v1beta2/server_generated.go index b6c60852..017aa8ae 100644 --- a/internal/server/disk/internal/v1beta2/server_generated.go +++ b/pkg/server/disk/impl/v1beta2/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta2" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1beta2") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) DiskStats(context context.Context, versionedRequest *v1beta2.DiskStatsRequest) (*v1beta2.DiskStatsResponse, error) { - request := &internal.DiskStatsRequest{} - if err := Convert_v1beta2_DiskStatsRequest_To_internal_DiskStatsRequest(versionedRequest, request); err != nil { + request := &impl.DiskStatsRequest{} + if err := Convert_v1beta2_DiskStatsRequest_To_impl_DiskStatsRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) DiskStats(context context.Context, versionedRequest *v1be } versionedResponse := &v1beta2.DiskStatsResponse{} - if err := Convert_internal_DiskStatsResponse_To_v1beta2_DiskStatsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_DiskStatsResponse_To_v1beta2_DiskStatsResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) DiskStats(context context.Context, versionedRequest *v1be } func (s *versionedAPI) GetAttachState(context context.Context, versionedRequest *v1beta2.GetAttachStateRequest) (*v1beta2.GetAttachStateResponse, error) { - request := &internal.GetAttachStateRequest{} - if err := Convert_v1beta2_GetAttachStateRequest_To_internal_GetAttachStateRequest(versionedRequest, request); err != nil { + request := &impl.GetAttachStateRequest{} + if err := Convert_v1beta2_GetAttachStateRequest_To_impl_GetAttachStateRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) GetAttachState(context context.Context, versionedRequest } versionedResponse := &v1beta2.GetAttachStateResponse{} - if err := Convert_internal_GetAttachStateResponse_To_v1beta2_GetAttachStateResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetAttachStateResponse_To_v1beta2_GetAttachStateResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) GetAttachState(context context.Context, versionedRequest } func (s *versionedAPI) ListDiskIDs(context context.Context, versionedRequest *v1beta2.ListDiskIDsRequest) (*v1beta2.ListDiskIDsResponse, error) { - request := &internal.ListDiskIDsRequest{} - if err := Convert_v1beta2_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(versionedRequest, request); err != nil { + request := &impl.ListDiskIDsRequest{} + if err := Convert_v1beta2_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) ListDiskIDs(context context.Context, versionedRequest *v1 } versionedResponse := &v1beta2.ListDiskIDsResponse{} - if err := Convert_internal_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListDiskIDsResponse_To_v1beta2_ListDiskIDsResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) ListDiskIDs(context context.Context, versionedRequest *v1 } func (s *versionedAPI) ListDiskLocations(context context.Context, versionedRequest *v1beta2.ListDiskLocationsRequest) (*v1beta2.ListDiskLocationsResponse, error) { - request := &internal.ListDiskLocationsRequest{} - if err := Convert_v1beta2_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(versionedRequest, request); err != nil { + request := &impl.ListDiskLocationsRequest{} + if err := Convert_v1beta2_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) ListDiskLocations(context context.Context, versionedReque } versionedResponse := &v1beta2.ListDiskLocationsResponse{} - if err := Convert_internal_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListDiskLocationsResponse_To_v1beta2_ListDiskLocationsResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) ListDiskLocations(context context.Context, versionedReque } func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest *v1beta2.PartitionDiskRequest) (*v1beta2.PartitionDiskResponse, error) { - request := &internal.PartitionDiskRequest{} - if err := Convert_v1beta2_PartitionDiskRequest_To_internal_PartitionDiskRequest(versionedRequest, request); err != nil { + request := &impl.PartitionDiskRequest{} + if err := Convert_v1beta2_PartitionDiskRequest_To_impl_PartitionDiskRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest * } versionedResponse := &v1beta2.PartitionDiskResponse{} - if err := Convert_internal_PartitionDiskResponse_To_v1beta2_PartitionDiskResponse(response, versionedResponse); err != nil { + if err := Convert_impl_PartitionDiskResponse_To_v1beta2_PartitionDiskResponse(response, versionedResponse); err != nil { return nil, err } @@ -123,8 +123,8 @@ func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest * } func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1beta2.RescanRequest) (*v1beta2.RescanResponse, error) { - request := &internal.RescanRequest{} - if err := Convert_v1beta2_RescanRequest_To_internal_RescanRequest(versionedRequest, request); err != nil { + request := &impl.RescanRequest{} + if err := Convert_v1beta2_RescanRequest_To_impl_RescanRequest(versionedRequest, request); err != nil { return nil, err } @@ -134,7 +134,7 @@ func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1beta2 } versionedResponse := &v1beta2.RescanResponse{} - if err := Convert_internal_RescanResponse_To_v1beta2_RescanResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RescanResponse_To_v1beta2_RescanResponse(response, versionedResponse); err != nil { return nil, err } @@ -142,8 +142,8 @@ func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1beta2 } func (s *versionedAPI) SetAttachState(context context.Context, versionedRequest *v1beta2.SetAttachStateRequest) (*v1beta2.SetAttachStateResponse, error) { - request := &internal.SetAttachStateRequest{} - if err := Convert_v1beta2_SetAttachStateRequest_To_internal_SetAttachStateRequest(versionedRequest, request); err != nil { + request := &impl.SetAttachStateRequest{} + if err := Convert_v1beta2_SetAttachStateRequest_To_impl_SetAttachStateRequest(versionedRequest, request); err != nil { return nil, err } @@ -153,7 +153,7 @@ func (s *versionedAPI) SetAttachState(context context.Context, versionedRequest } versionedResponse := &v1beta2.SetAttachStateResponse{} - if err := Convert_internal_SetAttachStateResponse_To_v1beta2_SetAttachStateResponse(response, versionedResponse); err != nil { + if err := Convert_impl_SetAttachStateResponse_To_v1beta2_SetAttachStateResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/disk/internal/v1beta3/conversion.go b/pkg/server/disk/impl/v1beta3/conversion.go similarity index 55% rename from internal/server/disk/internal/v1beta3/conversion.go rename to pkg/server/disk/impl/v1beta3/conversion.go index eff2f9e4..88108b5b 100644 --- a/internal/server/disk/internal/v1beta3/conversion.go +++ b/pkg/server/disk/impl/v1beta3/conversion.go @@ -2,21 +2,21 @@ package v1beta3 import ( "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3" - internal "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" ) // Add manual conversion functions here to override automatic conversion functions -func Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *internal.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error { +func Convert_impl_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *impl.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error { if in.DiskIDs != nil { in, out := &in.DiskIDs, &out.DiskIDs *out = make(map[uint32]*v1beta3.DiskIDs, len(*in)) for key, val := range *in { // This function is almost generated correctly, it has an issue in the type of arguments sent - // e.g. if err := Convert_internal_DiskIDs_To_v1beta3_DiskIDs(*&val, *newVal); err != nil { + // e.g. if err := Convert_impl_DiskIDs_To_v1beta3_DiskIDs(*&val, *newVal); err != nil { newVal := new(v1beta3.DiskIDs) - if err := Convert_internal_DiskIDs_To_v1beta3_DiskIDs(val, newVal); err != nil { + if err := Convert_impl_DiskIDs_To_v1beta3_DiskIDs(val, newVal); err != nil { return err } (*out)[key] = newVal @@ -28,16 +28,16 @@ func Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *int return nil } -func Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *internal.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error { +func Convert_impl_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *impl.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error { if in.DiskLocations != nil { in, out := &in.DiskLocations, &out.DiskLocations *out = make(map[uint32]*v1beta3.DiskLocation, len(*in)) for key, val := range *in { // This function is almost generated correctly, it has an issue in the type of arguments sent - // e.g. if err := Convert_internal_DiskLocation_To_v1beta3_DiskLocation(*&val, *newVal); err != nil { + // e.g. if err := Convert_impl_DiskLocation_To_v1beta3_DiskLocation(*&val, *newVal); err != nil { newVal := new(v1beta3.DiskLocation) - if err := Convert_internal_DiskLocation_To_v1beta3_DiskLocation(val, newVal); err != nil { + if err := Convert_impl_DiskLocation_To_v1beta3_DiskLocation(val, newVal); err != nil { return err } (*out)[key] = newVal diff --git a/pkg/server/disk/impl/v1beta3/conversion_generated.go b/pkg/server/disk/impl/v1beta3/conversion_generated.go new file mode 100644 index 00000000..d347b57d --- /dev/null +++ b/pkg/server/disk/impl/v1beta3/conversion_generated.go @@ -0,0 +1,338 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1beta3 + +import ( + v1beta3 "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" +) + +func autoConvert_v1beta3_DiskIDs_To_impl_DiskIDs(in *v1beta3.DiskIDs, out *impl.DiskIDs) error { + out.Page83 = in.Page83 + out.SerialNumber = in.SerialNumber + return nil +} + +// Convert_v1beta3_DiskIDs_To_impl_DiskIDs is an autogenerated conversion function. +func Convert_v1beta3_DiskIDs_To_impl_DiskIDs(in *v1beta3.DiskIDs, out *impl.DiskIDs) error { + return autoConvert_v1beta3_DiskIDs_To_impl_DiskIDs(in, out) +} + +func autoConvert_impl_DiskIDs_To_v1beta3_DiskIDs(in *impl.DiskIDs, out *v1beta3.DiskIDs) error { + out.Page83 = in.Page83 + out.SerialNumber = in.SerialNumber + return nil +} + +// Convert_impl_DiskIDs_To_v1beta3_DiskIDs is an autogenerated conversion function. +func Convert_impl_DiskIDs_To_v1beta3_DiskIDs(in *impl.DiskIDs, out *v1beta3.DiskIDs) error { + return autoConvert_impl_DiskIDs_To_v1beta3_DiskIDs(in, out) +} + +func autoConvert_v1beta3_DiskLocation_To_impl_DiskLocation(in *v1beta3.DiskLocation, out *impl.DiskLocation) error { + out.Adapter = in.Adapter + out.Bus = in.Bus + out.Target = in.Target + out.LUNID = in.LUNID + return nil +} + +// Convert_v1beta3_DiskLocation_To_impl_DiskLocation is an autogenerated conversion function. +func Convert_v1beta3_DiskLocation_To_impl_DiskLocation(in *v1beta3.DiskLocation, out *impl.DiskLocation) error { + return autoConvert_v1beta3_DiskLocation_To_impl_DiskLocation(in, out) +} + +func autoConvert_impl_DiskLocation_To_v1beta3_DiskLocation(in *impl.DiskLocation, out *v1beta3.DiskLocation) error { + out.Adapter = in.Adapter + out.Bus = in.Bus + out.Target = in.Target + out.LUNID = in.LUNID + return nil +} + +// Convert_impl_DiskLocation_To_v1beta3_DiskLocation is an autogenerated conversion function. +func Convert_impl_DiskLocation_To_v1beta3_DiskLocation(in *impl.DiskLocation, out *v1beta3.DiskLocation) error { + return autoConvert_impl_DiskLocation_To_v1beta3_DiskLocation(in, out) +} + +func autoConvert_v1beta3_GetDiskStateRequest_To_impl_GetDiskStateRequest(in *v1beta3.GetDiskStateRequest, out *impl.GetDiskStateRequest) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_v1beta3_GetDiskStateRequest_To_impl_GetDiskStateRequest is an autogenerated conversion function. +func Convert_v1beta3_GetDiskStateRequest_To_impl_GetDiskStateRequest(in *v1beta3.GetDiskStateRequest, out *impl.GetDiskStateRequest) error { + return autoConvert_v1beta3_GetDiskStateRequest_To_impl_GetDiskStateRequest(in, out) +} + +func autoConvert_impl_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest(in *impl.GetDiskStateRequest, out *v1beta3.GetDiskStateRequest) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_impl_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest is an autogenerated conversion function. +func Convert_impl_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest(in *impl.GetDiskStateRequest, out *v1beta3.GetDiskStateRequest) error { + return autoConvert_impl_GetDiskStateRequest_To_v1beta3_GetDiskStateRequest(in, out) +} + +func autoConvert_v1beta3_GetDiskStateResponse_To_impl_GetDiskStateResponse(in *v1beta3.GetDiskStateResponse, out *impl.GetDiskStateResponse) error { + out.IsOnline = in.IsOnline + return nil +} + +// Convert_v1beta3_GetDiskStateResponse_To_impl_GetDiskStateResponse is an autogenerated conversion function. +func Convert_v1beta3_GetDiskStateResponse_To_impl_GetDiskStateResponse(in *v1beta3.GetDiskStateResponse, out *impl.GetDiskStateResponse) error { + return autoConvert_v1beta3_GetDiskStateResponse_To_impl_GetDiskStateResponse(in, out) +} + +func autoConvert_impl_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(in *impl.GetDiskStateResponse, out *v1beta3.GetDiskStateResponse) error { + out.IsOnline = in.IsOnline + return nil +} + +// Convert_impl_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse is an autogenerated conversion function. +func Convert_impl_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(in *impl.GetDiskStateResponse, out *v1beta3.GetDiskStateResponse) error { + return autoConvert_impl_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(in, out) +} + +func autoConvert_v1beta3_GetDiskStatsRequest_To_impl_GetDiskStatsRequest(in *v1beta3.GetDiskStatsRequest, out *impl.GetDiskStatsRequest) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_v1beta3_GetDiskStatsRequest_To_impl_GetDiskStatsRequest is an autogenerated conversion function. +func Convert_v1beta3_GetDiskStatsRequest_To_impl_GetDiskStatsRequest(in *v1beta3.GetDiskStatsRequest, out *impl.GetDiskStatsRequest) error { + return autoConvert_v1beta3_GetDiskStatsRequest_To_impl_GetDiskStatsRequest(in, out) +} + +func autoConvert_impl_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest(in *impl.GetDiskStatsRequest, out *v1beta3.GetDiskStatsRequest) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_impl_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest is an autogenerated conversion function. +func Convert_impl_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest(in *impl.GetDiskStatsRequest, out *v1beta3.GetDiskStatsRequest) error { + return autoConvert_impl_GetDiskStatsRequest_To_v1beta3_GetDiskStatsRequest(in, out) +} + +func autoConvert_v1beta3_GetDiskStatsResponse_To_impl_GetDiskStatsResponse(in *v1beta3.GetDiskStatsResponse, out *impl.GetDiskStatsResponse) error { + out.TotalBytes = in.TotalBytes + return nil +} + +// Convert_v1beta3_GetDiskStatsResponse_To_impl_GetDiskStatsResponse is an autogenerated conversion function. +func Convert_v1beta3_GetDiskStatsResponse_To_impl_GetDiskStatsResponse(in *v1beta3.GetDiskStatsResponse, out *impl.GetDiskStatsResponse) error { + return autoConvert_v1beta3_GetDiskStatsResponse_To_impl_GetDiskStatsResponse(in, out) +} + +func autoConvert_impl_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(in *impl.GetDiskStatsResponse, out *v1beta3.GetDiskStatsResponse) error { + out.TotalBytes = in.TotalBytes + return nil +} + +// Convert_impl_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse is an autogenerated conversion function. +func Convert_impl_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(in *impl.GetDiskStatsResponse, out *v1beta3.GetDiskStatsResponse) error { + return autoConvert_impl_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(in, out) +} + +func autoConvert_v1beta3_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(in *v1beta3.ListDiskIDsRequest, out *impl.ListDiskIDsRequest) error { + return nil +} + +// Convert_v1beta3_ListDiskIDsRequest_To_impl_ListDiskIDsRequest is an autogenerated conversion function. +func Convert_v1beta3_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(in *v1beta3.ListDiskIDsRequest, out *impl.ListDiskIDsRequest) error { + return autoConvert_v1beta3_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(in, out) +} + +func autoConvert_impl_ListDiskIDsRequest_To_v1beta3_ListDiskIDsRequest(in *impl.ListDiskIDsRequest, out *v1beta3.ListDiskIDsRequest) error { + return nil +} + +// Convert_impl_ListDiskIDsRequest_To_v1beta3_ListDiskIDsRequest is an autogenerated conversion function. +func Convert_impl_ListDiskIDsRequest_To_v1beta3_ListDiskIDsRequest(in *impl.ListDiskIDsRequest, out *v1beta3.ListDiskIDsRequest) error { + return autoConvert_impl_ListDiskIDsRequest_To_v1beta3_ListDiskIDsRequest(in, out) +} + +func autoConvert_v1beta3_ListDiskIDsResponse_To_impl_ListDiskIDsResponse(in *v1beta3.ListDiskIDsResponse, out *impl.ListDiskIDsResponse) error { + if in.DiskIDs != nil { + in, out := &in.DiskIDs, &out.DiskIDs + *out = make(map[uint32]*impl.DiskIDs, len(*in)) + for key, val := range *in { + newVal := new(*impl.DiskIDs) + if err := Convert_v1beta3_DiskIDs_To_impl_DiskIDs(*&val, *newVal); err != nil { + return err + } + (*out)[key] = *newVal + } + } else { + out.DiskIDs = nil + } + return nil +} + +// Convert_v1beta3_ListDiskIDsResponse_To_impl_ListDiskIDsResponse is an autogenerated conversion function. +func Convert_v1beta3_ListDiskIDsResponse_To_impl_ListDiskIDsResponse(in *v1beta3.ListDiskIDsResponse, out *impl.ListDiskIDsResponse) error { + return autoConvert_v1beta3_ListDiskIDsResponse_To_impl_ListDiskIDsResponse(in, out) +} + +// detected external conversion function +// Convert_impl_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(in *impl.ListDiskIDsResponse, out *v1beta3.ListDiskIDsResponse) error +// skipping generation of the auto function + +func autoConvert_v1beta3_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in *v1beta3.ListDiskLocationsRequest, out *impl.ListDiskLocationsRequest) error { + return nil +} + +// Convert_v1beta3_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest is an autogenerated conversion function. +func Convert_v1beta3_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in *v1beta3.ListDiskLocationsRequest, out *impl.ListDiskLocationsRequest) error { + return autoConvert_v1beta3_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(in, out) +} + +func autoConvert_impl_ListDiskLocationsRequest_To_v1beta3_ListDiskLocationsRequest(in *impl.ListDiskLocationsRequest, out *v1beta3.ListDiskLocationsRequest) error { + return nil +} + +// Convert_impl_ListDiskLocationsRequest_To_v1beta3_ListDiskLocationsRequest is an autogenerated conversion function. +func Convert_impl_ListDiskLocationsRequest_To_v1beta3_ListDiskLocationsRequest(in *impl.ListDiskLocationsRequest, out *v1beta3.ListDiskLocationsRequest) error { + return autoConvert_impl_ListDiskLocationsRequest_To_v1beta3_ListDiskLocationsRequest(in, out) +} + +func autoConvert_v1beta3_ListDiskLocationsResponse_To_impl_ListDiskLocationsResponse(in *v1beta3.ListDiskLocationsResponse, out *impl.ListDiskLocationsResponse) error { + if in.DiskLocations != nil { + in, out := &in.DiskLocations, &out.DiskLocations + *out = make(map[uint32]*impl.DiskLocation, len(*in)) + for key, val := range *in { + newVal := new(*impl.DiskLocation) + if err := Convert_v1beta3_DiskLocation_To_impl_DiskLocation(*&val, *newVal); err != nil { + return err + } + (*out)[key] = *newVal + } + } else { + out.DiskLocations = nil + } + return nil +} + +// Convert_v1beta3_ListDiskLocationsResponse_To_impl_ListDiskLocationsResponse is an autogenerated conversion function. +func Convert_v1beta3_ListDiskLocationsResponse_To_impl_ListDiskLocationsResponse(in *v1beta3.ListDiskLocationsResponse, out *impl.ListDiskLocationsResponse) error { + return autoConvert_v1beta3_ListDiskLocationsResponse_To_impl_ListDiskLocationsResponse(in, out) +} + +// detected external conversion function +// Convert_impl_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(in *impl.ListDiskLocationsResponse, out *v1beta3.ListDiskLocationsResponse) error +// skipping generation of the auto function + +func autoConvert_v1beta3_PartitionDiskRequest_To_impl_PartitionDiskRequest(in *v1beta3.PartitionDiskRequest, out *impl.PartitionDiskRequest) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_v1beta3_PartitionDiskRequest_To_impl_PartitionDiskRequest is an autogenerated conversion function. +func Convert_v1beta3_PartitionDiskRequest_To_impl_PartitionDiskRequest(in *v1beta3.PartitionDiskRequest, out *impl.PartitionDiskRequest) error { + return autoConvert_v1beta3_PartitionDiskRequest_To_impl_PartitionDiskRequest(in, out) +} + +func autoConvert_impl_PartitionDiskRequest_To_v1beta3_PartitionDiskRequest(in *impl.PartitionDiskRequest, out *v1beta3.PartitionDiskRequest) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_impl_PartitionDiskRequest_To_v1beta3_PartitionDiskRequest is an autogenerated conversion function. +func Convert_impl_PartitionDiskRequest_To_v1beta3_PartitionDiskRequest(in *impl.PartitionDiskRequest, out *v1beta3.PartitionDiskRequest) error { + return autoConvert_impl_PartitionDiskRequest_To_v1beta3_PartitionDiskRequest(in, out) +} + +func autoConvert_v1beta3_PartitionDiskResponse_To_impl_PartitionDiskResponse(in *v1beta3.PartitionDiskResponse, out *impl.PartitionDiskResponse) error { + return nil +} + +// Convert_v1beta3_PartitionDiskResponse_To_impl_PartitionDiskResponse is an autogenerated conversion function. +func Convert_v1beta3_PartitionDiskResponse_To_impl_PartitionDiskResponse(in *v1beta3.PartitionDiskResponse, out *impl.PartitionDiskResponse) error { + return autoConvert_v1beta3_PartitionDiskResponse_To_impl_PartitionDiskResponse(in, out) +} + +func autoConvert_impl_PartitionDiskResponse_To_v1beta3_PartitionDiskResponse(in *impl.PartitionDiskResponse, out *v1beta3.PartitionDiskResponse) error { + return nil +} + +// Convert_impl_PartitionDiskResponse_To_v1beta3_PartitionDiskResponse is an autogenerated conversion function. +func Convert_impl_PartitionDiskResponse_To_v1beta3_PartitionDiskResponse(in *impl.PartitionDiskResponse, out *v1beta3.PartitionDiskResponse) error { + return autoConvert_impl_PartitionDiskResponse_To_v1beta3_PartitionDiskResponse(in, out) +} + +func autoConvert_v1beta3_RescanRequest_To_impl_RescanRequest(in *v1beta3.RescanRequest, out *impl.RescanRequest) error { + return nil +} + +// Convert_v1beta3_RescanRequest_To_impl_RescanRequest is an autogenerated conversion function. +func Convert_v1beta3_RescanRequest_To_impl_RescanRequest(in *v1beta3.RescanRequest, out *impl.RescanRequest) error { + return autoConvert_v1beta3_RescanRequest_To_impl_RescanRequest(in, out) +} + +func autoConvert_impl_RescanRequest_To_v1beta3_RescanRequest(in *impl.RescanRequest, out *v1beta3.RescanRequest) error { + return nil +} + +// Convert_impl_RescanRequest_To_v1beta3_RescanRequest is an autogenerated conversion function. +func Convert_impl_RescanRequest_To_v1beta3_RescanRequest(in *impl.RescanRequest, out *v1beta3.RescanRequest) error { + return autoConvert_impl_RescanRequest_To_v1beta3_RescanRequest(in, out) +} + +func autoConvert_v1beta3_RescanResponse_To_impl_RescanResponse(in *v1beta3.RescanResponse, out *impl.RescanResponse) error { + return nil +} + +// Convert_v1beta3_RescanResponse_To_impl_RescanResponse is an autogenerated conversion function. +func Convert_v1beta3_RescanResponse_To_impl_RescanResponse(in *v1beta3.RescanResponse, out *impl.RescanResponse) error { + return autoConvert_v1beta3_RescanResponse_To_impl_RescanResponse(in, out) +} + +func autoConvert_impl_RescanResponse_To_v1beta3_RescanResponse(in *impl.RescanResponse, out *v1beta3.RescanResponse) error { + return nil +} + +// Convert_impl_RescanResponse_To_v1beta3_RescanResponse is an autogenerated conversion function. +func Convert_impl_RescanResponse_To_v1beta3_RescanResponse(in *impl.RescanResponse, out *v1beta3.RescanResponse) error { + return autoConvert_impl_RescanResponse_To_v1beta3_RescanResponse(in, out) +} + +func autoConvert_v1beta3_SetDiskStateRequest_To_impl_SetDiskStateRequest(in *v1beta3.SetDiskStateRequest, out *impl.SetDiskStateRequest) error { + out.DiskNumber = in.DiskNumber + out.IsOnline = in.IsOnline + return nil +} + +// Convert_v1beta3_SetDiskStateRequest_To_impl_SetDiskStateRequest is an autogenerated conversion function. +func Convert_v1beta3_SetDiskStateRequest_To_impl_SetDiskStateRequest(in *v1beta3.SetDiskStateRequest, out *impl.SetDiskStateRequest) error { + return autoConvert_v1beta3_SetDiskStateRequest_To_impl_SetDiskStateRequest(in, out) +} + +func autoConvert_impl_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest(in *impl.SetDiskStateRequest, out *v1beta3.SetDiskStateRequest) error { + out.DiskNumber = in.DiskNumber + out.IsOnline = in.IsOnline + return nil +} + +// Convert_impl_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest is an autogenerated conversion function. +func Convert_impl_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest(in *impl.SetDiskStateRequest, out *v1beta3.SetDiskStateRequest) error { + return autoConvert_impl_SetDiskStateRequest_To_v1beta3_SetDiskStateRequest(in, out) +} + +func autoConvert_v1beta3_SetDiskStateResponse_To_impl_SetDiskStateResponse(in *v1beta3.SetDiskStateResponse, out *impl.SetDiskStateResponse) error { + return nil +} + +// Convert_v1beta3_SetDiskStateResponse_To_impl_SetDiskStateResponse is an autogenerated conversion function. +func Convert_v1beta3_SetDiskStateResponse_To_impl_SetDiskStateResponse(in *v1beta3.SetDiskStateResponse, out *impl.SetDiskStateResponse) error { + return autoConvert_v1beta3_SetDiskStateResponse_To_impl_SetDiskStateResponse(in, out) +} + +func autoConvert_impl_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(in *impl.SetDiskStateResponse, out *v1beta3.SetDiskStateResponse) error { + return nil +} + +// Convert_impl_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse is an autogenerated conversion function. +func Convert_impl_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(in *impl.SetDiskStateResponse, out *v1beta3.SetDiskStateResponse) error { + return autoConvert_impl_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(in, out) +} diff --git a/internal/server/disk/internal/v1beta3/server_generated.go b/pkg/server/disk/impl/v1beta3/server_generated.go similarity index 59% rename from internal/server/disk/internal/v1beta3/server_generated.go rename to pkg/server/disk/impl/v1beta3/server_generated.go index ab510464..366058e1 100644 --- a/internal/server/disk/internal/v1beta3/server_generated.go +++ b/pkg/server/disk/impl/v1beta3/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/disk/v1beta3" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1beta3") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) GetDiskState(context context.Context, versionedRequest *v1beta3.GetDiskStateRequest) (*v1beta3.GetDiskStateResponse, error) { - request := &internal.GetDiskStateRequest{} - if err := Convert_v1beta3_GetDiskStateRequest_To_internal_GetDiskStateRequest(versionedRequest, request); err != nil { + request := &impl.GetDiskStateRequest{} + if err := Convert_v1beta3_GetDiskStateRequest_To_impl_GetDiskStateRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) GetDiskState(context context.Context, versionedRequest *v } versionedResponse := &v1beta3.GetDiskStateResponse{} - if err := Convert_internal_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetDiskStateResponse_To_v1beta3_GetDiskStateResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) GetDiskState(context context.Context, versionedRequest *v } func (s *versionedAPI) GetDiskStats(context context.Context, versionedRequest *v1beta3.GetDiskStatsRequest) (*v1beta3.GetDiskStatsResponse, error) { - request := &internal.GetDiskStatsRequest{} - if err := Convert_v1beta3_GetDiskStatsRequest_To_internal_GetDiskStatsRequest(versionedRequest, request); err != nil { + request := &impl.GetDiskStatsRequest{} + if err := Convert_v1beta3_GetDiskStatsRequest_To_impl_GetDiskStatsRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) GetDiskStats(context context.Context, versionedRequest *v } versionedResponse := &v1beta3.GetDiskStatsResponse{} - if err := Convert_internal_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetDiskStatsResponse_To_v1beta3_GetDiskStatsResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) GetDiskStats(context context.Context, versionedRequest *v } func (s *versionedAPI) ListDiskIDs(context context.Context, versionedRequest *v1beta3.ListDiskIDsRequest) (*v1beta3.ListDiskIDsResponse, error) { - request := &internal.ListDiskIDsRequest{} - if err := Convert_v1beta3_ListDiskIDsRequest_To_internal_ListDiskIDsRequest(versionedRequest, request); err != nil { + request := &impl.ListDiskIDsRequest{} + if err := Convert_v1beta3_ListDiskIDsRequest_To_impl_ListDiskIDsRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) ListDiskIDs(context context.Context, versionedRequest *v1 } versionedResponse := &v1beta3.ListDiskIDsResponse{} - if err := Convert_internal_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListDiskIDsResponse_To_v1beta3_ListDiskIDsResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) ListDiskIDs(context context.Context, versionedRequest *v1 } func (s *versionedAPI) ListDiskLocations(context context.Context, versionedRequest *v1beta3.ListDiskLocationsRequest) (*v1beta3.ListDiskLocationsResponse, error) { - request := &internal.ListDiskLocationsRequest{} - if err := Convert_v1beta3_ListDiskLocationsRequest_To_internal_ListDiskLocationsRequest(versionedRequest, request); err != nil { + request := &impl.ListDiskLocationsRequest{} + if err := Convert_v1beta3_ListDiskLocationsRequest_To_impl_ListDiskLocationsRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) ListDiskLocations(context context.Context, versionedReque } versionedResponse := &v1beta3.ListDiskLocationsResponse{} - if err := Convert_internal_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListDiskLocationsResponse_To_v1beta3_ListDiskLocationsResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) ListDiskLocations(context context.Context, versionedReque } func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest *v1beta3.PartitionDiskRequest) (*v1beta3.PartitionDiskResponse, error) { - request := &internal.PartitionDiskRequest{} - if err := Convert_v1beta3_PartitionDiskRequest_To_internal_PartitionDiskRequest(versionedRequest, request); err != nil { + request := &impl.PartitionDiskRequest{} + if err := Convert_v1beta3_PartitionDiskRequest_To_impl_PartitionDiskRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest * } versionedResponse := &v1beta3.PartitionDiskResponse{} - if err := Convert_internal_PartitionDiskResponse_To_v1beta3_PartitionDiskResponse(response, versionedResponse); err != nil { + if err := Convert_impl_PartitionDiskResponse_To_v1beta3_PartitionDiskResponse(response, versionedResponse); err != nil { return nil, err } @@ -123,8 +123,8 @@ func (s *versionedAPI) PartitionDisk(context context.Context, versionedRequest * } func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1beta3.RescanRequest) (*v1beta3.RescanResponse, error) { - request := &internal.RescanRequest{} - if err := Convert_v1beta3_RescanRequest_To_internal_RescanRequest(versionedRequest, request); err != nil { + request := &impl.RescanRequest{} + if err := Convert_v1beta3_RescanRequest_To_impl_RescanRequest(versionedRequest, request); err != nil { return nil, err } @@ -134,7 +134,7 @@ func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1beta3 } versionedResponse := &v1beta3.RescanResponse{} - if err := Convert_internal_RescanResponse_To_v1beta3_RescanResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RescanResponse_To_v1beta3_RescanResponse(response, versionedResponse); err != nil { return nil, err } @@ -142,8 +142,8 @@ func (s *versionedAPI) Rescan(context context.Context, versionedRequest *v1beta3 } func (s *versionedAPI) SetDiskState(context context.Context, versionedRequest *v1beta3.SetDiskStateRequest) (*v1beta3.SetDiskStateResponse, error) { - request := &internal.SetDiskStateRequest{} - if err := Convert_v1beta3_SetDiskStateRequest_To_internal_SetDiskStateRequest(versionedRequest, request); err != nil { + request := &impl.SetDiskStateRequest{} + if err := Convert_v1beta3_SetDiskStateRequest_To_impl_SetDiskStateRequest(versionedRequest, request); err != nil { return nil, err } @@ -153,7 +153,7 @@ func (s *versionedAPI) SetDiskState(context context.Context, versionedRequest *v } versionedResponse := &v1beta3.SetDiskStateResponse{} - if err := Convert_internal_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(response, versionedResponse); err != nil { + if err := Convert_impl_SetDiskStateResponse_To_v1beta3_SetDiskStateResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/disk/server.go b/pkg/server/disk/server.go similarity index 98% rename from internal/server/disk/server.go rename to pkg/server/disk/server.go index 4b0945f1..ca0abdac 100644 --- a/internal/server/disk/server.go +++ b/pkg/server/disk/server.go @@ -6,8 +6,8 @@ import ( "strconv" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/os/disk" - "github.com/kubernetes-csi/csi-proxy/internal/server/disk/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/os/disk" + internal "github.com/kubernetes-csi/csi-proxy/pkg/server/disk/impl" "k8s.io/klog/v2" ) diff --git a/internal/server/filesystem/api_group_generated.go b/pkg/server/filesystem/api_group_generated.go similarity index 65% rename from internal/server/filesystem/api_group_generated.go rename to pkg/server/filesystem/api_group_generated.go index abd78657..62a9aa9c 100644 --- a/internal/server/filesystem/api_group_generated.go +++ b/pkg/server/filesystem/api_group_generated.go @@ -4,17 +4,17 @@ package filesystem import ( "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal" - "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal/v1alpha1" - "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal/v1beta1" - "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal/v1beta2" - srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types" + "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl" + "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl/v1alpha1" + "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl/v1beta1" + "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl/v1beta2" + srvtypes "github.com/kubernetes-csi/csi-proxy/pkg/server/types" ) const name = "filesystem" // ensure the server defines all the required methods -var _ internal.ServerInterface = &Server{} +var _ impl.ServerInterface = &Server{} func (s *Server) VersionedAPIs() []*srvtypes.VersionedAPI { v1alpha1Server := v1alpha1.NewVersionedServer(s) diff --git a/internal/server/filesystem/internal/types.go b/pkg/server/filesystem/impl/types.go similarity index 99% rename from internal/server/filesystem/internal/types.go rename to pkg/server/filesystem/impl/types.go index 475220e9..7b904f88 100644 --- a/internal/server/filesystem/internal/types.go +++ b/pkg/server/filesystem/impl/types.go @@ -1,4 +1,4 @@ -package internal +package impl // PathExistsRequest is the internal representation of requests to the PathExists endpoint. type PathExistsRequest struct { diff --git a/internal/server/filesystem/internal/types_generated.go b/pkg/server/filesystem/impl/types_generated.go similarity index 98% rename from internal/server/filesystem/internal/types_generated.go rename to pkg/server/filesystem/impl/types_generated.go index 2bf9abbf..0abf98af 100644 --- a/internal/server/filesystem/internal/types_generated.go +++ b/pkg/server/filesystem/impl/types_generated.go @@ -1,6 +1,6 @@ // Code generated by csi-proxy-api-gen. DO NOT EDIT. -package internal +package impl import ( "context" diff --git a/internal/server/smb/internal/v1alpha1/conversion.go b/pkg/server/filesystem/impl/v1alpha1/conversion.go similarity index 100% rename from internal/server/smb/internal/v1alpha1/conversion.go rename to pkg/server/filesystem/impl/v1alpha1/conversion.go diff --git a/pkg/server/filesystem/impl/v1alpha1/conversion_generated.go b/pkg/server/filesystem/impl/v1alpha1/conversion_generated.go new file mode 100644 index 00000000..91761f56 --- /dev/null +++ b/pkg/server/filesystem/impl/v1alpha1/conversion_generated.go @@ -0,0 +1,206 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl" +) + +func autoConvert_v1alpha1_IsMountPointRequest_To_impl_IsMountPointRequest(in *v1alpha1.IsMountPointRequest, out *impl.IsMountPointRequest) error { + out.Path = in.Path + return nil +} + +// Convert_v1alpha1_IsMountPointRequest_To_impl_IsMountPointRequest is an autogenerated conversion function. +func Convert_v1alpha1_IsMountPointRequest_To_impl_IsMountPointRequest(in *v1alpha1.IsMountPointRequest, out *impl.IsMountPointRequest) error { + return autoConvert_v1alpha1_IsMountPointRequest_To_impl_IsMountPointRequest(in, out) +} + +func autoConvert_impl_IsMountPointRequest_To_v1alpha1_IsMountPointRequest(in *impl.IsMountPointRequest, out *v1alpha1.IsMountPointRequest) error { + out.Path = in.Path + return nil +} + +// Convert_impl_IsMountPointRequest_To_v1alpha1_IsMountPointRequest is an autogenerated conversion function. +func Convert_impl_IsMountPointRequest_To_v1alpha1_IsMountPointRequest(in *impl.IsMountPointRequest, out *v1alpha1.IsMountPointRequest) error { + return autoConvert_impl_IsMountPointRequest_To_v1alpha1_IsMountPointRequest(in, out) +} + +func autoConvert_v1alpha1_IsMountPointResponse_To_impl_IsMountPointResponse(in *v1alpha1.IsMountPointResponse, out *impl.IsMountPointResponse) error { + out.IsMountPoint = in.IsMountPoint + return nil +} + +// Convert_v1alpha1_IsMountPointResponse_To_impl_IsMountPointResponse is an autogenerated conversion function. +func Convert_v1alpha1_IsMountPointResponse_To_impl_IsMountPointResponse(in *v1alpha1.IsMountPointResponse, out *impl.IsMountPointResponse) error { + return autoConvert_v1alpha1_IsMountPointResponse_To_impl_IsMountPointResponse(in, out) +} + +func autoConvert_impl_IsMountPointResponse_To_v1alpha1_IsMountPointResponse(in *impl.IsMountPointResponse, out *v1alpha1.IsMountPointResponse) error { + out.IsMountPoint = in.IsMountPoint + return nil +} + +// Convert_impl_IsMountPointResponse_To_v1alpha1_IsMountPointResponse is an autogenerated conversion function. +func Convert_impl_IsMountPointResponse_To_v1alpha1_IsMountPointResponse(in *impl.IsMountPointResponse, out *v1alpha1.IsMountPointResponse) error { + return autoConvert_impl_IsMountPointResponse_To_v1alpha1_IsMountPointResponse(in, out) +} + +func autoConvert_v1alpha1_LinkPathRequest_To_impl_LinkPathRequest(in *v1alpha1.LinkPathRequest, out *impl.LinkPathRequest) error { + out.SourcePath = in.SourcePath + out.TargetPath = in.TargetPath + return nil +} + +// Convert_v1alpha1_LinkPathRequest_To_impl_LinkPathRequest is an autogenerated conversion function. +func Convert_v1alpha1_LinkPathRequest_To_impl_LinkPathRequest(in *v1alpha1.LinkPathRequest, out *impl.LinkPathRequest) error { + return autoConvert_v1alpha1_LinkPathRequest_To_impl_LinkPathRequest(in, out) +} + +func autoConvert_impl_LinkPathRequest_To_v1alpha1_LinkPathRequest(in *impl.LinkPathRequest, out *v1alpha1.LinkPathRequest) error { + out.SourcePath = in.SourcePath + out.TargetPath = in.TargetPath + return nil +} + +// Convert_impl_LinkPathRequest_To_v1alpha1_LinkPathRequest is an autogenerated conversion function. +func Convert_impl_LinkPathRequest_To_v1alpha1_LinkPathRequest(in *impl.LinkPathRequest, out *v1alpha1.LinkPathRequest) error { + return autoConvert_impl_LinkPathRequest_To_v1alpha1_LinkPathRequest(in, out) +} + +func autoConvert_v1alpha1_LinkPathResponse_To_impl_LinkPathResponse(in *v1alpha1.LinkPathResponse, out *impl.LinkPathResponse) error { + return nil +} + +// Convert_v1alpha1_LinkPathResponse_To_impl_LinkPathResponse is an autogenerated conversion function. +func Convert_v1alpha1_LinkPathResponse_To_impl_LinkPathResponse(in *v1alpha1.LinkPathResponse, out *impl.LinkPathResponse) error { + return autoConvert_v1alpha1_LinkPathResponse_To_impl_LinkPathResponse(in, out) +} + +func autoConvert_impl_LinkPathResponse_To_v1alpha1_LinkPathResponse(in *impl.LinkPathResponse, out *v1alpha1.LinkPathResponse) error { + return nil +} + +// Convert_impl_LinkPathResponse_To_v1alpha1_LinkPathResponse is an autogenerated conversion function. +func Convert_impl_LinkPathResponse_To_v1alpha1_LinkPathResponse(in *impl.LinkPathResponse, out *v1alpha1.LinkPathResponse) error { + return autoConvert_impl_LinkPathResponse_To_v1alpha1_LinkPathResponse(in, out) +} + +func autoConvert_v1alpha1_MkdirRequest_To_impl_MkdirRequest(in *v1alpha1.MkdirRequest, out *impl.MkdirRequest) error { + out.Path = in.Path + return nil +} + +// Convert_v1alpha1_MkdirRequest_To_impl_MkdirRequest is an autogenerated conversion function. +func Convert_v1alpha1_MkdirRequest_To_impl_MkdirRequest(in *v1alpha1.MkdirRequest, out *impl.MkdirRequest) error { + return autoConvert_v1alpha1_MkdirRequest_To_impl_MkdirRequest(in, out) +} + +func autoConvert_impl_MkdirRequest_To_v1alpha1_MkdirRequest(in *impl.MkdirRequest, out *v1alpha1.MkdirRequest) error { + out.Path = in.Path + return nil +} + +// Convert_impl_MkdirRequest_To_v1alpha1_MkdirRequest is an autogenerated conversion function. +func Convert_impl_MkdirRequest_To_v1alpha1_MkdirRequest(in *impl.MkdirRequest, out *v1alpha1.MkdirRequest) error { + return autoConvert_impl_MkdirRequest_To_v1alpha1_MkdirRequest(in, out) +} + +func autoConvert_v1alpha1_MkdirResponse_To_impl_MkdirResponse(in *v1alpha1.MkdirResponse, out *impl.MkdirResponse) error { + return nil +} + +// Convert_v1alpha1_MkdirResponse_To_impl_MkdirResponse is an autogenerated conversion function. +func Convert_v1alpha1_MkdirResponse_To_impl_MkdirResponse(in *v1alpha1.MkdirResponse, out *impl.MkdirResponse) error { + return autoConvert_v1alpha1_MkdirResponse_To_impl_MkdirResponse(in, out) +} + +func autoConvert_impl_MkdirResponse_To_v1alpha1_MkdirResponse(in *impl.MkdirResponse, out *v1alpha1.MkdirResponse) error { + return nil +} + +// Convert_impl_MkdirResponse_To_v1alpha1_MkdirResponse is an autogenerated conversion function. +func Convert_impl_MkdirResponse_To_v1alpha1_MkdirResponse(in *impl.MkdirResponse, out *v1alpha1.MkdirResponse) error { + return autoConvert_impl_MkdirResponse_To_v1alpha1_MkdirResponse(in, out) +} + +func autoConvert_v1alpha1_PathExistsRequest_To_impl_PathExistsRequest(in *v1alpha1.PathExistsRequest, out *impl.PathExistsRequest) error { + out.Path = in.Path + return nil +} + +// Convert_v1alpha1_PathExistsRequest_To_impl_PathExistsRequest is an autogenerated conversion function. +func Convert_v1alpha1_PathExistsRequest_To_impl_PathExistsRequest(in *v1alpha1.PathExistsRequest, out *impl.PathExistsRequest) error { + return autoConvert_v1alpha1_PathExistsRequest_To_impl_PathExistsRequest(in, out) +} + +func autoConvert_impl_PathExistsRequest_To_v1alpha1_PathExistsRequest(in *impl.PathExistsRequest, out *v1alpha1.PathExistsRequest) error { + out.Path = in.Path + return nil +} + +// Convert_impl_PathExistsRequest_To_v1alpha1_PathExistsRequest is an autogenerated conversion function. +func Convert_impl_PathExistsRequest_To_v1alpha1_PathExistsRequest(in *impl.PathExistsRequest, out *v1alpha1.PathExistsRequest) error { + return autoConvert_impl_PathExistsRequest_To_v1alpha1_PathExistsRequest(in, out) +} + +func autoConvert_v1alpha1_PathExistsResponse_To_impl_PathExistsResponse(in *v1alpha1.PathExistsResponse, out *impl.PathExistsResponse) error { + out.Exists = in.Exists + return nil +} + +// Convert_v1alpha1_PathExistsResponse_To_impl_PathExistsResponse is an autogenerated conversion function. +func Convert_v1alpha1_PathExistsResponse_To_impl_PathExistsResponse(in *v1alpha1.PathExistsResponse, out *impl.PathExistsResponse) error { + return autoConvert_v1alpha1_PathExistsResponse_To_impl_PathExistsResponse(in, out) +} + +func autoConvert_impl_PathExistsResponse_To_v1alpha1_PathExistsResponse(in *impl.PathExistsResponse, out *v1alpha1.PathExistsResponse) error { + out.Exists = in.Exists + return nil +} + +// Convert_impl_PathExistsResponse_To_v1alpha1_PathExistsResponse is an autogenerated conversion function. +func Convert_impl_PathExistsResponse_To_v1alpha1_PathExistsResponse(in *impl.PathExistsResponse, out *v1alpha1.PathExistsResponse) error { + return autoConvert_impl_PathExistsResponse_To_v1alpha1_PathExistsResponse(in, out) +} + +func autoConvert_v1alpha1_RmdirRequest_To_impl_RmdirRequest(in *v1alpha1.RmdirRequest, out *impl.RmdirRequest) error { + out.Path = in.Path + out.Force = in.Force + return nil +} + +// Convert_v1alpha1_RmdirRequest_To_impl_RmdirRequest is an autogenerated conversion function. +func Convert_v1alpha1_RmdirRequest_To_impl_RmdirRequest(in *v1alpha1.RmdirRequest, out *impl.RmdirRequest) error { + return autoConvert_v1alpha1_RmdirRequest_To_impl_RmdirRequest(in, out) +} + +func autoConvert_impl_RmdirRequest_To_v1alpha1_RmdirRequest(in *impl.RmdirRequest, out *v1alpha1.RmdirRequest) error { + out.Path = in.Path + out.Force = in.Force + return nil +} + +// Convert_impl_RmdirRequest_To_v1alpha1_RmdirRequest is an autogenerated conversion function. +func Convert_impl_RmdirRequest_To_v1alpha1_RmdirRequest(in *impl.RmdirRequest, out *v1alpha1.RmdirRequest) error { + return autoConvert_impl_RmdirRequest_To_v1alpha1_RmdirRequest(in, out) +} + +func autoConvert_v1alpha1_RmdirResponse_To_impl_RmdirResponse(in *v1alpha1.RmdirResponse, out *impl.RmdirResponse) error { + return nil +} + +// Convert_v1alpha1_RmdirResponse_To_impl_RmdirResponse is an autogenerated conversion function. +func Convert_v1alpha1_RmdirResponse_To_impl_RmdirResponse(in *v1alpha1.RmdirResponse, out *impl.RmdirResponse) error { + return autoConvert_v1alpha1_RmdirResponse_To_impl_RmdirResponse(in, out) +} + +func autoConvert_impl_RmdirResponse_To_v1alpha1_RmdirResponse(in *impl.RmdirResponse, out *v1alpha1.RmdirResponse) error { + return nil +} + +// Convert_impl_RmdirResponse_To_v1alpha1_RmdirResponse is an autogenerated conversion function. +func Convert_impl_RmdirResponse_To_v1alpha1_RmdirResponse(in *impl.RmdirResponse, out *v1alpha1.RmdirResponse) error { + return autoConvert_impl_RmdirResponse_To_v1alpha1_RmdirResponse(in, out) +} diff --git a/internal/server/filesystem/internal/v1alpha1/server_generated.go b/pkg/server/filesystem/impl/v1alpha1/server_generated.go similarity index 61% rename from internal/server/filesystem/internal/v1alpha1/server_generated.go rename to pkg/server/filesystem/impl/v1alpha1/server_generated.go index 7a2b352a..382585c3 100644 --- a/internal/server/filesystem/internal/v1alpha1/server_generated.go +++ b/pkg/server/filesystem/impl/v1alpha1/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1alpha1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1alpha1") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) IsMountPoint(context context.Context, versionedRequest *v1alpha1.IsMountPointRequest) (*v1alpha1.IsMountPointResponse, error) { - request := &internal.IsMountPointRequest{} - if err := Convert_v1alpha1_IsMountPointRequest_To_internal_IsMountPointRequest(versionedRequest, request); err != nil { + request := &impl.IsMountPointRequest{} + if err := Convert_v1alpha1_IsMountPointRequest_To_impl_IsMountPointRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) IsMountPoint(context context.Context, versionedRequest *v } versionedResponse := &v1alpha1.IsMountPointResponse{} - if err := Convert_internal_IsMountPointResponse_To_v1alpha1_IsMountPointResponse(response, versionedResponse); err != nil { + if err := Convert_impl_IsMountPointResponse_To_v1alpha1_IsMountPointResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) IsMountPoint(context context.Context, versionedRequest *v } func (s *versionedAPI) LinkPath(context context.Context, versionedRequest *v1alpha1.LinkPathRequest) (*v1alpha1.LinkPathResponse, error) { - request := &internal.LinkPathRequest{} - if err := Convert_v1alpha1_LinkPathRequest_To_internal_LinkPathRequest(versionedRequest, request); err != nil { + request := &impl.LinkPathRequest{} + if err := Convert_v1alpha1_LinkPathRequest_To_impl_LinkPathRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) LinkPath(context context.Context, versionedRequest *v1alp } versionedResponse := &v1alpha1.LinkPathResponse{} - if err := Convert_internal_LinkPathResponse_To_v1alpha1_LinkPathResponse(response, versionedResponse); err != nil { + if err := Convert_impl_LinkPathResponse_To_v1alpha1_LinkPathResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) LinkPath(context context.Context, versionedRequest *v1alp } func (s *versionedAPI) Mkdir(context context.Context, versionedRequest *v1alpha1.MkdirRequest) (*v1alpha1.MkdirResponse, error) { - request := &internal.MkdirRequest{} - if err := Convert_v1alpha1_MkdirRequest_To_internal_MkdirRequest(versionedRequest, request); err != nil { + request := &impl.MkdirRequest{} + if err := Convert_v1alpha1_MkdirRequest_To_impl_MkdirRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) Mkdir(context context.Context, versionedRequest *v1alpha1 } versionedResponse := &v1alpha1.MkdirResponse{} - if err := Convert_internal_MkdirResponse_To_v1alpha1_MkdirResponse(response, versionedResponse); err != nil { + if err := Convert_impl_MkdirResponse_To_v1alpha1_MkdirResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) Mkdir(context context.Context, versionedRequest *v1alpha1 } func (s *versionedAPI) PathExists(context context.Context, versionedRequest *v1alpha1.PathExistsRequest) (*v1alpha1.PathExistsResponse, error) { - request := &internal.PathExistsRequest{} - if err := Convert_v1alpha1_PathExistsRequest_To_internal_PathExistsRequest(versionedRequest, request); err != nil { + request := &impl.PathExistsRequest{} + if err := Convert_v1alpha1_PathExistsRequest_To_impl_PathExistsRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) PathExists(context context.Context, versionedRequest *v1a } versionedResponse := &v1alpha1.PathExistsResponse{} - if err := Convert_internal_PathExistsResponse_To_v1alpha1_PathExistsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_PathExistsResponse_To_v1alpha1_PathExistsResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) PathExists(context context.Context, versionedRequest *v1a } func (s *versionedAPI) Rmdir(context context.Context, versionedRequest *v1alpha1.RmdirRequest) (*v1alpha1.RmdirResponse, error) { - request := &internal.RmdirRequest{} - if err := Convert_v1alpha1_RmdirRequest_To_internal_RmdirRequest(versionedRequest, request); err != nil { + request := &impl.RmdirRequest{} + if err := Convert_v1alpha1_RmdirRequest_To_impl_RmdirRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) Rmdir(context context.Context, versionedRequest *v1alpha1 } versionedResponse := &v1alpha1.RmdirResponse{} - if err := Convert_internal_RmdirResponse_To_v1alpha1_RmdirResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RmdirResponse_To_v1alpha1_RmdirResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/filesystem/internal/v1beta1/conversion.go b/pkg/server/filesystem/impl/v1beta1/conversion.go similarity index 100% rename from internal/server/filesystem/internal/v1beta1/conversion.go rename to pkg/server/filesystem/impl/v1beta1/conversion.go diff --git a/pkg/server/filesystem/impl/v1beta1/conversion_generated.go b/pkg/server/filesystem/impl/v1beta1/conversion_generated.go new file mode 100644 index 00000000..9ab58c38 --- /dev/null +++ b/pkg/server/filesystem/impl/v1beta1/conversion_generated.go @@ -0,0 +1,206 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1beta1 + +import ( + v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl" +) + +func autoConvert_v1beta1_IsMountPointRequest_To_impl_IsMountPointRequest(in *v1beta1.IsMountPointRequest, out *impl.IsMountPointRequest) error { + out.Path = in.Path + return nil +} + +// Convert_v1beta1_IsMountPointRequest_To_impl_IsMountPointRequest is an autogenerated conversion function. +func Convert_v1beta1_IsMountPointRequest_To_impl_IsMountPointRequest(in *v1beta1.IsMountPointRequest, out *impl.IsMountPointRequest) error { + return autoConvert_v1beta1_IsMountPointRequest_To_impl_IsMountPointRequest(in, out) +} + +func autoConvert_impl_IsMountPointRequest_To_v1beta1_IsMountPointRequest(in *impl.IsMountPointRequest, out *v1beta1.IsMountPointRequest) error { + out.Path = in.Path + return nil +} + +// Convert_impl_IsMountPointRequest_To_v1beta1_IsMountPointRequest is an autogenerated conversion function. +func Convert_impl_IsMountPointRequest_To_v1beta1_IsMountPointRequest(in *impl.IsMountPointRequest, out *v1beta1.IsMountPointRequest) error { + return autoConvert_impl_IsMountPointRequest_To_v1beta1_IsMountPointRequest(in, out) +} + +func autoConvert_v1beta1_IsMountPointResponse_To_impl_IsMountPointResponse(in *v1beta1.IsMountPointResponse, out *impl.IsMountPointResponse) error { + out.IsMountPoint = in.IsMountPoint + return nil +} + +// Convert_v1beta1_IsMountPointResponse_To_impl_IsMountPointResponse is an autogenerated conversion function. +func Convert_v1beta1_IsMountPointResponse_To_impl_IsMountPointResponse(in *v1beta1.IsMountPointResponse, out *impl.IsMountPointResponse) error { + return autoConvert_v1beta1_IsMountPointResponse_To_impl_IsMountPointResponse(in, out) +} + +func autoConvert_impl_IsMountPointResponse_To_v1beta1_IsMountPointResponse(in *impl.IsMountPointResponse, out *v1beta1.IsMountPointResponse) error { + out.IsMountPoint = in.IsMountPoint + return nil +} + +// Convert_impl_IsMountPointResponse_To_v1beta1_IsMountPointResponse is an autogenerated conversion function. +func Convert_impl_IsMountPointResponse_To_v1beta1_IsMountPointResponse(in *impl.IsMountPointResponse, out *v1beta1.IsMountPointResponse) error { + return autoConvert_impl_IsMountPointResponse_To_v1beta1_IsMountPointResponse(in, out) +} + +func autoConvert_v1beta1_LinkPathRequest_To_impl_LinkPathRequest(in *v1beta1.LinkPathRequest, out *impl.LinkPathRequest) error { + out.SourcePath = in.SourcePath + out.TargetPath = in.TargetPath + return nil +} + +// Convert_v1beta1_LinkPathRequest_To_impl_LinkPathRequest is an autogenerated conversion function. +func Convert_v1beta1_LinkPathRequest_To_impl_LinkPathRequest(in *v1beta1.LinkPathRequest, out *impl.LinkPathRequest) error { + return autoConvert_v1beta1_LinkPathRequest_To_impl_LinkPathRequest(in, out) +} + +func autoConvert_impl_LinkPathRequest_To_v1beta1_LinkPathRequest(in *impl.LinkPathRequest, out *v1beta1.LinkPathRequest) error { + out.SourcePath = in.SourcePath + out.TargetPath = in.TargetPath + return nil +} + +// Convert_impl_LinkPathRequest_To_v1beta1_LinkPathRequest is an autogenerated conversion function. +func Convert_impl_LinkPathRequest_To_v1beta1_LinkPathRequest(in *impl.LinkPathRequest, out *v1beta1.LinkPathRequest) error { + return autoConvert_impl_LinkPathRequest_To_v1beta1_LinkPathRequest(in, out) +} + +func autoConvert_v1beta1_LinkPathResponse_To_impl_LinkPathResponse(in *v1beta1.LinkPathResponse, out *impl.LinkPathResponse) error { + return nil +} + +// Convert_v1beta1_LinkPathResponse_To_impl_LinkPathResponse is an autogenerated conversion function. +func Convert_v1beta1_LinkPathResponse_To_impl_LinkPathResponse(in *v1beta1.LinkPathResponse, out *impl.LinkPathResponse) error { + return autoConvert_v1beta1_LinkPathResponse_To_impl_LinkPathResponse(in, out) +} + +func autoConvert_impl_LinkPathResponse_To_v1beta1_LinkPathResponse(in *impl.LinkPathResponse, out *v1beta1.LinkPathResponse) error { + return nil +} + +// Convert_impl_LinkPathResponse_To_v1beta1_LinkPathResponse is an autogenerated conversion function. +func Convert_impl_LinkPathResponse_To_v1beta1_LinkPathResponse(in *impl.LinkPathResponse, out *v1beta1.LinkPathResponse) error { + return autoConvert_impl_LinkPathResponse_To_v1beta1_LinkPathResponse(in, out) +} + +func autoConvert_v1beta1_MkdirRequest_To_impl_MkdirRequest(in *v1beta1.MkdirRequest, out *impl.MkdirRequest) error { + out.Path = in.Path + return nil +} + +// Convert_v1beta1_MkdirRequest_To_impl_MkdirRequest is an autogenerated conversion function. +func Convert_v1beta1_MkdirRequest_To_impl_MkdirRequest(in *v1beta1.MkdirRequest, out *impl.MkdirRequest) error { + return autoConvert_v1beta1_MkdirRequest_To_impl_MkdirRequest(in, out) +} + +func autoConvert_impl_MkdirRequest_To_v1beta1_MkdirRequest(in *impl.MkdirRequest, out *v1beta1.MkdirRequest) error { + out.Path = in.Path + return nil +} + +// Convert_impl_MkdirRequest_To_v1beta1_MkdirRequest is an autogenerated conversion function. +func Convert_impl_MkdirRequest_To_v1beta1_MkdirRequest(in *impl.MkdirRequest, out *v1beta1.MkdirRequest) error { + return autoConvert_impl_MkdirRequest_To_v1beta1_MkdirRequest(in, out) +} + +func autoConvert_v1beta1_MkdirResponse_To_impl_MkdirResponse(in *v1beta1.MkdirResponse, out *impl.MkdirResponse) error { + return nil +} + +// Convert_v1beta1_MkdirResponse_To_impl_MkdirResponse is an autogenerated conversion function. +func Convert_v1beta1_MkdirResponse_To_impl_MkdirResponse(in *v1beta1.MkdirResponse, out *impl.MkdirResponse) error { + return autoConvert_v1beta1_MkdirResponse_To_impl_MkdirResponse(in, out) +} + +func autoConvert_impl_MkdirResponse_To_v1beta1_MkdirResponse(in *impl.MkdirResponse, out *v1beta1.MkdirResponse) error { + return nil +} + +// Convert_impl_MkdirResponse_To_v1beta1_MkdirResponse is an autogenerated conversion function. +func Convert_impl_MkdirResponse_To_v1beta1_MkdirResponse(in *impl.MkdirResponse, out *v1beta1.MkdirResponse) error { + return autoConvert_impl_MkdirResponse_To_v1beta1_MkdirResponse(in, out) +} + +func autoConvert_v1beta1_PathExistsRequest_To_impl_PathExistsRequest(in *v1beta1.PathExistsRequest, out *impl.PathExistsRequest) error { + out.Path = in.Path + return nil +} + +// Convert_v1beta1_PathExistsRequest_To_impl_PathExistsRequest is an autogenerated conversion function. +func Convert_v1beta1_PathExistsRequest_To_impl_PathExistsRequest(in *v1beta1.PathExistsRequest, out *impl.PathExistsRequest) error { + return autoConvert_v1beta1_PathExistsRequest_To_impl_PathExistsRequest(in, out) +} + +func autoConvert_impl_PathExistsRequest_To_v1beta1_PathExistsRequest(in *impl.PathExistsRequest, out *v1beta1.PathExistsRequest) error { + out.Path = in.Path + return nil +} + +// Convert_impl_PathExistsRequest_To_v1beta1_PathExistsRequest is an autogenerated conversion function. +func Convert_impl_PathExistsRequest_To_v1beta1_PathExistsRequest(in *impl.PathExistsRequest, out *v1beta1.PathExistsRequest) error { + return autoConvert_impl_PathExistsRequest_To_v1beta1_PathExistsRequest(in, out) +} + +func autoConvert_v1beta1_PathExistsResponse_To_impl_PathExistsResponse(in *v1beta1.PathExistsResponse, out *impl.PathExistsResponse) error { + out.Exists = in.Exists + return nil +} + +// Convert_v1beta1_PathExistsResponse_To_impl_PathExistsResponse is an autogenerated conversion function. +func Convert_v1beta1_PathExistsResponse_To_impl_PathExistsResponse(in *v1beta1.PathExistsResponse, out *impl.PathExistsResponse) error { + return autoConvert_v1beta1_PathExistsResponse_To_impl_PathExistsResponse(in, out) +} + +func autoConvert_impl_PathExistsResponse_To_v1beta1_PathExistsResponse(in *impl.PathExistsResponse, out *v1beta1.PathExistsResponse) error { + out.Exists = in.Exists + return nil +} + +// Convert_impl_PathExistsResponse_To_v1beta1_PathExistsResponse is an autogenerated conversion function. +func Convert_impl_PathExistsResponse_To_v1beta1_PathExistsResponse(in *impl.PathExistsResponse, out *v1beta1.PathExistsResponse) error { + return autoConvert_impl_PathExistsResponse_To_v1beta1_PathExistsResponse(in, out) +} + +func autoConvert_v1beta1_RmdirRequest_To_impl_RmdirRequest(in *v1beta1.RmdirRequest, out *impl.RmdirRequest) error { + out.Path = in.Path + out.Force = in.Force + return nil +} + +// Convert_v1beta1_RmdirRequest_To_impl_RmdirRequest is an autogenerated conversion function. +func Convert_v1beta1_RmdirRequest_To_impl_RmdirRequest(in *v1beta1.RmdirRequest, out *impl.RmdirRequest) error { + return autoConvert_v1beta1_RmdirRequest_To_impl_RmdirRequest(in, out) +} + +func autoConvert_impl_RmdirRequest_To_v1beta1_RmdirRequest(in *impl.RmdirRequest, out *v1beta1.RmdirRequest) error { + out.Path = in.Path + out.Force = in.Force + return nil +} + +// Convert_impl_RmdirRequest_To_v1beta1_RmdirRequest is an autogenerated conversion function. +func Convert_impl_RmdirRequest_To_v1beta1_RmdirRequest(in *impl.RmdirRequest, out *v1beta1.RmdirRequest) error { + return autoConvert_impl_RmdirRequest_To_v1beta1_RmdirRequest(in, out) +} + +func autoConvert_v1beta1_RmdirResponse_To_impl_RmdirResponse(in *v1beta1.RmdirResponse, out *impl.RmdirResponse) error { + return nil +} + +// Convert_v1beta1_RmdirResponse_To_impl_RmdirResponse is an autogenerated conversion function. +func Convert_v1beta1_RmdirResponse_To_impl_RmdirResponse(in *v1beta1.RmdirResponse, out *impl.RmdirResponse) error { + return autoConvert_v1beta1_RmdirResponse_To_impl_RmdirResponse(in, out) +} + +func autoConvert_impl_RmdirResponse_To_v1beta1_RmdirResponse(in *impl.RmdirResponse, out *v1beta1.RmdirResponse) error { + return nil +} + +// Convert_impl_RmdirResponse_To_v1beta1_RmdirResponse is an autogenerated conversion function. +func Convert_impl_RmdirResponse_To_v1beta1_RmdirResponse(in *impl.RmdirResponse, out *v1beta1.RmdirResponse) error { + return autoConvert_impl_RmdirResponse_To_v1beta1_RmdirResponse(in, out) +} diff --git a/internal/server/filesystem/internal/v1beta1/server_generated.go b/pkg/server/filesystem/impl/v1beta1/server_generated.go similarity index 63% rename from internal/server/filesystem/internal/v1beta1/server_generated.go rename to pkg/server/filesystem/impl/v1beta1/server_generated.go index 070bc00d..db125cbe 100644 --- a/internal/server/filesystem/internal/v1beta1/server_generated.go +++ b/pkg/server/filesystem/impl/v1beta1/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1beta1") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) IsMountPoint(context context.Context, versionedRequest *v1beta1.IsMountPointRequest) (*v1beta1.IsMountPointResponse, error) { - request := &internal.IsMountPointRequest{} - if err := Convert_v1beta1_IsMountPointRequest_To_internal_IsMountPointRequest(versionedRequest, request); err != nil { + request := &impl.IsMountPointRequest{} + if err := Convert_v1beta1_IsMountPointRequest_To_impl_IsMountPointRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) IsMountPoint(context context.Context, versionedRequest *v } versionedResponse := &v1beta1.IsMountPointResponse{} - if err := Convert_internal_IsMountPointResponse_To_v1beta1_IsMountPointResponse(response, versionedResponse); err != nil { + if err := Convert_impl_IsMountPointResponse_To_v1beta1_IsMountPointResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) IsMountPoint(context context.Context, versionedRequest *v } func (s *versionedAPI) LinkPath(context context.Context, versionedRequest *v1beta1.LinkPathRequest) (*v1beta1.LinkPathResponse, error) { - request := &internal.LinkPathRequest{} - if err := Convert_v1beta1_LinkPathRequest_To_internal_LinkPathRequest(versionedRequest, request); err != nil { + request := &impl.LinkPathRequest{} + if err := Convert_v1beta1_LinkPathRequest_To_impl_LinkPathRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) LinkPath(context context.Context, versionedRequest *v1bet } versionedResponse := &v1beta1.LinkPathResponse{} - if err := Convert_internal_LinkPathResponse_To_v1beta1_LinkPathResponse(response, versionedResponse); err != nil { + if err := Convert_impl_LinkPathResponse_To_v1beta1_LinkPathResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) LinkPath(context context.Context, versionedRequest *v1bet } func (s *versionedAPI) Mkdir(context context.Context, versionedRequest *v1beta1.MkdirRequest) (*v1beta1.MkdirResponse, error) { - request := &internal.MkdirRequest{} - if err := Convert_v1beta1_MkdirRequest_To_internal_MkdirRequest(versionedRequest, request); err != nil { + request := &impl.MkdirRequest{} + if err := Convert_v1beta1_MkdirRequest_To_impl_MkdirRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) Mkdir(context context.Context, versionedRequest *v1beta1. } versionedResponse := &v1beta1.MkdirResponse{} - if err := Convert_internal_MkdirResponse_To_v1beta1_MkdirResponse(response, versionedResponse); err != nil { + if err := Convert_impl_MkdirResponse_To_v1beta1_MkdirResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) Mkdir(context context.Context, versionedRequest *v1beta1. } func (s *versionedAPI) PathExists(context context.Context, versionedRequest *v1beta1.PathExistsRequest) (*v1beta1.PathExistsResponse, error) { - request := &internal.PathExistsRequest{} - if err := Convert_v1beta1_PathExistsRequest_To_internal_PathExistsRequest(versionedRequest, request); err != nil { + request := &impl.PathExistsRequest{} + if err := Convert_v1beta1_PathExistsRequest_To_impl_PathExistsRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) PathExists(context context.Context, versionedRequest *v1b } versionedResponse := &v1beta1.PathExistsResponse{} - if err := Convert_internal_PathExistsResponse_To_v1beta1_PathExistsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_PathExistsResponse_To_v1beta1_PathExistsResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) PathExists(context context.Context, versionedRequest *v1b } func (s *versionedAPI) Rmdir(context context.Context, versionedRequest *v1beta1.RmdirRequest) (*v1beta1.RmdirResponse, error) { - request := &internal.RmdirRequest{} - if err := Convert_v1beta1_RmdirRequest_To_internal_RmdirRequest(versionedRequest, request); err != nil { + request := &impl.RmdirRequest{} + if err := Convert_v1beta1_RmdirRequest_To_impl_RmdirRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) Rmdir(context context.Context, versionedRequest *v1beta1. } versionedResponse := &v1beta1.RmdirResponse{} - if err := Convert_internal_RmdirResponse_To_v1beta1_RmdirResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RmdirResponse_To_v1beta1_RmdirResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/filesystem/internal/v1beta2/conversion.go b/pkg/server/filesystem/impl/v1beta2/conversion.go similarity index 100% rename from internal/server/filesystem/internal/v1beta2/conversion.go rename to pkg/server/filesystem/impl/v1beta2/conversion.go diff --git a/pkg/server/filesystem/impl/v1beta2/conversion_generated.go b/pkg/server/filesystem/impl/v1beta2/conversion_generated.go new file mode 100644 index 00000000..cde0c231 --- /dev/null +++ b/pkg/server/filesystem/impl/v1beta2/conversion_generated.go @@ -0,0 +1,206 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1beta2 + +import ( + v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta2" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl" +) + +func autoConvert_v1beta2_CreateSymlinkRequest_To_impl_CreateSymlinkRequest(in *v1beta2.CreateSymlinkRequest, out *impl.CreateSymlinkRequest) error { + out.SourcePath = in.SourcePath + out.TargetPath = in.TargetPath + return nil +} + +// Convert_v1beta2_CreateSymlinkRequest_To_impl_CreateSymlinkRequest is an autogenerated conversion function. +func Convert_v1beta2_CreateSymlinkRequest_To_impl_CreateSymlinkRequest(in *v1beta2.CreateSymlinkRequest, out *impl.CreateSymlinkRequest) error { + return autoConvert_v1beta2_CreateSymlinkRequest_To_impl_CreateSymlinkRequest(in, out) +} + +func autoConvert_impl_CreateSymlinkRequest_To_v1beta2_CreateSymlinkRequest(in *impl.CreateSymlinkRequest, out *v1beta2.CreateSymlinkRequest) error { + out.SourcePath = in.SourcePath + out.TargetPath = in.TargetPath + return nil +} + +// Convert_impl_CreateSymlinkRequest_To_v1beta2_CreateSymlinkRequest is an autogenerated conversion function. +func Convert_impl_CreateSymlinkRequest_To_v1beta2_CreateSymlinkRequest(in *impl.CreateSymlinkRequest, out *v1beta2.CreateSymlinkRequest) error { + return autoConvert_impl_CreateSymlinkRequest_To_v1beta2_CreateSymlinkRequest(in, out) +} + +func autoConvert_v1beta2_CreateSymlinkResponse_To_impl_CreateSymlinkResponse(in *v1beta2.CreateSymlinkResponse, out *impl.CreateSymlinkResponse) error { + return nil +} + +// Convert_v1beta2_CreateSymlinkResponse_To_impl_CreateSymlinkResponse is an autogenerated conversion function. +func Convert_v1beta2_CreateSymlinkResponse_To_impl_CreateSymlinkResponse(in *v1beta2.CreateSymlinkResponse, out *impl.CreateSymlinkResponse) error { + return autoConvert_v1beta2_CreateSymlinkResponse_To_impl_CreateSymlinkResponse(in, out) +} + +func autoConvert_impl_CreateSymlinkResponse_To_v1beta2_CreateSymlinkResponse(in *impl.CreateSymlinkResponse, out *v1beta2.CreateSymlinkResponse) error { + return nil +} + +// Convert_impl_CreateSymlinkResponse_To_v1beta2_CreateSymlinkResponse is an autogenerated conversion function. +func Convert_impl_CreateSymlinkResponse_To_v1beta2_CreateSymlinkResponse(in *impl.CreateSymlinkResponse, out *v1beta2.CreateSymlinkResponse) error { + return autoConvert_impl_CreateSymlinkResponse_To_v1beta2_CreateSymlinkResponse(in, out) +} + +func autoConvert_v1beta2_IsSymlinkRequest_To_impl_IsSymlinkRequest(in *v1beta2.IsSymlinkRequest, out *impl.IsSymlinkRequest) error { + out.Path = in.Path + return nil +} + +// Convert_v1beta2_IsSymlinkRequest_To_impl_IsSymlinkRequest is an autogenerated conversion function. +func Convert_v1beta2_IsSymlinkRequest_To_impl_IsSymlinkRequest(in *v1beta2.IsSymlinkRequest, out *impl.IsSymlinkRequest) error { + return autoConvert_v1beta2_IsSymlinkRequest_To_impl_IsSymlinkRequest(in, out) +} + +func autoConvert_impl_IsSymlinkRequest_To_v1beta2_IsSymlinkRequest(in *impl.IsSymlinkRequest, out *v1beta2.IsSymlinkRequest) error { + out.Path = in.Path + return nil +} + +// Convert_impl_IsSymlinkRequest_To_v1beta2_IsSymlinkRequest is an autogenerated conversion function. +func Convert_impl_IsSymlinkRequest_To_v1beta2_IsSymlinkRequest(in *impl.IsSymlinkRequest, out *v1beta2.IsSymlinkRequest) error { + return autoConvert_impl_IsSymlinkRequest_To_v1beta2_IsSymlinkRequest(in, out) +} + +func autoConvert_v1beta2_IsSymlinkResponse_To_impl_IsSymlinkResponse(in *v1beta2.IsSymlinkResponse, out *impl.IsSymlinkResponse) error { + out.IsSymlink = in.IsSymlink + return nil +} + +// Convert_v1beta2_IsSymlinkResponse_To_impl_IsSymlinkResponse is an autogenerated conversion function. +func Convert_v1beta2_IsSymlinkResponse_To_impl_IsSymlinkResponse(in *v1beta2.IsSymlinkResponse, out *impl.IsSymlinkResponse) error { + return autoConvert_v1beta2_IsSymlinkResponse_To_impl_IsSymlinkResponse(in, out) +} + +func autoConvert_impl_IsSymlinkResponse_To_v1beta2_IsSymlinkResponse(in *impl.IsSymlinkResponse, out *v1beta2.IsSymlinkResponse) error { + out.IsSymlink = in.IsSymlink + return nil +} + +// Convert_impl_IsSymlinkResponse_To_v1beta2_IsSymlinkResponse is an autogenerated conversion function. +func Convert_impl_IsSymlinkResponse_To_v1beta2_IsSymlinkResponse(in *impl.IsSymlinkResponse, out *v1beta2.IsSymlinkResponse) error { + return autoConvert_impl_IsSymlinkResponse_To_v1beta2_IsSymlinkResponse(in, out) +} + +func autoConvert_v1beta2_MkdirRequest_To_impl_MkdirRequest(in *v1beta2.MkdirRequest, out *impl.MkdirRequest) error { + out.Path = in.Path + return nil +} + +// Convert_v1beta2_MkdirRequest_To_impl_MkdirRequest is an autogenerated conversion function. +func Convert_v1beta2_MkdirRequest_To_impl_MkdirRequest(in *v1beta2.MkdirRequest, out *impl.MkdirRequest) error { + return autoConvert_v1beta2_MkdirRequest_To_impl_MkdirRequest(in, out) +} + +func autoConvert_impl_MkdirRequest_To_v1beta2_MkdirRequest(in *impl.MkdirRequest, out *v1beta2.MkdirRequest) error { + out.Path = in.Path + return nil +} + +// Convert_impl_MkdirRequest_To_v1beta2_MkdirRequest is an autogenerated conversion function. +func Convert_impl_MkdirRequest_To_v1beta2_MkdirRequest(in *impl.MkdirRequest, out *v1beta2.MkdirRequest) error { + return autoConvert_impl_MkdirRequest_To_v1beta2_MkdirRequest(in, out) +} + +func autoConvert_v1beta2_MkdirResponse_To_impl_MkdirResponse(in *v1beta2.MkdirResponse, out *impl.MkdirResponse) error { + return nil +} + +// Convert_v1beta2_MkdirResponse_To_impl_MkdirResponse is an autogenerated conversion function. +func Convert_v1beta2_MkdirResponse_To_impl_MkdirResponse(in *v1beta2.MkdirResponse, out *impl.MkdirResponse) error { + return autoConvert_v1beta2_MkdirResponse_To_impl_MkdirResponse(in, out) +} + +func autoConvert_impl_MkdirResponse_To_v1beta2_MkdirResponse(in *impl.MkdirResponse, out *v1beta2.MkdirResponse) error { + return nil +} + +// Convert_impl_MkdirResponse_To_v1beta2_MkdirResponse is an autogenerated conversion function. +func Convert_impl_MkdirResponse_To_v1beta2_MkdirResponse(in *impl.MkdirResponse, out *v1beta2.MkdirResponse) error { + return autoConvert_impl_MkdirResponse_To_v1beta2_MkdirResponse(in, out) +} + +func autoConvert_v1beta2_PathExistsRequest_To_impl_PathExistsRequest(in *v1beta2.PathExistsRequest, out *impl.PathExistsRequest) error { + out.Path = in.Path + return nil +} + +// Convert_v1beta2_PathExistsRequest_To_impl_PathExistsRequest is an autogenerated conversion function. +func Convert_v1beta2_PathExistsRequest_To_impl_PathExistsRequest(in *v1beta2.PathExistsRequest, out *impl.PathExistsRequest) error { + return autoConvert_v1beta2_PathExistsRequest_To_impl_PathExistsRequest(in, out) +} + +func autoConvert_impl_PathExistsRequest_To_v1beta2_PathExistsRequest(in *impl.PathExistsRequest, out *v1beta2.PathExistsRequest) error { + out.Path = in.Path + return nil +} + +// Convert_impl_PathExistsRequest_To_v1beta2_PathExistsRequest is an autogenerated conversion function. +func Convert_impl_PathExistsRequest_To_v1beta2_PathExistsRequest(in *impl.PathExistsRequest, out *v1beta2.PathExistsRequest) error { + return autoConvert_impl_PathExistsRequest_To_v1beta2_PathExistsRequest(in, out) +} + +func autoConvert_v1beta2_PathExistsResponse_To_impl_PathExistsResponse(in *v1beta2.PathExistsResponse, out *impl.PathExistsResponse) error { + out.Exists = in.Exists + return nil +} + +// Convert_v1beta2_PathExistsResponse_To_impl_PathExistsResponse is an autogenerated conversion function. +func Convert_v1beta2_PathExistsResponse_To_impl_PathExistsResponse(in *v1beta2.PathExistsResponse, out *impl.PathExistsResponse) error { + return autoConvert_v1beta2_PathExistsResponse_To_impl_PathExistsResponse(in, out) +} + +func autoConvert_impl_PathExistsResponse_To_v1beta2_PathExistsResponse(in *impl.PathExistsResponse, out *v1beta2.PathExistsResponse) error { + out.Exists = in.Exists + return nil +} + +// Convert_impl_PathExistsResponse_To_v1beta2_PathExistsResponse is an autogenerated conversion function. +func Convert_impl_PathExistsResponse_To_v1beta2_PathExistsResponse(in *impl.PathExistsResponse, out *v1beta2.PathExistsResponse) error { + return autoConvert_impl_PathExistsResponse_To_v1beta2_PathExistsResponse(in, out) +} + +func autoConvert_v1beta2_RmdirRequest_To_impl_RmdirRequest(in *v1beta2.RmdirRequest, out *impl.RmdirRequest) error { + out.Path = in.Path + out.Force = in.Force + return nil +} + +// Convert_v1beta2_RmdirRequest_To_impl_RmdirRequest is an autogenerated conversion function. +func Convert_v1beta2_RmdirRequest_To_impl_RmdirRequest(in *v1beta2.RmdirRequest, out *impl.RmdirRequest) error { + return autoConvert_v1beta2_RmdirRequest_To_impl_RmdirRequest(in, out) +} + +func autoConvert_impl_RmdirRequest_To_v1beta2_RmdirRequest(in *impl.RmdirRequest, out *v1beta2.RmdirRequest) error { + out.Path = in.Path + out.Force = in.Force + return nil +} + +// Convert_impl_RmdirRequest_To_v1beta2_RmdirRequest is an autogenerated conversion function. +func Convert_impl_RmdirRequest_To_v1beta2_RmdirRequest(in *impl.RmdirRequest, out *v1beta2.RmdirRequest) error { + return autoConvert_impl_RmdirRequest_To_v1beta2_RmdirRequest(in, out) +} + +func autoConvert_v1beta2_RmdirResponse_To_impl_RmdirResponse(in *v1beta2.RmdirResponse, out *impl.RmdirResponse) error { + return nil +} + +// Convert_v1beta2_RmdirResponse_To_impl_RmdirResponse is an autogenerated conversion function. +func Convert_v1beta2_RmdirResponse_To_impl_RmdirResponse(in *v1beta2.RmdirResponse, out *impl.RmdirResponse) error { + return autoConvert_v1beta2_RmdirResponse_To_impl_RmdirResponse(in, out) +} + +func autoConvert_impl_RmdirResponse_To_v1beta2_RmdirResponse(in *impl.RmdirResponse, out *v1beta2.RmdirResponse) error { + return nil +} + +// Convert_impl_RmdirResponse_To_v1beta2_RmdirResponse is an autogenerated conversion function. +func Convert_impl_RmdirResponse_To_v1beta2_RmdirResponse(in *impl.RmdirResponse, out *v1beta2.RmdirResponse) error { + return autoConvert_impl_RmdirResponse_To_v1beta2_RmdirResponse(in, out) +} diff --git a/internal/server/filesystem/internal/v1beta2/server_generated.go b/pkg/server/filesystem/impl/v1beta2/server_generated.go similarity index 60% rename from internal/server/filesystem/internal/v1beta2/server_generated.go rename to pkg/server/filesystem/impl/v1beta2/server_generated.go index bae6fd36..f562dbc3 100644 --- a/internal/server/filesystem/internal/v1beta2/server_generated.go +++ b/pkg/server/filesystem/impl/v1beta2/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/filesystem/v1beta2" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1beta2") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) CreateSymlink(context context.Context, versionedRequest *v1beta2.CreateSymlinkRequest) (*v1beta2.CreateSymlinkResponse, error) { - request := &internal.CreateSymlinkRequest{} - if err := Convert_v1beta2_CreateSymlinkRequest_To_internal_CreateSymlinkRequest(versionedRequest, request); err != nil { + request := &impl.CreateSymlinkRequest{} + if err := Convert_v1beta2_CreateSymlinkRequest_To_impl_CreateSymlinkRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) CreateSymlink(context context.Context, versionedRequest * } versionedResponse := &v1beta2.CreateSymlinkResponse{} - if err := Convert_internal_CreateSymlinkResponse_To_v1beta2_CreateSymlinkResponse(response, versionedResponse); err != nil { + if err := Convert_impl_CreateSymlinkResponse_To_v1beta2_CreateSymlinkResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) CreateSymlink(context context.Context, versionedRequest * } func (s *versionedAPI) IsSymlink(context context.Context, versionedRequest *v1beta2.IsSymlinkRequest) (*v1beta2.IsSymlinkResponse, error) { - request := &internal.IsSymlinkRequest{} - if err := Convert_v1beta2_IsSymlinkRequest_To_internal_IsSymlinkRequest(versionedRequest, request); err != nil { + request := &impl.IsSymlinkRequest{} + if err := Convert_v1beta2_IsSymlinkRequest_To_impl_IsSymlinkRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) IsSymlink(context context.Context, versionedRequest *v1be } versionedResponse := &v1beta2.IsSymlinkResponse{} - if err := Convert_internal_IsSymlinkResponse_To_v1beta2_IsSymlinkResponse(response, versionedResponse); err != nil { + if err := Convert_impl_IsSymlinkResponse_To_v1beta2_IsSymlinkResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) IsSymlink(context context.Context, versionedRequest *v1be } func (s *versionedAPI) Mkdir(context context.Context, versionedRequest *v1beta2.MkdirRequest) (*v1beta2.MkdirResponse, error) { - request := &internal.MkdirRequest{} - if err := Convert_v1beta2_MkdirRequest_To_internal_MkdirRequest(versionedRequest, request); err != nil { + request := &impl.MkdirRequest{} + if err := Convert_v1beta2_MkdirRequest_To_impl_MkdirRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) Mkdir(context context.Context, versionedRequest *v1beta2. } versionedResponse := &v1beta2.MkdirResponse{} - if err := Convert_internal_MkdirResponse_To_v1beta2_MkdirResponse(response, versionedResponse); err != nil { + if err := Convert_impl_MkdirResponse_To_v1beta2_MkdirResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) Mkdir(context context.Context, versionedRequest *v1beta2. } func (s *versionedAPI) PathExists(context context.Context, versionedRequest *v1beta2.PathExistsRequest) (*v1beta2.PathExistsResponse, error) { - request := &internal.PathExistsRequest{} - if err := Convert_v1beta2_PathExistsRequest_To_internal_PathExistsRequest(versionedRequest, request); err != nil { + request := &impl.PathExistsRequest{} + if err := Convert_v1beta2_PathExistsRequest_To_impl_PathExistsRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) PathExists(context context.Context, versionedRequest *v1b } versionedResponse := &v1beta2.PathExistsResponse{} - if err := Convert_internal_PathExistsResponse_To_v1beta2_PathExistsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_PathExistsResponse_To_v1beta2_PathExistsResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) PathExists(context context.Context, versionedRequest *v1b } func (s *versionedAPI) Rmdir(context context.Context, versionedRequest *v1beta2.RmdirRequest) (*v1beta2.RmdirResponse, error) { - request := &internal.RmdirRequest{} - if err := Convert_v1beta2_RmdirRequest_To_internal_RmdirRequest(versionedRequest, request); err != nil { + request := &impl.RmdirRequest{} + if err := Convert_v1beta2_RmdirRequest_To_impl_RmdirRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) Rmdir(context context.Context, versionedRequest *v1beta2. } versionedResponse := &v1beta2.RmdirResponse{} - if err := Convert_internal_RmdirResponse_To_v1beta2_RmdirResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RmdirResponse_To_v1beta2_RmdirResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/filesystem/server.go b/pkg/server/filesystem/server.go similarity index 97% rename from internal/server/filesystem/server.go rename to pkg/server/filesystem/server.go index 00a8ff52..510903d0 100644 --- a/internal/server/filesystem/server.go +++ b/pkg/server/filesystem/server.go @@ -7,9 +7,9 @@ import ( "strings" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/os/filesystem" - "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal" - "github.com/kubernetes-csi/csi-proxy/internal/utils" + "github.com/kubernetes-csi/csi-proxy/pkg/os/filesystem" + internal "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl" + "github.com/kubernetes-csi/csi-proxy/pkg/utils" "k8s.io/klog/v2" ) diff --git a/internal/server/filesystem/server_test.go b/pkg/server/filesystem/server_test.go similarity index 97% rename from internal/server/filesystem/server_test.go rename to pkg/server/filesystem/server_test.go index f19640d5..815e7fb4 100644 --- a/internal/server/filesystem/server_test.go +++ b/pkg/server/filesystem/server_test.go @@ -5,8 +5,8 @@ import ( "testing" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/os/filesystem" - "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/os/filesystem" + internal "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem/impl" ) type fakeFileSystemAPI struct{} diff --git a/internal/server/iscsi/api_group_generated.go b/pkg/server/iscsi/api_group_generated.go similarity index 66% rename from internal/server/iscsi/api_group_generated.go rename to pkg/server/iscsi/api_group_generated.go index a0d61016..6ea44272 100644 --- a/internal/server/iscsi/api_group_generated.go +++ b/pkg/server/iscsi/api_group_generated.go @@ -4,16 +4,16 @@ package iscsi import ( "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal" - "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal/v1alpha1" - "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal/v1alpha2" - srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types" + "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" + "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl/v1alpha1" + "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl/v1alpha2" + srvtypes "github.com/kubernetes-csi/csi-proxy/pkg/server/types" ) const name = "iscsi" // ensure the server defines all the required methods -var _ internal.ServerInterface = &Server{} +var _ impl.ServerInterface = &Server{} func (s *Server) VersionedAPIs() []*srvtypes.VersionedAPI { v1alpha1Server := v1alpha1.NewVersionedServer(s) diff --git a/internal/server/iscsi/internal/conversion_test.go b/pkg/server/iscsi/impl/conversion_test.go similarity index 92% rename from internal/server/iscsi/internal/conversion_test.go rename to pkg/server/iscsi/impl/conversion_test.go index 7712dc44..534aa7a1 100644 --- a/internal/server/iscsi/internal/conversion_test.go +++ b/pkg/server/iscsi/impl/conversion_test.go @@ -1,4 +1,4 @@ -package internal_test +package impl_test import ( "testing" @@ -6,9 +6,9 @@ import ( "github.com/google/go-cmp/cmp" "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha1" "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha2" - "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal" - v1alpha1_internal "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal/v1alpha1" - v1alpha2_internal "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal/v1alpha2" + internal "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" + v1alpha1_internal "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl/v1alpha1" + v1alpha2_internal "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl/v1alpha2" "google.golang.org/protobuf/testing/protocmp" ) diff --git a/internal/server/iscsi/internal/types.go b/pkg/server/iscsi/impl/types.go similarity index 99% rename from internal/server/iscsi/internal/types.go rename to pkg/server/iscsi/impl/types.go index 597a9476..7f9ef68c 100644 --- a/internal/server/iscsi/internal/types.go +++ b/pkg/server/iscsi/impl/types.go @@ -1,4 +1,4 @@ -package internal +package impl type AddTargetPortalRequest struct { // iSCSI Target Portal to register in the initiator diff --git a/internal/server/iscsi/internal/types_generated.go b/pkg/server/iscsi/impl/types_generated.go similarity index 98% rename from internal/server/iscsi/internal/types_generated.go rename to pkg/server/iscsi/impl/types_generated.go index 3eb219ac..edde3984 100644 --- a/internal/server/iscsi/internal/types_generated.go +++ b/pkg/server/iscsi/impl/types_generated.go @@ -1,6 +1,6 @@ // Code generated by csi-proxy-api-gen. DO NOT EDIT. -package internal +package impl import ( "context" diff --git a/internal/server/iscsi/internal/v1alpha1/conversion.go b/pkg/server/iscsi/impl/v1alpha1/conversion.go similarity index 56% rename from internal/server/iscsi/internal/v1alpha1/conversion.go rename to pkg/server/iscsi/impl/v1alpha1/conversion.go index 5d163b29..f6a7081a 100644 --- a/internal/server/iscsi/internal/v1alpha1/conversion.go +++ b/pkg/server/iscsi/impl/v1alpha1/conversion.go @@ -2,18 +2,18 @@ package v1alpha1 import ( "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha1" - "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" ) // Add manual conversion functions here to override automatic conversion functions -func Convert_internal_ListTargetPortalsResponse_To_v1alpha1_ListTargetPortalsResponse(in *internal.ListTargetPortalsResponse, out *v1alpha1.ListTargetPortalsResponse) error { +func Convert_impl_ListTargetPortalsResponse_To_v1alpha1_ListTargetPortalsResponse(in *impl.ListTargetPortalsResponse, out *v1alpha1.ListTargetPortalsResponse) error { if in.TargetPortals != nil { in, out := &in.TargetPortals, &out.TargetPortals *out = make([]*v1alpha1.TargetPortal, len(*in)) for i := range *in { (*out)[i] = new(v1alpha1.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha1_TargetPortal(*&(*in)[i], *&(*out)[i]); err != nil { + if err := Convert_impl_TargetPortal_To_v1alpha1_TargetPortal(*&(*in)[i], *&(*out)[i]); err != nil { return err } } diff --git a/pkg/server/iscsi/impl/v1alpha1/conversion_generated.go b/pkg/server/iscsi/impl/v1alpha1/conversion_generated.go new file mode 100644 index 00000000..24693488 --- /dev/null +++ b/pkg/server/iscsi/impl/v1alpha1/conversion_generated.go @@ -0,0 +1,414 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + unsafe "unsafe" + + v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" +) + +func autoConvert_v1alpha1_AddTargetPortalRequest_To_impl_AddTargetPortalRequest(in *v1alpha1.AddTargetPortalRequest, out *impl.AddTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha1_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_v1alpha1_AddTargetPortalRequest_To_impl_AddTargetPortalRequest is an autogenerated conversion function. +func Convert_v1alpha1_AddTargetPortalRequest_To_impl_AddTargetPortalRequest(in *v1alpha1.AddTargetPortalRequest, out *impl.AddTargetPortalRequest) error { + return autoConvert_v1alpha1_AddTargetPortalRequest_To_impl_AddTargetPortalRequest(in, out) +} + +func autoConvert_impl_AddTargetPortalRequest_To_v1alpha1_AddTargetPortalRequest(in *impl.AddTargetPortalRequest, out *v1alpha1.AddTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha1.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_impl_AddTargetPortalRequest_To_v1alpha1_AddTargetPortalRequest is an autogenerated conversion function. +func Convert_impl_AddTargetPortalRequest_To_v1alpha1_AddTargetPortalRequest(in *impl.AddTargetPortalRequest, out *v1alpha1.AddTargetPortalRequest) error { + return autoConvert_impl_AddTargetPortalRequest_To_v1alpha1_AddTargetPortalRequest(in, out) +} + +func autoConvert_v1alpha1_AddTargetPortalResponse_To_impl_AddTargetPortalResponse(in *v1alpha1.AddTargetPortalResponse, out *impl.AddTargetPortalResponse) error { + return nil +} + +// Convert_v1alpha1_AddTargetPortalResponse_To_impl_AddTargetPortalResponse is an autogenerated conversion function. +func Convert_v1alpha1_AddTargetPortalResponse_To_impl_AddTargetPortalResponse(in *v1alpha1.AddTargetPortalResponse, out *impl.AddTargetPortalResponse) error { + return autoConvert_v1alpha1_AddTargetPortalResponse_To_impl_AddTargetPortalResponse(in, out) +} + +func autoConvert_impl_AddTargetPortalResponse_To_v1alpha1_AddTargetPortalResponse(in *impl.AddTargetPortalResponse, out *v1alpha1.AddTargetPortalResponse) error { + return nil +} + +// Convert_impl_AddTargetPortalResponse_To_v1alpha1_AddTargetPortalResponse is an autogenerated conversion function. +func Convert_impl_AddTargetPortalResponse_To_v1alpha1_AddTargetPortalResponse(in *impl.AddTargetPortalResponse, out *v1alpha1.AddTargetPortalResponse) error { + return autoConvert_impl_AddTargetPortalResponse_To_v1alpha1_AddTargetPortalResponse(in, out) +} + +func autoConvert_v1alpha1_ConnectTargetRequest_To_impl_ConnectTargetRequest(in *v1alpha1.ConnectTargetRequest, out *impl.ConnectTargetRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha1_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + out.AuthType = impl.AuthenticationType(in.AuthType) + out.ChapUsername = in.ChapUsername + out.ChapSecret = in.ChapSecret + return nil +} + +// Convert_v1alpha1_ConnectTargetRequest_To_impl_ConnectTargetRequest is an autogenerated conversion function. +func Convert_v1alpha1_ConnectTargetRequest_To_impl_ConnectTargetRequest(in *v1alpha1.ConnectTargetRequest, out *impl.ConnectTargetRequest) error { + return autoConvert_v1alpha1_ConnectTargetRequest_To_impl_ConnectTargetRequest(in, out) +} + +func autoConvert_impl_ConnectTargetRequest_To_v1alpha1_ConnectTargetRequest(in *impl.ConnectTargetRequest, out *v1alpha1.ConnectTargetRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha1.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + out.AuthType = v1alpha1.AuthenticationType(in.AuthType) + out.ChapUsername = in.ChapUsername + out.ChapSecret = in.ChapSecret + return nil +} + +// Convert_impl_ConnectTargetRequest_To_v1alpha1_ConnectTargetRequest is an autogenerated conversion function. +func Convert_impl_ConnectTargetRequest_To_v1alpha1_ConnectTargetRequest(in *impl.ConnectTargetRequest, out *v1alpha1.ConnectTargetRequest) error { + return autoConvert_impl_ConnectTargetRequest_To_v1alpha1_ConnectTargetRequest(in, out) +} + +func autoConvert_v1alpha1_ConnectTargetResponse_To_impl_ConnectTargetResponse(in *v1alpha1.ConnectTargetResponse, out *impl.ConnectTargetResponse) error { + return nil +} + +// Convert_v1alpha1_ConnectTargetResponse_To_impl_ConnectTargetResponse is an autogenerated conversion function. +func Convert_v1alpha1_ConnectTargetResponse_To_impl_ConnectTargetResponse(in *v1alpha1.ConnectTargetResponse, out *impl.ConnectTargetResponse) error { + return autoConvert_v1alpha1_ConnectTargetResponse_To_impl_ConnectTargetResponse(in, out) +} + +func autoConvert_impl_ConnectTargetResponse_To_v1alpha1_ConnectTargetResponse(in *impl.ConnectTargetResponse, out *v1alpha1.ConnectTargetResponse) error { + return nil +} + +// Convert_impl_ConnectTargetResponse_To_v1alpha1_ConnectTargetResponse is an autogenerated conversion function. +func Convert_impl_ConnectTargetResponse_To_v1alpha1_ConnectTargetResponse(in *impl.ConnectTargetResponse, out *v1alpha1.ConnectTargetResponse) error { + return autoConvert_impl_ConnectTargetResponse_To_v1alpha1_ConnectTargetResponse(in, out) +} + +func autoConvert_v1alpha1_DisconnectTargetRequest_To_impl_DisconnectTargetRequest(in *v1alpha1.DisconnectTargetRequest, out *impl.DisconnectTargetRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha1_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + return nil +} + +// Convert_v1alpha1_DisconnectTargetRequest_To_impl_DisconnectTargetRequest is an autogenerated conversion function. +func Convert_v1alpha1_DisconnectTargetRequest_To_impl_DisconnectTargetRequest(in *v1alpha1.DisconnectTargetRequest, out *impl.DisconnectTargetRequest) error { + return autoConvert_v1alpha1_DisconnectTargetRequest_To_impl_DisconnectTargetRequest(in, out) +} + +func autoConvert_impl_DisconnectTargetRequest_To_v1alpha1_DisconnectTargetRequest(in *impl.DisconnectTargetRequest, out *v1alpha1.DisconnectTargetRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha1.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + return nil +} + +// Convert_impl_DisconnectTargetRequest_To_v1alpha1_DisconnectTargetRequest is an autogenerated conversion function. +func Convert_impl_DisconnectTargetRequest_To_v1alpha1_DisconnectTargetRequest(in *impl.DisconnectTargetRequest, out *v1alpha1.DisconnectTargetRequest) error { + return autoConvert_impl_DisconnectTargetRequest_To_v1alpha1_DisconnectTargetRequest(in, out) +} + +func autoConvert_v1alpha1_DisconnectTargetResponse_To_impl_DisconnectTargetResponse(in *v1alpha1.DisconnectTargetResponse, out *impl.DisconnectTargetResponse) error { + return nil +} + +// Convert_v1alpha1_DisconnectTargetResponse_To_impl_DisconnectTargetResponse is an autogenerated conversion function. +func Convert_v1alpha1_DisconnectTargetResponse_To_impl_DisconnectTargetResponse(in *v1alpha1.DisconnectTargetResponse, out *impl.DisconnectTargetResponse) error { + return autoConvert_v1alpha1_DisconnectTargetResponse_To_impl_DisconnectTargetResponse(in, out) +} + +func autoConvert_impl_DisconnectTargetResponse_To_v1alpha1_DisconnectTargetResponse(in *impl.DisconnectTargetResponse, out *v1alpha1.DisconnectTargetResponse) error { + return nil +} + +// Convert_impl_DisconnectTargetResponse_To_v1alpha1_DisconnectTargetResponse is an autogenerated conversion function. +func Convert_impl_DisconnectTargetResponse_To_v1alpha1_DisconnectTargetResponse(in *impl.DisconnectTargetResponse, out *v1alpha1.DisconnectTargetResponse) error { + return autoConvert_impl_DisconnectTargetResponse_To_v1alpha1_DisconnectTargetResponse(in, out) +} + +func autoConvert_v1alpha1_DiscoverTargetPortalRequest_To_impl_DiscoverTargetPortalRequest(in *v1alpha1.DiscoverTargetPortalRequest, out *impl.DiscoverTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha1_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_v1alpha1_DiscoverTargetPortalRequest_To_impl_DiscoverTargetPortalRequest is an autogenerated conversion function. +func Convert_v1alpha1_DiscoverTargetPortalRequest_To_impl_DiscoverTargetPortalRequest(in *v1alpha1.DiscoverTargetPortalRequest, out *impl.DiscoverTargetPortalRequest) error { + return autoConvert_v1alpha1_DiscoverTargetPortalRequest_To_impl_DiscoverTargetPortalRequest(in, out) +} + +func autoConvert_impl_DiscoverTargetPortalRequest_To_v1alpha1_DiscoverTargetPortalRequest(in *impl.DiscoverTargetPortalRequest, out *v1alpha1.DiscoverTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha1.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_impl_DiscoverTargetPortalRequest_To_v1alpha1_DiscoverTargetPortalRequest is an autogenerated conversion function. +func Convert_impl_DiscoverTargetPortalRequest_To_v1alpha1_DiscoverTargetPortalRequest(in *impl.DiscoverTargetPortalRequest, out *v1alpha1.DiscoverTargetPortalRequest) error { + return autoConvert_impl_DiscoverTargetPortalRequest_To_v1alpha1_DiscoverTargetPortalRequest(in, out) +} + +func autoConvert_v1alpha1_DiscoverTargetPortalResponse_To_impl_DiscoverTargetPortalResponse(in *v1alpha1.DiscoverTargetPortalResponse, out *impl.DiscoverTargetPortalResponse) error { + out.Iqns = *(*[]string)(unsafe.Pointer(&in.Iqns)) + return nil +} + +// Convert_v1alpha1_DiscoverTargetPortalResponse_To_impl_DiscoverTargetPortalResponse is an autogenerated conversion function. +func Convert_v1alpha1_DiscoverTargetPortalResponse_To_impl_DiscoverTargetPortalResponse(in *v1alpha1.DiscoverTargetPortalResponse, out *impl.DiscoverTargetPortalResponse) error { + return autoConvert_v1alpha1_DiscoverTargetPortalResponse_To_impl_DiscoverTargetPortalResponse(in, out) +} + +func autoConvert_impl_DiscoverTargetPortalResponse_To_v1alpha1_DiscoverTargetPortalResponse(in *impl.DiscoverTargetPortalResponse, out *v1alpha1.DiscoverTargetPortalResponse) error { + out.Iqns = *(*[]string)(unsafe.Pointer(&in.Iqns)) + return nil +} + +// Convert_impl_DiscoverTargetPortalResponse_To_v1alpha1_DiscoverTargetPortalResponse is an autogenerated conversion function. +func Convert_impl_DiscoverTargetPortalResponse_To_v1alpha1_DiscoverTargetPortalResponse(in *impl.DiscoverTargetPortalResponse, out *v1alpha1.DiscoverTargetPortalResponse) error { + return autoConvert_impl_DiscoverTargetPortalResponse_To_v1alpha1_DiscoverTargetPortalResponse(in, out) +} + +func autoConvert_v1alpha1_GetTargetDisksRequest_To_impl_GetTargetDisksRequest(in *v1alpha1.GetTargetDisksRequest, out *impl.GetTargetDisksRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha1_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + return nil +} + +// Convert_v1alpha1_GetTargetDisksRequest_To_impl_GetTargetDisksRequest is an autogenerated conversion function. +func Convert_v1alpha1_GetTargetDisksRequest_To_impl_GetTargetDisksRequest(in *v1alpha1.GetTargetDisksRequest, out *impl.GetTargetDisksRequest) error { + return autoConvert_v1alpha1_GetTargetDisksRequest_To_impl_GetTargetDisksRequest(in, out) +} + +func autoConvert_impl_GetTargetDisksRequest_To_v1alpha1_GetTargetDisksRequest(in *impl.GetTargetDisksRequest, out *v1alpha1.GetTargetDisksRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha1.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + return nil +} + +// Convert_impl_GetTargetDisksRequest_To_v1alpha1_GetTargetDisksRequest is an autogenerated conversion function. +func Convert_impl_GetTargetDisksRequest_To_v1alpha1_GetTargetDisksRequest(in *impl.GetTargetDisksRequest, out *v1alpha1.GetTargetDisksRequest) error { + return autoConvert_impl_GetTargetDisksRequest_To_v1alpha1_GetTargetDisksRequest(in, out) +} + +func autoConvert_v1alpha1_GetTargetDisksResponse_To_impl_GetTargetDisksResponse(in *v1alpha1.GetTargetDisksResponse, out *impl.GetTargetDisksResponse) error { + out.DiskIDs = *(*[]string)(unsafe.Pointer(&in.DiskIDs)) + return nil +} + +// Convert_v1alpha1_GetTargetDisksResponse_To_impl_GetTargetDisksResponse is an autogenerated conversion function. +func Convert_v1alpha1_GetTargetDisksResponse_To_impl_GetTargetDisksResponse(in *v1alpha1.GetTargetDisksResponse, out *impl.GetTargetDisksResponse) error { + return autoConvert_v1alpha1_GetTargetDisksResponse_To_impl_GetTargetDisksResponse(in, out) +} + +func autoConvert_impl_GetTargetDisksResponse_To_v1alpha1_GetTargetDisksResponse(in *impl.GetTargetDisksResponse, out *v1alpha1.GetTargetDisksResponse) error { + out.DiskIDs = *(*[]string)(unsafe.Pointer(&in.DiskIDs)) + return nil +} + +// Convert_impl_GetTargetDisksResponse_To_v1alpha1_GetTargetDisksResponse is an autogenerated conversion function. +func Convert_impl_GetTargetDisksResponse_To_v1alpha1_GetTargetDisksResponse(in *impl.GetTargetDisksResponse, out *v1alpha1.GetTargetDisksResponse) error { + return autoConvert_impl_GetTargetDisksResponse_To_v1alpha1_GetTargetDisksResponse(in, out) +} + +func autoConvert_v1alpha1_ListTargetPortalsRequest_To_impl_ListTargetPortalsRequest(in *v1alpha1.ListTargetPortalsRequest, out *impl.ListTargetPortalsRequest) error { + return nil +} + +// Convert_v1alpha1_ListTargetPortalsRequest_To_impl_ListTargetPortalsRequest is an autogenerated conversion function. +func Convert_v1alpha1_ListTargetPortalsRequest_To_impl_ListTargetPortalsRequest(in *v1alpha1.ListTargetPortalsRequest, out *impl.ListTargetPortalsRequest) error { + return autoConvert_v1alpha1_ListTargetPortalsRequest_To_impl_ListTargetPortalsRequest(in, out) +} + +func autoConvert_impl_ListTargetPortalsRequest_To_v1alpha1_ListTargetPortalsRequest(in *impl.ListTargetPortalsRequest, out *v1alpha1.ListTargetPortalsRequest) error { + return nil +} + +// Convert_impl_ListTargetPortalsRequest_To_v1alpha1_ListTargetPortalsRequest is an autogenerated conversion function. +func Convert_impl_ListTargetPortalsRequest_To_v1alpha1_ListTargetPortalsRequest(in *impl.ListTargetPortalsRequest, out *v1alpha1.ListTargetPortalsRequest) error { + return autoConvert_impl_ListTargetPortalsRequest_To_v1alpha1_ListTargetPortalsRequest(in, out) +} + +func autoConvert_v1alpha1_ListTargetPortalsResponse_To_impl_ListTargetPortalsResponse(in *v1alpha1.ListTargetPortalsResponse, out *impl.ListTargetPortalsResponse) error { + if in.TargetPortals != nil { + in, out := &in.TargetPortals, &out.TargetPortals + *out = make([]*impl.TargetPortal, len(*in)) + for i := range *in { + if err := Convert_v1alpha1_TargetPortal_To_impl_TargetPortal(*&(*in)[i], *&(*out)[i]); err != nil { + return err + } + } + } else { + out.TargetPortals = nil + } + return nil +} + +// Convert_v1alpha1_ListTargetPortalsResponse_To_impl_ListTargetPortalsResponse is an autogenerated conversion function. +func Convert_v1alpha1_ListTargetPortalsResponse_To_impl_ListTargetPortalsResponse(in *v1alpha1.ListTargetPortalsResponse, out *impl.ListTargetPortalsResponse) error { + return autoConvert_v1alpha1_ListTargetPortalsResponse_To_impl_ListTargetPortalsResponse(in, out) +} + +// detected external conversion function +// Convert_impl_ListTargetPortalsResponse_To_v1alpha1_ListTargetPortalsResponse(in *impl.ListTargetPortalsResponse, out *v1alpha1.ListTargetPortalsResponse) error +// skipping generation of the auto function + +func autoConvert_v1alpha1_RemoveTargetPortalRequest_To_impl_RemoveTargetPortalRequest(in *v1alpha1.RemoveTargetPortalRequest, out *impl.RemoveTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha1_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_v1alpha1_RemoveTargetPortalRequest_To_impl_RemoveTargetPortalRequest is an autogenerated conversion function. +func Convert_v1alpha1_RemoveTargetPortalRequest_To_impl_RemoveTargetPortalRequest(in *v1alpha1.RemoveTargetPortalRequest, out *impl.RemoveTargetPortalRequest) error { + return autoConvert_v1alpha1_RemoveTargetPortalRequest_To_impl_RemoveTargetPortalRequest(in, out) +} + +func autoConvert_impl_RemoveTargetPortalRequest_To_v1alpha1_RemoveTargetPortalRequest(in *impl.RemoveTargetPortalRequest, out *v1alpha1.RemoveTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha1.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha1_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_impl_RemoveTargetPortalRequest_To_v1alpha1_RemoveTargetPortalRequest is an autogenerated conversion function. +func Convert_impl_RemoveTargetPortalRequest_To_v1alpha1_RemoveTargetPortalRequest(in *impl.RemoveTargetPortalRequest, out *v1alpha1.RemoveTargetPortalRequest) error { + return autoConvert_impl_RemoveTargetPortalRequest_To_v1alpha1_RemoveTargetPortalRequest(in, out) +} + +func autoConvert_v1alpha1_RemoveTargetPortalResponse_To_impl_RemoveTargetPortalResponse(in *v1alpha1.RemoveTargetPortalResponse, out *impl.RemoveTargetPortalResponse) error { + return nil +} + +// Convert_v1alpha1_RemoveTargetPortalResponse_To_impl_RemoveTargetPortalResponse is an autogenerated conversion function. +func Convert_v1alpha1_RemoveTargetPortalResponse_To_impl_RemoveTargetPortalResponse(in *v1alpha1.RemoveTargetPortalResponse, out *impl.RemoveTargetPortalResponse) error { + return autoConvert_v1alpha1_RemoveTargetPortalResponse_To_impl_RemoveTargetPortalResponse(in, out) +} + +func autoConvert_impl_RemoveTargetPortalResponse_To_v1alpha1_RemoveTargetPortalResponse(in *impl.RemoveTargetPortalResponse, out *v1alpha1.RemoveTargetPortalResponse) error { + return nil +} + +// Convert_impl_RemoveTargetPortalResponse_To_v1alpha1_RemoveTargetPortalResponse is an autogenerated conversion function. +func Convert_impl_RemoveTargetPortalResponse_To_v1alpha1_RemoveTargetPortalResponse(in *impl.RemoveTargetPortalResponse, out *v1alpha1.RemoveTargetPortalResponse) error { + return autoConvert_impl_RemoveTargetPortalResponse_To_v1alpha1_RemoveTargetPortalResponse(in, out) +} + +func autoConvert_v1alpha1_TargetPortal_To_impl_TargetPortal(in *v1alpha1.TargetPortal, out *impl.TargetPortal) error { + out.TargetAddress = in.TargetAddress + out.TargetPort = in.TargetPort + return nil +} + +// Convert_v1alpha1_TargetPortal_To_impl_TargetPortal is an autogenerated conversion function. +func Convert_v1alpha1_TargetPortal_To_impl_TargetPortal(in *v1alpha1.TargetPortal, out *impl.TargetPortal) error { + return autoConvert_v1alpha1_TargetPortal_To_impl_TargetPortal(in, out) +} + +func autoConvert_impl_TargetPortal_To_v1alpha1_TargetPortal(in *impl.TargetPortal, out *v1alpha1.TargetPortal) error { + out.TargetAddress = in.TargetAddress + out.TargetPort = in.TargetPort + return nil +} + +// Convert_impl_TargetPortal_To_v1alpha1_TargetPortal is an autogenerated conversion function. +func Convert_impl_TargetPortal_To_v1alpha1_TargetPortal(in *impl.TargetPortal, out *v1alpha1.TargetPortal) error { + return autoConvert_impl_TargetPortal_To_v1alpha1_TargetPortal(in, out) +} diff --git a/internal/server/iscsi/internal/v1alpha1/server_generated.go b/pkg/server/iscsi/impl/v1alpha1/server_generated.go similarity index 59% rename from internal/server/iscsi/internal/v1alpha1/server_generated.go rename to pkg/server/iscsi/impl/v1alpha1/server_generated.go index fe0cbaef..47ab7f52 100644 --- a/internal/server/iscsi/internal/v1alpha1/server_generated.go +++ b/pkg/server/iscsi/impl/v1alpha1/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1alpha1") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) AddTargetPortal(context context.Context, versionedRequest *v1alpha1.AddTargetPortalRequest) (*v1alpha1.AddTargetPortalResponse, error) { - request := &internal.AddTargetPortalRequest{} - if err := Convert_v1alpha1_AddTargetPortalRequest_To_internal_AddTargetPortalRequest(versionedRequest, request); err != nil { + request := &impl.AddTargetPortalRequest{} + if err := Convert_v1alpha1_AddTargetPortalRequest_To_impl_AddTargetPortalRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) AddTargetPortal(context context.Context, versionedRequest } versionedResponse := &v1alpha1.AddTargetPortalResponse{} - if err := Convert_internal_AddTargetPortalResponse_To_v1alpha1_AddTargetPortalResponse(response, versionedResponse); err != nil { + if err := Convert_impl_AddTargetPortalResponse_To_v1alpha1_AddTargetPortalResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) AddTargetPortal(context context.Context, versionedRequest } func (s *versionedAPI) ConnectTarget(context context.Context, versionedRequest *v1alpha1.ConnectTargetRequest) (*v1alpha1.ConnectTargetResponse, error) { - request := &internal.ConnectTargetRequest{} - if err := Convert_v1alpha1_ConnectTargetRequest_To_internal_ConnectTargetRequest(versionedRequest, request); err != nil { + request := &impl.ConnectTargetRequest{} + if err := Convert_v1alpha1_ConnectTargetRequest_To_impl_ConnectTargetRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) ConnectTarget(context context.Context, versionedRequest * } versionedResponse := &v1alpha1.ConnectTargetResponse{} - if err := Convert_internal_ConnectTargetResponse_To_v1alpha1_ConnectTargetResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ConnectTargetResponse_To_v1alpha1_ConnectTargetResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) ConnectTarget(context context.Context, versionedRequest * } func (s *versionedAPI) DisconnectTarget(context context.Context, versionedRequest *v1alpha1.DisconnectTargetRequest) (*v1alpha1.DisconnectTargetResponse, error) { - request := &internal.DisconnectTargetRequest{} - if err := Convert_v1alpha1_DisconnectTargetRequest_To_internal_DisconnectTargetRequest(versionedRequest, request); err != nil { + request := &impl.DisconnectTargetRequest{} + if err := Convert_v1alpha1_DisconnectTargetRequest_To_impl_DisconnectTargetRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) DisconnectTarget(context context.Context, versionedReques } versionedResponse := &v1alpha1.DisconnectTargetResponse{} - if err := Convert_internal_DisconnectTargetResponse_To_v1alpha1_DisconnectTargetResponse(response, versionedResponse); err != nil { + if err := Convert_impl_DisconnectTargetResponse_To_v1alpha1_DisconnectTargetResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) DisconnectTarget(context context.Context, versionedReques } func (s *versionedAPI) DiscoverTargetPortal(context context.Context, versionedRequest *v1alpha1.DiscoverTargetPortalRequest) (*v1alpha1.DiscoverTargetPortalResponse, error) { - request := &internal.DiscoverTargetPortalRequest{} - if err := Convert_v1alpha1_DiscoverTargetPortalRequest_To_internal_DiscoverTargetPortalRequest(versionedRequest, request); err != nil { + request := &impl.DiscoverTargetPortalRequest{} + if err := Convert_v1alpha1_DiscoverTargetPortalRequest_To_impl_DiscoverTargetPortalRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) DiscoverTargetPortal(context context.Context, versionedRe } versionedResponse := &v1alpha1.DiscoverTargetPortalResponse{} - if err := Convert_internal_DiscoverTargetPortalResponse_To_v1alpha1_DiscoverTargetPortalResponse(response, versionedResponse); err != nil { + if err := Convert_impl_DiscoverTargetPortalResponse_To_v1alpha1_DiscoverTargetPortalResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) DiscoverTargetPortal(context context.Context, versionedRe } func (s *versionedAPI) GetTargetDisks(context context.Context, versionedRequest *v1alpha1.GetTargetDisksRequest) (*v1alpha1.GetTargetDisksResponse, error) { - request := &internal.GetTargetDisksRequest{} - if err := Convert_v1alpha1_GetTargetDisksRequest_To_internal_GetTargetDisksRequest(versionedRequest, request); err != nil { + request := &impl.GetTargetDisksRequest{} + if err := Convert_v1alpha1_GetTargetDisksRequest_To_impl_GetTargetDisksRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) GetTargetDisks(context context.Context, versionedRequest } versionedResponse := &v1alpha1.GetTargetDisksResponse{} - if err := Convert_internal_GetTargetDisksResponse_To_v1alpha1_GetTargetDisksResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetTargetDisksResponse_To_v1alpha1_GetTargetDisksResponse(response, versionedResponse); err != nil { return nil, err } @@ -123,8 +123,8 @@ func (s *versionedAPI) GetTargetDisks(context context.Context, versionedRequest } func (s *versionedAPI) ListTargetPortals(context context.Context, versionedRequest *v1alpha1.ListTargetPortalsRequest) (*v1alpha1.ListTargetPortalsResponse, error) { - request := &internal.ListTargetPortalsRequest{} - if err := Convert_v1alpha1_ListTargetPortalsRequest_To_internal_ListTargetPortalsRequest(versionedRequest, request); err != nil { + request := &impl.ListTargetPortalsRequest{} + if err := Convert_v1alpha1_ListTargetPortalsRequest_To_impl_ListTargetPortalsRequest(versionedRequest, request); err != nil { return nil, err } @@ -134,7 +134,7 @@ func (s *versionedAPI) ListTargetPortals(context context.Context, versionedReque } versionedResponse := &v1alpha1.ListTargetPortalsResponse{} - if err := Convert_internal_ListTargetPortalsResponse_To_v1alpha1_ListTargetPortalsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListTargetPortalsResponse_To_v1alpha1_ListTargetPortalsResponse(response, versionedResponse); err != nil { return nil, err } @@ -142,8 +142,8 @@ func (s *versionedAPI) ListTargetPortals(context context.Context, versionedReque } func (s *versionedAPI) RemoveTargetPortal(context context.Context, versionedRequest *v1alpha1.RemoveTargetPortalRequest) (*v1alpha1.RemoveTargetPortalResponse, error) { - request := &internal.RemoveTargetPortalRequest{} - if err := Convert_v1alpha1_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest(versionedRequest, request); err != nil { + request := &impl.RemoveTargetPortalRequest{} + if err := Convert_v1alpha1_RemoveTargetPortalRequest_To_impl_RemoveTargetPortalRequest(versionedRequest, request); err != nil { return nil, err } @@ -153,7 +153,7 @@ func (s *versionedAPI) RemoveTargetPortal(context context.Context, versionedRequ } versionedResponse := &v1alpha1.RemoveTargetPortalResponse{} - if err := Convert_internal_RemoveTargetPortalResponse_To_v1alpha1_RemoveTargetPortalResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RemoveTargetPortalResponse_To_v1alpha1_RemoveTargetPortalResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/iscsi/internal/v1alpha2/conversion.go b/pkg/server/iscsi/impl/v1alpha2/conversion.go similarity index 56% rename from internal/server/iscsi/internal/v1alpha2/conversion.go rename to pkg/server/iscsi/impl/v1alpha2/conversion.go index c5045a23..874691a8 100644 --- a/internal/server/iscsi/internal/v1alpha2/conversion.go +++ b/pkg/server/iscsi/impl/v1alpha2/conversion.go @@ -2,18 +2,18 @@ package v1alpha2 import ( "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha2" - "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" ) // Add manual conversion functions here to override automatic conversion functions -func Convert_internal_ListTargetPortalsResponse_To_v1alpha2_ListTargetPortalsResponse(in *internal.ListTargetPortalsResponse, out *v1alpha2.ListTargetPortalsResponse) error { +func Convert_impl_ListTargetPortalsResponse_To_v1alpha2_ListTargetPortalsResponse(in *impl.ListTargetPortalsResponse, out *v1alpha2.ListTargetPortalsResponse) error { if in.TargetPortals != nil { in, out := &in.TargetPortals, &out.TargetPortals *out = make([]*v1alpha2.TargetPortal, len(*in)) for i := range *in { (*out)[i] = new(v1alpha2.TargetPortal) - if err := Convert_internal_TargetPortal_To_v1alpha2_TargetPortal(*&(*in)[i], *&(*out)[i]); err != nil { + if err := Convert_impl_TargetPortal_To_v1alpha2_TargetPortal(*&(*in)[i], *&(*out)[i]); err != nil { return err } } diff --git a/pkg/server/iscsi/impl/v1alpha2/conversion_generated.go b/pkg/server/iscsi/impl/v1alpha2/conversion_generated.go new file mode 100644 index 00000000..fafa0a6f --- /dev/null +++ b/pkg/server/iscsi/impl/v1alpha2/conversion_generated.go @@ -0,0 +1,452 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha2 + +import ( + unsafe "unsafe" + + v1alpha2 "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha2" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" +) + +func autoConvert_v1alpha2_AddTargetPortalRequest_To_impl_AddTargetPortalRequest(in *v1alpha2.AddTargetPortalRequest, out *impl.AddTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha2_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_v1alpha2_AddTargetPortalRequest_To_impl_AddTargetPortalRequest is an autogenerated conversion function. +func Convert_v1alpha2_AddTargetPortalRequest_To_impl_AddTargetPortalRequest(in *v1alpha2.AddTargetPortalRequest, out *impl.AddTargetPortalRequest) error { + return autoConvert_v1alpha2_AddTargetPortalRequest_To_impl_AddTargetPortalRequest(in, out) +} + +func autoConvert_impl_AddTargetPortalRequest_To_v1alpha2_AddTargetPortalRequest(in *impl.AddTargetPortalRequest, out *v1alpha2.AddTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha2.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_impl_AddTargetPortalRequest_To_v1alpha2_AddTargetPortalRequest is an autogenerated conversion function. +func Convert_impl_AddTargetPortalRequest_To_v1alpha2_AddTargetPortalRequest(in *impl.AddTargetPortalRequest, out *v1alpha2.AddTargetPortalRequest) error { + return autoConvert_impl_AddTargetPortalRequest_To_v1alpha2_AddTargetPortalRequest(in, out) +} + +func autoConvert_v1alpha2_AddTargetPortalResponse_To_impl_AddTargetPortalResponse(in *v1alpha2.AddTargetPortalResponse, out *impl.AddTargetPortalResponse) error { + return nil +} + +// Convert_v1alpha2_AddTargetPortalResponse_To_impl_AddTargetPortalResponse is an autogenerated conversion function. +func Convert_v1alpha2_AddTargetPortalResponse_To_impl_AddTargetPortalResponse(in *v1alpha2.AddTargetPortalResponse, out *impl.AddTargetPortalResponse) error { + return autoConvert_v1alpha2_AddTargetPortalResponse_To_impl_AddTargetPortalResponse(in, out) +} + +func autoConvert_impl_AddTargetPortalResponse_To_v1alpha2_AddTargetPortalResponse(in *impl.AddTargetPortalResponse, out *v1alpha2.AddTargetPortalResponse) error { + return nil +} + +// Convert_impl_AddTargetPortalResponse_To_v1alpha2_AddTargetPortalResponse is an autogenerated conversion function. +func Convert_impl_AddTargetPortalResponse_To_v1alpha2_AddTargetPortalResponse(in *impl.AddTargetPortalResponse, out *v1alpha2.AddTargetPortalResponse) error { + return autoConvert_impl_AddTargetPortalResponse_To_v1alpha2_AddTargetPortalResponse(in, out) +} + +func autoConvert_v1alpha2_ConnectTargetRequest_To_impl_ConnectTargetRequest(in *v1alpha2.ConnectTargetRequest, out *impl.ConnectTargetRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha2_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + out.AuthType = impl.AuthenticationType(in.AuthType) + out.ChapUsername = in.ChapUsername + out.ChapSecret = in.ChapSecret + return nil +} + +// Convert_v1alpha2_ConnectTargetRequest_To_impl_ConnectTargetRequest is an autogenerated conversion function. +func Convert_v1alpha2_ConnectTargetRequest_To_impl_ConnectTargetRequest(in *v1alpha2.ConnectTargetRequest, out *impl.ConnectTargetRequest) error { + return autoConvert_v1alpha2_ConnectTargetRequest_To_impl_ConnectTargetRequest(in, out) +} + +func autoConvert_impl_ConnectTargetRequest_To_v1alpha2_ConnectTargetRequest(in *impl.ConnectTargetRequest, out *v1alpha2.ConnectTargetRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha2.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + out.AuthType = v1alpha2.AuthenticationType(in.AuthType) + out.ChapUsername = in.ChapUsername + out.ChapSecret = in.ChapSecret + return nil +} + +// Convert_impl_ConnectTargetRequest_To_v1alpha2_ConnectTargetRequest is an autogenerated conversion function. +func Convert_impl_ConnectTargetRequest_To_v1alpha2_ConnectTargetRequest(in *impl.ConnectTargetRequest, out *v1alpha2.ConnectTargetRequest) error { + return autoConvert_impl_ConnectTargetRequest_To_v1alpha2_ConnectTargetRequest(in, out) +} + +func autoConvert_v1alpha2_ConnectTargetResponse_To_impl_ConnectTargetResponse(in *v1alpha2.ConnectTargetResponse, out *impl.ConnectTargetResponse) error { + return nil +} + +// Convert_v1alpha2_ConnectTargetResponse_To_impl_ConnectTargetResponse is an autogenerated conversion function. +func Convert_v1alpha2_ConnectTargetResponse_To_impl_ConnectTargetResponse(in *v1alpha2.ConnectTargetResponse, out *impl.ConnectTargetResponse) error { + return autoConvert_v1alpha2_ConnectTargetResponse_To_impl_ConnectTargetResponse(in, out) +} + +func autoConvert_impl_ConnectTargetResponse_To_v1alpha2_ConnectTargetResponse(in *impl.ConnectTargetResponse, out *v1alpha2.ConnectTargetResponse) error { + return nil +} + +// Convert_impl_ConnectTargetResponse_To_v1alpha2_ConnectTargetResponse is an autogenerated conversion function. +func Convert_impl_ConnectTargetResponse_To_v1alpha2_ConnectTargetResponse(in *impl.ConnectTargetResponse, out *v1alpha2.ConnectTargetResponse) error { + return autoConvert_impl_ConnectTargetResponse_To_v1alpha2_ConnectTargetResponse(in, out) +} + +func autoConvert_v1alpha2_DisconnectTargetRequest_To_impl_DisconnectTargetRequest(in *v1alpha2.DisconnectTargetRequest, out *impl.DisconnectTargetRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha2_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + return nil +} + +// Convert_v1alpha2_DisconnectTargetRequest_To_impl_DisconnectTargetRequest is an autogenerated conversion function. +func Convert_v1alpha2_DisconnectTargetRequest_To_impl_DisconnectTargetRequest(in *v1alpha2.DisconnectTargetRequest, out *impl.DisconnectTargetRequest) error { + return autoConvert_v1alpha2_DisconnectTargetRequest_To_impl_DisconnectTargetRequest(in, out) +} + +func autoConvert_impl_DisconnectTargetRequest_To_v1alpha2_DisconnectTargetRequest(in *impl.DisconnectTargetRequest, out *v1alpha2.DisconnectTargetRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha2.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + return nil +} + +// Convert_impl_DisconnectTargetRequest_To_v1alpha2_DisconnectTargetRequest is an autogenerated conversion function. +func Convert_impl_DisconnectTargetRequest_To_v1alpha2_DisconnectTargetRequest(in *impl.DisconnectTargetRequest, out *v1alpha2.DisconnectTargetRequest) error { + return autoConvert_impl_DisconnectTargetRequest_To_v1alpha2_DisconnectTargetRequest(in, out) +} + +func autoConvert_v1alpha2_DisconnectTargetResponse_To_impl_DisconnectTargetResponse(in *v1alpha2.DisconnectTargetResponse, out *impl.DisconnectTargetResponse) error { + return nil +} + +// Convert_v1alpha2_DisconnectTargetResponse_To_impl_DisconnectTargetResponse is an autogenerated conversion function. +func Convert_v1alpha2_DisconnectTargetResponse_To_impl_DisconnectTargetResponse(in *v1alpha2.DisconnectTargetResponse, out *impl.DisconnectTargetResponse) error { + return autoConvert_v1alpha2_DisconnectTargetResponse_To_impl_DisconnectTargetResponse(in, out) +} + +func autoConvert_impl_DisconnectTargetResponse_To_v1alpha2_DisconnectTargetResponse(in *impl.DisconnectTargetResponse, out *v1alpha2.DisconnectTargetResponse) error { + return nil +} + +// Convert_impl_DisconnectTargetResponse_To_v1alpha2_DisconnectTargetResponse is an autogenerated conversion function. +func Convert_impl_DisconnectTargetResponse_To_v1alpha2_DisconnectTargetResponse(in *impl.DisconnectTargetResponse, out *v1alpha2.DisconnectTargetResponse) error { + return autoConvert_impl_DisconnectTargetResponse_To_v1alpha2_DisconnectTargetResponse(in, out) +} + +func autoConvert_v1alpha2_DiscoverTargetPortalRequest_To_impl_DiscoverTargetPortalRequest(in *v1alpha2.DiscoverTargetPortalRequest, out *impl.DiscoverTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha2_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_v1alpha2_DiscoverTargetPortalRequest_To_impl_DiscoverTargetPortalRequest is an autogenerated conversion function. +func Convert_v1alpha2_DiscoverTargetPortalRequest_To_impl_DiscoverTargetPortalRequest(in *v1alpha2.DiscoverTargetPortalRequest, out *impl.DiscoverTargetPortalRequest) error { + return autoConvert_v1alpha2_DiscoverTargetPortalRequest_To_impl_DiscoverTargetPortalRequest(in, out) +} + +func autoConvert_impl_DiscoverTargetPortalRequest_To_v1alpha2_DiscoverTargetPortalRequest(in *impl.DiscoverTargetPortalRequest, out *v1alpha2.DiscoverTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha2.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_impl_DiscoverTargetPortalRequest_To_v1alpha2_DiscoverTargetPortalRequest is an autogenerated conversion function. +func Convert_impl_DiscoverTargetPortalRequest_To_v1alpha2_DiscoverTargetPortalRequest(in *impl.DiscoverTargetPortalRequest, out *v1alpha2.DiscoverTargetPortalRequest) error { + return autoConvert_impl_DiscoverTargetPortalRequest_To_v1alpha2_DiscoverTargetPortalRequest(in, out) +} + +func autoConvert_v1alpha2_DiscoverTargetPortalResponse_To_impl_DiscoverTargetPortalResponse(in *v1alpha2.DiscoverTargetPortalResponse, out *impl.DiscoverTargetPortalResponse) error { + out.Iqns = *(*[]string)(unsafe.Pointer(&in.Iqns)) + return nil +} + +// Convert_v1alpha2_DiscoverTargetPortalResponse_To_impl_DiscoverTargetPortalResponse is an autogenerated conversion function. +func Convert_v1alpha2_DiscoverTargetPortalResponse_To_impl_DiscoverTargetPortalResponse(in *v1alpha2.DiscoverTargetPortalResponse, out *impl.DiscoverTargetPortalResponse) error { + return autoConvert_v1alpha2_DiscoverTargetPortalResponse_To_impl_DiscoverTargetPortalResponse(in, out) +} + +func autoConvert_impl_DiscoverTargetPortalResponse_To_v1alpha2_DiscoverTargetPortalResponse(in *impl.DiscoverTargetPortalResponse, out *v1alpha2.DiscoverTargetPortalResponse) error { + out.Iqns = *(*[]string)(unsafe.Pointer(&in.Iqns)) + return nil +} + +// Convert_impl_DiscoverTargetPortalResponse_To_v1alpha2_DiscoverTargetPortalResponse is an autogenerated conversion function. +func Convert_impl_DiscoverTargetPortalResponse_To_v1alpha2_DiscoverTargetPortalResponse(in *impl.DiscoverTargetPortalResponse, out *v1alpha2.DiscoverTargetPortalResponse) error { + return autoConvert_impl_DiscoverTargetPortalResponse_To_v1alpha2_DiscoverTargetPortalResponse(in, out) +} + +func autoConvert_v1alpha2_GetTargetDisksRequest_To_impl_GetTargetDisksRequest(in *v1alpha2.GetTargetDisksRequest, out *impl.GetTargetDisksRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha2_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + return nil +} + +// Convert_v1alpha2_GetTargetDisksRequest_To_impl_GetTargetDisksRequest is an autogenerated conversion function. +func Convert_v1alpha2_GetTargetDisksRequest_To_impl_GetTargetDisksRequest(in *v1alpha2.GetTargetDisksRequest, out *impl.GetTargetDisksRequest) error { + return autoConvert_v1alpha2_GetTargetDisksRequest_To_impl_GetTargetDisksRequest(in, out) +} + +func autoConvert_impl_GetTargetDisksRequest_To_v1alpha2_GetTargetDisksRequest(in *impl.GetTargetDisksRequest, out *v1alpha2.GetTargetDisksRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha2.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + out.Iqn = in.Iqn + return nil +} + +// Convert_impl_GetTargetDisksRequest_To_v1alpha2_GetTargetDisksRequest is an autogenerated conversion function. +func Convert_impl_GetTargetDisksRequest_To_v1alpha2_GetTargetDisksRequest(in *impl.GetTargetDisksRequest, out *v1alpha2.GetTargetDisksRequest) error { + return autoConvert_impl_GetTargetDisksRequest_To_v1alpha2_GetTargetDisksRequest(in, out) +} + +func autoConvert_v1alpha2_GetTargetDisksResponse_To_impl_GetTargetDisksResponse(in *v1alpha2.GetTargetDisksResponse, out *impl.GetTargetDisksResponse) error { + out.DiskIDs = *(*[]string)(unsafe.Pointer(&in.DiskIDs)) + return nil +} + +// Convert_v1alpha2_GetTargetDisksResponse_To_impl_GetTargetDisksResponse is an autogenerated conversion function. +func Convert_v1alpha2_GetTargetDisksResponse_To_impl_GetTargetDisksResponse(in *v1alpha2.GetTargetDisksResponse, out *impl.GetTargetDisksResponse) error { + return autoConvert_v1alpha2_GetTargetDisksResponse_To_impl_GetTargetDisksResponse(in, out) +} + +func autoConvert_impl_GetTargetDisksResponse_To_v1alpha2_GetTargetDisksResponse(in *impl.GetTargetDisksResponse, out *v1alpha2.GetTargetDisksResponse) error { + out.DiskIDs = *(*[]string)(unsafe.Pointer(&in.DiskIDs)) + return nil +} + +// Convert_impl_GetTargetDisksResponse_To_v1alpha2_GetTargetDisksResponse is an autogenerated conversion function. +func Convert_impl_GetTargetDisksResponse_To_v1alpha2_GetTargetDisksResponse(in *impl.GetTargetDisksResponse, out *v1alpha2.GetTargetDisksResponse) error { + return autoConvert_impl_GetTargetDisksResponse_To_v1alpha2_GetTargetDisksResponse(in, out) +} + +func autoConvert_v1alpha2_ListTargetPortalsRequest_To_impl_ListTargetPortalsRequest(in *v1alpha2.ListTargetPortalsRequest, out *impl.ListTargetPortalsRequest) error { + return nil +} + +// Convert_v1alpha2_ListTargetPortalsRequest_To_impl_ListTargetPortalsRequest is an autogenerated conversion function. +func Convert_v1alpha2_ListTargetPortalsRequest_To_impl_ListTargetPortalsRequest(in *v1alpha2.ListTargetPortalsRequest, out *impl.ListTargetPortalsRequest) error { + return autoConvert_v1alpha2_ListTargetPortalsRequest_To_impl_ListTargetPortalsRequest(in, out) +} + +func autoConvert_impl_ListTargetPortalsRequest_To_v1alpha2_ListTargetPortalsRequest(in *impl.ListTargetPortalsRequest, out *v1alpha2.ListTargetPortalsRequest) error { + return nil +} + +// Convert_impl_ListTargetPortalsRequest_To_v1alpha2_ListTargetPortalsRequest is an autogenerated conversion function. +func Convert_impl_ListTargetPortalsRequest_To_v1alpha2_ListTargetPortalsRequest(in *impl.ListTargetPortalsRequest, out *v1alpha2.ListTargetPortalsRequest) error { + return autoConvert_impl_ListTargetPortalsRequest_To_v1alpha2_ListTargetPortalsRequest(in, out) +} + +func autoConvert_v1alpha2_ListTargetPortalsResponse_To_impl_ListTargetPortalsResponse(in *v1alpha2.ListTargetPortalsResponse, out *impl.ListTargetPortalsResponse) error { + if in.TargetPortals != nil { + in, out := &in.TargetPortals, &out.TargetPortals + *out = make([]*impl.TargetPortal, len(*in)) + for i := range *in { + if err := Convert_v1alpha2_TargetPortal_To_impl_TargetPortal(*&(*in)[i], *&(*out)[i]); err != nil { + return err + } + } + } else { + out.TargetPortals = nil + } + return nil +} + +// Convert_v1alpha2_ListTargetPortalsResponse_To_impl_ListTargetPortalsResponse is an autogenerated conversion function. +func Convert_v1alpha2_ListTargetPortalsResponse_To_impl_ListTargetPortalsResponse(in *v1alpha2.ListTargetPortalsResponse, out *impl.ListTargetPortalsResponse) error { + return autoConvert_v1alpha2_ListTargetPortalsResponse_To_impl_ListTargetPortalsResponse(in, out) +} + +// detected external conversion function +// Convert_impl_ListTargetPortalsResponse_To_v1alpha2_ListTargetPortalsResponse(in *impl.ListTargetPortalsResponse, out *v1alpha2.ListTargetPortalsResponse) error +// skipping generation of the auto function + +func autoConvert_v1alpha2_RemoveTargetPortalRequest_To_impl_RemoveTargetPortalRequest(in *v1alpha2.RemoveTargetPortalRequest, out *impl.RemoveTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(impl.TargetPortal) + if err := Convert_v1alpha2_TargetPortal_To_impl_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_v1alpha2_RemoveTargetPortalRequest_To_impl_RemoveTargetPortalRequest is an autogenerated conversion function. +func Convert_v1alpha2_RemoveTargetPortalRequest_To_impl_RemoveTargetPortalRequest(in *v1alpha2.RemoveTargetPortalRequest, out *impl.RemoveTargetPortalRequest) error { + return autoConvert_v1alpha2_RemoveTargetPortalRequest_To_impl_RemoveTargetPortalRequest(in, out) +} + +func autoConvert_impl_RemoveTargetPortalRequest_To_v1alpha2_RemoveTargetPortalRequest(in *impl.RemoveTargetPortalRequest, out *v1alpha2.RemoveTargetPortalRequest) error { + if in.TargetPortal != nil { + in, out := &in.TargetPortal, &out.TargetPortal + *out = new(v1alpha2.TargetPortal) + if err := Convert_impl_TargetPortal_To_v1alpha2_TargetPortal(*in, *out); err != nil { + return err + } + } else { + out.TargetPortal = nil + } + return nil +} + +// Convert_impl_RemoveTargetPortalRequest_To_v1alpha2_RemoveTargetPortalRequest is an autogenerated conversion function. +func Convert_impl_RemoveTargetPortalRequest_To_v1alpha2_RemoveTargetPortalRequest(in *impl.RemoveTargetPortalRequest, out *v1alpha2.RemoveTargetPortalRequest) error { + return autoConvert_impl_RemoveTargetPortalRequest_To_v1alpha2_RemoveTargetPortalRequest(in, out) +} + +func autoConvert_v1alpha2_RemoveTargetPortalResponse_To_impl_RemoveTargetPortalResponse(in *v1alpha2.RemoveTargetPortalResponse, out *impl.RemoveTargetPortalResponse) error { + return nil +} + +// Convert_v1alpha2_RemoveTargetPortalResponse_To_impl_RemoveTargetPortalResponse is an autogenerated conversion function. +func Convert_v1alpha2_RemoveTargetPortalResponse_To_impl_RemoveTargetPortalResponse(in *v1alpha2.RemoveTargetPortalResponse, out *impl.RemoveTargetPortalResponse) error { + return autoConvert_v1alpha2_RemoveTargetPortalResponse_To_impl_RemoveTargetPortalResponse(in, out) +} + +func autoConvert_impl_RemoveTargetPortalResponse_To_v1alpha2_RemoveTargetPortalResponse(in *impl.RemoveTargetPortalResponse, out *v1alpha2.RemoveTargetPortalResponse) error { + return nil +} + +// Convert_impl_RemoveTargetPortalResponse_To_v1alpha2_RemoveTargetPortalResponse is an autogenerated conversion function. +func Convert_impl_RemoveTargetPortalResponse_To_v1alpha2_RemoveTargetPortalResponse(in *impl.RemoveTargetPortalResponse, out *v1alpha2.RemoveTargetPortalResponse) error { + return autoConvert_impl_RemoveTargetPortalResponse_To_v1alpha2_RemoveTargetPortalResponse(in, out) +} + +func autoConvert_v1alpha2_SetMutualChapSecretRequest_To_impl_SetMutualChapSecretRequest(in *v1alpha2.SetMutualChapSecretRequest, out *impl.SetMutualChapSecretRequest) error { + out.MutualChapSecret = in.MutualChapSecret + return nil +} + +// Convert_v1alpha2_SetMutualChapSecretRequest_To_impl_SetMutualChapSecretRequest is an autogenerated conversion function. +func Convert_v1alpha2_SetMutualChapSecretRequest_To_impl_SetMutualChapSecretRequest(in *v1alpha2.SetMutualChapSecretRequest, out *impl.SetMutualChapSecretRequest) error { + return autoConvert_v1alpha2_SetMutualChapSecretRequest_To_impl_SetMutualChapSecretRequest(in, out) +} + +func autoConvert_impl_SetMutualChapSecretRequest_To_v1alpha2_SetMutualChapSecretRequest(in *impl.SetMutualChapSecretRequest, out *v1alpha2.SetMutualChapSecretRequest) error { + out.MutualChapSecret = in.MutualChapSecret + return nil +} + +// Convert_impl_SetMutualChapSecretRequest_To_v1alpha2_SetMutualChapSecretRequest is an autogenerated conversion function. +func Convert_impl_SetMutualChapSecretRequest_To_v1alpha2_SetMutualChapSecretRequest(in *impl.SetMutualChapSecretRequest, out *v1alpha2.SetMutualChapSecretRequest) error { + return autoConvert_impl_SetMutualChapSecretRequest_To_v1alpha2_SetMutualChapSecretRequest(in, out) +} + +func autoConvert_v1alpha2_SetMutualChapSecretResponse_To_impl_SetMutualChapSecretResponse(in *v1alpha2.SetMutualChapSecretResponse, out *impl.SetMutualChapSecretResponse) error { + return nil +} + +// Convert_v1alpha2_SetMutualChapSecretResponse_To_impl_SetMutualChapSecretResponse is an autogenerated conversion function. +func Convert_v1alpha2_SetMutualChapSecretResponse_To_impl_SetMutualChapSecretResponse(in *v1alpha2.SetMutualChapSecretResponse, out *impl.SetMutualChapSecretResponse) error { + return autoConvert_v1alpha2_SetMutualChapSecretResponse_To_impl_SetMutualChapSecretResponse(in, out) +} + +func autoConvert_impl_SetMutualChapSecretResponse_To_v1alpha2_SetMutualChapSecretResponse(in *impl.SetMutualChapSecretResponse, out *v1alpha2.SetMutualChapSecretResponse) error { + return nil +} + +// Convert_impl_SetMutualChapSecretResponse_To_v1alpha2_SetMutualChapSecretResponse is an autogenerated conversion function. +func Convert_impl_SetMutualChapSecretResponse_To_v1alpha2_SetMutualChapSecretResponse(in *impl.SetMutualChapSecretResponse, out *v1alpha2.SetMutualChapSecretResponse) error { + return autoConvert_impl_SetMutualChapSecretResponse_To_v1alpha2_SetMutualChapSecretResponse(in, out) +} + +func autoConvert_v1alpha2_TargetPortal_To_impl_TargetPortal(in *v1alpha2.TargetPortal, out *impl.TargetPortal) error { + out.TargetAddress = in.TargetAddress + out.TargetPort = in.TargetPort + return nil +} + +// Convert_v1alpha2_TargetPortal_To_impl_TargetPortal is an autogenerated conversion function. +func Convert_v1alpha2_TargetPortal_To_impl_TargetPortal(in *v1alpha2.TargetPortal, out *impl.TargetPortal) error { + return autoConvert_v1alpha2_TargetPortal_To_impl_TargetPortal(in, out) +} + +func autoConvert_impl_TargetPortal_To_v1alpha2_TargetPortal(in *impl.TargetPortal, out *v1alpha2.TargetPortal) error { + out.TargetAddress = in.TargetAddress + out.TargetPort = in.TargetPort + return nil +} + +// Convert_impl_TargetPortal_To_v1alpha2_TargetPortal is an autogenerated conversion function. +func Convert_impl_TargetPortal_To_v1alpha2_TargetPortal(in *impl.TargetPortal, out *v1alpha2.TargetPortal) error { + return autoConvert_impl_TargetPortal_To_v1alpha2_TargetPortal(in, out) +} diff --git a/pkg/server/iscsi/impl/v1alpha2/doc.go b/pkg/server/iscsi/impl/v1alpha2/doc.go new file mode 100644 index 00000000..e3028f79 --- /dev/null +++ b/pkg/server/iscsi/impl/v1alpha2/doc.go @@ -0,0 +1,4 @@ +// Temporary code generated by csi-proxy-api-gen. DO NOT COMMIT. +// Should be removed automatically, but please remove manually otherwise. + +package v1alpha2 diff --git a/internal/server/iscsi/internal/v1alpha2/server_generated.go b/pkg/server/iscsi/impl/v1alpha2/server_generated.go similarity index 59% rename from internal/server/iscsi/internal/v1alpha2/server_generated.go rename to pkg/server/iscsi/impl/v1alpha2/server_generated.go index 2ec59120..199aa39f 100644 --- a/internal/server/iscsi/internal/v1alpha2/server_generated.go +++ b/pkg/server/iscsi/impl/v1alpha2/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha2" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1alpha2") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) AddTargetPortal(context context.Context, versionedRequest *v1alpha2.AddTargetPortalRequest) (*v1alpha2.AddTargetPortalResponse, error) { - request := &internal.AddTargetPortalRequest{} - if err := Convert_v1alpha2_AddTargetPortalRequest_To_internal_AddTargetPortalRequest(versionedRequest, request); err != nil { + request := &impl.AddTargetPortalRequest{} + if err := Convert_v1alpha2_AddTargetPortalRequest_To_impl_AddTargetPortalRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) AddTargetPortal(context context.Context, versionedRequest } versionedResponse := &v1alpha2.AddTargetPortalResponse{} - if err := Convert_internal_AddTargetPortalResponse_To_v1alpha2_AddTargetPortalResponse(response, versionedResponse); err != nil { + if err := Convert_impl_AddTargetPortalResponse_To_v1alpha2_AddTargetPortalResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) AddTargetPortal(context context.Context, versionedRequest } func (s *versionedAPI) ConnectTarget(context context.Context, versionedRequest *v1alpha2.ConnectTargetRequest) (*v1alpha2.ConnectTargetResponse, error) { - request := &internal.ConnectTargetRequest{} - if err := Convert_v1alpha2_ConnectTargetRequest_To_internal_ConnectTargetRequest(versionedRequest, request); err != nil { + request := &impl.ConnectTargetRequest{} + if err := Convert_v1alpha2_ConnectTargetRequest_To_impl_ConnectTargetRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) ConnectTarget(context context.Context, versionedRequest * } versionedResponse := &v1alpha2.ConnectTargetResponse{} - if err := Convert_internal_ConnectTargetResponse_To_v1alpha2_ConnectTargetResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ConnectTargetResponse_To_v1alpha2_ConnectTargetResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) ConnectTarget(context context.Context, versionedRequest * } func (s *versionedAPI) DisconnectTarget(context context.Context, versionedRequest *v1alpha2.DisconnectTargetRequest) (*v1alpha2.DisconnectTargetResponse, error) { - request := &internal.DisconnectTargetRequest{} - if err := Convert_v1alpha2_DisconnectTargetRequest_To_internal_DisconnectTargetRequest(versionedRequest, request); err != nil { + request := &impl.DisconnectTargetRequest{} + if err := Convert_v1alpha2_DisconnectTargetRequest_To_impl_DisconnectTargetRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) DisconnectTarget(context context.Context, versionedReques } versionedResponse := &v1alpha2.DisconnectTargetResponse{} - if err := Convert_internal_DisconnectTargetResponse_To_v1alpha2_DisconnectTargetResponse(response, versionedResponse); err != nil { + if err := Convert_impl_DisconnectTargetResponse_To_v1alpha2_DisconnectTargetResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) DisconnectTarget(context context.Context, versionedReques } func (s *versionedAPI) DiscoverTargetPortal(context context.Context, versionedRequest *v1alpha2.DiscoverTargetPortalRequest) (*v1alpha2.DiscoverTargetPortalResponse, error) { - request := &internal.DiscoverTargetPortalRequest{} - if err := Convert_v1alpha2_DiscoverTargetPortalRequest_To_internal_DiscoverTargetPortalRequest(versionedRequest, request); err != nil { + request := &impl.DiscoverTargetPortalRequest{} + if err := Convert_v1alpha2_DiscoverTargetPortalRequest_To_impl_DiscoverTargetPortalRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) DiscoverTargetPortal(context context.Context, versionedRe } versionedResponse := &v1alpha2.DiscoverTargetPortalResponse{} - if err := Convert_internal_DiscoverTargetPortalResponse_To_v1alpha2_DiscoverTargetPortalResponse(response, versionedResponse); err != nil { + if err := Convert_impl_DiscoverTargetPortalResponse_To_v1alpha2_DiscoverTargetPortalResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) DiscoverTargetPortal(context context.Context, versionedRe } func (s *versionedAPI) GetTargetDisks(context context.Context, versionedRequest *v1alpha2.GetTargetDisksRequest) (*v1alpha2.GetTargetDisksResponse, error) { - request := &internal.GetTargetDisksRequest{} - if err := Convert_v1alpha2_GetTargetDisksRequest_To_internal_GetTargetDisksRequest(versionedRequest, request); err != nil { + request := &impl.GetTargetDisksRequest{} + if err := Convert_v1alpha2_GetTargetDisksRequest_To_impl_GetTargetDisksRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) GetTargetDisks(context context.Context, versionedRequest } versionedResponse := &v1alpha2.GetTargetDisksResponse{} - if err := Convert_internal_GetTargetDisksResponse_To_v1alpha2_GetTargetDisksResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetTargetDisksResponse_To_v1alpha2_GetTargetDisksResponse(response, versionedResponse); err != nil { return nil, err } @@ -123,8 +123,8 @@ func (s *versionedAPI) GetTargetDisks(context context.Context, versionedRequest } func (s *versionedAPI) ListTargetPortals(context context.Context, versionedRequest *v1alpha2.ListTargetPortalsRequest) (*v1alpha2.ListTargetPortalsResponse, error) { - request := &internal.ListTargetPortalsRequest{} - if err := Convert_v1alpha2_ListTargetPortalsRequest_To_internal_ListTargetPortalsRequest(versionedRequest, request); err != nil { + request := &impl.ListTargetPortalsRequest{} + if err := Convert_v1alpha2_ListTargetPortalsRequest_To_impl_ListTargetPortalsRequest(versionedRequest, request); err != nil { return nil, err } @@ -134,7 +134,7 @@ func (s *versionedAPI) ListTargetPortals(context context.Context, versionedReque } versionedResponse := &v1alpha2.ListTargetPortalsResponse{} - if err := Convert_internal_ListTargetPortalsResponse_To_v1alpha2_ListTargetPortalsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListTargetPortalsResponse_To_v1alpha2_ListTargetPortalsResponse(response, versionedResponse); err != nil { return nil, err } @@ -142,8 +142,8 @@ func (s *versionedAPI) ListTargetPortals(context context.Context, versionedReque } func (s *versionedAPI) RemoveTargetPortal(context context.Context, versionedRequest *v1alpha2.RemoveTargetPortalRequest) (*v1alpha2.RemoveTargetPortalResponse, error) { - request := &internal.RemoveTargetPortalRequest{} - if err := Convert_v1alpha2_RemoveTargetPortalRequest_To_internal_RemoveTargetPortalRequest(versionedRequest, request); err != nil { + request := &impl.RemoveTargetPortalRequest{} + if err := Convert_v1alpha2_RemoveTargetPortalRequest_To_impl_RemoveTargetPortalRequest(versionedRequest, request); err != nil { return nil, err } @@ -153,7 +153,7 @@ func (s *versionedAPI) RemoveTargetPortal(context context.Context, versionedRequ } versionedResponse := &v1alpha2.RemoveTargetPortalResponse{} - if err := Convert_internal_RemoveTargetPortalResponse_To_v1alpha2_RemoveTargetPortalResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RemoveTargetPortalResponse_To_v1alpha2_RemoveTargetPortalResponse(response, versionedResponse); err != nil { return nil, err } @@ -161,8 +161,8 @@ func (s *versionedAPI) RemoveTargetPortal(context context.Context, versionedRequ } func (s *versionedAPI) SetMutualChapSecret(context context.Context, versionedRequest *v1alpha2.SetMutualChapSecretRequest) (*v1alpha2.SetMutualChapSecretResponse, error) { - request := &internal.SetMutualChapSecretRequest{} - if err := Convert_v1alpha2_SetMutualChapSecretRequest_To_internal_SetMutualChapSecretRequest(versionedRequest, request); err != nil { + request := &impl.SetMutualChapSecretRequest{} + if err := Convert_v1alpha2_SetMutualChapSecretRequest_To_impl_SetMutualChapSecretRequest(versionedRequest, request); err != nil { return nil, err } @@ -172,7 +172,7 @@ func (s *versionedAPI) SetMutualChapSecret(context context.Context, versionedReq } versionedResponse := &v1alpha2.SetMutualChapSecretResponse{} - if err := Convert_internal_SetMutualChapSecretResponse_To_v1alpha2_SetMutualChapSecretResponse(response, versionedResponse); err != nil { + if err := Convert_impl_SetMutualChapSecretResponse_To_v1alpha2_SetMutualChapSecretResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/iscsi/server.go b/pkg/server/iscsi/server.go similarity index 98% rename from internal/server/iscsi/server.go rename to pkg/server/iscsi/server.go index 32b9dfd5..21a91c80 100644 --- a/internal/server/iscsi/server.go +++ b/pkg/server/iscsi/server.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/os/iscsi" - "github.com/kubernetes-csi/csi-proxy/internal/server/iscsi/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/os/iscsi" + internal "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" "k8s.io/klog/v2" ) diff --git a/internal/server/server.go b/pkg/server/server.go similarity index 98% rename from internal/server/server.go rename to pkg/server/server.go index 5de1af6e..cecab7dd 100644 --- a/internal/server/server.go +++ b/pkg/server/server.go @@ -7,7 +7,7 @@ import ( "github.com/Microsoft/go-winio" "github.com/kubernetes-csi/csi-proxy/client" - srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types" + srvtypes "github.com/kubernetes-csi/csi-proxy/pkg/server/types" "github.com/pkg/errors" "google.golang.org/grpc" ) diff --git a/internal/server/smb/api_group_generated.go b/pkg/server/smb/api_group_generated.go similarity index 67% rename from internal/server/smb/api_group_generated.go rename to pkg/server/smb/api_group_generated.go index 8e58734a..e349a0dc 100644 --- a/internal/server/smb/api_group_generated.go +++ b/pkg/server/smb/api_group_generated.go @@ -4,17 +4,17 @@ package smb import ( "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal" - "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal/v1alpha1" - "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal/v1beta1" - "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal/v1beta2" - srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types" + "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl" + "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl/v1alpha1" + "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl/v1beta1" + "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl/v1beta2" + srvtypes "github.com/kubernetes-csi/csi-proxy/pkg/server/types" ) const name = "smb" // ensure the server defines all the required methods -var _ internal.ServerInterface = &Server{} +var _ impl.ServerInterface = &Server{} func (s *Server) VersionedAPIs() []*srvtypes.VersionedAPI { v1alpha1Server := v1alpha1.NewVersionedServer(s) diff --git a/internal/server/smb/internal/types.go b/pkg/server/smb/impl/types.go similarity index 95% rename from internal/server/smb/internal/types.go rename to pkg/server/smb/impl/types.go index 39d8a862..100d820d 100644 --- a/internal/server/smb/internal/types.go +++ b/pkg/server/smb/impl/types.go @@ -1,4 +1,4 @@ -package internal +package impl type NewSmbGlobalMappingRequest struct { RemotePath string diff --git a/internal/server/smb/internal/types_generated.go b/pkg/server/smb/impl/types_generated.go similarity index 97% rename from internal/server/smb/internal/types_generated.go rename to pkg/server/smb/impl/types_generated.go index fb2d5306..c6cb54d0 100644 --- a/internal/server/smb/internal/types_generated.go +++ b/pkg/server/smb/impl/types_generated.go @@ -1,6 +1,6 @@ // Code generated by csi-proxy-api-gen. DO NOT EDIT. -package internal +package impl import ( "context" diff --git a/internal/server/system/internal/v1alpha1/conversion.go b/pkg/server/smb/impl/v1alpha1/conversion.go similarity index 100% rename from internal/server/system/internal/v1alpha1/conversion.go rename to pkg/server/smb/impl/v1alpha1/conversion.go diff --git a/pkg/server/smb/impl/v1alpha1/conversion_generated.go b/pkg/server/smb/impl/v1alpha1/conversion_generated.go new file mode 100644 index 00000000..fb701ea6 --- /dev/null +++ b/pkg/server/smb/impl/v1alpha1/conversion_generated.go @@ -0,0 +1,90 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1alpha1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl" +) + +func autoConvert_v1alpha1_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(in *v1alpha1.NewSmbGlobalMappingRequest, out *impl.NewSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + out.LocalPath = in.LocalPath + out.Username = in.Username + out.Password = in.Password + return nil +} + +// Convert_v1alpha1_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_v1alpha1_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(in *v1alpha1.NewSmbGlobalMappingRequest, out *impl.NewSmbGlobalMappingRequest) error { + return autoConvert_v1alpha1_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(in, out) +} + +func autoConvert_impl_NewSmbGlobalMappingRequest_To_v1alpha1_NewSmbGlobalMappingRequest(in *impl.NewSmbGlobalMappingRequest, out *v1alpha1.NewSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + out.LocalPath = in.LocalPath + out.Username = in.Username + out.Password = in.Password + return nil +} + +// Convert_impl_NewSmbGlobalMappingRequest_To_v1alpha1_NewSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_impl_NewSmbGlobalMappingRequest_To_v1alpha1_NewSmbGlobalMappingRequest(in *impl.NewSmbGlobalMappingRequest, out *v1alpha1.NewSmbGlobalMappingRequest) error { + return autoConvert_impl_NewSmbGlobalMappingRequest_To_v1alpha1_NewSmbGlobalMappingRequest(in, out) +} + +func autoConvert_v1alpha1_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse(in *v1alpha1.NewSmbGlobalMappingResponse, out *impl.NewSmbGlobalMappingResponse) error { + return nil +} + +// Convert_v1alpha1_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_v1alpha1_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse(in *v1alpha1.NewSmbGlobalMappingResponse, out *impl.NewSmbGlobalMappingResponse) error { + return autoConvert_v1alpha1_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse(in, out) +} + +func autoConvert_impl_NewSmbGlobalMappingResponse_To_v1alpha1_NewSmbGlobalMappingResponse(in *impl.NewSmbGlobalMappingResponse, out *v1alpha1.NewSmbGlobalMappingResponse) error { + return nil +} + +// Convert_impl_NewSmbGlobalMappingResponse_To_v1alpha1_NewSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_impl_NewSmbGlobalMappingResponse_To_v1alpha1_NewSmbGlobalMappingResponse(in *impl.NewSmbGlobalMappingResponse, out *v1alpha1.NewSmbGlobalMappingResponse) error { + return autoConvert_impl_NewSmbGlobalMappingResponse_To_v1alpha1_NewSmbGlobalMappingResponse(in, out) +} + +func autoConvert_v1alpha1_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(in *v1alpha1.RemoveSmbGlobalMappingRequest, out *impl.RemoveSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + return nil +} + +// Convert_v1alpha1_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_v1alpha1_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(in *v1alpha1.RemoveSmbGlobalMappingRequest, out *impl.RemoveSmbGlobalMappingRequest) error { + return autoConvert_v1alpha1_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(in, out) +} + +func autoConvert_impl_RemoveSmbGlobalMappingRequest_To_v1alpha1_RemoveSmbGlobalMappingRequest(in *impl.RemoveSmbGlobalMappingRequest, out *v1alpha1.RemoveSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + return nil +} + +// Convert_impl_RemoveSmbGlobalMappingRequest_To_v1alpha1_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_impl_RemoveSmbGlobalMappingRequest_To_v1alpha1_RemoveSmbGlobalMappingRequest(in *impl.RemoveSmbGlobalMappingRequest, out *v1alpha1.RemoveSmbGlobalMappingRequest) error { + return autoConvert_impl_RemoveSmbGlobalMappingRequest_To_v1alpha1_RemoveSmbGlobalMappingRequest(in, out) +} + +func autoConvert_v1alpha1_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse(in *v1alpha1.RemoveSmbGlobalMappingResponse, out *impl.RemoveSmbGlobalMappingResponse) error { + return nil +} + +// Convert_v1alpha1_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_v1alpha1_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse(in *v1alpha1.RemoveSmbGlobalMappingResponse, out *impl.RemoveSmbGlobalMappingResponse) error { + return autoConvert_v1alpha1_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse(in, out) +} + +func autoConvert_impl_RemoveSmbGlobalMappingResponse_To_v1alpha1_RemoveSmbGlobalMappingResponse(in *impl.RemoveSmbGlobalMappingResponse, out *v1alpha1.RemoveSmbGlobalMappingResponse) error { + return nil +} + +// Convert_impl_RemoveSmbGlobalMappingResponse_To_v1alpha1_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_impl_RemoveSmbGlobalMappingResponse_To_v1alpha1_RemoveSmbGlobalMappingResponse(in *impl.RemoveSmbGlobalMappingResponse, out *v1alpha1.RemoveSmbGlobalMappingResponse) error { + return autoConvert_impl_RemoveSmbGlobalMappingResponse_To_v1alpha1_RemoveSmbGlobalMappingResponse(in, out) +} diff --git a/internal/server/smb/internal/v1alpha1/server_generated.go b/pkg/server/smb/impl/v1alpha1/server_generated.go similarity index 62% rename from internal/server/smb/internal/v1alpha1/server_generated.go rename to pkg/server/smb/impl/v1alpha1/server_generated.go index b8abecdc..56b3dc4b 100644 --- a/internal/server/smb/internal/v1alpha1/server_generated.go +++ b/pkg/server/smb/impl/v1alpha1/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1alpha1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1alpha1") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) NewSmbGlobalMapping(context context.Context, versionedRequest *v1alpha1.NewSmbGlobalMappingRequest) (*v1alpha1.NewSmbGlobalMappingResponse, error) { - request := &internal.NewSmbGlobalMappingRequest{} - if err := Convert_v1alpha1_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(versionedRequest, request); err != nil { + request := &impl.NewSmbGlobalMappingRequest{} + if err := Convert_v1alpha1_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) NewSmbGlobalMapping(context context.Context, versionedReq } versionedResponse := &v1alpha1.NewSmbGlobalMappingResponse{} - if err := Convert_internal_NewSmbGlobalMappingResponse_To_v1alpha1_NewSmbGlobalMappingResponse(response, versionedResponse); err != nil { + if err := Convert_impl_NewSmbGlobalMappingResponse_To_v1alpha1_NewSmbGlobalMappingResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) NewSmbGlobalMapping(context context.Context, versionedReq } func (s *versionedAPI) RemoveSmbGlobalMapping(context context.Context, versionedRequest *v1alpha1.RemoveSmbGlobalMappingRequest) (*v1alpha1.RemoveSmbGlobalMappingResponse, error) { - request := &internal.RemoveSmbGlobalMappingRequest{} - if err := Convert_v1alpha1_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(versionedRequest, request); err != nil { + request := &impl.RemoveSmbGlobalMappingRequest{} + if err := Convert_v1alpha1_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) RemoveSmbGlobalMapping(context context.Context, versioned } versionedResponse := &v1alpha1.RemoveSmbGlobalMappingResponse{} - if err := Convert_internal_RemoveSmbGlobalMappingResponse_To_v1alpha1_RemoveSmbGlobalMappingResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RemoveSmbGlobalMappingResponse_To_v1alpha1_RemoveSmbGlobalMappingResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/smb/internal/v1beta1/conversion.go b/pkg/server/smb/impl/v1beta1/conversion.go similarity index 100% rename from internal/server/smb/internal/v1beta1/conversion.go rename to pkg/server/smb/impl/v1beta1/conversion.go diff --git a/pkg/server/smb/impl/v1beta1/conversion_generated.go b/pkg/server/smb/impl/v1beta1/conversion_generated.go new file mode 100644 index 00000000..2bbc8001 --- /dev/null +++ b/pkg/server/smb/impl/v1beta1/conversion_generated.go @@ -0,0 +1,90 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1beta1 + +import ( + v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1beta1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl" +) + +func autoConvert_v1beta1_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(in *v1beta1.NewSmbGlobalMappingRequest, out *impl.NewSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + out.LocalPath = in.LocalPath + out.Username = in.Username + out.Password = in.Password + return nil +} + +// Convert_v1beta1_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_v1beta1_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(in *v1beta1.NewSmbGlobalMappingRequest, out *impl.NewSmbGlobalMappingRequest) error { + return autoConvert_v1beta1_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(in, out) +} + +func autoConvert_impl_NewSmbGlobalMappingRequest_To_v1beta1_NewSmbGlobalMappingRequest(in *impl.NewSmbGlobalMappingRequest, out *v1beta1.NewSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + out.LocalPath = in.LocalPath + out.Username = in.Username + out.Password = in.Password + return nil +} + +// Convert_impl_NewSmbGlobalMappingRequest_To_v1beta1_NewSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_impl_NewSmbGlobalMappingRequest_To_v1beta1_NewSmbGlobalMappingRequest(in *impl.NewSmbGlobalMappingRequest, out *v1beta1.NewSmbGlobalMappingRequest) error { + return autoConvert_impl_NewSmbGlobalMappingRequest_To_v1beta1_NewSmbGlobalMappingRequest(in, out) +} + +func autoConvert_v1beta1_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse(in *v1beta1.NewSmbGlobalMappingResponse, out *impl.NewSmbGlobalMappingResponse) error { + return nil +} + +// Convert_v1beta1_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_v1beta1_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse(in *v1beta1.NewSmbGlobalMappingResponse, out *impl.NewSmbGlobalMappingResponse) error { + return autoConvert_v1beta1_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse(in, out) +} + +func autoConvert_impl_NewSmbGlobalMappingResponse_To_v1beta1_NewSmbGlobalMappingResponse(in *impl.NewSmbGlobalMappingResponse, out *v1beta1.NewSmbGlobalMappingResponse) error { + return nil +} + +// Convert_impl_NewSmbGlobalMappingResponse_To_v1beta1_NewSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_impl_NewSmbGlobalMappingResponse_To_v1beta1_NewSmbGlobalMappingResponse(in *impl.NewSmbGlobalMappingResponse, out *v1beta1.NewSmbGlobalMappingResponse) error { + return autoConvert_impl_NewSmbGlobalMappingResponse_To_v1beta1_NewSmbGlobalMappingResponse(in, out) +} + +func autoConvert_v1beta1_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(in *v1beta1.RemoveSmbGlobalMappingRequest, out *impl.RemoveSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + return nil +} + +// Convert_v1beta1_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_v1beta1_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(in *v1beta1.RemoveSmbGlobalMappingRequest, out *impl.RemoveSmbGlobalMappingRequest) error { + return autoConvert_v1beta1_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(in, out) +} + +func autoConvert_impl_RemoveSmbGlobalMappingRequest_To_v1beta1_RemoveSmbGlobalMappingRequest(in *impl.RemoveSmbGlobalMappingRequest, out *v1beta1.RemoveSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + return nil +} + +// Convert_impl_RemoveSmbGlobalMappingRequest_To_v1beta1_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_impl_RemoveSmbGlobalMappingRequest_To_v1beta1_RemoveSmbGlobalMappingRequest(in *impl.RemoveSmbGlobalMappingRequest, out *v1beta1.RemoveSmbGlobalMappingRequest) error { + return autoConvert_impl_RemoveSmbGlobalMappingRequest_To_v1beta1_RemoveSmbGlobalMappingRequest(in, out) +} + +func autoConvert_v1beta1_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse(in *v1beta1.RemoveSmbGlobalMappingResponse, out *impl.RemoveSmbGlobalMappingResponse) error { + return nil +} + +// Convert_v1beta1_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_v1beta1_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse(in *v1beta1.RemoveSmbGlobalMappingResponse, out *impl.RemoveSmbGlobalMappingResponse) error { + return autoConvert_v1beta1_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse(in, out) +} + +func autoConvert_impl_RemoveSmbGlobalMappingResponse_To_v1beta1_RemoveSmbGlobalMappingResponse(in *impl.RemoveSmbGlobalMappingResponse, out *v1beta1.RemoveSmbGlobalMappingResponse) error { + return nil +} + +// Convert_impl_RemoveSmbGlobalMappingResponse_To_v1beta1_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_impl_RemoveSmbGlobalMappingResponse_To_v1beta1_RemoveSmbGlobalMappingResponse(in *impl.RemoveSmbGlobalMappingResponse, out *v1beta1.RemoveSmbGlobalMappingResponse) error { + return autoConvert_impl_RemoveSmbGlobalMappingResponse_To_v1beta1_RemoveSmbGlobalMappingResponse(in, out) +} diff --git a/internal/server/smb/internal/v1beta1/server_generated.go b/pkg/server/smb/impl/v1beta1/server_generated.go similarity index 62% rename from internal/server/smb/internal/v1beta1/server_generated.go rename to pkg/server/smb/impl/v1beta1/server_generated.go index 7f701eba..ce181a9a 100644 --- a/internal/server/smb/internal/v1beta1/server_generated.go +++ b/pkg/server/smb/impl/v1beta1/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1beta1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1beta1") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) NewSmbGlobalMapping(context context.Context, versionedRequest *v1beta1.NewSmbGlobalMappingRequest) (*v1beta1.NewSmbGlobalMappingResponse, error) { - request := &internal.NewSmbGlobalMappingRequest{} - if err := Convert_v1beta1_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(versionedRequest, request); err != nil { + request := &impl.NewSmbGlobalMappingRequest{} + if err := Convert_v1beta1_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) NewSmbGlobalMapping(context context.Context, versionedReq } versionedResponse := &v1beta1.NewSmbGlobalMappingResponse{} - if err := Convert_internal_NewSmbGlobalMappingResponse_To_v1beta1_NewSmbGlobalMappingResponse(response, versionedResponse); err != nil { + if err := Convert_impl_NewSmbGlobalMappingResponse_To_v1beta1_NewSmbGlobalMappingResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) NewSmbGlobalMapping(context context.Context, versionedReq } func (s *versionedAPI) RemoveSmbGlobalMapping(context context.Context, versionedRequest *v1beta1.RemoveSmbGlobalMappingRequest) (*v1beta1.RemoveSmbGlobalMappingResponse, error) { - request := &internal.RemoveSmbGlobalMappingRequest{} - if err := Convert_v1beta1_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(versionedRequest, request); err != nil { + request := &impl.RemoveSmbGlobalMappingRequest{} + if err := Convert_v1beta1_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) RemoveSmbGlobalMapping(context context.Context, versioned } versionedResponse := &v1beta1.RemoveSmbGlobalMappingResponse{} - if err := Convert_internal_RemoveSmbGlobalMappingResponse_To_v1beta1_RemoveSmbGlobalMappingResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RemoveSmbGlobalMappingResponse_To_v1beta1_RemoveSmbGlobalMappingResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/smb/internal/v1beta2/conversion.go b/pkg/server/smb/impl/v1beta2/conversion.go similarity index 100% rename from internal/server/smb/internal/v1beta2/conversion.go rename to pkg/server/smb/impl/v1beta2/conversion.go diff --git a/pkg/server/smb/impl/v1beta2/conversion_generated.go b/pkg/server/smb/impl/v1beta2/conversion_generated.go new file mode 100644 index 00000000..e6f68073 --- /dev/null +++ b/pkg/server/smb/impl/v1beta2/conversion_generated.go @@ -0,0 +1,90 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1beta2 + +import ( + v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1beta2" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl" +) + +func autoConvert_v1beta2_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(in *v1beta2.NewSmbGlobalMappingRequest, out *impl.NewSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + out.LocalPath = in.LocalPath + out.Username = in.Username + out.Password = in.Password + return nil +} + +// Convert_v1beta2_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_v1beta2_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(in *v1beta2.NewSmbGlobalMappingRequest, out *impl.NewSmbGlobalMappingRequest) error { + return autoConvert_v1beta2_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(in, out) +} + +func autoConvert_impl_NewSmbGlobalMappingRequest_To_v1beta2_NewSmbGlobalMappingRequest(in *impl.NewSmbGlobalMappingRequest, out *v1beta2.NewSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + out.LocalPath = in.LocalPath + out.Username = in.Username + out.Password = in.Password + return nil +} + +// Convert_impl_NewSmbGlobalMappingRequest_To_v1beta2_NewSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_impl_NewSmbGlobalMappingRequest_To_v1beta2_NewSmbGlobalMappingRequest(in *impl.NewSmbGlobalMappingRequest, out *v1beta2.NewSmbGlobalMappingRequest) error { + return autoConvert_impl_NewSmbGlobalMappingRequest_To_v1beta2_NewSmbGlobalMappingRequest(in, out) +} + +func autoConvert_v1beta2_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse(in *v1beta2.NewSmbGlobalMappingResponse, out *impl.NewSmbGlobalMappingResponse) error { + return nil +} + +// Convert_v1beta2_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_v1beta2_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse(in *v1beta2.NewSmbGlobalMappingResponse, out *impl.NewSmbGlobalMappingResponse) error { + return autoConvert_v1beta2_NewSmbGlobalMappingResponse_To_impl_NewSmbGlobalMappingResponse(in, out) +} + +func autoConvert_impl_NewSmbGlobalMappingResponse_To_v1beta2_NewSmbGlobalMappingResponse(in *impl.NewSmbGlobalMappingResponse, out *v1beta2.NewSmbGlobalMappingResponse) error { + return nil +} + +// Convert_impl_NewSmbGlobalMappingResponse_To_v1beta2_NewSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_impl_NewSmbGlobalMappingResponse_To_v1beta2_NewSmbGlobalMappingResponse(in *impl.NewSmbGlobalMappingResponse, out *v1beta2.NewSmbGlobalMappingResponse) error { + return autoConvert_impl_NewSmbGlobalMappingResponse_To_v1beta2_NewSmbGlobalMappingResponse(in, out) +} + +func autoConvert_v1beta2_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(in *v1beta2.RemoveSmbGlobalMappingRequest, out *impl.RemoveSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + return nil +} + +// Convert_v1beta2_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_v1beta2_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(in *v1beta2.RemoveSmbGlobalMappingRequest, out *impl.RemoveSmbGlobalMappingRequest) error { + return autoConvert_v1beta2_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(in, out) +} + +func autoConvert_impl_RemoveSmbGlobalMappingRequest_To_v1beta2_RemoveSmbGlobalMappingRequest(in *impl.RemoveSmbGlobalMappingRequest, out *v1beta2.RemoveSmbGlobalMappingRequest) error { + out.RemotePath = in.RemotePath + return nil +} + +// Convert_impl_RemoveSmbGlobalMappingRequest_To_v1beta2_RemoveSmbGlobalMappingRequest is an autogenerated conversion function. +func Convert_impl_RemoveSmbGlobalMappingRequest_To_v1beta2_RemoveSmbGlobalMappingRequest(in *impl.RemoveSmbGlobalMappingRequest, out *v1beta2.RemoveSmbGlobalMappingRequest) error { + return autoConvert_impl_RemoveSmbGlobalMappingRequest_To_v1beta2_RemoveSmbGlobalMappingRequest(in, out) +} + +func autoConvert_v1beta2_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse(in *v1beta2.RemoveSmbGlobalMappingResponse, out *impl.RemoveSmbGlobalMappingResponse) error { + return nil +} + +// Convert_v1beta2_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_v1beta2_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse(in *v1beta2.RemoveSmbGlobalMappingResponse, out *impl.RemoveSmbGlobalMappingResponse) error { + return autoConvert_v1beta2_RemoveSmbGlobalMappingResponse_To_impl_RemoveSmbGlobalMappingResponse(in, out) +} + +func autoConvert_impl_RemoveSmbGlobalMappingResponse_To_v1beta2_RemoveSmbGlobalMappingResponse(in *impl.RemoveSmbGlobalMappingResponse, out *v1beta2.RemoveSmbGlobalMappingResponse) error { + return nil +} + +// Convert_impl_RemoveSmbGlobalMappingResponse_To_v1beta2_RemoveSmbGlobalMappingResponse is an autogenerated conversion function. +func Convert_impl_RemoveSmbGlobalMappingResponse_To_v1beta2_RemoveSmbGlobalMappingResponse(in *impl.RemoveSmbGlobalMappingResponse, out *v1beta2.RemoveSmbGlobalMappingResponse) error { + return autoConvert_impl_RemoveSmbGlobalMappingResponse_To_v1beta2_RemoveSmbGlobalMappingResponse(in, out) +} diff --git a/internal/server/smb/internal/v1beta2/server_generated.go b/pkg/server/smb/impl/v1beta2/server_generated.go similarity index 62% rename from internal/server/smb/internal/v1beta2/server_generated.go rename to pkg/server/smb/impl/v1beta2/server_generated.go index a4cdda8c..5036f007 100644 --- a/internal/server/smb/internal/v1beta2/server_generated.go +++ b/pkg/server/smb/impl/v1beta2/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1beta2" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1beta2") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) NewSmbGlobalMapping(context context.Context, versionedRequest *v1beta2.NewSmbGlobalMappingRequest) (*v1beta2.NewSmbGlobalMappingResponse, error) { - request := &internal.NewSmbGlobalMappingRequest{} - if err := Convert_v1beta2_NewSmbGlobalMappingRequest_To_internal_NewSmbGlobalMappingRequest(versionedRequest, request); err != nil { + request := &impl.NewSmbGlobalMappingRequest{} + if err := Convert_v1beta2_NewSmbGlobalMappingRequest_To_impl_NewSmbGlobalMappingRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) NewSmbGlobalMapping(context context.Context, versionedReq } versionedResponse := &v1beta2.NewSmbGlobalMappingResponse{} - if err := Convert_internal_NewSmbGlobalMappingResponse_To_v1beta2_NewSmbGlobalMappingResponse(response, versionedResponse); err != nil { + if err := Convert_impl_NewSmbGlobalMappingResponse_To_v1beta2_NewSmbGlobalMappingResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) NewSmbGlobalMapping(context context.Context, versionedReq } func (s *versionedAPI) RemoveSmbGlobalMapping(context context.Context, versionedRequest *v1beta2.RemoveSmbGlobalMappingRequest) (*v1beta2.RemoveSmbGlobalMappingResponse, error) { - request := &internal.RemoveSmbGlobalMappingRequest{} - if err := Convert_v1beta2_RemoveSmbGlobalMappingRequest_To_internal_RemoveSmbGlobalMappingRequest(versionedRequest, request); err != nil { + request := &impl.RemoveSmbGlobalMappingRequest{} + if err := Convert_v1beta2_RemoveSmbGlobalMappingRequest_To_impl_RemoveSmbGlobalMappingRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) RemoveSmbGlobalMapping(context context.Context, versioned } versionedResponse := &v1beta2.RemoveSmbGlobalMappingResponse{} - if err := Convert_internal_RemoveSmbGlobalMappingResponse_To_v1beta2_RemoveSmbGlobalMappingResponse(response, versionedResponse); err != nil { + if err := Convert_impl_RemoveSmbGlobalMappingResponse_To_v1beta2_RemoveSmbGlobalMappingResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/smb/server.go b/pkg/server/smb/server.go similarity index 93% rename from internal/server/smb/server.go rename to pkg/server/smb/server.go index 42445fbc..1cb8b076 100644 --- a/internal/server/smb/server.go +++ b/pkg/server/smb/server.go @@ -6,9 +6,9 @@ import ( "strings" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/os/smb" - fsserver "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem" - "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/os/smb" + fsserver "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem" + internal "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl" "k8s.io/klog/v2" ) diff --git a/internal/server/smb/server_test.go b/pkg/server/smb/server_test.go similarity index 100% rename from internal/server/smb/server_test.go rename to pkg/server/smb/server_test.go diff --git a/internal/server/system/api_group_generated.go b/pkg/server/system/api_group_generated.go similarity index 65% rename from internal/server/system/api_group_generated.go rename to pkg/server/system/api_group_generated.go index 7ba1afe2..1d440641 100644 --- a/internal/server/system/api_group_generated.go +++ b/pkg/server/system/api_group_generated.go @@ -4,15 +4,15 @@ package system import ( "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/system/internal" - "github.com/kubernetes-csi/csi-proxy/internal/server/system/internal/v1alpha1" - srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types" + "github.com/kubernetes-csi/csi-proxy/pkg/server/system/impl" + "github.com/kubernetes-csi/csi-proxy/pkg/server/system/impl/v1alpha1" + srvtypes "github.com/kubernetes-csi/csi-proxy/pkg/server/types" ) const name = "system" // ensure the server defines all the required methods -var _ internal.ServerInterface = &Server{} +var _ impl.ServerInterface = &Server{} func (s *Server) VersionedAPIs() []*srvtypes.VersionedAPI { v1alpha1Server := v1alpha1.NewVersionedServer(s) diff --git a/internal/server/system/internal/types.go b/pkg/server/system/impl/types.go similarity index 98% rename from internal/server/system/internal/types.go rename to pkg/server/system/impl/types.go index e55644ae..3098ea0e 100644 --- a/internal/server/system/internal/types.go +++ b/pkg/server/system/impl/types.go @@ -1,4 +1,4 @@ -package internal +package impl type GetBIOSSerialNumberRequest struct { } diff --git a/internal/server/system/internal/types_generated.go b/pkg/server/system/impl/types_generated.go similarity index 97% rename from internal/server/system/internal/types_generated.go rename to pkg/server/system/impl/types_generated.go index 30add208..164ba50d 100644 --- a/internal/server/system/internal/types_generated.go +++ b/pkg/server/system/impl/types_generated.go @@ -1,6 +1,6 @@ // Code generated by csi-proxy-api-gen. DO NOT EDIT. -package internal +package impl import ( "context" diff --git a/pkg/server/system/impl/v1alpha1/conversion.go b/pkg/server/system/impl/v1alpha1/conversion.go new file mode 100644 index 00000000..23e83731 --- /dev/null +++ b/pkg/server/system/impl/v1alpha1/conversion.go @@ -0,0 +1,3 @@ +package v1alpha1 + +// Add manual conversion functions here to override automatic conversion functions diff --git a/pkg/server/system/impl/v1alpha1/conversion_generated.go b/pkg/server/system/impl/v1alpha1/conversion_generated.go new file mode 100644 index 00000000..5b7f4e2a --- /dev/null +++ b/pkg/server/system/impl/v1alpha1/conversion_generated.go @@ -0,0 +1,168 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/system/v1alpha1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/system/impl" +) + +func autoConvert_v1alpha1_GetBIOSSerialNumberRequest_To_impl_GetBIOSSerialNumberRequest(in *v1alpha1.GetBIOSSerialNumberRequest, out *impl.GetBIOSSerialNumberRequest) error { + return nil +} + +// Convert_v1alpha1_GetBIOSSerialNumberRequest_To_impl_GetBIOSSerialNumberRequest is an autogenerated conversion function. +func Convert_v1alpha1_GetBIOSSerialNumberRequest_To_impl_GetBIOSSerialNumberRequest(in *v1alpha1.GetBIOSSerialNumberRequest, out *impl.GetBIOSSerialNumberRequest) error { + return autoConvert_v1alpha1_GetBIOSSerialNumberRequest_To_impl_GetBIOSSerialNumberRequest(in, out) +} + +func autoConvert_impl_GetBIOSSerialNumberRequest_To_v1alpha1_GetBIOSSerialNumberRequest(in *impl.GetBIOSSerialNumberRequest, out *v1alpha1.GetBIOSSerialNumberRequest) error { + return nil +} + +// Convert_impl_GetBIOSSerialNumberRequest_To_v1alpha1_GetBIOSSerialNumberRequest is an autogenerated conversion function. +func Convert_impl_GetBIOSSerialNumberRequest_To_v1alpha1_GetBIOSSerialNumberRequest(in *impl.GetBIOSSerialNumberRequest, out *v1alpha1.GetBIOSSerialNumberRequest) error { + return autoConvert_impl_GetBIOSSerialNumberRequest_To_v1alpha1_GetBIOSSerialNumberRequest(in, out) +} + +func autoConvert_v1alpha1_GetBIOSSerialNumberResponse_To_impl_GetBIOSSerialNumberResponse(in *v1alpha1.GetBIOSSerialNumberResponse, out *impl.GetBIOSSerialNumberResponse) error { + out.SerialNumber = in.SerialNumber + return nil +} + +// Convert_v1alpha1_GetBIOSSerialNumberResponse_To_impl_GetBIOSSerialNumberResponse is an autogenerated conversion function. +func Convert_v1alpha1_GetBIOSSerialNumberResponse_To_impl_GetBIOSSerialNumberResponse(in *v1alpha1.GetBIOSSerialNumberResponse, out *impl.GetBIOSSerialNumberResponse) error { + return autoConvert_v1alpha1_GetBIOSSerialNumberResponse_To_impl_GetBIOSSerialNumberResponse(in, out) +} + +func autoConvert_impl_GetBIOSSerialNumberResponse_To_v1alpha1_GetBIOSSerialNumberResponse(in *impl.GetBIOSSerialNumberResponse, out *v1alpha1.GetBIOSSerialNumberResponse) error { + out.SerialNumber = in.SerialNumber + return nil +} + +// Convert_impl_GetBIOSSerialNumberResponse_To_v1alpha1_GetBIOSSerialNumberResponse is an autogenerated conversion function. +func Convert_impl_GetBIOSSerialNumberResponse_To_v1alpha1_GetBIOSSerialNumberResponse(in *impl.GetBIOSSerialNumberResponse, out *v1alpha1.GetBIOSSerialNumberResponse) error { + return autoConvert_impl_GetBIOSSerialNumberResponse_To_v1alpha1_GetBIOSSerialNumberResponse(in, out) +} + +func autoConvert_v1alpha1_GetServiceRequest_To_impl_GetServiceRequest(in *v1alpha1.GetServiceRequest, out *impl.GetServiceRequest) error { + out.Name = in.Name + return nil +} + +// Convert_v1alpha1_GetServiceRequest_To_impl_GetServiceRequest is an autogenerated conversion function. +func Convert_v1alpha1_GetServiceRequest_To_impl_GetServiceRequest(in *v1alpha1.GetServiceRequest, out *impl.GetServiceRequest) error { + return autoConvert_v1alpha1_GetServiceRequest_To_impl_GetServiceRequest(in, out) +} + +func autoConvert_impl_GetServiceRequest_To_v1alpha1_GetServiceRequest(in *impl.GetServiceRequest, out *v1alpha1.GetServiceRequest) error { + out.Name = in.Name + return nil +} + +// Convert_impl_GetServiceRequest_To_v1alpha1_GetServiceRequest is an autogenerated conversion function. +func Convert_impl_GetServiceRequest_To_v1alpha1_GetServiceRequest(in *impl.GetServiceRequest, out *v1alpha1.GetServiceRequest) error { + return autoConvert_impl_GetServiceRequest_To_v1alpha1_GetServiceRequest(in, out) +} + +func autoConvert_v1alpha1_GetServiceResponse_To_impl_GetServiceResponse(in *v1alpha1.GetServiceResponse, out *impl.GetServiceResponse) error { + out.DisplayName = in.DisplayName + out.StartType = impl.Startype(in.StartType) + out.Status = impl.ServiceStatus(in.Status) + return nil +} + +// Convert_v1alpha1_GetServiceResponse_To_impl_GetServiceResponse is an autogenerated conversion function. +func Convert_v1alpha1_GetServiceResponse_To_impl_GetServiceResponse(in *v1alpha1.GetServiceResponse, out *impl.GetServiceResponse) error { + return autoConvert_v1alpha1_GetServiceResponse_To_impl_GetServiceResponse(in, out) +} + +func autoConvert_impl_GetServiceResponse_To_v1alpha1_GetServiceResponse(in *impl.GetServiceResponse, out *v1alpha1.GetServiceResponse) error { + out.DisplayName = in.DisplayName + out.StartType = v1alpha1.StartType(in.StartType) + out.Status = v1alpha1.ServiceStatus(in.Status) + return nil +} + +// Convert_impl_GetServiceResponse_To_v1alpha1_GetServiceResponse is an autogenerated conversion function. +func Convert_impl_GetServiceResponse_To_v1alpha1_GetServiceResponse(in *impl.GetServiceResponse, out *v1alpha1.GetServiceResponse) error { + return autoConvert_impl_GetServiceResponse_To_v1alpha1_GetServiceResponse(in, out) +} + +func autoConvert_v1alpha1_StartServiceRequest_To_impl_StartServiceRequest(in *v1alpha1.StartServiceRequest, out *impl.StartServiceRequest) error { + out.Name = in.Name + return nil +} + +// Convert_v1alpha1_StartServiceRequest_To_impl_StartServiceRequest is an autogenerated conversion function. +func Convert_v1alpha1_StartServiceRequest_To_impl_StartServiceRequest(in *v1alpha1.StartServiceRequest, out *impl.StartServiceRequest) error { + return autoConvert_v1alpha1_StartServiceRequest_To_impl_StartServiceRequest(in, out) +} + +func autoConvert_impl_StartServiceRequest_To_v1alpha1_StartServiceRequest(in *impl.StartServiceRequest, out *v1alpha1.StartServiceRequest) error { + out.Name = in.Name + return nil +} + +// Convert_impl_StartServiceRequest_To_v1alpha1_StartServiceRequest is an autogenerated conversion function. +func Convert_impl_StartServiceRequest_To_v1alpha1_StartServiceRequest(in *impl.StartServiceRequest, out *v1alpha1.StartServiceRequest) error { + return autoConvert_impl_StartServiceRequest_To_v1alpha1_StartServiceRequest(in, out) +} + +func autoConvert_v1alpha1_StartServiceResponse_To_impl_StartServiceResponse(in *v1alpha1.StartServiceResponse, out *impl.StartServiceResponse) error { + return nil +} + +// Convert_v1alpha1_StartServiceResponse_To_impl_StartServiceResponse is an autogenerated conversion function. +func Convert_v1alpha1_StartServiceResponse_To_impl_StartServiceResponse(in *v1alpha1.StartServiceResponse, out *impl.StartServiceResponse) error { + return autoConvert_v1alpha1_StartServiceResponse_To_impl_StartServiceResponse(in, out) +} + +func autoConvert_impl_StartServiceResponse_To_v1alpha1_StartServiceResponse(in *impl.StartServiceResponse, out *v1alpha1.StartServiceResponse) error { + return nil +} + +// Convert_impl_StartServiceResponse_To_v1alpha1_StartServiceResponse is an autogenerated conversion function. +func Convert_impl_StartServiceResponse_To_v1alpha1_StartServiceResponse(in *impl.StartServiceResponse, out *v1alpha1.StartServiceResponse) error { + return autoConvert_impl_StartServiceResponse_To_v1alpha1_StartServiceResponse(in, out) +} + +func autoConvert_v1alpha1_StopServiceRequest_To_impl_StopServiceRequest(in *v1alpha1.StopServiceRequest, out *impl.StopServiceRequest) error { + out.Name = in.Name + out.Force = in.Force + return nil +} + +// Convert_v1alpha1_StopServiceRequest_To_impl_StopServiceRequest is an autogenerated conversion function. +func Convert_v1alpha1_StopServiceRequest_To_impl_StopServiceRequest(in *v1alpha1.StopServiceRequest, out *impl.StopServiceRequest) error { + return autoConvert_v1alpha1_StopServiceRequest_To_impl_StopServiceRequest(in, out) +} + +func autoConvert_impl_StopServiceRequest_To_v1alpha1_StopServiceRequest(in *impl.StopServiceRequest, out *v1alpha1.StopServiceRequest) error { + out.Name = in.Name + out.Force = in.Force + return nil +} + +// Convert_impl_StopServiceRequest_To_v1alpha1_StopServiceRequest is an autogenerated conversion function. +func Convert_impl_StopServiceRequest_To_v1alpha1_StopServiceRequest(in *impl.StopServiceRequest, out *v1alpha1.StopServiceRequest) error { + return autoConvert_impl_StopServiceRequest_To_v1alpha1_StopServiceRequest(in, out) +} + +func autoConvert_v1alpha1_StopServiceResponse_To_impl_StopServiceResponse(in *v1alpha1.StopServiceResponse, out *impl.StopServiceResponse) error { + return nil +} + +// Convert_v1alpha1_StopServiceResponse_To_impl_StopServiceResponse is an autogenerated conversion function. +func Convert_v1alpha1_StopServiceResponse_To_impl_StopServiceResponse(in *v1alpha1.StopServiceResponse, out *impl.StopServiceResponse) error { + return autoConvert_v1alpha1_StopServiceResponse_To_impl_StopServiceResponse(in, out) +} + +func autoConvert_impl_StopServiceResponse_To_v1alpha1_StopServiceResponse(in *impl.StopServiceResponse, out *v1alpha1.StopServiceResponse) error { + return nil +} + +// Convert_impl_StopServiceResponse_To_v1alpha1_StopServiceResponse is an autogenerated conversion function. +func Convert_impl_StopServiceResponse_To_v1alpha1_StopServiceResponse(in *impl.StopServiceResponse, out *v1alpha1.StopServiceResponse) error { + return autoConvert_impl_StopServiceResponse_To_v1alpha1_StopServiceResponse(in, out) +} diff --git a/internal/server/system/internal/v1alpha1/server_generated.go b/pkg/server/system/impl/v1alpha1/server_generated.go similarity index 63% rename from internal/server/system/internal/v1alpha1/server_generated.go rename to pkg/server/system/impl/v1alpha1/server_generated.go index 72707955..bc724056 100644 --- a/internal/server/system/internal/v1alpha1/server_generated.go +++ b/pkg/server/system/impl/v1alpha1/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/system/v1alpha1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/system/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/system/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1alpha1") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) GetBIOSSerialNumber(context context.Context, versionedRequest *v1alpha1.GetBIOSSerialNumberRequest) (*v1alpha1.GetBIOSSerialNumberResponse, error) { - request := &internal.GetBIOSSerialNumberRequest{} - if err := Convert_v1alpha1_GetBIOSSerialNumberRequest_To_internal_GetBIOSSerialNumberRequest(versionedRequest, request); err != nil { + request := &impl.GetBIOSSerialNumberRequest{} + if err := Convert_v1alpha1_GetBIOSSerialNumberRequest_To_impl_GetBIOSSerialNumberRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) GetBIOSSerialNumber(context context.Context, versionedReq } versionedResponse := &v1alpha1.GetBIOSSerialNumberResponse{} - if err := Convert_internal_GetBIOSSerialNumberResponse_To_v1alpha1_GetBIOSSerialNumberResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetBIOSSerialNumberResponse_To_v1alpha1_GetBIOSSerialNumberResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) GetBIOSSerialNumber(context context.Context, versionedReq } func (s *versionedAPI) GetService(context context.Context, versionedRequest *v1alpha1.GetServiceRequest) (*v1alpha1.GetServiceResponse, error) { - request := &internal.GetServiceRequest{} - if err := Convert_v1alpha1_GetServiceRequest_To_internal_GetServiceRequest(versionedRequest, request); err != nil { + request := &impl.GetServiceRequest{} + if err := Convert_v1alpha1_GetServiceRequest_To_impl_GetServiceRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) GetService(context context.Context, versionedRequest *v1a } versionedResponse := &v1alpha1.GetServiceResponse{} - if err := Convert_internal_GetServiceResponse_To_v1alpha1_GetServiceResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetServiceResponse_To_v1alpha1_GetServiceResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) GetService(context context.Context, versionedRequest *v1a } func (s *versionedAPI) StartService(context context.Context, versionedRequest *v1alpha1.StartServiceRequest) (*v1alpha1.StartServiceResponse, error) { - request := &internal.StartServiceRequest{} - if err := Convert_v1alpha1_StartServiceRequest_To_internal_StartServiceRequest(versionedRequest, request); err != nil { + request := &impl.StartServiceRequest{} + if err := Convert_v1alpha1_StartServiceRequest_To_impl_StartServiceRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) StartService(context context.Context, versionedRequest *v } versionedResponse := &v1alpha1.StartServiceResponse{} - if err := Convert_internal_StartServiceResponse_To_v1alpha1_StartServiceResponse(response, versionedResponse); err != nil { + if err := Convert_impl_StartServiceResponse_To_v1alpha1_StartServiceResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) StartService(context context.Context, versionedRequest *v } func (s *versionedAPI) StopService(context context.Context, versionedRequest *v1alpha1.StopServiceRequest) (*v1alpha1.StopServiceResponse, error) { - request := &internal.StopServiceRequest{} - if err := Convert_v1alpha1_StopServiceRequest_To_internal_StopServiceRequest(versionedRequest, request); err != nil { + request := &impl.StopServiceRequest{} + if err := Convert_v1alpha1_StopServiceRequest_To_impl_StopServiceRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) StopService(context context.Context, versionedRequest *v1 } versionedResponse := &v1alpha1.StopServiceResponse{} - if err := Convert_internal_StopServiceResponse_To_v1alpha1_StopServiceResponse(response, versionedResponse); err != nil { + if err := Convert_impl_StopServiceResponse_To_v1alpha1_StopServiceResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/system/server.go b/pkg/server/system/server.go similarity index 94% rename from internal/server/system/server.go rename to pkg/server/system/server.go index 2aeaa249..1ed09c40 100644 --- a/internal/server/system/server.go +++ b/pkg/server/system/server.go @@ -4,8 +4,8 @@ import ( "context" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/os/system" - "github.com/kubernetes-csi/csi-proxy/internal/server/system/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/os/system" + internal "github.com/kubernetes-csi/csi-proxy/pkg/server/system/impl" "k8s.io/klog/v2" ) diff --git a/internal/server/types/types.go b/pkg/server/types/types.go similarity index 100% rename from internal/server/types/types.go rename to pkg/server/types/types.go diff --git a/internal/server/volume/api_group_generated.go b/pkg/server/volume/api_group_generated.go similarity index 66% rename from internal/server/volume/api_group_generated.go rename to pkg/server/volume/api_group_generated.go index 3afb5f4e..e8259ea6 100644 --- a/internal/server/volume/api_group_generated.go +++ b/pkg/server/volume/api_group_generated.go @@ -4,18 +4,18 @@ package volume import ( "github.com/kubernetes-csi/csi-proxy/client/apiversion" - srvtypes "github.com/kubernetes-csi/csi-proxy/internal/server/types" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal/v1alpha1" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal/v1beta1" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal/v1beta2" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal/v1beta3" + srvtypes "github.com/kubernetes-csi/csi-proxy/pkg/server/types" + "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" + "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl/v1alpha1" + "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl/v1beta1" + "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl/v1beta2" + "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl/v1beta3" ) const name = "volume" // ensure the server defines all the required methods -var _ internal.ServerInterface = &Server{} +var _ impl.ServerInterface = &Server{} func (s *Server) VersionedAPIs() []*srvtypes.VersionedAPI { v1alpha1Server := v1alpha1.NewVersionedServer(s) diff --git a/internal/server/volume/internal/types.go b/pkg/server/volume/impl/types.go similarity index 99% rename from internal/server/volume/internal/types.go rename to pkg/server/volume/impl/types.go index 2ce818d8..4fc4b707 100644 --- a/internal/server/volume/internal/types.go +++ b/pkg/server/volume/impl/types.go @@ -3,7 +3,7 @@ // has definition for older APIs e.g. volume/v1alpha1, volume/v1beta1, etc // Because of this some structs are needed but are no longer used in newer APIs -package internal +package impl type ListVolumesOnDiskRequest struct { DiskNumber uint32 diff --git a/internal/server/volume/internal/types_generated.go b/pkg/server/volume/impl/types_generated.go similarity index 99% rename from internal/server/volume/internal/types_generated.go rename to pkg/server/volume/impl/types_generated.go index 9c1a5cf3..c46c24b2 100644 --- a/internal/server/volume/internal/types_generated.go +++ b/pkg/server/volume/impl/types_generated.go @@ -1,6 +1,6 @@ // Code generated by csi-proxy-api-gen. DO NOT EDIT. -package internal +package impl import ( "context" diff --git a/pkg/server/volume/impl/v1alpha1/conversion.go b/pkg/server/volume/impl/v1alpha1/conversion.go new file mode 100644 index 00000000..6cfcb77b --- /dev/null +++ b/pkg/server/volume/impl/v1alpha1/conversion.go @@ -0,0 +1,49 @@ +package v1alpha1 + +import ( + "fmt" + "strconv" + + "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1alpha1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" +) + +// Add manual conversion functions here to override automatic conversion functions + +func Convert_v1alpha1_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(in *v1alpha1.ListVolumesOnDiskRequest, out *impl.ListVolumesOnDiskRequest) error { + diskIDUint, err := strconv.ParseUint(in.DiskId, 10, 64) + if err != nil { + return fmt.Errorf("Failed to parse diskId: err=%+v", err) + } + out.DiskNumber = uint32(diskIDUint) + return nil +} + +func Convert_impl_ListVolumesOnDiskRequest_To_v1alpha1_ListVolumesOnDiskRequest(in *impl.ListVolumesOnDiskRequest, out *v1alpha1.ListVolumesOnDiskRequest) error { + out.DiskId = strconv.FormatUint(uint64(in.DiskNumber), 10) + return nil +} + +func Convert_v1alpha1_MountVolumeRequest_To_impl_MountVolumeRequest(in *v1alpha1.MountVolumeRequest, out *impl.MountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.TargetPath = in.Path + return nil +} + +func Convert_impl_MountVolumeRequest_To_v1alpha1_MountVolumeRequest(in *impl.MountVolumeRequest, out *v1alpha1.MountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Path = in.TargetPath + return nil +} + +func Convert_v1alpha1_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(in *v1alpha1.ResizeVolumeRequest, out *impl.ResizeVolumeRequest) error { + out.VolumeId = in.VolumeId + out.SizeBytes = in.Size + return nil +} + +func Convert_impl_ResizeVolumeRequest_To_v1alpha1_ResizeVolumeRequest(in *impl.ResizeVolumeRequest, out *v1alpha1.ResizeVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Size = in.SizeBytes + return nil +} diff --git a/pkg/server/volume/impl/v1alpha1/conversion_generated.go b/pkg/server/volume/impl/v1alpha1/conversion_generated.go new file mode 100644 index 00000000..c9444524 --- /dev/null +++ b/pkg/server/volume/impl/v1alpha1/conversion_generated.go @@ -0,0 +1,208 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1alpha1 + +import ( + unsafe "unsafe" + + v1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1alpha1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" +) + +func autoConvert_v1alpha1_DismountVolumeRequest_To_impl_DismountVolumeRequest(in *v1alpha1.DismountVolumeRequest, out *impl.DismountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Path = in.Path + return nil +} + +// Convert_v1alpha1_DismountVolumeRequest_To_impl_DismountVolumeRequest is an autogenerated conversion function. +func Convert_v1alpha1_DismountVolumeRequest_To_impl_DismountVolumeRequest(in *v1alpha1.DismountVolumeRequest, out *impl.DismountVolumeRequest) error { + return autoConvert_v1alpha1_DismountVolumeRequest_To_impl_DismountVolumeRequest(in, out) +} + +func autoConvert_impl_DismountVolumeRequest_To_v1alpha1_DismountVolumeRequest(in *impl.DismountVolumeRequest, out *v1alpha1.DismountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Path = in.Path + return nil +} + +// Convert_impl_DismountVolumeRequest_To_v1alpha1_DismountVolumeRequest is an autogenerated conversion function. +func Convert_impl_DismountVolumeRequest_To_v1alpha1_DismountVolumeRequest(in *impl.DismountVolumeRequest, out *v1alpha1.DismountVolumeRequest) error { + return autoConvert_impl_DismountVolumeRequest_To_v1alpha1_DismountVolumeRequest(in, out) +} + +func autoConvert_v1alpha1_DismountVolumeResponse_To_impl_DismountVolumeResponse(in *v1alpha1.DismountVolumeResponse, out *impl.DismountVolumeResponse) error { + return nil +} + +// Convert_v1alpha1_DismountVolumeResponse_To_impl_DismountVolumeResponse is an autogenerated conversion function. +func Convert_v1alpha1_DismountVolumeResponse_To_impl_DismountVolumeResponse(in *v1alpha1.DismountVolumeResponse, out *impl.DismountVolumeResponse) error { + return autoConvert_v1alpha1_DismountVolumeResponse_To_impl_DismountVolumeResponse(in, out) +} + +func autoConvert_impl_DismountVolumeResponse_To_v1alpha1_DismountVolumeResponse(in *impl.DismountVolumeResponse, out *v1alpha1.DismountVolumeResponse) error { + return nil +} + +// Convert_impl_DismountVolumeResponse_To_v1alpha1_DismountVolumeResponse is an autogenerated conversion function. +func Convert_impl_DismountVolumeResponse_To_v1alpha1_DismountVolumeResponse(in *impl.DismountVolumeResponse, out *v1alpha1.DismountVolumeResponse) error { + return autoConvert_impl_DismountVolumeResponse_To_v1alpha1_DismountVolumeResponse(in, out) +} + +func autoConvert_v1alpha1_FormatVolumeRequest_To_impl_FormatVolumeRequest(in *v1alpha1.FormatVolumeRequest, out *impl.FormatVolumeRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1alpha1_FormatVolumeRequest_To_impl_FormatVolumeRequest is an autogenerated conversion function. +func Convert_v1alpha1_FormatVolumeRequest_To_impl_FormatVolumeRequest(in *v1alpha1.FormatVolumeRequest, out *impl.FormatVolumeRequest) error { + return autoConvert_v1alpha1_FormatVolumeRequest_To_impl_FormatVolumeRequest(in, out) +} + +func autoConvert_impl_FormatVolumeRequest_To_v1alpha1_FormatVolumeRequest(in *impl.FormatVolumeRequest, out *v1alpha1.FormatVolumeRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_FormatVolumeRequest_To_v1alpha1_FormatVolumeRequest is an autogenerated conversion function. +func Convert_impl_FormatVolumeRequest_To_v1alpha1_FormatVolumeRequest(in *impl.FormatVolumeRequest, out *v1alpha1.FormatVolumeRequest) error { + return autoConvert_impl_FormatVolumeRequest_To_v1alpha1_FormatVolumeRequest(in, out) +} + +func autoConvert_v1alpha1_FormatVolumeResponse_To_impl_FormatVolumeResponse(in *v1alpha1.FormatVolumeResponse, out *impl.FormatVolumeResponse) error { + return nil +} + +// Convert_v1alpha1_FormatVolumeResponse_To_impl_FormatVolumeResponse is an autogenerated conversion function. +func Convert_v1alpha1_FormatVolumeResponse_To_impl_FormatVolumeResponse(in *v1alpha1.FormatVolumeResponse, out *impl.FormatVolumeResponse) error { + return autoConvert_v1alpha1_FormatVolumeResponse_To_impl_FormatVolumeResponse(in, out) +} + +func autoConvert_impl_FormatVolumeResponse_To_v1alpha1_FormatVolumeResponse(in *impl.FormatVolumeResponse, out *v1alpha1.FormatVolumeResponse) error { + return nil +} + +// Convert_impl_FormatVolumeResponse_To_v1alpha1_FormatVolumeResponse is an autogenerated conversion function. +func Convert_impl_FormatVolumeResponse_To_v1alpha1_FormatVolumeResponse(in *impl.FormatVolumeResponse, out *v1alpha1.FormatVolumeResponse) error { + return autoConvert_impl_FormatVolumeResponse_To_v1alpha1_FormatVolumeResponse(in, out) +} + +func autoConvert_v1alpha1_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in *v1alpha1.IsVolumeFormattedRequest, out *impl.IsVolumeFormattedRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1alpha1_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest is an autogenerated conversion function. +func Convert_v1alpha1_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in *v1alpha1.IsVolumeFormattedRequest, out *impl.IsVolumeFormattedRequest) error { + return autoConvert_v1alpha1_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in, out) +} + +func autoConvert_impl_IsVolumeFormattedRequest_To_v1alpha1_IsVolumeFormattedRequest(in *impl.IsVolumeFormattedRequest, out *v1alpha1.IsVolumeFormattedRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_IsVolumeFormattedRequest_To_v1alpha1_IsVolumeFormattedRequest is an autogenerated conversion function. +func Convert_impl_IsVolumeFormattedRequest_To_v1alpha1_IsVolumeFormattedRequest(in *impl.IsVolumeFormattedRequest, out *v1alpha1.IsVolumeFormattedRequest) error { + return autoConvert_impl_IsVolumeFormattedRequest_To_v1alpha1_IsVolumeFormattedRequest(in, out) +} + +func autoConvert_v1alpha1_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in *v1alpha1.IsVolumeFormattedResponse, out *impl.IsVolumeFormattedResponse) error { + out.Formatted = in.Formatted + return nil +} + +// Convert_v1alpha1_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse is an autogenerated conversion function. +func Convert_v1alpha1_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in *v1alpha1.IsVolumeFormattedResponse, out *impl.IsVolumeFormattedResponse) error { + return autoConvert_v1alpha1_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in, out) +} + +func autoConvert_impl_IsVolumeFormattedResponse_To_v1alpha1_IsVolumeFormattedResponse(in *impl.IsVolumeFormattedResponse, out *v1alpha1.IsVolumeFormattedResponse) error { + out.Formatted = in.Formatted + return nil +} + +// Convert_impl_IsVolumeFormattedResponse_To_v1alpha1_IsVolumeFormattedResponse is an autogenerated conversion function. +func Convert_impl_IsVolumeFormattedResponse_To_v1alpha1_IsVolumeFormattedResponse(in *impl.IsVolumeFormattedResponse, out *v1alpha1.IsVolumeFormattedResponse) error { + return autoConvert_impl_IsVolumeFormattedResponse_To_v1alpha1_IsVolumeFormattedResponse(in, out) +} + +// detected external conversion function +// Convert_v1alpha1_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(in *v1alpha1.ListVolumesOnDiskRequest, out *impl.ListVolumesOnDiskRequest) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ListVolumesOnDiskRequest_To_v1alpha1_ListVolumesOnDiskRequest(in *impl.ListVolumesOnDiskRequest, out *v1alpha1.ListVolumesOnDiskRequest) error +// skipping generation of the auto function + +func autoConvert_v1alpha1_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in *v1alpha1.ListVolumesOnDiskResponse, out *impl.ListVolumesOnDiskResponse) error { + out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) + return nil +} + +// Convert_v1alpha1_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse is an autogenerated conversion function. +func Convert_v1alpha1_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in *v1alpha1.ListVolumesOnDiskResponse, out *impl.ListVolumesOnDiskResponse) error { + return autoConvert_v1alpha1_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in, out) +} + +func autoConvert_impl_ListVolumesOnDiskResponse_To_v1alpha1_ListVolumesOnDiskResponse(in *impl.ListVolumesOnDiskResponse, out *v1alpha1.ListVolumesOnDiskResponse) error { + out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) + return nil +} + +// Convert_impl_ListVolumesOnDiskResponse_To_v1alpha1_ListVolumesOnDiskResponse is an autogenerated conversion function. +func Convert_impl_ListVolumesOnDiskResponse_To_v1alpha1_ListVolumesOnDiskResponse(in *impl.ListVolumesOnDiskResponse, out *v1alpha1.ListVolumesOnDiskResponse) error { + return autoConvert_impl_ListVolumesOnDiskResponse_To_v1alpha1_ListVolumesOnDiskResponse(in, out) +} + +// detected external conversion function +// Convert_v1alpha1_MountVolumeRequest_To_impl_MountVolumeRequest(in *v1alpha1.MountVolumeRequest, out *impl.MountVolumeRequest) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_MountVolumeRequest_To_v1alpha1_MountVolumeRequest(in *impl.MountVolumeRequest, out *v1alpha1.MountVolumeRequest) error +// skipping generation of the auto function + +func autoConvert_v1alpha1_MountVolumeResponse_To_impl_MountVolumeResponse(in *v1alpha1.MountVolumeResponse, out *impl.MountVolumeResponse) error { + return nil +} + +// Convert_v1alpha1_MountVolumeResponse_To_impl_MountVolumeResponse is an autogenerated conversion function. +func Convert_v1alpha1_MountVolumeResponse_To_impl_MountVolumeResponse(in *v1alpha1.MountVolumeResponse, out *impl.MountVolumeResponse) error { + return autoConvert_v1alpha1_MountVolumeResponse_To_impl_MountVolumeResponse(in, out) +} + +func autoConvert_impl_MountVolumeResponse_To_v1alpha1_MountVolumeResponse(in *impl.MountVolumeResponse, out *v1alpha1.MountVolumeResponse) error { + return nil +} + +// Convert_impl_MountVolumeResponse_To_v1alpha1_MountVolumeResponse is an autogenerated conversion function. +func Convert_impl_MountVolumeResponse_To_v1alpha1_MountVolumeResponse(in *impl.MountVolumeResponse, out *v1alpha1.MountVolumeResponse) error { + return autoConvert_impl_MountVolumeResponse_To_v1alpha1_MountVolumeResponse(in, out) +} + +// detected external conversion function +// Convert_v1alpha1_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(in *v1alpha1.ResizeVolumeRequest, out *impl.ResizeVolumeRequest) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ResizeVolumeRequest_To_v1alpha1_ResizeVolumeRequest(in *impl.ResizeVolumeRequest, out *v1alpha1.ResizeVolumeRequest) error +// skipping generation of the auto function + +func autoConvert_v1alpha1_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in *v1alpha1.ResizeVolumeResponse, out *impl.ResizeVolumeResponse) error { + return nil +} + +// Convert_v1alpha1_ResizeVolumeResponse_To_impl_ResizeVolumeResponse is an autogenerated conversion function. +func Convert_v1alpha1_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in *v1alpha1.ResizeVolumeResponse, out *impl.ResizeVolumeResponse) error { + return autoConvert_v1alpha1_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in, out) +} + +func autoConvert_impl_ResizeVolumeResponse_To_v1alpha1_ResizeVolumeResponse(in *impl.ResizeVolumeResponse, out *v1alpha1.ResizeVolumeResponse) error { + return nil +} + +// Convert_impl_ResizeVolumeResponse_To_v1alpha1_ResizeVolumeResponse is an autogenerated conversion function. +func Convert_impl_ResizeVolumeResponse_To_v1alpha1_ResizeVolumeResponse(in *impl.ResizeVolumeResponse, out *v1alpha1.ResizeVolumeResponse) error { + return autoConvert_impl_ResizeVolumeResponse_To_v1alpha1_ResizeVolumeResponse(in, out) +} diff --git a/internal/server/volume/internal/v1alpha1/server_generated.go b/pkg/server/volume/impl/v1alpha1/server_generated.go similarity index 59% rename from internal/server/volume/internal/v1alpha1/server_generated.go rename to pkg/server/volume/impl/v1alpha1/server_generated.go index faa967f2..a61da576 100644 --- a/internal/server/volume/internal/v1alpha1/server_generated.go +++ b/pkg/server/volume/impl/v1alpha1/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1alpha1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1alpha1") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) DismountVolume(context context.Context, versionedRequest *v1alpha1.DismountVolumeRequest) (*v1alpha1.DismountVolumeResponse, error) { - request := &internal.DismountVolumeRequest{} - if err := Convert_v1alpha1_DismountVolumeRequest_To_internal_DismountVolumeRequest(versionedRequest, request); err != nil { + request := &impl.DismountVolumeRequest{} + if err := Convert_v1alpha1_DismountVolumeRequest_To_impl_DismountVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) DismountVolume(context context.Context, versionedRequest } versionedResponse := &v1alpha1.DismountVolumeResponse{} - if err := Convert_internal_DismountVolumeResponse_To_v1alpha1_DismountVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_DismountVolumeResponse_To_v1alpha1_DismountVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) DismountVolume(context context.Context, versionedRequest } func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v1alpha1.FormatVolumeRequest) (*v1alpha1.FormatVolumeResponse, error) { - request := &internal.FormatVolumeRequest{} - if err := Convert_v1alpha1_FormatVolumeRequest_To_internal_FormatVolumeRequest(versionedRequest, request); err != nil { + request := &impl.FormatVolumeRequest{} + if err := Convert_v1alpha1_FormatVolumeRequest_To_impl_FormatVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v } versionedResponse := &v1alpha1.FormatVolumeResponse{} - if err := Convert_internal_FormatVolumeResponse_To_v1alpha1_FormatVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_FormatVolumeResponse_To_v1alpha1_FormatVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v } func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedRequest *v1alpha1.IsVolumeFormattedRequest) (*v1alpha1.IsVolumeFormattedResponse, error) { - request := &internal.IsVolumeFormattedRequest{} - if err := Convert_v1alpha1_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(versionedRequest, request); err != nil { + request := &impl.IsVolumeFormattedRequest{} + if err := Convert_v1alpha1_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedReque } versionedResponse := &v1alpha1.IsVolumeFormattedResponse{} - if err := Convert_internal_IsVolumeFormattedResponse_To_v1alpha1_IsVolumeFormattedResponse(response, versionedResponse); err != nil { + if err := Convert_impl_IsVolumeFormattedResponse_To_v1alpha1_IsVolumeFormattedResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedReque } func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedRequest *v1alpha1.ListVolumesOnDiskRequest) (*v1alpha1.ListVolumesOnDiskResponse, error) { - request := &internal.ListVolumesOnDiskRequest{} - if err := Convert_v1alpha1_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(versionedRequest, request); err != nil { + request := &impl.ListVolumesOnDiskRequest{} + if err := Convert_v1alpha1_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedReque } versionedResponse := &v1alpha1.ListVolumesOnDiskResponse{} - if err := Convert_internal_ListVolumesOnDiskResponse_To_v1alpha1_ListVolumesOnDiskResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListVolumesOnDiskResponse_To_v1alpha1_ListVolumesOnDiskResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedReque } func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1alpha1.MountVolumeRequest) (*v1alpha1.MountVolumeResponse, error) { - request := &internal.MountVolumeRequest{} - if err := Convert_v1alpha1_MountVolumeRequest_To_internal_MountVolumeRequest(versionedRequest, request); err != nil { + request := &impl.MountVolumeRequest{} + if err := Convert_v1alpha1_MountVolumeRequest_To_impl_MountVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1 } versionedResponse := &v1alpha1.MountVolumeResponse{} - if err := Convert_internal_MountVolumeResponse_To_v1alpha1_MountVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_MountVolumeResponse_To_v1alpha1_MountVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -123,8 +123,8 @@ func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1 } func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v1alpha1.ResizeVolumeRequest) (*v1alpha1.ResizeVolumeResponse, error) { - request := &internal.ResizeVolumeRequest{} - if err := Convert_v1alpha1_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(versionedRequest, request); err != nil { + request := &impl.ResizeVolumeRequest{} + if err := Convert_v1alpha1_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -134,7 +134,7 @@ func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v } versionedResponse := &v1alpha1.ResizeVolumeResponse{} - if err := Convert_internal_ResizeVolumeResponse_To_v1alpha1_ResizeVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ResizeVolumeResponse_To_v1alpha1_ResizeVolumeResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/pkg/server/volume/impl/v1beta1/conversion.go b/pkg/server/volume/impl/v1beta1/conversion.go new file mode 100644 index 00000000..de412b72 --- /dev/null +++ b/pkg/server/volume/impl/v1beta1/conversion.go @@ -0,0 +1,49 @@ +package v1beta1 + +import ( + "fmt" + "strconv" + + "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" +) + +// Add manual conversion functions here to override automatic conversion functions + +func Convert_v1beta1_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(in *v1beta1.ListVolumesOnDiskRequest, out *impl.ListVolumesOnDiskRequest) error { + diskIDUint, err := strconv.ParseUint(in.DiskId, 10, 64) + if err != nil { + return fmt.Errorf("Failed to parse diskId: err=%+v", err) + } + out.DiskNumber = uint32(diskIDUint) + return nil +} + +func Convert_impl_ListVolumesOnDiskRequest_To_v1beta1_ListVolumesOnDiskRequest(in *impl.ListVolumesOnDiskRequest, out *v1beta1.ListVolumesOnDiskRequest) error { + out.DiskId = strconv.FormatUint(uint64(in.DiskNumber), 10) + return nil +} + +func Convert_v1beta1_MountVolumeRequest_To_impl_MountVolumeRequest(in *v1beta1.MountVolumeRequest, out *impl.MountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.TargetPath = in.Path + return nil +} + +func Convert_impl_MountVolumeRequest_To_v1beta1_MountVolumeRequest(in *impl.MountVolumeRequest, out *v1beta1.MountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Path = in.TargetPath + return nil +} + +func Convert_v1beta1_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(in *v1beta1.ResizeVolumeRequest, out *impl.ResizeVolumeRequest) error { + out.VolumeId = in.VolumeId + out.SizeBytes = in.Size + return nil +} + +func Convert_impl_ResizeVolumeRequest_To_v1beta1_ResizeVolumeRequest(in *impl.ResizeVolumeRequest, out *v1beta1.ResizeVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Size = in.SizeBytes + return nil +} diff --git a/pkg/server/volume/impl/v1beta1/conversion_generated.go b/pkg/server/volume/impl/v1beta1/conversion_generated.go new file mode 100644 index 00000000..24f9b76c --- /dev/null +++ b/pkg/server/volume/impl/v1beta1/conversion_generated.go @@ -0,0 +1,330 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1beta1 + +import ( + unsafe "unsafe" + + v1beta1 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" +) + +func autoConvert_v1beta1_DismountVolumeRequest_To_impl_DismountVolumeRequest(in *v1beta1.DismountVolumeRequest, out *impl.DismountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Path = in.Path + return nil +} + +// Convert_v1beta1_DismountVolumeRequest_To_impl_DismountVolumeRequest is an autogenerated conversion function. +func Convert_v1beta1_DismountVolumeRequest_To_impl_DismountVolumeRequest(in *v1beta1.DismountVolumeRequest, out *impl.DismountVolumeRequest) error { + return autoConvert_v1beta1_DismountVolumeRequest_To_impl_DismountVolumeRequest(in, out) +} + +func autoConvert_impl_DismountVolumeRequest_To_v1beta1_DismountVolumeRequest(in *impl.DismountVolumeRequest, out *v1beta1.DismountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Path = in.Path + return nil +} + +// Convert_impl_DismountVolumeRequest_To_v1beta1_DismountVolumeRequest is an autogenerated conversion function. +func Convert_impl_DismountVolumeRequest_To_v1beta1_DismountVolumeRequest(in *impl.DismountVolumeRequest, out *v1beta1.DismountVolumeRequest) error { + return autoConvert_impl_DismountVolumeRequest_To_v1beta1_DismountVolumeRequest(in, out) +} + +func autoConvert_v1beta1_DismountVolumeResponse_To_impl_DismountVolumeResponse(in *v1beta1.DismountVolumeResponse, out *impl.DismountVolumeResponse) error { + return nil +} + +// Convert_v1beta1_DismountVolumeResponse_To_impl_DismountVolumeResponse is an autogenerated conversion function. +func Convert_v1beta1_DismountVolumeResponse_To_impl_DismountVolumeResponse(in *v1beta1.DismountVolumeResponse, out *impl.DismountVolumeResponse) error { + return autoConvert_v1beta1_DismountVolumeResponse_To_impl_DismountVolumeResponse(in, out) +} + +func autoConvert_impl_DismountVolumeResponse_To_v1beta1_DismountVolumeResponse(in *impl.DismountVolumeResponse, out *v1beta1.DismountVolumeResponse) error { + return nil +} + +// Convert_impl_DismountVolumeResponse_To_v1beta1_DismountVolumeResponse is an autogenerated conversion function. +func Convert_impl_DismountVolumeResponse_To_v1beta1_DismountVolumeResponse(in *impl.DismountVolumeResponse, out *v1beta1.DismountVolumeResponse) error { + return autoConvert_impl_DismountVolumeResponse_To_v1beta1_DismountVolumeResponse(in, out) +} + +func autoConvert_v1beta1_FormatVolumeRequest_To_impl_FormatVolumeRequest(in *v1beta1.FormatVolumeRequest, out *impl.FormatVolumeRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta1_FormatVolumeRequest_To_impl_FormatVolumeRequest is an autogenerated conversion function. +func Convert_v1beta1_FormatVolumeRequest_To_impl_FormatVolumeRequest(in *v1beta1.FormatVolumeRequest, out *impl.FormatVolumeRequest) error { + return autoConvert_v1beta1_FormatVolumeRequest_To_impl_FormatVolumeRequest(in, out) +} + +func autoConvert_impl_FormatVolumeRequest_To_v1beta1_FormatVolumeRequest(in *impl.FormatVolumeRequest, out *v1beta1.FormatVolumeRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_FormatVolumeRequest_To_v1beta1_FormatVolumeRequest is an autogenerated conversion function. +func Convert_impl_FormatVolumeRequest_To_v1beta1_FormatVolumeRequest(in *impl.FormatVolumeRequest, out *v1beta1.FormatVolumeRequest) error { + return autoConvert_impl_FormatVolumeRequest_To_v1beta1_FormatVolumeRequest(in, out) +} + +func autoConvert_v1beta1_FormatVolumeResponse_To_impl_FormatVolumeResponse(in *v1beta1.FormatVolumeResponse, out *impl.FormatVolumeResponse) error { + return nil +} + +// Convert_v1beta1_FormatVolumeResponse_To_impl_FormatVolumeResponse is an autogenerated conversion function. +func Convert_v1beta1_FormatVolumeResponse_To_impl_FormatVolumeResponse(in *v1beta1.FormatVolumeResponse, out *impl.FormatVolumeResponse) error { + return autoConvert_v1beta1_FormatVolumeResponse_To_impl_FormatVolumeResponse(in, out) +} + +func autoConvert_impl_FormatVolumeResponse_To_v1beta1_FormatVolumeResponse(in *impl.FormatVolumeResponse, out *v1beta1.FormatVolumeResponse) error { + return nil +} + +// Convert_impl_FormatVolumeResponse_To_v1beta1_FormatVolumeResponse is an autogenerated conversion function. +func Convert_impl_FormatVolumeResponse_To_v1beta1_FormatVolumeResponse(in *impl.FormatVolumeResponse, out *v1beta1.FormatVolumeResponse) error { + return autoConvert_impl_FormatVolumeResponse_To_v1beta1_FormatVolumeResponse(in, out) +} + +func autoConvert_v1beta1_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in *v1beta1.IsVolumeFormattedRequest, out *impl.IsVolumeFormattedRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta1_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest is an autogenerated conversion function. +func Convert_v1beta1_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in *v1beta1.IsVolumeFormattedRequest, out *impl.IsVolumeFormattedRequest) error { + return autoConvert_v1beta1_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in, out) +} + +func autoConvert_impl_IsVolumeFormattedRequest_To_v1beta1_IsVolumeFormattedRequest(in *impl.IsVolumeFormattedRequest, out *v1beta1.IsVolumeFormattedRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_IsVolumeFormattedRequest_To_v1beta1_IsVolumeFormattedRequest is an autogenerated conversion function. +func Convert_impl_IsVolumeFormattedRequest_To_v1beta1_IsVolumeFormattedRequest(in *impl.IsVolumeFormattedRequest, out *v1beta1.IsVolumeFormattedRequest) error { + return autoConvert_impl_IsVolumeFormattedRequest_To_v1beta1_IsVolumeFormattedRequest(in, out) +} + +func autoConvert_v1beta1_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in *v1beta1.IsVolumeFormattedResponse, out *impl.IsVolumeFormattedResponse) error { + out.Formatted = in.Formatted + return nil +} + +// Convert_v1beta1_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse is an autogenerated conversion function. +func Convert_v1beta1_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in *v1beta1.IsVolumeFormattedResponse, out *impl.IsVolumeFormattedResponse) error { + return autoConvert_v1beta1_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in, out) +} + +func autoConvert_impl_IsVolumeFormattedResponse_To_v1beta1_IsVolumeFormattedResponse(in *impl.IsVolumeFormattedResponse, out *v1beta1.IsVolumeFormattedResponse) error { + out.Formatted = in.Formatted + return nil +} + +// Convert_impl_IsVolumeFormattedResponse_To_v1beta1_IsVolumeFormattedResponse is an autogenerated conversion function. +func Convert_impl_IsVolumeFormattedResponse_To_v1beta1_IsVolumeFormattedResponse(in *impl.IsVolumeFormattedResponse, out *v1beta1.IsVolumeFormattedResponse) error { + return autoConvert_impl_IsVolumeFormattedResponse_To_v1beta1_IsVolumeFormattedResponse(in, out) +} + +// detected external conversion function +// Convert_v1beta1_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(in *v1beta1.ListVolumesOnDiskRequest, out *impl.ListVolumesOnDiskRequest) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ListVolumesOnDiskRequest_To_v1beta1_ListVolumesOnDiskRequest(in *impl.ListVolumesOnDiskRequest, out *v1beta1.ListVolumesOnDiskRequest) error +// skipping generation of the auto function + +func autoConvert_v1beta1_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in *v1beta1.ListVolumesOnDiskResponse, out *impl.ListVolumesOnDiskResponse) error { + out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) + return nil +} + +// Convert_v1beta1_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse is an autogenerated conversion function. +func Convert_v1beta1_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in *v1beta1.ListVolumesOnDiskResponse, out *impl.ListVolumesOnDiskResponse) error { + return autoConvert_v1beta1_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in, out) +} + +func autoConvert_impl_ListVolumesOnDiskResponse_To_v1beta1_ListVolumesOnDiskResponse(in *impl.ListVolumesOnDiskResponse, out *v1beta1.ListVolumesOnDiskResponse) error { + out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) + return nil +} + +// Convert_impl_ListVolumesOnDiskResponse_To_v1beta1_ListVolumesOnDiskResponse is an autogenerated conversion function. +func Convert_impl_ListVolumesOnDiskResponse_To_v1beta1_ListVolumesOnDiskResponse(in *impl.ListVolumesOnDiskResponse, out *v1beta1.ListVolumesOnDiskResponse) error { + return autoConvert_impl_ListVolumesOnDiskResponse_To_v1beta1_ListVolumesOnDiskResponse(in, out) +} + +// detected external conversion function +// Convert_v1beta1_MountVolumeRequest_To_impl_MountVolumeRequest(in *v1beta1.MountVolumeRequest, out *impl.MountVolumeRequest) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_MountVolumeRequest_To_v1beta1_MountVolumeRequest(in *impl.MountVolumeRequest, out *v1beta1.MountVolumeRequest) error +// skipping generation of the auto function + +func autoConvert_v1beta1_MountVolumeResponse_To_impl_MountVolumeResponse(in *v1beta1.MountVolumeResponse, out *impl.MountVolumeResponse) error { + return nil +} + +// Convert_v1beta1_MountVolumeResponse_To_impl_MountVolumeResponse is an autogenerated conversion function. +func Convert_v1beta1_MountVolumeResponse_To_impl_MountVolumeResponse(in *v1beta1.MountVolumeResponse, out *impl.MountVolumeResponse) error { + return autoConvert_v1beta1_MountVolumeResponse_To_impl_MountVolumeResponse(in, out) +} + +func autoConvert_impl_MountVolumeResponse_To_v1beta1_MountVolumeResponse(in *impl.MountVolumeResponse, out *v1beta1.MountVolumeResponse) error { + return nil +} + +// Convert_impl_MountVolumeResponse_To_v1beta1_MountVolumeResponse is an autogenerated conversion function. +func Convert_impl_MountVolumeResponse_To_v1beta1_MountVolumeResponse(in *impl.MountVolumeResponse, out *v1beta1.MountVolumeResponse) error { + return autoConvert_impl_MountVolumeResponse_To_v1beta1_MountVolumeResponse(in, out) +} + +// detected external conversion function +// Convert_v1beta1_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(in *v1beta1.ResizeVolumeRequest, out *impl.ResizeVolumeRequest) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ResizeVolumeRequest_To_v1beta1_ResizeVolumeRequest(in *impl.ResizeVolumeRequest, out *v1beta1.ResizeVolumeRequest) error +// skipping generation of the auto function + +func autoConvert_v1beta1_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in *v1beta1.ResizeVolumeResponse, out *impl.ResizeVolumeResponse) error { + return nil +} + +// Convert_v1beta1_ResizeVolumeResponse_To_impl_ResizeVolumeResponse is an autogenerated conversion function. +func Convert_v1beta1_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in *v1beta1.ResizeVolumeResponse, out *impl.ResizeVolumeResponse) error { + return autoConvert_v1beta1_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in, out) +} + +func autoConvert_impl_ResizeVolumeResponse_To_v1beta1_ResizeVolumeResponse(in *impl.ResizeVolumeResponse, out *v1beta1.ResizeVolumeResponse) error { + return nil +} + +// Convert_impl_ResizeVolumeResponse_To_v1beta1_ResizeVolumeResponse is an autogenerated conversion function. +func Convert_impl_ResizeVolumeResponse_To_v1beta1_ResizeVolumeResponse(in *impl.ResizeVolumeResponse, out *v1beta1.ResizeVolumeResponse) error { + return autoConvert_impl_ResizeVolumeResponse_To_v1beta1_ResizeVolumeResponse(in, out) +} + +func autoConvert_v1beta1_VolumeDiskNumberRequest_To_impl_VolumeDiskNumberRequest(in *v1beta1.VolumeDiskNumberRequest, out *impl.VolumeDiskNumberRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta1_VolumeDiskNumberRequest_To_impl_VolumeDiskNumberRequest is an autogenerated conversion function. +func Convert_v1beta1_VolumeDiskNumberRequest_To_impl_VolumeDiskNumberRequest(in *v1beta1.VolumeDiskNumberRequest, out *impl.VolumeDiskNumberRequest) error { + return autoConvert_v1beta1_VolumeDiskNumberRequest_To_impl_VolumeDiskNumberRequest(in, out) +} + +func autoConvert_impl_VolumeDiskNumberRequest_To_v1beta1_VolumeDiskNumberRequest(in *impl.VolumeDiskNumberRequest, out *v1beta1.VolumeDiskNumberRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_VolumeDiskNumberRequest_To_v1beta1_VolumeDiskNumberRequest is an autogenerated conversion function. +func Convert_impl_VolumeDiskNumberRequest_To_v1beta1_VolumeDiskNumberRequest(in *impl.VolumeDiskNumberRequest, out *v1beta1.VolumeDiskNumberRequest) error { + return autoConvert_impl_VolumeDiskNumberRequest_To_v1beta1_VolumeDiskNumberRequest(in, out) +} + +func autoConvert_v1beta1_VolumeDiskNumberResponse_To_impl_VolumeDiskNumberResponse(in *v1beta1.VolumeDiskNumberResponse, out *impl.VolumeDiskNumberResponse) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_v1beta1_VolumeDiskNumberResponse_To_impl_VolumeDiskNumberResponse is an autogenerated conversion function. +func Convert_v1beta1_VolumeDiskNumberResponse_To_impl_VolumeDiskNumberResponse(in *v1beta1.VolumeDiskNumberResponse, out *impl.VolumeDiskNumberResponse) error { + return autoConvert_v1beta1_VolumeDiskNumberResponse_To_impl_VolumeDiskNumberResponse(in, out) +} + +func autoConvert_impl_VolumeDiskNumberResponse_To_v1beta1_VolumeDiskNumberResponse(in *impl.VolumeDiskNumberResponse, out *v1beta1.VolumeDiskNumberResponse) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_impl_VolumeDiskNumberResponse_To_v1beta1_VolumeDiskNumberResponse is an autogenerated conversion function. +func Convert_impl_VolumeDiskNumberResponse_To_v1beta1_VolumeDiskNumberResponse(in *impl.VolumeDiskNumberResponse, out *v1beta1.VolumeDiskNumberResponse) error { + return autoConvert_impl_VolumeDiskNumberResponse_To_v1beta1_VolumeDiskNumberResponse(in, out) +} + +func autoConvert_v1beta1_VolumeIDFromMountRequest_To_impl_VolumeIDFromMountRequest(in *v1beta1.VolumeIDFromMountRequest, out *impl.VolumeIDFromMountRequest) error { + out.Mount = in.Mount + return nil +} + +// Convert_v1beta1_VolumeIDFromMountRequest_To_impl_VolumeIDFromMountRequest is an autogenerated conversion function. +func Convert_v1beta1_VolumeIDFromMountRequest_To_impl_VolumeIDFromMountRequest(in *v1beta1.VolumeIDFromMountRequest, out *impl.VolumeIDFromMountRequest) error { + return autoConvert_v1beta1_VolumeIDFromMountRequest_To_impl_VolumeIDFromMountRequest(in, out) +} + +func autoConvert_impl_VolumeIDFromMountRequest_To_v1beta1_VolumeIDFromMountRequest(in *impl.VolumeIDFromMountRequest, out *v1beta1.VolumeIDFromMountRequest) error { + out.Mount = in.Mount + return nil +} + +// Convert_impl_VolumeIDFromMountRequest_To_v1beta1_VolumeIDFromMountRequest is an autogenerated conversion function. +func Convert_impl_VolumeIDFromMountRequest_To_v1beta1_VolumeIDFromMountRequest(in *impl.VolumeIDFromMountRequest, out *v1beta1.VolumeIDFromMountRequest) error { + return autoConvert_impl_VolumeIDFromMountRequest_To_v1beta1_VolumeIDFromMountRequest(in, out) +} + +func autoConvert_v1beta1_VolumeIDFromMountResponse_To_impl_VolumeIDFromMountResponse(in *v1beta1.VolumeIDFromMountResponse, out *impl.VolumeIDFromMountResponse) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta1_VolumeIDFromMountResponse_To_impl_VolumeIDFromMountResponse is an autogenerated conversion function. +func Convert_v1beta1_VolumeIDFromMountResponse_To_impl_VolumeIDFromMountResponse(in *v1beta1.VolumeIDFromMountResponse, out *impl.VolumeIDFromMountResponse) error { + return autoConvert_v1beta1_VolumeIDFromMountResponse_To_impl_VolumeIDFromMountResponse(in, out) +} + +func autoConvert_impl_VolumeIDFromMountResponse_To_v1beta1_VolumeIDFromMountResponse(in *impl.VolumeIDFromMountResponse, out *v1beta1.VolumeIDFromMountResponse) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_VolumeIDFromMountResponse_To_v1beta1_VolumeIDFromMountResponse is an autogenerated conversion function. +func Convert_impl_VolumeIDFromMountResponse_To_v1beta1_VolumeIDFromMountResponse(in *impl.VolumeIDFromMountResponse, out *v1beta1.VolumeIDFromMountResponse) error { + return autoConvert_impl_VolumeIDFromMountResponse_To_v1beta1_VolumeIDFromMountResponse(in, out) +} + +func autoConvert_v1beta1_VolumeStatsRequest_To_impl_VolumeStatsRequest(in *v1beta1.VolumeStatsRequest, out *impl.VolumeStatsRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta1_VolumeStatsRequest_To_impl_VolumeStatsRequest is an autogenerated conversion function. +func Convert_v1beta1_VolumeStatsRequest_To_impl_VolumeStatsRequest(in *v1beta1.VolumeStatsRequest, out *impl.VolumeStatsRequest) error { + return autoConvert_v1beta1_VolumeStatsRequest_To_impl_VolumeStatsRequest(in, out) +} + +func autoConvert_impl_VolumeStatsRequest_To_v1beta1_VolumeStatsRequest(in *impl.VolumeStatsRequest, out *v1beta1.VolumeStatsRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_VolumeStatsRequest_To_v1beta1_VolumeStatsRequest is an autogenerated conversion function. +func Convert_impl_VolumeStatsRequest_To_v1beta1_VolumeStatsRequest(in *impl.VolumeStatsRequest, out *v1beta1.VolumeStatsRequest) error { + return autoConvert_impl_VolumeStatsRequest_To_v1beta1_VolumeStatsRequest(in, out) +} + +func autoConvert_v1beta1_VolumeStatsResponse_To_impl_VolumeStatsResponse(in *v1beta1.VolumeStatsResponse, out *impl.VolumeStatsResponse) error { + out.VolumeSize = in.VolumeSize + out.VolumeUsedSize = in.VolumeUsedSize + return nil +} + +// Convert_v1beta1_VolumeStatsResponse_To_impl_VolumeStatsResponse is an autogenerated conversion function. +func Convert_v1beta1_VolumeStatsResponse_To_impl_VolumeStatsResponse(in *v1beta1.VolumeStatsResponse, out *impl.VolumeStatsResponse) error { + return autoConvert_v1beta1_VolumeStatsResponse_To_impl_VolumeStatsResponse(in, out) +} + +func autoConvert_impl_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse(in *impl.VolumeStatsResponse, out *v1beta1.VolumeStatsResponse) error { + out.VolumeSize = in.VolumeSize + out.VolumeUsedSize = in.VolumeUsedSize + return nil +} + +// Convert_impl_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse is an autogenerated conversion function. +func Convert_impl_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse(in *impl.VolumeStatsResponse, out *v1beta1.VolumeStatsResponse) error { + return autoConvert_impl_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse(in, out) +} diff --git a/internal/server/volume/internal/v1beta1/server_generated.go b/pkg/server/volume/impl/v1beta1/server_generated.go similarity index 59% rename from internal/server/volume/internal/v1beta1/server_generated.go rename to pkg/server/volume/impl/v1beta1/server_generated.go index dad62f44..714f71b6 100644 --- a/internal/server/volume/internal/v1beta1/server_generated.go +++ b/pkg/server/volume/impl/v1beta1/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta1" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1beta1") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) DismountVolume(context context.Context, versionedRequest *v1beta1.DismountVolumeRequest) (*v1beta1.DismountVolumeResponse, error) { - request := &internal.DismountVolumeRequest{} - if err := Convert_v1beta1_DismountVolumeRequest_To_internal_DismountVolumeRequest(versionedRequest, request); err != nil { + request := &impl.DismountVolumeRequest{} + if err := Convert_v1beta1_DismountVolumeRequest_To_impl_DismountVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) DismountVolume(context context.Context, versionedRequest } versionedResponse := &v1beta1.DismountVolumeResponse{} - if err := Convert_internal_DismountVolumeResponse_To_v1beta1_DismountVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_DismountVolumeResponse_To_v1beta1_DismountVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) DismountVolume(context context.Context, versionedRequest } func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v1beta1.FormatVolumeRequest) (*v1beta1.FormatVolumeResponse, error) { - request := &internal.FormatVolumeRequest{} - if err := Convert_v1beta1_FormatVolumeRequest_To_internal_FormatVolumeRequest(versionedRequest, request); err != nil { + request := &impl.FormatVolumeRequest{} + if err := Convert_v1beta1_FormatVolumeRequest_To_impl_FormatVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v } versionedResponse := &v1beta1.FormatVolumeResponse{} - if err := Convert_internal_FormatVolumeResponse_To_v1beta1_FormatVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_FormatVolumeResponse_To_v1beta1_FormatVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v } func (s *versionedAPI) GetVolumeDiskNumber(context context.Context, versionedRequest *v1beta1.VolumeDiskNumberRequest) (*v1beta1.VolumeDiskNumberResponse, error) { - request := &internal.VolumeDiskNumberRequest{} - if err := Convert_v1beta1_VolumeDiskNumberRequest_To_internal_VolumeDiskNumberRequest(versionedRequest, request); err != nil { + request := &impl.VolumeDiskNumberRequest{} + if err := Convert_v1beta1_VolumeDiskNumberRequest_To_impl_VolumeDiskNumberRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) GetVolumeDiskNumber(context context.Context, versionedReq } versionedResponse := &v1beta1.VolumeDiskNumberResponse{} - if err := Convert_internal_VolumeDiskNumberResponse_To_v1beta1_VolumeDiskNumberResponse(response, versionedResponse); err != nil { + if err := Convert_impl_VolumeDiskNumberResponse_To_v1beta1_VolumeDiskNumberResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) GetVolumeDiskNumber(context context.Context, versionedReq } func (s *versionedAPI) GetVolumeIDFromMount(context context.Context, versionedRequest *v1beta1.VolumeIDFromMountRequest) (*v1beta1.VolumeIDFromMountResponse, error) { - request := &internal.VolumeIDFromMountRequest{} - if err := Convert_v1beta1_VolumeIDFromMountRequest_To_internal_VolumeIDFromMountRequest(versionedRequest, request); err != nil { + request := &impl.VolumeIDFromMountRequest{} + if err := Convert_v1beta1_VolumeIDFromMountRequest_To_impl_VolumeIDFromMountRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) GetVolumeIDFromMount(context context.Context, versionedRe } versionedResponse := &v1beta1.VolumeIDFromMountResponse{} - if err := Convert_internal_VolumeIDFromMountResponse_To_v1beta1_VolumeIDFromMountResponse(response, versionedResponse); err != nil { + if err := Convert_impl_VolumeIDFromMountResponse_To_v1beta1_VolumeIDFromMountResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) GetVolumeIDFromMount(context context.Context, versionedRe } func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedRequest *v1beta1.IsVolumeFormattedRequest) (*v1beta1.IsVolumeFormattedResponse, error) { - request := &internal.IsVolumeFormattedRequest{} - if err := Convert_v1beta1_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(versionedRequest, request); err != nil { + request := &impl.IsVolumeFormattedRequest{} + if err := Convert_v1beta1_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedReque } versionedResponse := &v1beta1.IsVolumeFormattedResponse{} - if err := Convert_internal_IsVolumeFormattedResponse_To_v1beta1_IsVolumeFormattedResponse(response, versionedResponse); err != nil { + if err := Convert_impl_IsVolumeFormattedResponse_To_v1beta1_IsVolumeFormattedResponse(response, versionedResponse); err != nil { return nil, err } @@ -123,8 +123,8 @@ func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedReque } func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedRequest *v1beta1.ListVolumesOnDiskRequest) (*v1beta1.ListVolumesOnDiskResponse, error) { - request := &internal.ListVolumesOnDiskRequest{} - if err := Convert_v1beta1_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(versionedRequest, request); err != nil { + request := &impl.ListVolumesOnDiskRequest{} + if err := Convert_v1beta1_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(versionedRequest, request); err != nil { return nil, err } @@ -134,7 +134,7 @@ func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedReque } versionedResponse := &v1beta1.ListVolumesOnDiskResponse{} - if err := Convert_internal_ListVolumesOnDiskResponse_To_v1beta1_ListVolumesOnDiskResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListVolumesOnDiskResponse_To_v1beta1_ListVolumesOnDiskResponse(response, versionedResponse); err != nil { return nil, err } @@ -142,8 +142,8 @@ func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedReque } func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1beta1.MountVolumeRequest) (*v1beta1.MountVolumeResponse, error) { - request := &internal.MountVolumeRequest{} - if err := Convert_v1beta1_MountVolumeRequest_To_internal_MountVolumeRequest(versionedRequest, request); err != nil { + request := &impl.MountVolumeRequest{} + if err := Convert_v1beta1_MountVolumeRequest_To_impl_MountVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -153,7 +153,7 @@ func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1 } versionedResponse := &v1beta1.MountVolumeResponse{} - if err := Convert_internal_MountVolumeResponse_To_v1beta1_MountVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_MountVolumeResponse_To_v1beta1_MountVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -161,8 +161,8 @@ func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1 } func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v1beta1.ResizeVolumeRequest) (*v1beta1.ResizeVolumeResponse, error) { - request := &internal.ResizeVolumeRequest{} - if err := Convert_v1beta1_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(versionedRequest, request); err != nil { + request := &impl.ResizeVolumeRequest{} + if err := Convert_v1beta1_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -172,7 +172,7 @@ func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v } versionedResponse := &v1beta1.ResizeVolumeResponse{} - if err := Convert_internal_ResizeVolumeResponse_To_v1beta1_ResizeVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ResizeVolumeResponse_To_v1beta1_ResizeVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -180,8 +180,8 @@ func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v } func (s *versionedAPI) VolumeStats(context context.Context, versionedRequest *v1beta1.VolumeStatsRequest) (*v1beta1.VolumeStatsResponse, error) { - request := &internal.VolumeStatsRequest{} - if err := Convert_v1beta1_VolumeStatsRequest_To_internal_VolumeStatsRequest(versionedRequest, request); err != nil { + request := &impl.VolumeStatsRequest{} + if err := Convert_v1beta1_VolumeStatsRequest_To_impl_VolumeStatsRequest(versionedRequest, request); err != nil { return nil, err } @@ -191,7 +191,7 @@ func (s *versionedAPI) VolumeStats(context context.Context, versionedRequest *v1 } versionedResponse := &v1beta1.VolumeStatsResponse{} - if err := Convert_internal_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_VolumeStatsResponse_To_v1beta1_VolumeStatsResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/pkg/server/volume/impl/v1beta2/conversion.go b/pkg/server/volume/impl/v1beta2/conversion.go new file mode 100644 index 00000000..37d3056b --- /dev/null +++ b/pkg/server/volume/impl/v1beta2/conversion.go @@ -0,0 +1,49 @@ +package v1beta2 + +import ( + "fmt" + "strconv" + + "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta2" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" +) + +// Add manual conversion functions here to override automatic conversion functions + +func Convert_v1beta2_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(in *v1beta2.ListVolumesOnDiskRequest, out *impl.ListVolumesOnDiskRequest) error { + diskIDUint, err := strconv.ParseUint(in.DiskId, 10, 64) + if err != nil { + return fmt.Errorf("Failed to parse diskId: err=%+v", err) + } + out.DiskNumber = uint32(diskIDUint) + return nil +} + +func Convert_impl_ListVolumesOnDiskRequest_To_v1beta2_ListVolumesOnDiskRequest(in *impl.ListVolumesOnDiskRequest, out *v1beta2.ListVolumesOnDiskRequest) error { + out.DiskId = strconv.FormatUint(uint64(in.DiskNumber), 10) + return nil +} + +func Convert_v1beta2_MountVolumeRequest_To_impl_MountVolumeRequest(in *v1beta2.MountVolumeRequest, out *impl.MountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.TargetPath = in.Path + return nil +} + +func Convert_impl_MountVolumeRequest_To_v1beta2_MountVolumeRequest(in *impl.MountVolumeRequest, out *v1beta2.MountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Path = in.TargetPath + return nil +} + +func Convert_v1beta2_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(in *v1beta2.ResizeVolumeRequest, out *impl.ResizeVolumeRequest) error { + out.VolumeId = in.VolumeId + out.SizeBytes = in.Size + return nil +} + +func Convert_impl_ResizeVolumeRequest_To_v1beta2_ResizeVolumeRequest(in *impl.ResizeVolumeRequest, out *v1beta2.ResizeVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Size = in.SizeBytes + return nil +} diff --git a/pkg/server/volume/impl/v1beta2/conversion_generated.go b/pkg/server/volume/impl/v1beta2/conversion_generated.go new file mode 100644 index 00000000..2218b32c --- /dev/null +++ b/pkg/server/volume/impl/v1beta2/conversion_generated.go @@ -0,0 +1,368 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1beta2 + +import ( + unsafe "unsafe" + + v1beta2 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta2" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" +) + +func autoConvert_v1beta2_DismountVolumeRequest_To_impl_DismountVolumeRequest(in *v1beta2.DismountVolumeRequest, out *impl.DismountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Path = in.Path + return nil +} + +// Convert_v1beta2_DismountVolumeRequest_To_impl_DismountVolumeRequest is an autogenerated conversion function. +func Convert_v1beta2_DismountVolumeRequest_To_impl_DismountVolumeRequest(in *v1beta2.DismountVolumeRequest, out *impl.DismountVolumeRequest) error { + return autoConvert_v1beta2_DismountVolumeRequest_To_impl_DismountVolumeRequest(in, out) +} + +func autoConvert_impl_DismountVolumeRequest_To_v1beta2_DismountVolumeRequest(in *impl.DismountVolumeRequest, out *v1beta2.DismountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.Path = in.Path + return nil +} + +// Convert_impl_DismountVolumeRequest_To_v1beta2_DismountVolumeRequest is an autogenerated conversion function. +func Convert_impl_DismountVolumeRequest_To_v1beta2_DismountVolumeRequest(in *impl.DismountVolumeRequest, out *v1beta2.DismountVolumeRequest) error { + return autoConvert_impl_DismountVolumeRequest_To_v1beta2_DismountVolumeRequest(in, out) +} + +func autoConvert_v1beta2_DismountVolumeResponse_To_impl_DismountVolumeResponse(in *v1beta2.DismountVolumeResponse, out *impl.DismountVolumeResponse) error { + return nil +} + +// Convert_v1beta2_DismountVolumeResponse_To_impl_DismountVolumeResponse is an autogenerated conversion function. +func Convert_v1beta2_DismountVolumeResponse_To_impl_DismountVolumeResponse(in *v1beta2.DismountVolumeResponse, out *impl.DismountVolumeResponse) error { + return autoConvert_v1beta2_DismountVolumeResponse_To_impl_DismountVolumeResponse(in, out) +} + +func autoConvert_impl_DismountVolumeResponse_To_v1beta2_DismountVolumeResponse(in *impl.DismountVolumeResponse, out *v1beta2.DismountVolumeResponse) error { + return nil +} + +// Convert_impl_DismountVolumeResponse_To_v1beta2_DismountVolumeResponse is an autogenerated conversion function. +func Convert_impl_DismountVolumeResponse_To_v1beta2_DismountVolumeResponse(in *impl.DismountVolumeResponse, out *v1beta2.DismountVolumeResponse) error { + return autoConvert_impl_DismountVolumeResponse_To_v1beta2_DismountVolumeResponse(in, out) +} + +func autoConvert_v1beta2_FormatVolumeRequest_To_impl_FormatVolumeRequest(in *v1beta2.FormatVolumeRequest, out *impl.FormatVolumeRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta2_FormatVolumeRequest_To_impl_FormatVolumeRequest is an autogenerated conversion function. +func Convert_v1beta2_FormatVolumeRequest_To_impl_FormatVolumeRequest(in *v1beta2.FormatVolumeRequest, out *impl.FormatVolumeRequest) error { + return autoConvert_v1beta2_FormatVolumeRequest_To_impl_FormatVolumeRequest(in, out) +} + +func autoConvert_impl_FormatVolumeRequest_To_v1beta2_FormatVolumeRequest(in *impl.FormatVolumeRequest, out *v1beta2.FormatVolumeRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_FormatVolumeRequest_To_v1beta2_FormatVolumeRequest is an autogenerated conversion function. +func Convert_impl_FormatVolumeRequest_To_v1beta2_FormatVolumeRequest(in *impl.FormatVolumeRequest, out *v1beta2.FormatVolumeRequest) error { + return autoConvert_impl_FormatVolumeRequest_To_v1beta2_FormatVolumeRequest(in, out) +} + +func autoConvert_v1beta2_FormatVolumeResponse_To_impl_FormatVolumeResponse(in *v1beta2.FormatVolumeResponse, out *impl.FormatVolumeResponse) error { + return nil +} + +// Convert_v1beta2_FormatVolumeResponse_To_impl_FormatVolumeResponse is an autogenerated conversion function. +func Convert_v1beta2_FormatVolumeResponse_To_impl_FormatVolumeResponse(in *v1beta2.FormatVolumeResponse, out *impl.FormatVolumeResponse) error { + return autoConvert_v1beta2_FormatVolumeResponse_To_impl_FormatVolumeResponse(in, out) +} + +func autoConvert_impl_FormatVolumeResponse_To_v1beta2_FormatVolumeResponse(in *impl.FormatVolumeResponse, out *v1beta2.FormatVolumeResponse) error { + return nil +} + +// Convert_impl_FormatVolumeResponse_To_v1beta2_FormatVolumeResponse is an autogenerated conversion function. +func Convert_impl_FormatVolumeResponse_To_v1beta2_FormatVolumeResponse(in *impl.FormatVolumeResponse, out *v1beta2.FormatVolumeResponse) error { + return autoConvert_impl_FormatVolumeResponse_To_v1beta2_FormatVolumeResponse(in, out) +} + +func autoConvert_v1beta2_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in *v1beta2.IsVolumeFormattedRequest, out *impl.IsVolumeFormattedRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta2_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest is an autogenerated conversion function. +func Convert_v1beta2_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in *v1beta2.IsVolumeFormattedRequest, out *impl.IsVolumeFormattedRequest) error { + return autoConvert_v1beta2_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in, out) +} + +func autoConvert_impl_IsVolumeFormattedRequest_To_v1beta2_IsVolumeFormattedRequest(in *impl.IsVolumeFormattedRequest, out *v1beta2.IsVolumeFormattedRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_IsVolumeFormattedRequest_To_v1beta2_IsVolumeFormattedRequest is an autogenerated conversion function. +func Convert_impl_IsVolumeFormattedRequest_To_v1beta2_IsVolumeFormattedRequest(in *impl.IsVolumeFormattedRequest, out *v1beta2.IsVolumeFormattedRequest) error { + return autoConvert_impl_IsVolumeFormattedRequest_To_v1beta2_IsVolumeFormattedRequest(in, out) +} + +func autoConvert_v1beta2_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in *v1beta2.IsVolumeFormattedResponse, out *impl.IsVolumeFormattedResponse) error { + out.Formatted = in.Formatted + return nil +} + +// Convert_v1beta2_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse is an autogenerated conversion function. +func Convert_v1beta2_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in *v1beta2.IsVolumeFormattedResponse, out *impl.IsVolumeFormattedResponse) error { + return autoConvert_v1beta2_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in, out) +} + +func autoConvert_impl_IsVolumeFormattedResponse_To_v1beta2_IsVolumeFormattedResponse(in *impl.IsVolumeFormattedResponse, out *v1beta2.IsVolumeFormattedResponse) error { + out.Formatted = in.Formatted + return nil +} + +// Convert_impl_IsVolumeFormattedResponse_To_v1beta2_IsVolumeFormattedResponse is an autogenerated conversion function. +func Convert_impl_IsVolumeFormattedResponse_To_v1beta2_IsVolumeFormattedResponse(in *impl.IsVolumeFormattedResponse, out *v1beta2.IsVolumeFormattedResponse) error { + return autoConvert_impl_IsVolumeFormattedResponse_To_v1beta2_IsVolumeFormattedResponse(in, out) +} + +// detected external conversion function +// Convert_v1beta2_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(in *v1beta2.ListVolumesOnDiskRequest, out *impl.ListVolumesOnDiskRequest) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ListVolumesOnDiskRequest_To_v1beta2_ListVolumesOnDiskRequest(in *impl.ListVolumesOnDiskRequest, out *v1beta2.ListVolumesOnDiskRequest) error +// skipping generation of the auto function + +func autoConvert_v1beta2_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in *v1beta2.ListVolumesOnDiskResponse, out *impl.ListVolumesOnDiskResponse) error { + out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) + return nil +} + +// Convert_v1beta2_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse is an autogenerated conversion function. +func Convert_v1beta2_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in *v1beta2.ListVolumesOnDiskResponse, out *impl.ListVolumesOnDiskResponse) error { + return autoConvert_v1beta2_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in, out) +} + +func autoConvert_impl_ListVolumesOnDiskResponse_To_v1beta2_ListVolumesOnDiskResponse(in *impl.ListVolumesOnDiskResponse, out *v1beta2.ListVolumesOnDiskResponse) error { + out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) + return nil +} + +// Convert_impl_ListVolumesOnDiskResponse_To_v1beta2_ListVolumesOnDiskResponse is an autogenerated conversion function. +func Convert_impl_ListVolumesOnDiskResponse_To_v1beta2_ListVolumesOnDiskResponse(in *impl.ListVolumesOnDiskResponse, out *v1beta2.ListVolumesOnDiskResponse) error { + return autoConvert_impl_ListVolumesOnDiskResponse_To_v1beta2_ListVolumesOnDiskResponse(in, out) +} + +// detected external conversion function +// Convert_v1beta2_MountVolumeRequest_To_impl_MountVolumeRequest(in *v1beta2.MountVolumeRequest, out *impl.MountVolumeRequest) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_MountVolumeRequest_To_v1beta2_MountVolumeRequest(in *impl.MountVolumeRequest, out *v1beta2.MountVolumeRequest) error +// skipping generation of the auto function + +func autoConvert_v1beta2_MountVolumeResponse_To_impl_MountVolumeResponse(in *v1beta2.MountVolumeResponse, out *impl.MountVolumeResponse) error { + return nil +} + +// Convert_v1beta2_MountVolumeResponse_To_impl_MountVolumeResponse is an autogenerated conversion function. +func Convert_v1beta2_MountVolumeResponse_To_impl_MountVolumeResponse(in *v1beta2.MountVolumeResponse, out *impl.MountVolumeResponse) error { + return autoConvert_v1beta2_MountVolumeResponse_To_impl_MountVolumeResponse(in, out) +} + +func autoConvert_impl_MountVolumeResponse_To_v1beta2_MountVolumeResponse(in *impl.MountVolumeResponse, out *v1beta2.MountVolumeResponse) error { + return nil +} + +// Convert_impl_MountVolumeResponse_To_v1beta2_MountVolumeResponse is an autogenerated conversion function. +func Convert_impl_MountVolumeResponse_To_v1beta2_MountVolumeResponse(in *impl.MountVolumeResponse, out *v1beta2.MountVolumeResponse) error { + return autoConvert_impl_MountVolumeResponse_To_v1beta2_MountVolumeResponse(in, out) +} + +// detected external conversion function +// Convert_v1beta2_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(in *v1beta2.ResizeVolumeRequest, out *impl.ResizeVolumeRequest) error +// skipping generation of the auto function + +// detected external conversion function +// Convert_impl_ResizeVolumeRequest_To_v1beta2_ResizeVolumeRequest(in *impl.ResizeVolumeRequest, out *v1beta2.ResizeVolumeRequest) error +// skipping generation of the auto function + +func autoConvert_v1beta2_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in *v1beta2.ResizeVolumeResponse, out *impl.ResizeVolumeResponse) error { + return nil +} + +// Convert_v1beta2_ResizeVolumeResponse_To_impl_ResizeVolumeResponse is an autogenerated conversion function. +func Convert_v1beta2_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in *v1beta2.ResizeVolumeResponse, out *impl.ResizeVolumeResponse) error { + return autoConvert_v1beta2_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in, out) +} + +func autoConvert_impl_ResizeVolumeResponse_To_v1beta2_ResizeVolumeResponse(in *impl.ResizeVolumeResponse, out *v1beta2.ResizeVolumeResponse) error { + return nil +} + +// Convert_impl_ResizeVolumeResponse_To_v1beta2_ResizeVolumeResponse is an autogenerated conversion function. +func Convert_impl_ResizeVolumeResponse_To_v1beta2_ResizeVolumeResponse(in *impl.ResizeVolumeResponse, out *v1beta2.ResizeVolumeResponse) error { + return autoConvert_impl_ResizeVolumeResponse_To_v1beta2_ResizeVolumeResponse(in, out) +} + +func autoConvert_v1beta2_VolumeDiskNumberRequest_To_impl_VolumeDiskNumberRequest(in *v1beta2.VolumeDiskNumberRequest, out *impl.VolumeDiskNumberRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta2_VolumeDiskNumberRequest_To_impl_VolumeDiskNumberRequest is an autogenerated conversion function. +func Convert_v1beta2_VolumeDiskNumberRequest_To_impl_VolumeDiskNumberRequest(in *v1beta2.VolumeDiskNumberRequest, out *impl.VolumeDiskNumberRequest) error { + return autoConvert_v1beta2_VolumeDiskNumberRequest_To_impl_VolumeDiskNumberRequest(in, out) +} + +func autoConvert_impl_VolumeDiskNumberRequest_To_v1beta2_VolumeDiskNumberRequest(in *impl.VolumeDiskNumberRequest, out *v1beta2.VolumeDiskNumberRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_VolumeDiskNumberRequest_To_v1beta2_VolumeDiskNumberRequest is an autogenerated conversion function. +func Convert_impl_VolumeDiskNumberRequest_To_v1beta2_VolumeDiskNumberRequest(in *impl.VolumeDiskNumberRequest, out *v1beta2.VolumeDiskNumberRequest) error { + return autoConvert_impl_VolumeDiskNumberRequest_To_v1beta2_VolumeDiskNumberRequest(in, out) +} + +func autoConvert_v1beta2_VolumeDiskNumberResponse_To_impl_VolumeDiskNumberResponse(in *v1beta2.VolumeDiskNumberResponse, out *impl.VolumeDiskNumberResponse) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_v1beta2_VolumeDiskNumberResponse_To_impl_VolumeDiskNumberResponse is an autogenerated conversion function. +func Convert_v1beta2_VolumeDiskNumberResponse_To_impl_VolumeDiskNumberResponse(in *v1beta2.VolumeDiskNumberResponse, out *impl.VolumeDiskNumberResponse) error { + return autoConvert_v1beta2_VolumeDiskNumberResponse_To_impl_VolumeDiskNumberResponse(in, out) +} + +func autoConvert_impl_VolumeDiskNumberResponse_To_v1beta2_VolumeDiskNumberResponse(in *impl.VolumeDiskNumberResponse, out *v1beta2.VolumeDiskNumberResponse) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_impl_VolumeDiskNumberResponse_To_v1beta2_VolumeDiskNumberResponse is an autogenerated conversion function. +func Convert_impl_VolumeDiskNumberResponse_To_v1beta2_VolumeDiskNumberResponse(in *impl.VolumeDiskNumberResponse, out *v1beta2.VolumeDiskNumberResponse) error { + return autoConvert_impl_VolumeDiskNumberResponse_To_v1beta2_VolumeDiskNumberResponse(in, out) +} + +func autoConvert_v1beta2_VolumeIDFromMountRequest_To_impl_VolumeIDFromMountRequest(in *v1beta2.VolumeIDFromMountRequest, out *impl.VolumeIDFromMountRequest) error { + out.Mount = in.Mount + return nil +} + +// Convert_v1beta2_VolumeIDFromMountRequest_To_impl_VolumeIDFromMountRequest is an autogenerated conversion function. +func Convert_v1beta2_VolumeIDFromMountRequest_To_impl_VolumeIDFromMountRequest(in *v1beta2.VolumeIDFromMountRequest, out *impl.VolumeIDFromMountRequest) error { + return autoConvert_v1beta2_VolumeIDFromMountRequest_To_impl_VolumeIDFromMountRequest(in, out) +} + +func autoConvert_impl_VolumeIDFromMountRequest_To_v1beta2_VolumeIDFromMountRequest(in *impl.VolumeIDFromMountRequest, out *v1beta2.VolumeIDFromMountRequest) error { + out.Mount = in.Mount + return nil +} + +// Convert_impl_VolumeIDFromMountRequest_To_v1beta2_VolumeIDFromMountRequest is an autogenerated conversion function. +func Convert_impl_VolumeIDFromMountRequest_To_v1beta2_VolumeIDFromMountRequest(in *impl.VolumeIDFromMountRequest, out *v1beta2.VolumeIDFromMountRequest) error { + return autoConvert_impl_VolumeIDFromMountRequest_To_v1beta2_VolumeIDFromMountRequest(in, out) +} + +func autoConvert_v1beta2_VolumeIDFromMountResponse_To_impl_VolumeIDFromMountResponse(in *v1beta2.VolumeIDFromMountResponse, out *impl.VolumeIDFromMountResponse) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta2_VolumeIDFromMountResponse_To_impl_VolumeIDFromMountResponse is an autogenerated conversion function. +func Convert_v1beta2_VolumeIDFromMountResponse_To_impl_VolumeIDFromMountResponse(in *v1beta2.VolumeIDFromMountResponse, out *impl.VolumeIDFromMountResponse) error { + return autoConvert_v1beta2_VolumeIDFromMountResponse_To_impl_VolumeIDFromMountResponse(in, out) +} + +func autoConvert_impl_VolumeIDFromMountResponse_To_v1beta2_VolumeIDFromMountResponse(in *impl.VolumeIDFromMountResponse, out *v1beta2.VolumeIDFromMountResponse) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_VolumeIDFromMountResponse_To_v1beta2_VolumeIDFromMountResponse is an autogenerated conversion function. +func Convert_impl_VolumeIDFromMountResponse_To_v1beta2_VolumeIDFromMountResponse(in *impl.VolumeIDFromMountResponse, out *v1beta2.VolumeIDFromMountResponse) error { + return autoConvert_impl_VolumeIDFromMountResponse_To_v1beta2_VolumeIDFromMountResponse(in, out) +} + +func autoConvert_v1beta2_VolumeStatsRequest_To_impl_VolumeStatsRequest(in *v1beta2.VolumeStatsRequest, out *impl.VolumeStatsRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta2_VolumeStatsRequest_To_impl_VolumeStatsRequest is an autogenerated conversion function. +func Convert_v1beta2_VolumeStatsRequest_To_impl_VolumeStatsRequest(in *v1beta2.VolumeStatsRequest, out *impl.VolumeStatsRequest) error { + return autoConvert_v1beta2_VolumeStatsRequest_To_impl_VolumeStatsRequest(in, out) +} + +func autoConvert_impl_VolumeStatsRequest_To_v1beta2_VolumeStatsRequest(in *impl.VolumeStatsRequest, out *v1beta2.VolumeStatsRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_VolumeStatsRequest_To_v1beta2_VolumeStatsRequest is an autogenerated conversion function. +func Convert_impl_VolumeStatsRequest_To_v1beta2_VolumeStatsRequest(in *impl.VolumeStatsRequest, out *v1beta2.VolumeStatsRequest) error { + return autoConvert_impl_VolumeStatsRequest_To_v1beta2_VolumeStatsRequest(in, out) +} + +func autoConvert_v1beta2_VolumeStatsResponse_To_impl_VolumeStatsResponse(in *v1beta2.VolumeStatsResponse, out *impl.VolumeStatsResponse) error { + out.VolumeSize = in.VolumeSize + out.VolumeUsedSize = in.VolumeUsedSize + return nil +} + +// Convert_v1beta2_VolumeStatsResponse_To_impl_VolumeStatsResponse is an autogenerated conversion function. +func Convert_v1beta2_VolumeStatsResponse_To_impl_VolumeStatsResponse(in *v1beta2.VolumeStatsResponse, out *impl.VolumeStatsResponse) error { + return autoConvert_v1beta2_VolumeStatsResponse_To_impl_VolumeStatsResponse(in, out) +} + +func autoConvert_impl_VolumeStatsResponse_To_v1beta2_VolumeStatsResponse(in *impl.VolumeStatsResponse, out *v1beta2.VolumeStatsResponse) error { + out.VolumeSize = in.VolumeSize + out.VolumeUsedSize = in.VolumeUsedSize + return nil +} + +// Convert_impl_VolumeStatsResponse_To_v1beta2_VolumeStatsResponse is an autogenerated conversion function. +func Convert_impl_VolumeStatsResponse_To_v1beta2_VolumeStatsResponse(in *impl.VolumeStatsResponse, out *v1beta2.VolumeStatsResponse) error { + return autoConvert_impl_VolumeStatsResponse_To_v1beta2_VolumeStatsResponse(in, out) +} + +func autoConvert_v1beta2_WriteVolumeCacheRequest_To_impl_WriteVolumeCacheRequest(in *v1beta2.WriteVolumeCacheRequest, out *impl.WriteVolumeCacheRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta2_WriteVolumeCacheRequest_To_impl_WriteVolumeCacheRequest is an autogenerated conversion function. +func Convert_v1beta2_WriteVolumeCacheRequest_To_impl_WriteVolumeCacheRequest(in *v1beta2.WriteVolumeCacheRequest, out *impl.WriteVolumeCacheRequest) error { + return autoConvert_v1beta2_WriteVolumeCacheRequest_To_impl_WriteVolumeCacheRequest(in, out) +} + +func autoConvert_impl_WriteVolumeCacheRequest_To_v1beta2_WriteVolumeCacheRequest(in *impl.WriteVolumeCacheRequest, out *v1beta2.WriteVolumeCacheRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_WriteVolumeCacheRequest_To_v1beta2_WriteVolumeCacheRequest is an autogenerated conversion function. +func Convert_impl_WriteVolumeCacheRequest_To_v1beta2_WriteVolumeCacheRequest(in *impl.WriteVolumeCacheRequest, out *v1beta2.WriteVolumeCacheRequest) error { + return autoConvert_impl_WriteVolumeCacheRequest_To_v1beta2_WriteVolumeCacheRequest(in, out) +} + +func autoConvert_v1beta2_WriteVolumeCacheResponse_To_impl_WriteVolumeCacheResponse(in *v1beta2.WriteVolumeCacheResponse, out *impl.WriteVolumeCacheResponse) error { + return nil +} + +// Convert_v1beta2_WriteVolumeCacheResponse_To_impl_WriteVolumeCacheResponse is an autogenerated conversion function. +func Convert_v1beta2_WriteVolumeCacheResponse_To_impl_WriteVolumeCacheResponse(in *v1beta2.WriteVolumeCacheResponse, out *impl.WriteVolumeCacheResponse) error { + return autoConvert_v1beta2_WriteVolumeCacheResponse_To_impl_WriteVolumeCacheResponse(in, out) +} + +func autoConvert_impl_WriteVolumeCacheResponse_To_v1beta2_WriteVolumeCacheResponse(in *impl.WriteVolumeCacheResponse, out *v1beta2.WriteVolumeCacheResponse) error { + return nil +} + +// Convert_impl_WriteVolumeCacheResponse_To_v1beta2_WriteVolumeCacheResponse is an autogenerated conversion function. +func Convert_impl_WriteVolumeCacheResponse_To_v1beta2_WriteVolumeCacheResponse(in *impl.WriteVolumeCacheResponse, out *v1beta2.WriteVolumeCacheResponse) error { + return autoConvert_impl_WriteVolumeCacheResponse_To_v1beta2_WriteVolumeCacheResponse(in, out) +} diff --git a/internal/server/volume/internal/v1beta2/server_generated.go b/pkg/server/volume/impl/v1beta2/server_generated.go similarity index 59% rename from internal/server/volume/internal/v1beta2/server_generated.go rename to pkg/server/volume/impl/v1beta2/server_generated.go index bc842ed0..1a5078d4 100644 --- a/internal/server/volume/internal/v1beta2/server_generated.go +++ b/pkg/server/volume/impl/v1beta2/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta2" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1beta2") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) DismountVolume(context context.Context, versionedRequest *v1beta2.DismountVolumeRequest) (*v1beta2.DismountVolumeResponse, error) { - request := &internal.DismountVolumeRequest{} - if err := Convert_v1beta2_DismountVolumeRequest_To_internal_DismountVolumeRequest(versionedRequest, request); err != nil { + request := &impl.DismountVolumeRequest{} + if err := Convert_v1beta2_DismountVolumeRequest_To_impl_DismountVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) DismountVolume(context context.Context, versionedRequest } versionedResponse := &v1beta2.DismountVolumeResponse{} - if err := Convert_internal_DismountVolumeResponse_To_v1beta2_DismountVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_DismountVolumeResponse_To_v1beta2_DismountVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) DismountVolume(context context.Context, versionedRequest } func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v1beta2.FormatVolumeRequest) (*v1beta2.FormatVolumeResponse, error) { - request := &internal.FormatVolumeRequest{} - if err := Convert_v1beta2_FormatVolumeRequest_To_internal_FormatVolumeRequest(versionedRequest, request); err != nil { + request := &impl.FormatVolumeRequest{} + if err := Convert_v1beta2_FormatVolumeRequest_To_impl_FormatVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v } versionedResponse := &v1beta2.FormatVolumeResponse{} - if err := Convert_internal_FormatVolumeResponse_To_v1beta2_FormatVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_FormatVolumeResponse_To_v1beta2_FormatVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v } func (s *versionedAPI) GetVolumeDiskNumber(context context.Context, versionedRequest *v1beta2.VolumeDiskNumberRequest) (*v1beta2.VolumeDiskNumberResponse, error) { - request := &internal.VolumeDiskNumberRequest{} - if err := Convert_v1beta2_VolumeDiskNumberRequest_To_internal_VolumeDiskNumberRequest(versionedRequest, request); err != nil { + request := &impl.VolumeDiskNumberRequest{} + if err := Convert_v1beta2_VolumeDiskNumberRequest_To_impl_VolumeDiskNumberRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) GetVolumeDiskNumber(context context.Context, versionedReq } versionedResponse := &v1beta2.VolumeDiskNumberResponse{} - if err := Convert_internal_VolumeDiskNumberResponse_To_v1beta2_VolumeDiskNumberResponse(response, versionedResponse); err != nil { + if err := Convert_impl_VolumeDiskNumberResponse_To_v1beta2_VolumeDiskNumberResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) GetVolumeDiskNumber(context context.Context, versionedReq } func (s *versionedAPI) GetVolumeIDFromMount(context context.Context, versionedRequest *v1beta2.VolumeIDFromMountRequest) (*v1beta2.VolumeIDFromMountResponse, error) { - request := &internal.VolumeIDFromMountRequest{} - if err := Convert_v1beta2_VolumeIDFromMountRequest_To_internal_VolumeIDFromMountRequest(versionedRequest, request); err != nil { + request := &impl.VolumeIDFromMountRequest{} + if err := Convert_v1beta2_VolumeIDFromMountRequest_To_impl_VolumeIDFromMountRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) GetVolumeIDFromMount(context context.Context, versionedRe } versionedResponse := &v1beta2.VolumeIDFromMountResponse{} - if err := Convert_internal_VolumeIDFromMountResponse_To_v1beta2_VolumeIDFromMountResponse(response, versionedResponse); err != nil { + if err := Convert_impl_VolumeIDFromMountResponse_To_v1beta2_VolumeIDFromMountResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) GetVolumeIDFromMount(context context.Context, versionedRe } func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedRequest *v1beta2.IsVolumeFormattedRequest) (*v1beta2.IsVolumeFormattedResponse, error) { - request := &internal.IsVolumeFormattedRequest{} - if err := Convert_v1beta2_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(versionedRequest, request); err != nil { + request := &impl.IsVolumeFormattedRequest{} + if err := Convert_v1beta2_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedReque } versionedResponse := &v1beta2.IsVolumeFormattedResponse{} - if err := Convert_internal_IsVolumeFormattedResponse_To_v1beta2_IsVolumeFormattedResponse(response, versionedResponse); err != nil { + if err := Convert_impl_IsVolumeFormattedResponse_To_v1beta2_IsVolumeFormattedResponse(response, versionedResponse); err != nil { return nil, err } @@ -123,8 +123,8 @@ func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedReque } func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedRequest *v1beta2.ListVolumesOnDiskRequest) (*v1beta2.ListVolumesOnDiskResponse, error) { - request := &internal.ListVolumesOnDiskRequest{} - if err := Convert_v1beta2_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(versionedRequest, request); err != nil { + request := &impl.ListVolumesOnDiskRequest{} + if err := Convert_v1beta2_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(versionedRequest, request); err != nil { return nil, err } @@ -134,7 +134,7 @@ func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedReque } versionedResponse := &v1beta2.ListVolumesOnDiskResponse{} - if err := Convert_internal_ListVolumesOnDiskResponse_To_v1beta2_ListVolumesOnDiskResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListVolumesOnDiskResponse_To_v1beta2_ListVolumesOnDiskResponse(response, versionedResponse); err != nil { return nil, err } @@ -142,8 +142,8 @@ func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedReque } func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1beta2.MountVolumeRequest) (*v1beta2.MountVolumeResponse, error) { - request := &internal.MountVolumeRequest{} - if err := Convert_v1beta2_MountVolumeRequest_To_internal_MountVolumeRequest(versionedRequest, request); err != nil { + request := &impl.MountVolumeRequest{} + if err := Convert_v1beta2_MountVolumeRequest_To_impl_MountVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -153,7 +153,7 @@ func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1 } versionedResponse := &v1beta2.MountVolumeResponse{} - if err := Convert_internal_MountVolumeResponse_To_v1beta2_MountVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_MountVolumeResponse_To_v1beta2_MountVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -161,8 +161,8 @@ func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1 } func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v1beta2.ResizeVolumeRequest) (*v1beta2.ResizeVolumeResponse, error) { - request := &internal.ResizeVolumeRequest{} - if err := Convert_v1beta2_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(versionedRequest, request); err != nil { + request := &impl.ResizeVolumeRequest{} + if err := Convert_v1beta2_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -172,7 +172,7 @@ func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v } versionedResponse := &v1beta2.ResizeVolumeResponse{} - if err := Convert_internal_ResizeVolumeResponse_To_v1beta2_ResizeVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ResizeVolumeResponse_To_v1beta2_ResizeVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -180,8 +180,8 @@ func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v } func (s *versionedAPI) VolumeStats(context context.Context, versionedRequest *v1beta2.VolumeStatsRequest) (*v1beta2.VolumeStatsResponse, error) { - request := &internal.VolumeStatsRequest{} - if err := Convert_v1beta2_VolumeStatsRequest_To_internal_VolumeStatsRequest(versionedRequest, request); err != nil { + request := &impl.VolumeStatsRequest{} + if err := Convert_v1beta2_VolumeStatsRequest_To_impl_VolumeStatsRequest(versionedRequest, request); err != nil { return nil, err } @@ -191,7 +191,7 @@ func (s *versionedAPI) VolumeStats(context context.Context, versionedRequest *v1 } versionedResponse := &v1beta2.VolumeStatsResponse{} - if err := Convert_internal_VolumeStatsResponse_To_v1beta2_VolumeStatsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_VolumeStatsResponse_To_v1beta2_VolumeStatsResponse(response, versionedResponse); err != nil { return nil, err } @@ -199,8 +199,8 @@ func (s *versionedAPI) VolumeStats(context context.Context, versionedRequest *v1 } func (s *versionedAPI) WriteVolumeCache(context context.Context, versionedRequest *v1beta2.WriteVolumeCacheRequest) (*v1beta2.WriteVolumeCacheResponse, error) { - request := &internal.WriteVolumeCacheRequest{} - if err := Convert_v1beta2_WriteVolumeCacheRequest_To_internal_WriteVolumeCacheRequest(versionedRequest, request); err != nil { + request := &impl.WriteVolumeCacheRequest{} + if err := Convert_v1beta2_WriteVolumeCacheRequest_To_impl_WriteVolumeCacheRequest(versionedRequest, request); err != nil { return nil, err } @@ -210,7 +210,7 @@ func (s *versionedAPI) WriteVolumeCache(context context.Context, versionedReques } versionedResponse := &v1beta2.WriteVolumeCacheResponse{} - if err := Convert_internal_WriteVolumeCacheResponse_To_v1beta2_WriteVolumeCacheResponse(response, versionedResponse); err != nil { + if err := Convert_impl_WriteVolumeCacheResponse_To_v1beta2_WriteVolumeCacheResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/volume/internal/v1beta3/conversion.go b/pkg/server/volume/impl/v1beta3/conversion.go similarity index 100% rename from internal/server/volume/internal/v1beta3/conversion.go rename to pkg/server/volume/impl/v1beta3/conversion.go diff --git a/pkg/server/volume/impl/v1beta3/conversion_generated.go b/pkg/server/volume/impl/v1beta3/conversion_generated.go new file mode 100644 index 00000000..eb7de83c --- /dev/null +++ b/pkg/server/volume/impl/v1beta3/conversion_generated.go @@ -0,0 +1,410 @@ +// Code generated by csi-proxy-api-gen. DO NOT EDIT. + +package v1beta3 + +import ( + unsafe "unsafe" + + v1beta3 "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3" + impl "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" +) + +func autoConvert_v1beta3_FormatVolumeRequest_To_impl_FormatVolumeRequest(in *v1beta3.FormatVolumeRequest, out *impl.FormatVolumeRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta3_FormatVolumeRequest_To_impl_FormatVolumeRequest is an autogenerated conversion function. +func Convert_v1beta3_FormatVolumeRequest_To_impl_FormatVolumeRequest(in *v1beta3.FormatVolumeRequest, out *impl.FormatVolumeRequest) error { + return autoConvert_v1beta3_FormatVolumeRequest_To_impl_FormatVolumeRequest(in, out) +} + +func autoConvert_impl_FormatVolumeRequest_To_v1beta3_FormatVolumeRequest(in *impl.FormatVolumeRequest, out *v1beta3.FormatVolumeRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_FormatVolumeRequest_To_v1beta3_FormatVolumeRequest is an autogenerated conversion function. +func Convert_impl_FormatVolumeRequest_To_v1beta3_FormatVolumeRequest(in *impl.FormatVolumeRequest, out *v1beta3.FormatVolumeRequest) error { + return autoConvert_impl_FormatVolumeRequest_To_v1beta3_FormatVolumeRequest(in, out) +} + +func autoConvert_v1beta3_FormatVolumeResponse_To_impl_FormatVolumeResponse(in *v1beta3.FormatVolumeResponse, out *impl.FormatVolumeResponse) error { + return nil +} + +// Convert_v1beta3_FormatVolumeResponse_To_impl_FormatVolumeResponse is an autogenerated conversion function. +func Convert_v1beta3_FormatVolumeResponse_To_impl_FormatVolumeResponse(in *v1beta3.FormatVolumeResponse, out *impl.FormatVolumeResponse) error { + return autoConvert_v1beta3_FormatVolumeResponse_To_impl_FormatVolumeResponse(in, out) +} + +func autoConvert_impl_FormatVolumeResponse_To_v1beta3_FormatVolumeResponse(in *impl.FormatVolumeResponse, out *v1beta3.FormatVolumeResponse) error { + return nil +} + +// Convert_impl_FormatVolumeResponse_To_v1beta3_FormatVolumeResponse is an autogenerated conversion function. +func Convert_impl_FormatVolumeResponse_To_v1beta3_FormatVolumeResponse(in *impl.FormatVolumeResponse, out *v1beta3.FormatVolumeResponse) error { + return autoConvert_impl_FormatVolumeResponse_To_v1beta3_FormatVolumeResponse(in, out) +} + +func autoConvert_v1beta3_GetDiskNumberFromVolumeIDRequest_To_impl_GetDiskNumberFromVolumeIDRequest(in *v1beta3.GetDiskNumberFromVolumeIDRequest, out *impl.GetDiskNumberFromVolumeIDRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta3_GetDiskNumberFromVolumeIDRequest_To_impl_GetDiskNumberFromVolumeIDRequest is an autogenerated conversion function. +func Convert_v1beta3_GetDiskNumberFromVolumeIDRequest_To_impl_GetDiskNumberFromVolumeIDRequest(in *v1beta3.GetDiskNumberFromVolumeIDRequest, out *impl.GetDiskNumberFromVolumeIDRequest) error { + return autoConvert_v1beta3_GetDiskNumberFromVolumeIDRequest_To_impl_GetDiskNumberFromVolumeIDRequest(in, out) +} + +func autoConvert_impl_GetDiskNumberFromVolumeIDRequest_To_v1beta3_GetDiskNumberFromVolumeIDRequest(in *impl.GetDiskNumberFromVolumeIDRequest, out *v1beta3.GetDiskNumberFromVolumeIDRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_GetDiskNumberFromVolumeIDRequest_To_v1beta3_GetDiskNumberFromVolumeIDRequest is an autogenerated conversion function. +func Convert_impl_GetDiskNumberFromVolumeIDRequest_To_v1beta3_GetDiskNumberFromVolumeIDRequest(in *impl.GetDiskNumberFromVolumeIDRequest, out *v1beta3.GetDiskNumberFromVolumeIDRequest) error { + return autoConvert_impl_GetDiskNumberFromVolumeIDRequest_To_v1beta3_GetDiskNumberFromVolumeIDRequest(in, out) +} + +func autoConvert_v1beta3_GetDiskNumberFromVolumeIDResponse_To_impl_GetDiskNumberFromVolumeIDResponse(in *v1beta3.GetDiskNumberFromVolumeIDResponse, out *impl.GetDiskNumberFromVolumeIDResponse) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_v1beta3_GetDiskNumberFromVolumeIDResponse_To_impl_GetDiskNumberFromVolumeIDResponse is an autogenerated conversion function. +func Convert_v1beta3_GetDiskNumberFromVolumeIDResponse_To_impl_GetDiskNumberFromVolumeIDResponse(in *v1beta3.GetDiskNumberFromVolumeIDResponse, out *impl.GetDiskNumberFromVolumeIDResponse) error { + return autoConvert_v1beta3_GetDiskNumberFromVolumeIDResponse_To_impl_GetDiskNumberFromVolumeIDResponse(in, out) +} + +func autoConvert_impl_GetDiskNumberFromVolumeIDResponse_To_v1beta3_GetDiskNumberFromVolumeIDResponse(in *impl.GetDiskNumberFromVolumeIDResponse, out *v1beta3.GetDiskNumberFromVolumeIDResponse) error { + out.DiskNumber = in.DiskNumber + return nil +} + +// Convert_impl_GetDiskNumberFromVolumeIDResponse_To_v1beta3_GetDiskNumberFromVolumeIDResponse is an autogenerated conversion function. +func Convert_impl_GetDiskNumberFromVolumeIDResponse_To_v1beta3_GetDiskNumberFromVolumeIDResponse(in *impl.GetDiskNumberFromVolumeIDResponse, out *v1beta3.GetDiskNumberFromVolumeIDResponse) error { + return autoConvert_impl_GetDiskNumberFromVolumeIDResponse_To_v1beta3_GetDiskNumberFromVolumeIDResponse(in, out) +} + +func autoConvert_v1beta3_GetVolumeIDFromTargetPathRequest_To_impl_GetVolumeIDFromTargetPathRequest(in *v1beta3.GetVolumeIDFromTargetPathRequest, out *impl.GetVolumeIDFromTargetPathRequest) error { + out.TargetPath = in.TargetPath + return nil +} + +// Convert_v1beta3_GetVolumeIDFromTargetPathRequest_To_impl_GetVolumeIDFromTargetPathRequest is an autogenerated conversion function. +func Convert_v1beta3_GetVolumeIDFromTargetPathRequest_To_impl_GetVolumeIDFromTargetPathRequest(in *v1beta3.GetVolumeIDFromTargetPathRequest, out *impl.GetVolumeIDFromTargetPathRequest) error { + return autoConvert_v1beta3_GetVolumeIDFromTargetPathRequest_To_impl_GetVolumeIDFromTargetPathRequest(in, out) +} + +func autoConvert_impl_GetVolumeIDFromTargetPathRequest_To_v1beta3_GetVolumeIDFromTargetPathRequest(in *impl.GetVolumeIDFromTargetPathRequest, out *v1beta3.GetVolumeIDFromTargetPathRequest) error { + out.TargetPath = in.TargetPath + return nil +} + +// Convert_impl_GetVolumeIDFromTargetPathRequest_To_v1beta3_GetVolumeIDFromTargetPathRequest is an autogenerated conversion function. +func Convert_impl_GetVolumeIDFromTargetPathRequest_To_v1beta3_GetVolumeIDFromTargetPathRequest(in *impl.GetVolumeIDFromTargetPathRequest, out *v1beta3.GetVolumeIDFromTargetPathRequest) error { + return autoConvert_impl_GetVolumeIDFromTargetPathRequest_To_v1beta3_GetVolumeIDFromTargetPathRequest(in, out) +} + +func autoConvert_v1beta3_GetVolumeIDFromTargetPathResponse_To_impl_GetVolumeIDFromTargetPathResponse(in *v1beta3.GetVolumeIDFromTargetPathResponse, out *impl.GetVolumeIDFromTargetPathResponse) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta3_GetVolumeIDFromTargetPathResponse_To_impl_GetVolumeIDFromTargetPathResponse is an autogenerated conversion function. +func Convert_v1beta3_GetVolumeIDFromTargetPathResponse_To_impl_GetVolumeIDFromTargetPathResponse(in *v1beta3.GetVolumeIDFromTargetPathResponse, out *impl.GetVolumeIDFromTargetPathResponse) error { + return autoConvert_v1beta3_GetVolumeIDFromTargetPathResponse_To_impl_GetVolumeIDFromTargetPathResponse(in, out) +} + +func autoConvert_impl_GetVolumeIDFromTargetPathResponse_To_v1beta3_GetVolumeIDFromTargetPathResponse(in *impl.GetVolumeIDFromTargetPathResponse, out *v1beta3.GetVolumeIDFromTargetPathResponse) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_GetVolumeIDFromTargetPathResponse_To_v1beta3_GetVolumeIDFromTargetPathResponse is an autogenerated conversion function. +func Convert_impl_GetVolumeIDFromTargetPathResponse_To_v1beta3_GetVolumeIDFromTargetPathResponse(in *impl.GetVolumeIDFromTargetPathResponse, out *v1beta3.GetVolumeIDFromTargetPathResponse) error { + return autoConvert_impl_GetVolumeIDFromTargetPathResponse_To_v1beta3_GetVolumeIDFromTargetPathResponse(in, out) +} + +func autoConvert_v1beta3_GetVolumeStatsRequest_To_impl_GetVolumeStatsRequest(in *v1beta3.GetVolumeStatsRequest, out *impl.GetVolumeStatsRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta3_GetVolumeStatsRequest_To_impl_GetVolumeStatsRequest is an autogenerated conversion function. +func Convert_v1beta3_GetVolumeStatsRequest_To_impl_GetVolumeStatsRequest(in *v1beta3.GetVolumeStatsRequest, out *impl.GetVolumeStatsRequest) error { + return autoConvert_v1beta3_GetVolumeStatsRequest_To_impl_GetVolumeStatsRequest(in, out) +} + +func autoConvert_impl_GetVolumeStatsRequest_To_v1beta3_GetVolumeStatsRequest(in *impl.GetVolumeStatsRequest, out *v1beta3.GetVolumeStatsRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_GetVolumeStatsRequest_To_v1beta3_GetVolumeStatsRequest is an autogenerated conversion function. +func Convert_impl_GetVolumeStatsRequest_To_v1beta3_GetVolumeStatsRequest(in *impl.GetVolumeStatsRequest, out *v1beta3.GetVolumeStatsRequest) error { + return autoConvert_impl_GetVolumeStatsRequest_To_v1beta3_GetVolumeStatsRequest(in, out) +} + +func autoConvert_v1beta3_GetVolumeStatsResponse_To_impl_GetVolumeStatsResponse(in *v1beta3.GetVolumeStatsResponse, out *impl.GetVolumeStatsResponse) error { + out.TotalBytes = in.TotalBytes + out.UsedBytes = in.UsedBytes + return nil +} + +// Convert_v1beta3_GetVolumeStatsResponse_To_impl_GetVolumeStatsResponse is an autogenerated conversion function. +func Convert_v1beta3_GetVolumeStatsResponse_To_impl_GetVolumeStatsResponse(in *v1beta3.GetVolumeStatsResponse, out *impl.GetVolumeStatsResponse) error { + return autoConvert_v1beta3_GetVolumeStatsResponse_To_impl_GetVolumeStatsResponse(in, out) +} + +func autoConvert_impl_GetVolumeStatsResponse_To_v1beta3_GetVolumeStatsResponse(in *impl.GetVolumeStatsResponse, out *v1beta3.GetVolumeStatsResponse) error { + out.TotalBytes = in.TotalBytes + out.UsedBytes = in.UsedBytes + return nil +} + +// Convert_impl_GetVolumeStatsResponse_To_v1beta3_GetVolumeStatsResponse is an autogenerated conversion function. +func Convert_impl_GetVolumeStatsResponse_To_v1beta3_GetVolumeStatsResponse(in *impl.GetVolumeStatsResponse, out *v1beta3.GetVolumeStatsResponse) error { + return autoConvert_impl_GetVolumeStatsResponse_To_v1beta3_GetVolumeStatsResponse(in, out) +} + +func autoConvert_v1beta3_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in *v1beta3.IsVolumeFormattedRequest, out *impl.IsVolumeFormattedRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta3_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest is an autogenerated conversion function. +func Convert_v1beta3_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in *v1beta3.IsVolumeFormattedRequest, out *impl.IsVolumeFormattedRequest) error { + return autoConvert_v1beta3_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(in, out) +} + +func autoConvert_impl_IsVolumeFormattedRequest_To_v1beta3_IsVolumeFormattedRequest(in *impl.IsVolumeFormattedRequest, out *v1beta3.IsVolumeFormattedRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_IsVolumeFormattedRequest_To_v1beta3_IsVolumeFormattedRequest is an autogenerated conversion function. +func Convert_impl_IsVolumeFormattedRequest_To_v1beta3_IsVolumeFormattedRequest(in *impl.IsVolumeFormattedRequest, out *v1beta3.IsVolumeFormattedRequest) error { + return autoConvert_impl_IsVolumeFormattedRequest_To_v1beta3_IsVolumeFormattedRequest(in, out) +} + +func autoConvert_v1beta3_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in *v1beta3.IsVolumeFormattedResponse, out *impl.IsVolumeFormattedResponse) error { + out.Formatted = in.Formatted + return nil +} + +// Convert_v1beta3_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse is an autogenerated conversion function. +func Convert_v1beta3_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in *v1beta3.IsVolumeFormattedResponse, out *impl.IsVolumeFormattedResponse) error { + return autoConvert_v1beta3_IsVolumeFormattedResponse_To_impl_IsVolumeFormattedResponse(in, out) +} + +func autoConvert_impl_IsVolumeFormattedResponse_To_v1beta3_IsVolumeFormattedResponse(in *impl.IsVolumeFormattedResponse, out *v1beta3.IsVolumeFormattedResponse) error { + out.Formatted = in.Formatted + return nil +} + +// Convert_impl_IsVolumeFormattedResponse_To_v1beta3_IsVolumeFormattedResponse is an autogenerated conversion function. +func Convert_impl_IsVolumeFormattedResponse_To_v1beta3_IsVolumeFormattedResponse(in *impl.IsVolumeFormattedResponse, out *v1beta3.IsVolumeFormattedResponse) error { + return autoConvert_impl_IsVolumeFormattedResponse_To_v1beta3_IsVolumeFormattedResponse(in, out) +} + +func autoConvert_v1beta3_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(in *v1beta3.ListVolumesOnDiskRequest, out *impl.ListVolumesOnDiskRequest) error { + out.DiskNumber = in.DiskNumber + out.PartitionNumber = in.PartitionNumber + return nil +} + +// Convert_v1beta3_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest is an autogenerated conversion function. +func Convert_v1beta3_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(in *v1beta3.ListVolumesOnDiskRequest, out *impl.ListVolumesOnDiskRequest) error { + return autoConvert_v1beta3_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(in, out) +} + +func autoConvert_impl_ListVolumesOnDiskRequest_To_v1beta3_ListVolumesOnDiskRequest(in *impl.ListVolumesOnDiskRequest, out *v1beta3.ListVolumesOnDiskRequest) error { + out.DiskNumber = in.DiskNumber + out.PartitionNumber = in.PartitionNumber + return nil +} + +// Convert_impl_ListVolumesOnDiskRequest_To_v1beta3_ListVolumesOnDiskRequest is an autogenerated conversion function. +func Convert_impl_ListVolumesOnDiskRequest_To_v1beta3_ListVolumesOnDiskRequest(in *impl.ListVolumesOnDiskRequest, out *v1beta3.ListVolumesOnDiskRequest) error { + return autoConvert_impl_ListVolumesOnDiskRequest_To_v1beta3_ListVolumesOnDiskRequest(in, out) +} + +func autoConvert_v1beta3_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in *v1beta3.ListVolumesOnDiskResponse, out *impl.ListVolumesOnDiskResponse) error { + out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) + return nil +} + +// Convert_v1beta3_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse is an autogenerated conversion function. +func Convert_v1beta3_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in *v1beta3.ListVolumesOnDiskResponse, out *impl.ListVolumesOnDiskResponse) error { + return autoConvert_v1beta3_ListVolumesOnDiskResponse_To_impl_ListVolumesOnDiskResponse(in, out) +} + +func autoConvert_impl_ListVolumesOnDiskResponse_To_v1beta3_ListVolumesOnDiskResponse(in *impl.ListVolumesOnDiskResponse, out *v1beta3.ListVolumesOnDiskResponse) error { + out.VolumeIds = *(*[]string)(unsafe.Pointer(&in.VolumeIds)) + return nil +} + +// Convert_impl_ListVolumesOnDiskResponse_To_v1beta3_ListVolumesOnDiskResponse is an autogenerated conversion function. +func Convert_impl_ListVolumesOnDiskResponse_To_v1beta3_ListVolumesOnDiskResponse(in *impl.ListVolumesOnDiskResponse, out *v1beta3.ListVolumesOnDiskResponse) error { + return autoConvert_impl_ListVolumesOnDiskResponse_To_v1beta3_ListVolumesOnDiskResponse(in, out) +} + +func autoConvert_v1beta3_MountVolumeRequest_To_impl_MountVolumeRequest(in *v1beta3.MountVolumeRequest, out *impl.MountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.TargetPath = in.TargetPath + return nil +} + +// Convert_v1beta3_MountVolumeRequest_To_impl_MountVolumeRequest is an autogenerated conversion function. +func Convert_v1beta3_MountVolumeRequest_To_impl_MountVolumeRequest(in *v1beta3.MountVolumeRequest, out *impl.MountVolumeRequest) error { + return autoConvert_v1beta3_MountVolumeRequest_To_impl_MountVolumeRequest(in, out) +} + +func autoConvert_impl_MountVolumeRequest_To_v1beta3_MountVolumeRequest(in *impl.MountVolumeRequest, out *v1beta3.MountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.TargetPath = in.TargetPath + return nil +} + +// Convert_impl_MountVolumeRequest_To_v1beta3_MountVolumeRequest is an autogenerated conversion function. +func Convert_impl_MountVolumeRequest_To_v1beta3_MountVolumeRequest(in *impl.MountVolumeRequest, out *v1beta3.MountVolumeRequest) error { + return autoConvert_impl_MountVolumeRequest_To_v1beta3_MountVolumeRequest(in, out) +} + +func autoConvert_v1beta3_MountVolumeResponse_To_impl_MountVolumeResponse(in *v1beta3.MountVolumeResponse, out *impl.MountVolumeResponse) error { + return nil +} + +// Convert_v1beta3_MountVolumeResponse_To_impl_MountVolumeResponse is an autogenerated conversion function. +func Convert_v1beta3_MountVolumeResponse_To_impl_MountVolumeResponse(in *v1beta3.MountVolumeResponse, out *impl.MountVolumeResponse) error { + return autoConvert_v1beta3_MountVolumeResponse_To_impl_MountVolumeResponse(in, out) +} + +func autoConvert_impl_MountVolumeResponse_To_v1beta3_MountVolumeResponse(in *impl.MountVolumeResponse, out *v1beta3.MountVolumeResponse) error { + return nil +} + +// Convert_impl_MountVolumeResponse_To_v1beta3_MountVolumeResponse is an autogenerated conversion function. +func Convert_impl_MountVolumeResponse_To_v1beta3_MountVolumeResponse(in *impl.MountVolumeResponse, out *v1beta3.MountVolumeResponse) error { + return autoConvert_impl_MountVolumeResponse_To_v1beta3_MountVolumeResponse(in, out) +} + +func autoConvert_v1beta3_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(in *v1beta3.ResizeVolumeRequest, out *impl.ResizeVolumeRequest) error { + out.VolumeId = in.VolumeId + out.SizeBytes = in.SizeBytes + return nil +} + +// Convert_v1beta3_ResizeVolumeRequest_To_impl_ResizeVolumeRequest is an autogenerated conversion function. +func Convert_v1beta3_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(in *v1beta3.ResizeVolumeRequest, out *impl.ResizeVolumeRequest) error { + return autoConvert_v1beta3_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(in, out) +} + +func autoConvert_impl_ResizeVolumeRequest_To_v1beta3_ResizeVolumeRequest(in *impl.ResizeVolumeRequest, out *v1beta3.ResizeVolumeRequest) error { + out.VolumeId = in.VolumeId + out.SizeBytes = in.SizeBytes + return nil +} + +// Convert_impl_ResizeVolumeRequest_To_v1beta3_ResizeVolumeRequest is an autogenerated conversion function. +func Convert_impl_ResizeVolumeRequest_To_v1beta3_ResizeVolumeRequest(in *impl.ResizeVolumeRequest, out *v1beta3.ResizeVolumeRequest) error { + return autoConvert_impl_ResizeVolumeRequest_To_v1beta3_ResizeVolumeRequest(in, out) +} + +func autoConvert_v1beta3_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in *v1beta3.ResizeVolumeResponse, out *impl.ResizeVolumeResponse) error { + return nil +} + +// Convert_v1beta3_ResizeVolumeResponse_To_impl_ResizeVolumeResponse is an autogenerated conversion function. +func Convert_v1beta3_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in *v1beta3.ResizeVolumeResponse, out *impl.ResizeVolumeResponse) error { + return autoConvert_v1beta3_ResizeVolumeResponse_To_impl_ResizeVolumeResponse(in, out) +} + +func autoConvert_impl_ResizeVolumeResponse_To_v1beta3_ResizeVolumeResponse(in *impl.ResizeVolumeResponse, out *v1beta3.ResizeVolumeResponse) error { + return nil +} + +// Convert_impl_ResizeVolumeResponse_To_v1beta3_ResizeVolumeResponse is an autogenerated conversion function. +func Convert_impl_ResizeVolumeResponse_To_v1beta3_ResizeVolumeResponse(in *impl.ResizeVolumeResponse, out *v1beta3.ResizeVolumeResponse) error { + return autoConvert_impl_ResizeVolumeResponse_To_v1beta3_ResizeVolumeResponse(in, out) +} + +func autoConvert_v1beta3_UnmountVolumeRequest_To_impl_UnmountVolumeRequest(in *v1beta3.UnmountVolumeRequest, out *impl.UnmountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.TargetPath = in.TargetPath + return nil +} + +// Convert_v1beta3_UnmountVolumeRequest_To_impl_UnmountVolumeRequest is an autogenerated conversion function. +func Convert_v1beta3_UnmountVolumeRequest_To_impl_UnmountVolumeRequest(in *v1beta3.UnmountVolumeRequest, out *impl.UnmountVolumeRequest) error { + return autoConvert_v1beta3_UnmountVolumeRequest_To_impl_UnmountVolumeRequest(in, out) +} + +func autoConvert_impl_UnmountVolumeRequest_To_v1beta3_UnmountVolumeRequest(in *impl.UnmountVolumeRequest, out *v1beta3.UnmountVolumeRequest) error { + out.VolumeId = in.VolumeId + out.TargetPath = in.TargetPath + return nil +} + +// Convert_impl_UnmountVolumeRequest_To_v1beta3_UnmountVolumeRequest is an autogenerated conversion function. +func Convert_impl_UnmountVolumeRequest_To_v1beta3_UnmountVolumeRequest(in *impl.UnmountVolumeRequest, out *v1beta3.UnmountVolumeRequest) error { + return autoConvert_impl_UnmountVolumeRequest_To_v1beta3_UnmountVolumeRequest(in, out) +} + +func autoConvert_v1beta3_UnmountVolumeResponse_To_impl_UnmountVolumeResponse(in *v1beta3.UnmountVolumeResponse, out *impl.UnmountVolumeResponse) error { + return nil +} + +// Convert_v1beta3_UnmountVolumeResponse_To_impl_UnmountVolumeResponse is an autogenerated conversion function. +func Convert_v1beta3_UnmountVolumeResponse_To_impl_UnmountVolumeResponse(in *v1beta3.UnmountVolumeResponse, out *impl.UnmountVolumeResponse) error { + return autoConvert_v1beta3_UnmountVolumeResponse_To_impl_UnmountVolumeResponse(in, out) +} + +func autoConvert_impl_UnmountVolumeResponse_To_v1beta3_UnmountVolumeResponse(in *impl.UnmountVolumeResponse, out *v1beta3.UnmountVolumeResponse) error { + return nil +} + +// Convert_impl_UnmountVolumeResponse_To_v1beta3_UnmountVolumeResponse is an autogenerated conversion function. +func Convert_impl_UnmountVolumeResponse_To_v1beta3_UnmountVolumeResponse(in *impl.UnmountVolumeResponse, out *v1beta3.UnmountVolumeResponse) error { + return autoConvert_impl_UnmountVolumeResponse_To_v1beta3_UnmountVolumeResponse(in, out) +} + +func autoConvert_v1beta3_WriteVolumeCacheRequest_To_impl_WriteVolumeCacheRequest(in *v1beta3.WriteVolumeCacheRequest, out *impl.WriteVolumeCacheRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_v1beta3_WriteVolumeCacheRequest_To_impl_WriteVolumeCacheRequest is an autogenerated conversion function. +func Convert_v1beta3_WriteVolumeCacheRequest_To_impl_WriteVolumeCacheRequest(in *v1beta3.WriteVolumeCacheRequest, out *impl.WriteVolumeCacheRequest) error { + return autoConvert_v1beta3_WriteVolumeCacheRequest_To_impl_WriteVolumeCacheRequest(in, out) +} + +func autoConvert_impl_WriteVolumeCacheRequest_To_v1beta3_WriteVolumeCacheRequest(in *impl.WriteVolumeCacheRequest, out *v1beta3.WriteVolumeCacheRequest) error { + out.VolumeId = in.VolumeId + return nil +} + +// Convert_impl_WriteVolumeCacheRequest_To_v1beta3_WriteVolumeCacheRequest is an autogenerated conversion function. +func Convert_impl_WriteVolumeCacheRequest_To_v1beta3_WriteVolumeCacheRequest(in *impl.WriteVolumeCacheRequest, out *v1beta3.WriteVolumeCacheRequest) error { + return autoConvert_impl_WriteVolumeCacheRequest_To_v1beta3_WriteVolumeCacheRequest(in, out) +} + +func autoConvert_v1beta3_WriteVolumeCacheResponse_To_impl_WriteVolumeCacheResponse(in *v1beta3.WriteVolumeCacheResponse, out *impl.WriteVolumeCacheResponse) error { + return nil +} + +// Convert_v1beta3_WriteVolumeCacheResponse_To_impl_WriteVolumeCacheResponse is an autogenerated conversion function. +func Convert_v1beta3_WriteVolumeCacheResponse_To_impl_WriteVolumeCacheResponse(in *v1beta3.WriteVolumeCacheResponse, out *impl.WriteVolumeCacheResponse) error { + return autoConvert_v1beta3_WriteVolumeCacheResponse_To_impl_WriteVolumeCacheResponse(in, out) +} + +func autoConvert_impl_WriteVolumeCacheResponse_To_v1beta3_WriteVolumeCacheResponse(in *impl.WriteVolumeCacheResponse, out *v1beta3.WriteVolumeCacheResponse) error { + return nil +} + +// Convert_impl_WriteVolumeCacheResponse_To_v1beta3_WriteVolumeCacheResponse is an autogenerated conversion function. +func Convert_impl_WriteVolumeCacheResponse_To_v1beta3_WriteVolumeCacheResponse(in *impl.WriteVolumeCacheResponse, out *v1beta3.WriteVolumeCacheResponse) error { + return autoConvert_impl_WriteVolumeCacheResponse_To_v1beta3_WriteVolumeCacheResponse(in, out) +} diff --git a/internal/server/volume/internal/v1beta3/server_generated.go b/pkg/server/volume/impl/v1beta3/server_generated.go similarity index 61% rename from internal/server/volume/internal/v1beta3/server_generated.go rename to pkg/server/volume/impl/v1beta3/server_generated.go index 6768c94b..25ce5c92 100644 --- a/internal/server/volume/internal/v1beta3/server_generated.go +++ b/pkg/server/volume/impl/v1beta3/server_generated.go @@ -7,17 +7,17 @@ import ( "github.com/kubernetes-csi/csi-proxy/client/api/volume/v1beta3" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" "google.golang.org/grpc" ) var version = apiversion.NewVersionOrPanic("v1beta3") type versionedAPI struct { - apiGroupServer internal.ServerInterface + apiGroupServer impl.ServerInterface } -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { +func NewVersionedServer(apiGroupServer impl.ServerInterface) impl.VersionedAPI { return &versionedAPI{ apiGroupServer: apiGroupServer, } @@ -28,8 +28,8 @@ func (s *versionedAPI) Register(grpcServer *grpc.Server) { } func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v1beta3.FormatVolumeRequest) (*v1beta3.FormatVolumeResponse, error) { - request := &internal.FormatVolumeRequest{} - if err := Convert_v1beta3_FormatVolumeRequest_To_internal_FormatVolumeRequest(versionedRequest, request); err != nil { + request := &impl.FormatVolumeRequest{} + if err := Convert_v1beta3_FormatVolumeRequest_To_impl_FormatVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -39,7 +39,7 @@ func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v } versionedResponse := &v1beta3.FormatVolumeResponse{} - if err := Convert_internal_FormatVolumeResponse_To_v1beta3_FormatVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_FormatVolumeResponse_To_v1beta3_FormatVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -47,8 +47,8 @@ func (s *versionedAPI) FormatVolume(context context.Context, versionedRequest *v } func (s *versionedAPI) GetDiskNumberFromVolumeID(context context.Context, versionedRequest *v1beta3.GetDiskNumberFromVolumeIDRequest) (*v1beta3.GetDiskNumberFromVolumeIDResponse, error) { - request := &internal.GetDiskNumberFromVolumeIDRequest{} - if err := Convert_v1beta3_GetDiskNumberFromVolumeIDRequest_To_internal_GetDiskNumberFromVolumeIDRequest(versionedRequest, request); err != nil { + request := &impl.GetDiskNumberFromVolumeIDRequest{} + if err := Convert_v1beta3_GetDiskNumberFromVolumeIDRequest_To_impl_GetDiskNumberFromVolumeIDRequest(versionedRequest, request); err != nil { return nil, err } @@ -58,7 +58,7 @@ func (s *versionedAPI) GetDiskNumberFromVolumeID(context context.Context, versio } versionedResponse := &v1beta3.GetDiskNumberFromVolumeIDResponse{} - if err := Convert_internal_GetDiskNumberFromVolumeIDResponse_To_v1beta3_GetDiskNumberFromVolumeIDResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetDiskNumberFromVolumeIDResponse_To_v1beta3_GetDiskNumberFromVolumeIDResponse(response, versionedResponse); err != nil { return nil, err } @@ -66,8 +66,8 @@ func (s *versionedAPI) GetDiskNumberFromVolumeID(context context.Context, versio } func (s *versionedAPI) GetVolumeIDFromTargetPath(context context.Context, versionedRequest *v1beta3.GetVolumeIDFromTargetPathRequest) (*v1beta3.GetVolumeIDFromTargetPathResponse, error) { - request := &internal.GetVolumeIDFromTargetPathRequest{} - if err := Convert_v1beta3_GetVolumeIDFromTargetPathRequest_To_internal_GetVolumeIDFromTargetPathRequest(versionedRequest, request); err != nil { + request := &impl.GetVolumeIDFromTargetPathRequest{} + if err := Convert_v1beta3_GetVolumeIDFromTargetPathRequest_To_impl_GetVolumeIDFromTargetPathRequest(versionedRequest, request); err != nil { return nil, err } @@ -77,7 +77,7 @@ func (s *versionedAPI) GetVolumeIDFromTargetPath(context context.Context, versio } versionedResponse := &v1beta3.GetVolumeIDFromTargetPathResponse{} - if err := Convert_internal_GetVolumeIDFromTargetPathResponse_To_v1beta3_GetVolumeIDFromTargetPathResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetVolumeIDFromTargetPathResponse_To_v1beta3_GetVolumeIDFromTargetPathResponse(response, versionedResponse); err != nil { return nil, err } @@ -85,8 +85,8 @@ func (s *versionedAPI) GetVolumeIDFromTargetPath(context context.Context, versio } func (s *versionedAPI) GetVolumeStats(context context.Context, versionedRequest *v1beta3.GetVolumeStatsRequest) (*v1beta3.GetVolumeStatsResponse, error) { - request := &internal.GetVolumeStatsRequest{} - if err := Convert_v1beta3_GetVolumeStatsRequest_To_internal_GetVolumeStatsRequest(versionedRequest, request); err != nil { + request := &impl.GetVolumeStatsRequest{} + if err := Convert_v1beta3_GetVolumeStatsRequest_To_impl_GetVolumeStatsRequest(versionedRequest, request); err != nil { return nil, err } @@ -96,7 +96,7 @@ func (s *versionedAPI) GetVolumeStats(context context.Context, versionedRequest } versionedResponse := &v1beta3.GetVolumeStatsResponse{} - if err := Convert_internal_GetVolumeStatsResponse_To_v1beta3_GetVolumeStatsResponse(response, versionedResponse); err != nil { + if err := Convert_impl_GetVolumeStatsResponse_To_v1beta3_GetVolumeStatsResponse(response, versionedResponse); err != nil { return nil, err } @@ -104,8 +104,8 @@ func (s *versionedAPI) GetVolumeStats(context context.Context, versionedRequest } func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedRequest *v1beta3.IsVolumeFormattedRequest) (*v1beta3.IsVolumeFormattedResponse, error) { - request := &internal.IsVolumeFormattedRequest{} - if err := Convert_v1beta3_IsVolumeFormattedRequest_To_internal_IsVolumeFormattedRequest(versionedRequest, request); err != nil { + request := &impl.IsVolumeFormattedRequest{} + if err := Convert_v1beta3_IsVolumeFormattedRequest_To_impl_IsVolumeFormattedRequest(versionedRequest, request); err != nil { return nil, err } @@ -115,7 +115,7 @@ func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedReque } versionedResponse := &v1beta3.IsVolumeFormattedResponse{} - if err := Convert_internal_IsVolumeFormattedResponse_To_v1beta3_IsVolumeFormattedResponse(response, versionedResponse); err != nil { + if err := Convert_impl_IsVolumeFormattedResponse_To_v1beta3_IsVolumeFormattedResponse(response, versionedResponse); err != nil { return nil, err } @@ -123,8 +123,8 @@ func (s *versionedAPI) IsVolumeFormatted(context context.Context, versionedReque } func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedRequest *v1beta3.ListVolumesOnDiskRequest) (*v1beta3.ListVolumesOnDiskResponse, error) { - request := &internal.ListVolumesOnDiskRequest{} - if err := Convert_v1beta3_ListVolumesOnDiskRequest_To_internal_ListVolumesOnDiskRequest(versionedRequest, request); err != nil { + request := &impl.ListVolumesOnDiskRequest{} + if err := Convert_v1beta3_ListVolumesOnDiskRequest_To_impl_ListVolumesOnDiskRequest(versionedRequest, request); err != nil { return nil, err } @@ -134,7 +134,7 @@ func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedReque } versionedResponse := &v1beta3.ListVolumesOnDiskResponse{} - if err := Convert_internal_ListVolumesOnDiskResponse_To_v1beta3_ListVolumesOnDiskResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ListVolumesOnDiskResponse_To_v1beta3_ListVolumesOnDiskResponse(response, versionedResponse); err != nil { return nil, err } @@ -142,8 +142,8 @@ func (s *versionedAPI) ListVolumesOnDisk(context context.Context, versionedReque } func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1beta3.MountVolumeRequest) (*v1beta3.MountVolumeResponse, error) { - request := &internal.MountVolumeRequest{} - if err := Convert_v1beta3_MountVolumeRequest_To_internal_MountVolumeRequest(versionedRequest, request); err != nil { + request := &impl.MountVolumeRequest{} + if err := Convert_v1beta3_MountVolumeRequest_To_impl_MountVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -153,7 +153,7 @@ func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1 } versionedResponse := &v1beta3.MountVolumeResponse{} - if err := Convert_internal_MountVolumeResponse_To_v1beta3_MountVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_MountVolumeResponse_To_v1beta3_MountVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -161,8 +161,8 @@ func (s *versionedAPI) MountVolume(context context.Context, versionedRequest *v1 } func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v1beta3.ResizeVolumeRequest) (*v1beta3.ResizeVolumeResponse, error) { - request := &internal.ResizeVolumeRequest{} - if err := Convert_v1beta3_ResizeVolumeRequest_To_internal_ResizeVolumeRequest(versionedRequest, request); err != nil { + request := &impl.ResizeVolumeRequest{} + if err := Convert_v1beta3_ResizeVolumeRequest_To_impl_ResizeVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -172,7 +172,7 @@ func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v } versionedResponse := &v1beta3.ResizeVolumeResponse{} - if err := Convert_internal_ResizeVolumeResponse_To_v1beta3_ResizeVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_ResizeVolumeResponse_To_v1beta3_ResizeVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -180,8 +180,8 @@ func (s *versionedAPI) ResizeVolume(context context.Context, versionedRequest *v } func (s *versionedAPI) UnmountVolume(context context.Context, versionedRequest *v1beta3.UnmountVolumeRequest) (*v1beta3.UnmountVolumeResponse, error) { - request := &internal.UnmountVolumeRequest{} - if err := Convert_v1beta3_UnmountVolumeRequest_To_internal_UnmountVolumeRequest(versionedRequest, request); err != nil { + request := &impl.UnmountVolumeRequest{} + if err := Convert_v1beta3_UnmountVolumeRequest_To_impl_UnmountVolumeRequest(versionedRequest, request); err != nil { return nil, err } @@ -191,7 +191,7 @@ func (s *versionedAPI) UnmountVolume(context context.Context, versionedRequest * } versionedResponse := &v1beta3.UnmountVolumeResponse{} - if err := Convert_internal_UnmountVolumeResponse_To_v1beta3_UnmountVolumeResponse(response, versionedResponse); err != nil { + if err := Convert_impl_UnmountVolumeResponse_To_v1beta3_UnmountVolumeResponse(response, versionedResponse); err != nil { return nil, err } @@ -199,8 +199,8 @@ func (s *versionedAPI) UnmountVolume(context context.Context, versionedRequest * } func (s *versionedAPI) WriteVolumeCache(context context.Context, versionedRequest *v1beta3.WriteVolumeCacheRequest) (*v1beta3.WriteVolumeCacheResponse, error) { - request := &internal.WriteVolumeCacheRequest{} - if err := Convert_v1beta3_WriteVolumeCacheRequest_To_internal_WriteVolumeCacheRequest(versionedRequest, request); err != nil { + request := &impl.WriteVolumeCacheRequest{} + if err := Convert_v1beta3_WriteVolumeCacheRequest_To_impl_WriteVolumeCacheRequest(versionedRequest, request); err != nil { return nil, err } @@ -210,7 +210,7 @@ func (s *versionedAPI) WriteVolumeCache(context context.Context, versionedReques } versionedResponse := &v1beta3.WriteVolumeCacheResponse{} - if err := Convert_internal_WriteVolumeCacheResponse_To_v1beta3_WriteVolumeCacheResponse(response, versionedResponse); err != nil { + if err := Convert_impl_WriteVolumeCacheResponse_To_v1beta3_WriteVolumeCacheResponse(response, versionedResponse); err != nil { return nil, err } diff --git a/internal/server/volume/server.go b/pkg/server/volume/server.go similarity index 98% rename from internal/server/volume/server.go rename to pkg/server/volume/server.go index 3c7a0259..e927eafb 100644 --- a/internal/server/volume/server.go +++ b/pkg/server/volume/server.go @@ -5,8 +5,8 @@ import ( "fmt" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/os/volume" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/os/volume" + internal "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" "k8s.io/klog/v2" ) diff --git a/internal/server/volume/server_test.go b/pkg/server/volume/server_test.go similarity index 96% rename from internal/server/volume/server_test.go rename to pkg/server/volume/server_test.go index fa619f40..20fdd665 100644 --- a/internal/server/volume/server_test.go +++ b/pkg/server/volume/server_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/os/volume" - "github.com/kubernetes-csi/csi-proxy/internal/server/volume/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/os/volume" + internal "github.com/kubernetes-csi/csi-proxy/pkg/server/volume/impl" ) type fakeVolumeAPI struct { diff --git a/internal/shared/disk/types.go b/pkg/shared/disk/types.go similarity index 100% rename from internal/shared/disk/types.go rename to pkg/shared/disk/types.go diff --git a/internal/utils/utils.go b/pkg/utils/utils.go similarity index 100% rename from internal/utils/utils.go rename to pkg/utils/utils.go From b94e4357e2cf6f6fb53d996ba24e81541445feb1 Mon Sep 17 00:00:00 2001 From: Mauricio Poppe Date: Tue, 15 Jun 2021 17:21:07 +0000 Subject: [PATCH 2/4] Build csi-proxy-api-gen in CI --- .github/workflows/windows.yml | 1 + pkg/server/smb/server_test.go | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 089e4d8b..7a9a855d 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -21,6 +21,7 @@ jobs: - name: Build run: | go build -v -a -o ./bin/csi-proxy.exe ./cmd/csi-proxy + go build -v -a -o ./bin/csi-proxy-api-gen.exe ./cmd/csi-proxy-api-gen - name: Run Windows Integration Tests run: | # start the CSI Proxy before running tests on windows diff --git a/pkg/server/smb/server_test.go b/pkg/server/smb/server_test.go index d3997766..fac07f2a 100644 --- a/pkg/server/smb/server_test.go +++ b/pkg/server/smb/server_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/internal/os/filesystem" - "github.com/kubernetes-csi/csi-proxy/internal/os/smb" - fsserver "github.com/kubernetes-csi/csi-proxy/internal/server/filesystem" - "github.com/kubernetes-csi/csi-proxy/internal/server/smb/internal" + "github.com/kubernetes-csi/csi-proxy/pkg/os/filesystem" + "github.com/kubernetes-csi/csi-proxy/pkg/os/smb" + fsserver "github.com/kubernetes-csi/csi-proxy/pkg/server/filesystem" + internal "github.com/kubernetes-csi/csi-proxy/pkg/server/smb/impl" ) type fakeSmbAPI struct{} From e979cbf3241c68a632dab315c9950fc8c4ac77a6 Mon Sep 17 00:00:00 2001 From: Mauricio Poppe Date: Tue, 15 Jun 2021 17:42:38 +0000 Subject: [PATCH 3/4] Update iscsi tests --- pkg/server/iscsi/impl/conversion_test.go | 34 ++++++++++++------------ 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/pkg/server/iscsi/impl/conversion_test.go b/pkg/server/iscsi/impl/conversion_test.go index 534aa7a1..75aa4015 100644 --- a/pkg/server/iscsi/impl/conversion_test.go +++ b/pkg/server/iscsi/impl/conversion_test.go @@ -6,21 +6,21 @@ import ( "github.com/google/go-cmp/cmp" "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha1" "github.com/kubernetes-csi/csi-proxy/client/api/iscsi/v1alpha2" - internal "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" - v1alpha1_internal "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl/v1alpha1" - v1alpha2_internal "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl/v1alpha2" + "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl" + v1alpha1_impl "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl/v1alpha1" + v1alpha2_impl "github.com/kubernetes-csi/csi-proxy/pkg/server/iscsi/impl/v1alpha2" "google.golang.org/protobuf/testing/protocmp" ) func TestListTargetPortals_Conversion_v1alpha1(t *testing.T) { testCases := []struct { - in *internal.ListTargetPortalsResponse + in *impl.ListTargetPortalsResponse wantOut *v1alpha1.ListTargetPortalsResponse wantErr bool }{ { - in: &internal.ListTargetPortalsResponse{ - TargetPortals: []*internal.TargetPortal{{TargetPort: 3260, TargetAddress: "test.iqn"}}, + in: &impl.ListTargetPortalsResponse{ + TargetPortals: []*impl.TargetPortal{{TargetPort: 3260, TargetAddress: "test.iqn"}}, }, wantOut: &v1alpha1.ListTargetPortalsResponse{ TargetPortals: []*v1alpha1.TargetPortal{{TargetPort: 3260, TargetAddress: "test.iqn"}}, @@ -28,8 +28,8 @@ func TestListTargetPortals_Conversion_v1alpha1(t *testing.T) { wantErr: false, }, { - in: &internal.ListTargetPortalsResponse{ - TargetPortals: []*internal.TargetPortal{{TargetPort: 3260, TargetAddress: "test.iqn"}, + in: &impl.ListTargetPortalsResponse{ + TargetPortals: []*impl.TargetPortal{{TargetPort: 3260, TargetAddress: "test.iqn"}, {TargetPort: 1000, TargetAddress: "test.iqn.2"}, }, }, @@ -41,7 +41,7 @@ func TestListTargetPortals_Conversion_v1alpha1(t *testing.T) { wantErr: false, }, { - in: &internal.ListTargetPortalsResponse{}, + in: &impl.ListTargetPortalsResponse{}, wantOut: &v1alpha1.ListTargetPortalsResponse{}, wantErr: false, }, @@ -49,7 +49,7 @@ func TestListTargetPortals_Conversion_v1alpha1(t *testing.T) { for _, tc := range testCases { got := v1alpha1.ListTargetPortalsResponse{} - err := v1alpha1_internal.Convert_internal_ListTargetPortalsResponse_To_v1alpha1_ListTargetPortalsResponse(tc.in, &got) + err := v1alpha1_impl.Convert_impl_ListTargetPortalsResponse_To_v1alpha1_ListTargetPortalsResponse(tc.in, &got) if tc.wantErr && err == nil { t.Errorf("Expected error but returned a nil error") } @@ -64,13 +64,13 @@ func TestListTargetPortals_Conversion_v1alpha1(t *testing.T) { func TestListTargetPortals_Conversion_v1alpha2(t *testing.T) { testCases := []struct { - in *internal.ListTargetPortalsResponse + in *impl.ListTargetPortalsResponse wantOut *v1alpha2.ListTargetPortalsResponse wantErr bool }{ { - in: &internal.ListTargetPortalsResponse{ - TargetPortals: []*internal.TargetPortal{{TargetPort: 3260, TargetAddress: "test.iqn"}}, + in: &impl.ListTargetPortalsResponse{ + TargetPortals: []*impl.TargetPortal{{TargetPort: 3260, TargetAddress: "test.iqn"}}, }, wantOut: &v1alpha2.ListTargetPortalsResponse{ TargetPortals: []*v1alpha2.TargetPortal{{TargetPort: 3260, TargetAddress: "test.iqn"}}, @@ -78,8 +78,8 @@ func TestListTargetPortals_Conversion_v1alpha2(t *testing.T) { wantErr: false, }, { - in: &internal.ListTargetPortalsResponse{ - TargetPortals: []*internal.TargetPortal{{TargetPort: 3260, TargetAddress: "test.iqn"}, + in: &impl.ListTargetPortalsResponse{ + TargetPortals: []*impl.TargetPortal{{TargetPort: 3260, TargetAddress: "test.iqn"}, {TargetPort: 1000, TargetAddress: "test.iqn.2"}, }, }, @@ -91,7 +91,7 @@ func TestListTargetPortals_Conversion_v1alpha2(t *testing.T) { wantErr: false, }, { - in: &internal.ListTargetPortalsResponse{}, + in: &impl.ListTargetPortalsResponse{}, wantOut: &v1alpha2.ListTargetPortalsResponse{}, wantErr: false, }, @@ -99,7 +99,7 @@ func TestListTargetPortals_Conversion_v1alpha2(t *testing.T) { for _, tc := range testCases { got := v1alpha2.ListTargetPortalsResponse{} - err := v1alpha2_internal.Convert_internal_ListTargetPortalsResponse_To_v1alpha2_ListTargetPortalsResponse(tc.in, &got) + err := v1alpha2_impl.Convert_impl_ListTargetPortalsResponse_To_v1alpha2_ListTargetPortalsResponse(tc.in, &got) if tc.wantErr && err == nil { t.Errorf("Expected error but returned a nil error") } From 915b50d60a771832b9ef7c5531c33c855cda2652 Mon Sep 17 00:00:00 2001 From: Mauricio Poppe Date: Tue, 15 Jun 2021 17:50:18 +0000 Subject: [PATCH 4/4] Fix integrationtests dummy paths --- .../server/dummy/{internal => impl}/types.go | 2 +- .../dummy/impl/v1/conversion_generated.go | 89 ++++++++++++++++++ .../impl/v1alpha1/conversion_generated.go | 41 +++++++++ .../impl/v1alpha2/conversion_generated.go | 45 +++++++++ .../server/dummy/internal/types_generated.go | 20 ---- .../server/dummy/internal/v1/conversion.go | 3 - .../dummy/internal/v1/conversion_generated.go | 92 ------------------- .../dummy/internal/v1/server_generated.go | 66 ------------- .../dummy/internal/v1alpha1/conversion.go | 23 ----- .../internal/v1alpha1/conversion_generated.go | 44 --------- .../internal/v1alpha1/server_generated.go | 47 ---------- .../dummy/internal/v1alpha2/conversion.go | 3 - .../internal/v1alpha2/conversion_generated.go | 48 ---------- .../internal/v1alpha2/server_generated.go | 47 ---------- .../apigroups/server/dummy/server.go | 12 +-- 15 files changed, 182 insertions(+), 400 deletions(-) rename integrationtests/apigroups/server/dummy/{internal => impl}/types.go (97%) delete mode 100644 integrationtests/apigroups/server/dummy/internal/types_generated.go delete mode 100644 integrationtests/apigroups/server/dummy/internal/v1/conversion.go delete mode 100644 integrationtests/apigroups/server/dummy/internal/v1/conversion_generated.go delete mode 100644 integrationtests/apigroups/server/dummy/internal/v1/server_generated.go delete mode 100644 integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion.go delete mode 100644 integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion_generated.go delete mode 100644 integrationtests/apigroups/server/dummy/internal/v1alpha1/server_generated.go delete mode 100644 integrationtests/apigroups/server/dummy/internal/v1alpha2/conversion.go delete mode 100644 integrationtests/apigroups/server/dummy/internal/v1alpha2/conversion_generated.go delete mode 100644 integrationtests/apigroups/server/dummy/internal/v1alpha2/server_generated.go diff --git a/integrationtests/apigroups/server/dummy/internal/types.go b/integrationtests/apigroups/server/dummy/impl/types.go similarity index 97% rename from integrationtests/apigroups/server/dummy/internal/types.go rename to integrationtests/apigroups/server/dummy/impl/types.go index a6e9c030..41c4ff03 100644 --- a/integrationtests/apigroups/server/dummy/internal/types.go +++ b/integrationtests/apigroups/server/dummy/impl/types.go @@ -1,4 +1,4 @@ -package internal +package impl // ComputeDoubleRequest is the internal representation of requests to the ComputeDouble endpoint. type ComputeDoubleRequest struct { diff --git a/integrationtests/apigroups/server/dummy/impl/v1/conversion_generated.go b/integrationtests/apigroups/server/dummy/impl/v1/conversion_generated.go index e0660689..df4695e7 100644 --- a/integrationtests/apigroups/server/dummy/impl/v1/conversion_generated.go +++ b/integrationtests/apigroups/server/dummy/impl/v1/conversion_generated.go @@ -1,3 +1,92 @@ // Code generated by csi-proxy-api-gen. DO NOT EDIT. package v1 + +import ( + unsafe "unsafe" + + v1 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1" + impl "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl" +) + +func autoConvert_v1_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(in *v1.ComputeDoubleRequest, out *impl.ComputeDoubleRequest) error { + out.Input64 = in.Input64 + return nil +} + +// Convert_v1_ComputeDoubleRequest_To_impl_ComputeDoubleRequest is an autogenerated conversion function. +func Convert_v1_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(in *v1.ComputeDoubleRequest, out *impl.ComputeDoubleRequest) error { + return autoConvert_v1_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(in, out) +} + +func autoConvert_impl_ComputeDoubleRequest_To_v1_ComputeDoubleRequest(in *impl.ComputeDoubleRequest, out *v1.ComputeDoubleRequest) error { + out.Input64 = in.Input64 + return nil +} + +// Convert_impl_ComputeDoubleRequest_To_v1_ComputeDoubleRequest is an autogenerated conversion function. +func Convert_impl_ComputeDoubleRequest_To_v1_ComputeDoubleRequest(in *impl.ComputeDoubleRequest, out *v1.ComputeDoubleRequest) error { + return autoConvert_impl_ComputeDoubleRequest_To_v1_ComputeDoubleRequest(in, out) +} + +func autoConvert_v1_ComputeDoubleResponse_To_impl_ComputeDoubleResponse(in *v1.ComputeDoubleResponse, out *impl.ComputeDoubleResponse) error { + out.Response = in.Response + return nil +} + +// Convert_v1_ComputeDoubleResponse_To_impl_ComputeDoubleResponse is an autogenerated conversion function. +func Convert_v1_ComputeDoubleResponse_To_impl_ComputeDoubleResponse(in *v1.ComputeDoubleResponse, out *impl.ComputeDoubleResponse) error { + return autoConvert_v1_ComputeDoubleResponse_To_impl_ComputeDoubleResponse(in, out) +} + +func autoConvert_impl_ComputeDoubleResponse_To_v1_ComputeDoubleResponse(in *impl.ComputeDoubleResponse, out *v1.ComputeDoubleResponse) error { + out.Response = in.Response + return nil +} + +// Convert_impl_ComputeDoubleResponse_To_v1_ComputeDoubleResponse is an autogenerated conversion function. +func Convert_impl_ComputeDoubleResponse_To_v1_ComputeDoubleResponse(in *impl.ComputeDoubleResponse, out *v1.ComputeDoubleResponse) error { + return autoConvert_impl_ComputeDoubleResponse_To_v1_ComputeDoubleResponse(in, out) +} + +func autoConvert_v1_TellMeAPoemRequest_To_impl_TellMeAPoemRequest(in *v1.TellMeAPoemRequest, out *impl.TellMeAPoemRequest) error { + out.IWantATitle = in.IWantATitle + return nil +} + +// Convert_v1_TellMeAPoemRequest_To_impl_TellMeAPoemRequest is an autogenerated conversion function. +func Convert_v1_TellMeAPoemRequest_To_impl_TellMeAPoemRequest(in *v1.TellMeAPoemRequest, out *impl.TellMeAPoemRequest) error { + return autoConvert_v1_TellMeAPoemRequest_To_impl_TellMeAPoemRequest(in, out) +} + +func autoConvert_impl_TellMeAPoemRequest_To_v1_TellMeAPoemRequest(in *impl.TellMeAPoemRequest, out *v1.TellMeAPoemRequest) error { + out.IWantATitle = in.IWantATitle + return nil +} + +// Convert_impl_TellMeAPoemRequest_To_v1_TellMeAPoemRequest is an autogenerated conversion function. +func Convert_impl_TellMeAPoemRequest_To_v1_TellMeAPoemRequest(in *impl.TellMeAPoemRequest, out *v1.TellMeAPoemRequest) error { + return autoConvert_impl_TellMeAPoemRequest_To_v1_TellMeAPoemRequest(in, out) +} + +func autoConvert_v1_TellMeAPoemResponse_To_impl_TellMeAPoemResponse(in *v1.TellMeAPoemResponse, out *impl.TellMeAPoemResponse) error { + out.Title = in.Title + out.Lines = *(*[]string)(unsafe.Pointer(&in.Lines)) + return nil +} + +// Convert_v1_TellMeAPoemResponse_To_impl_TellMeAPoemResponse is an autogenerated conversion function. +func Convert_v1_TellMeAPoemResponse_To_impl_TellMeAPoemResponse(in *v1.TellMeAPoemResponse, out *impl.TellMeAPoemResponse) error { + return autoConvert_v1_TellMeAPoemResponse_To_impl_TellMeAPoemResponse(in, out) +} + +func autoConvert_impl_TellMeAPoemResponse_To_v1_TellMeAPoemResponse(in *impl.TellMeAPoemResponse, out *v1.TellMeAPoemResponse) error { + out.Title = in.Title + out.Lines = *(*[]string)(unsafe.Pointer(&in.Lines)) + return nil +} + +// Convert_impl_TellMeAPoemResponse_To_v1_TellMeAPoemResponse is an autogenerated conversion function. +func Convert_impl_TellMeAPoemResponse_To_v1_TellMeAPoemResponse(in *impl.TellMeAPoemResponse, out *v1.TellMeAPoemResponse) error { + return autoConvert_impl_TellMeAPoemResponse_To_v1_TellMeAPoemResponse(in, out) +} diff --git a/integrationtests/apigroups/server/dummy/impl/v1alpha1/conversion_generated.go b/integrationtests/apigroups/server/dummy/impl/v1alpha1/conversion_generated.go index 3e8b8040..4a7da750 100644 --- a/integrationtests/apigroups/server/dummy/impl/v1alpha1/conversion_generated.go +++ b/integrationtests/apigroups/server/dummy/impl/v1alpha1/conversion_generated.go @@ -1,3 +1,44 @@ // Code generated by csi-proxy-api-gen. DO NOT EDIT. package v1alpha1 + +import ( + v1alpha1 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha1" + impl "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl" +) + +func autoConvert_v1alpha1_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(in *v1alpha1.ComputeDoubleRequest, out *impl.ComputeDoubleRequest) error { + return nil +} + +// Convert_v1alpha1_ComputeDoubleRequest_To_impl_ComputeDoubleRequest is an autogenerated conversion function. +func Convert_v1alpha1_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(in *v1alpha1.ComputeDoubleRequest, out *impl.ComputeDoubleRequest) error { + return autoConvert_v1alpha1_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(in, out) +} + +func autoConvert_impl_ComputeDoubleRequest_To_v1alpha1_ComputeDoubleRequest(in *impl.ComputeDoubleRequest, out *v1alpha1.ComputeDoubleRequest) error { + return nil +} + +// Convert_impl_ComputeDoubleRequest_To_v1alpha1_ComputeDoubleRequest is an autogenerated conversion function. +func Convert_impl_ComputeDoubleRequest_To_v1alpha1_ComputeDoubleRequest(in *impl.ComputeDoubleRequest, out *v1alpha1.ComputeDoubleRequest) error { + return autoConvert_impl_ComputeDoubleRequest_To_v1alpha1_ComputeDoubleRequest(in, out) +} + +func autoConvert_v1alpha1_ComputeDoubleResponse_To_impl_ComputeDoubleResponse(in *v1alpha1.ComputeDoubleResponse, out *impl.ComputeDoubleResponse) error { + return nil +} + +// Convert_v1alpha1_ComputeDoubleResponse_To_impl_ComputeDoubleResponse is an autogenerated conversion function. +func Convert_v1alpha1_ComputeDoubleResponse_To_impl_ComputeDoubleResponse(in *v1alpha1.ComputeDoubleResponse, out *impl.ComputeDoubleResponse) error { + return autoConvert_v1alpha1_ComputeDoubleResponse_To_impl_ComputeDoubleResponse(in, out) +} + +func autoConvert_impl_ComputeDoubleResponse_To_v1alpha1_ComputeDoubleResponse(in *impl.ComputeDoubleResponse, out *v1alpha1.ComputeDoubleResponse) error { + return nil +} + +// Convert_impl_ComputeDoubleResponse_To_v1alpha1_ComputeDoubleResponse is an autogenerated conversion function. +func Convert_impl_ComputeDoubleResponse_To_v1alpha1_ComputeDoubleResponse(in *impl.ComputeDoubleResponse, out *v1alpha1.ComputeDoubleResponse) error { + return autoConvert_impl_ComputeDoubleResponse_To_v1alpha1_ComputeDoubleResponse(in, out) +} diff --git a/integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion_generated.go b/integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion_generated.go index 97bd7e61..ce219424 100644 --- a/integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion_generated.go +++ b/integrationtests/apigroups/server/dummy/impl/v1alpha2/conversion_generated.go @@ -1,3 +1,48 @@ // Code generated by csi-proxy-api-gen. DO NOT EDIT. package v1alpha2 + +import ( + v1alpha2 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha2" + impl "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl" +) + +func autoConvert_v1alpha2_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(in *v1alpha2.ComputeDoubleRequest, out *impl.ComputeDoubleRequest) error { + out.Input64 = in.Input64 + return nil +} + +// Convert_v1alpha2_ComputeDoubleRequest_To_impl_ComputeDoubleRequest is an autogenerated conversion function. +func Convert_v1alpha2_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(in *v1alpha2.ComputeDoubleRequest, out *impl.ComputeDoubleRequest) error { + return autoConvert_v1alpha2_ComputeDoubleRequest_To_impl_ComputeDoubleRequest(in, out) +} + +func autoConvert_impl_ComputeDoubleRequest_To_v1alpha2_ComputeDoubleRequest(in *impl.ComputeDoubleRequest, out *v1alpha2.ComputeDoubleRequest) error { + out.Input64 = in.Input64 + return nil +} + +// Convert_impl_ComputeDoubleRequest_To_v1alpha2_ComputeDoubleRequest is an autogenerated conversion function. +func Convert_impl_ComputeDoubleRequest_To_v1alpha2_ComputeDoubleRequest(in *impl.ComputeDoubleRequest, out *v1alpha2.ComputeDoubleRequest) error { + return autoConvert_impl_ComputeDoubleRequest_To_v1alpha2_ComputeDoubleRequest(in, out) +} + +func autoConvert_v1alpha2_ComputeDoubleResponse_To_impl_ComputeDoubleResponse(in *v1alpha2.ComputeDoubleResponse, out *impl.ComputeDoubleResponse) error { + out.Response = in.Response + return nil +} + +// Convert_v1alpha2_ComputeDoubleResponse_To_impl_ComputeDoubleResponse is an autogenerated conversion function. +func Convert_v1alpha2_ComputeDoubleResponse_To_impl_ComputeDoubleResponse(in *v1alpha2.ComputeDoubleResponse, out *impl.ComputeDoubleResponse) error { + return autoConvert_v1alpha2_ComputeDoubleResponse_To_impl_ComputeDoubleResponse(in, out) +} + +func autoConvert_impl_ComputeDoubleResponse_To_v1alpha2_ComputeDoubleResponse(in *impl.ComputeDoubleResponse, out *v1alpha2.ComputeDoubleResponse) error { + out.Response = in.Response + return nil +} + +// Convert_impl_ComputeDoubleResponse_To_v1alpha2_ComputeDoubleResponse is an autogenerated conversion function. +func Convert_impl_ComputeDoubleResponse_To_v1alpha2_ComputeDoubleResponse(in *impl.ComputeDoubleResponse, out *v1alpha2.ComputeDoubleResponse) error { + return autoConvert_impl_ComputeDoubleResponse_To_v1alpha2_ComputeDoubleResponse(in, out) +} diff --git a/integrationtests/apigroups/server/dummy/internal/types_generated.go b/integrationtests/apigroups/server/dummy/internal/types_generated.go deleted file mode 100644 index 61dbb553..00000000 --- a/integrationtests/apigroups/server/dummy/internal/types_generated.go +++ /dev/null @@ -1,20 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package internal - -import ( - "context" - - "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "google.golang.org/grpc" -) - -type VersionedAPI interface { - Register(grpcServer *grpc.Server) -} - -// All the functions this group's server needs to define. -type ServerInterface interface { - ComputeDouble(context.Context, *ComputeDoubleRequest, apiversion.Version) (*ComputeDoubleResponse, error) - TellMeAPoem(context.Context, *TellMeAPoemRequest, apiversion.Version) (*TellMeAPoemResponse, error) -} diff --git a/integrationtests/apigroups/server/dummy/internal/v1/conversion.go b/integrationtests/apigroups/server/dummy/internal/v1/conversion.go deleted file mode 100644 index 7d35c7a3..00000000 --- a/integrationtests/apigroups/server/dummy/internal/v1/conversion.go +++ /dev/null @@ -1,3 +0,0 @@ -package v1 - -// Add manual conversion functions here to override automatic conversion functions diff --git a/integrationtests/apigroups/server/dummy/internal/v1/conversion_generated.go b/integrationtests/apigroups/server/dummy/internal/v1/conversion_generated.go deleted file mode 100644 index 8606927e..00000000 --- a/integrationtests/apigroups/server/dummy/internal/v1/conversion_generated.go +++ /dev/null @@ -1,92 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1 - -import ( - unsafe "unsafe" - - v1 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1" - internal "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal" -) - -func autoConvert_v1_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in *v1.ComputeDoubleRequest, out *internal.ComputeDoubleRequest) error { - out.Input64 = in.Input64 - return nil -} - -// Convert_v1_ComputeDoubleRequest_To_internal_ComputeDoubleRequest is an autogenerated conversion function. -func Convert_v1_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in *v1.ComputeDoubleRequest, out *internal.ComputeDoubleRequest) error { - return autoConvert_v1_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in, out) -} - -func autoConvert_internal_ComputeDoubleRequest_To_v1_ComputeDoubleRequest(in *internal.ComputeDoubleRequest, out *v1.ComputeDoubleRequest) error { - out.Input64 = in.Input64 - return nil -} - -// Convert_internal_ComputeDoubleRequest_To_v1_ComputeDoubleRequest is an autogenerated conversion function. -func Convert_internal_ComputeDoubleRequest_To_v1_ComputeDoubleRequest(in *internal.ComputeDoubleRequest, out *v1.ComputeDoubleRequest) error { - return autoConvert_internal_ComputeDoubleRequest_To_v1_ComputeDoubleRequest(in, out) -} - -func autoConvert_v1_ComputeDoubleResponse_To_internal_ComputeDoubleResponse(in *v1.ComputeDoubleResponse, out *internal.ComputeDoubleResponse) error { - out.Response = in.Response - return nil -} - -// Convert_v1_ComputeDoubleResponse_To_internal_ComputeDoubleResponse is an autogenerated conversion function. -func Convert_v1_ComputeDoubleResponse_To_internal_ComputeDoubleResponse(in *v1.ComputeDoubleResponse, out *internal.ComputeDoubleResponse) error { - return autoConvert_v1_ComputeDoubleResponse_To_internal_ComputeDoubleResponse(in, out) -} - -func autoConvert_internal_ComputeDoubleResponse_To_v1_ComputeDoubleResponse(in *internal.ComputeDoubleResponse, out *v1.ComputeDoubleResponse) error { - out.Response = in.Response - return nil -} - -// Convert_internal_ComputeDoubleResponse_To_v1_ComputeDoubleResponse is an autogenerated conversion function. -func Convert_internal_ComputeDoubleResponse_To_v1_ComputeDoubleResponse(in *internal.ComputeDoubleResponse, out *v1.ComputeDoubleResponse) error { - return autoConvert_internal_ComputeDoubleResponse_To_v1_ComputeDoubleResponse(in, out) -} - -func autoConvert_v1_TellMeAPoemRequest_To_internal_TellMeAPoemRequest(in *v1.TellMeAPoemRequest, out *internal.TellMeAPoemRequest) error { - out.IWantATitle = in.IWantATitle - return nil -} - -// Convert_v1_TellMeAPoemRequest_To_internal_TellMeAPoemRequest is an autogenerated conversion function. -func Convert_v1_TellMeAPoemRequest_To_internal_TellMeAPoemRequest(in *v1.TellMeAPoemRequest, out *internal.TellMeAPoemRequest) error { - return autoConvert_v1_TellMeAPoemRequest_To_internal_TellMeAPoemRequest(in, out) -} - -func autoConvert_internal_TellMeAPoemRequest_To_v1_TellMeAPoemRequest(in *internal.TellMeAPoemRequest, out *v1.TellMeAPoemRequest) error { - out.IWantATitle = in.IWantATitle - return nil -} - -// Convert_internal_TellMeAPoemRequest_To_v1_TellMeAPoemRequest is an autogenerated conversion function. -func Convert_internal_TellMeAPoemRequest_To_v1_TellMeAPoemRequest(in *internal.TellMeAPoemRequest, out *v1.TellMeAPoemRequest) error { - return autoConvert_internal_TellMeAPoemRequest_To_v1_TellMeAPoemRequest(in, out) -} - -func autoConvert_v1_TellMeAPoemResponse_To_internal_TellMeAPoemResponse(in *v1.TellMeAPoemResponse, out *internal.TellMeAPoemResponse) error { - out.Title = in.Title - out.Lines = *(*[]string)(unsafe.Pointer(&in.Lines)) - return nil -} - -// Convert_v1_TellMeAPoemResponse_To_internal_TellMeAPoemResponse is an autogenerated conversion function. -func Convert_v1_TellMeAPoemResponse_To_internal_TellMeAPoemResponse(in *v1.TellMeAPoemResponse, out *internal.TellMeAPoemResponse) error { - return autoConvert_v1_TellMeAPoemResponse_To_internal_TellMeAPoemResponse(in, out) -} - -func autoConvert_internal_TellMeAPoemResponse_To_v1_TellMeAPoemResponse(in *internal.TellMeAPoemResponse, out *v1.TellMeAPoemResponse) error { - out.Title = in.Title - out.Lines = *(*[]string)(unsafe.Pointer(&in.Lines)) - return nil -} - -// Convert_internal_TellMeAPoemResponse_To_v1_TellMeAPoemResponse is an autogenerated conversion function. -func Convert_internal_TellMeAPoemResponse_To_v1_TellMeAPoemResponse(in *internal.TellMeAPoemResponse, out *v1.TellMeAPoemResponse) error { - return autoConvert_internal_TellMeAPoemResponse_To_v1_TellMeAPoemResponse(in, out) -} diff --git a/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go b/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go deleted file mode 100644 index 349566d1..00000000 --- a/integrationtests/apigroups/server/dummy/internal/v1/server_generated.go +++ /dev/null @@ -1,66 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1 - -import ( - "context" - - "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal" - "google.golang.org/grpc" -) - -var version = apiversion.NewVersionOrPanic("v1") - -type versionedAPI struct { - apiGroupServer internal.ServerInterface -} - -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { - return &versionedAPI{ - apiGroupServer: apiGroupServer, - } -} - -func (s *versionedAPI) Register(grpcServer *grpc.Server) { - v1.RegisterDummyServer(grpcServer, s) -} - -func (s *versionedAPI) ComputeDouble(context context.Context, versionedRequest *v1.ComputeDoubleRequest) (*v1.ComputeDoubleResponse, error) { - request := &internal.ComputeDoubleRequest{} - if err := Convert_v1_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(versionedRequest, request); err != nil { - return nil, err - } - - response, err := s.apiGroupServer.ComputeDouble(context, request, version) - if err != nil { - return nil, err - } - - versionedResponse := &v1.ComputeDoubleResponse{} - if err := Convert_internal_ComputeDoubleResponse_To_v1_ComputeDoubleResponse(response, versionedResponse); err != nil { - return nil, err - } - - return versionedResponse, err -} - -func (s *versionedAPI) TellMeAPoem(context context.Context, versionedRequest *v1.TellMeAPoemRequest) (*v1.TellMeAPoemResponse, error) { - request := &internal.TellMeAPoemRequest{} - if err := Convert_v1_TellMeAPoemRequest_To_internal_TellMeAPoemRequest(versionedRequest, request); err != nil { - return nil, err - } - - response, err := s.apiGroupServer.TellMeAPoem(context, request, version) - if err != nil { - return nil, err - } - - versionedResponse := &v1.TellMeAPoemResponse{} - if err := Convert_internal_TellMeAPoemResponse_To_v1_TellMeAPoemResponse(response, versionedResponse); err != nil { - return nil, err - } - - return versionedResponse, err -} diff --git a/integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion.go b/integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion.go deleted file mode 100644 index 2c05e309..00000000 --- a/integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion.go +++ /dev/null @@ -1,23 +0,0 @@ -package v1alpha1 - -import ( - "fmt" - "math" - - pb "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha1" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal" -) - -func convert_pb_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in *pb.ComputeDoubleRequest, out *internal.ComputeDoubleRequest) error { - out.Input64 = int64(in.Input32) - return nil -} - -func convert_internal_ComputeDoubleResponse_To_pb_ComputeDoubleResponse(in *internal.ComputeDoubleResponse, out *pb.ComputeDoubleResponse) error { - i := in.Response - if i > math.MaxInt32 || i < math.MinInt32 { - return fmt.Errorf("int32 overflow for %d", i) - } - out.Response32 = int32(i) - return nil -} diff --git a/integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion_generated.go b/integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion_generated.go deleted file mode 100644 index e3aa6787..00000000 --- a/integrationtests/apigroups/server/dummy/internal/v1alpha1/conversion_generated.go +++ /dev/null @@ -1,44 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - v1alpha1 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha1" - internal "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal" -) - -func autoConvert_v1alpha1_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in *v1alpha1.ComputeDoubleRequest, out *internal.ComputeDoubleRequest) error { - return nil -} - -// Convert_v1alpha1_ComputeDoubleRequest_To_internal_ComputeDoubleRequest is an autogenerated conversion function. -func Convert_v1alpha1_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in *v1alpha1.ComputeDoubleRequest, out *internal.ComputeDoubleRequest) error { - return autoConvert_v1alpha1_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in, out) -} - -func autoConvert_internal_ComputeDoubleRequest_To_v1alpha1_ComputeDoubleRequest(in *internal.ComputeDoubleRequest, out *v1alpha1.ComputeDoubleRequest) error { - return nil -} - -// Convert_internal_ComputeDoubleRequest_To_v1alpha1_ComputeDoubleRequest is an autogenerated conversion function. -func Convert_internal_ComputeDoubleRequest_To_v1alpha1_ComputeDoubleRequest(in *internal.ComputeDoubleRequest, out *v1alpha1.ComputeDoubleRequest) error { - return autoConvert_internal_ComputeDoubleRequest_To_v1alpha1_ComputeDoubleRequest(in, out) -} - -func autoConvert_v1alpha1_ComputeDoubleResponse_To_internal_ComputeDoubleResponse(in *v1alpha1.ComputeDoubleResponse, out *internal.ComputeDoubleResponse) error { - return nil -} - -// Convert_v1alpha1_ComputeDoubleResponse_To_internal_ComputeDoubleResponse is an autogenerated conversion function. -func Convert_v1alpha1_ComputeDoubleResponse_To_internal_ComputeDoubleResponse(in *v1alpha1.ComputeDoubleResponse, out *internal.ComputeDoubleResponse) error { - return autoConvert_v1alpha1_ComputeDoubleResponse_To_internal_ComputeDoubleResponse(in, out) -} - -func autoConvert_internal_ComputeDoubleResponse_To_v1alpha1_ComputeDoubleResponse(in *internal.ComputeDoubleResponse, out *v1alpha1.ComputeDoubleResponse) error { - return nil -} - -// Convert_internal_ComputeDoubleResponse_To_v1alpha1_ComputeDoubleResponse is an autogenerated conversion function. -func Convert_internal_ComputeDoubleResponse_To_v1alpha1_ComputeDoubleResponse(in *internal.ComputeDoubleResponse, out *v1alpha1.ComputeDoubleResponse) error { - return autoConvert_internal_ComputeDoubleResponse_To_v1alpha1_ComputeDoubleResponse(in, out) -} diff --git a/integrationtests/apigroups/server/dummy/internal/v1alpha1/server_generated.go b/integrationtests/apigroups/server/dummy/internal/v1alpha1/server_generated.go deleted file mode 100644 index f08e8d5d..00000000 --- a/integrationtests/apigroups/server/dummy/internal/v1alpha1/server_generated.go +++ /dev/null @@ -1,47 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha1 - -import ( - "context" - - "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha1" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal" - "google.golang.org/grpc" -) - -var version = apiversion.NewVersionOrPanic("v1alpha1") - -type versionedAPI struct { - apiGroupServer internal.ServerInterface -} - -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { - return &versionedAPI{ - apiGroupServer: apiGroupServer, - } -} - -func (s *versionedAPI) Register(grpcServer *grpc.Server) { - v1alpha1.RegisterDummyServer(grpcServer, s) -} - -func (s *versionedAPI) ComputeDouble(context context.Context, versionedRequest *v1alpha1.ComputeDoubleRequest) (*v1alpha1.ComputeDoubleResponse, error) { - request := &internal.ComputeDoubleRequest{} - if err := Convert_v1alpha1_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(versionedRequest, request); err != nil { - return nil, err - } - - response, err := s.apiGroupServer.ComputeDouble(context, request, version) - if err != nil { - return nil, err - } - - versionedResponse := &v1alpha1.ComputeDoubleResponse{} - if err := Convert_internal_ComputeDoubleResponse_To_v1alpha1_ComputeDoubleResponse(response, versionedResponse); err != nil { - return nil, err - } - - return versionedResponse, err -} diff --git a/integrationtests/apigroups/server/dummy/internal/v1alpha2/conversion.go b/integrationtests/apigroups/server/dummy/internal/v1alpha2/conversion.go deleted file mode 100644 index 18765345..00000000 --- a/integrationtests/apigroups/server/dummy/internal/v1alpha2/conversion.go +++ /dev/null @@ -1,3 +0,0 @@ -package v1alpha2 - -// Add manual conversion functions here to override automatic conversion functions diff --git a/integrationtests/apigroups/server/dummy/internal/v1alpha2/conversion_generated.go b/integrationtests/apigroups/server/dummy/internal/v1alpha2/conversion_generated.go deleted file mode 100644 index 3c434120..00000000 --- a/integrationtests/apigroups/server/dummy/internal/v1alpha2/conversion_generated.go +++ /dev/null @@ -1,48 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha2 - -import ( - v1alpha2 "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha2" - internal "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal" -) - -func autoConvert_v1alpha2_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in *v1alpha2.ComputeDoubleRequest, out *internal.ComputeDoubleRequest) error { - out.Input64 = in.Input64 - return nil -} - -// Convert_v1alpha2_ComputeDoubleRequest_To_internal_ComputeDoubleRequest is an autogenerated conversion function. -func Convert_v1alpha2_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in *v1alpha2.ComputeDoubleRequest, out *internal.ComputeDoubleRequest) error { - return autoConvert_v1alpha2_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(in, out) -} - -func autoConvert_internal_ComputeDoubleRequest_To_v1alpha2_ComputeDoubleRequest(in *internal.ComputeDoubleRequest, out *v1alpha2.ComputeDoubleRequest) error { - out.Input64 = in.Input64 - return nil -} - -// Convert_internal_ComputeDoubleRequest_To_v1alpha2_ComputeDoubleRequest is an autogenerated conversion function. -func Convert_internal_ComputeDoubleRequest_To_v1alpha2_ComputeDoubleRequest(in *internal.ComputeDoubleRequest, out *v1alpha2.ComputeDoubleRequest) error { - return autoConvert_internal_ComputeDoubleRequest_To_v1alpha2_ComputeDoubleRequest(in, out) -} - -func autoConvert_v1alpha2_ComputeDoubleResponse_To_internal_ComputeDoubleResponse(in *v1alpha2.ComputeDoubleResponse, out *internal.ComputeDoubleResponse) error { - out.Response = in.Response - return nil -} - -// Convert_v1alpha2_ComputeDoubleResponse_To_internal_ComputeDoubleResponse is an autogenerated conversion function. -func Convert_v1alpha2_ComputeDoubleResponse_To_internal_ComputeDoubleResponse(in *v1alpha2.ComputeDoubleResponse, out *internal.ComputeDoubleResponse) error { - return autoConvert_v1alpha2_ComputeDoubleResponse_To_internal_ComputeDoubleResponse(in, out) -} - -func autoConvert_internal_ComputeDoubleResponse_To_v1alpha2_ComputeDoubleResponse(in *internal.ComputeDoubleResponse, out *v1alpha2.ComputeDoubleResponse) error { - out.Response = in.Response - return nil -} - -// Convert_internal_ComputeDoubleResponse_To_v1alpha2_ComputeDoubleResponse is an autogenerated conversion function. -func Convert_internal_ComputeDoubleResponse_To_v1alpha2_ComputeDoubleResponse(in *internal.ComputeDoubleResponse, out *v1alpha2.ComputeDoubleResponse) error { - return autoConvert_internal_ComputeDoubleResponse_To_v1alpha2_ComputeDoubleResponse(in, out) -} diff --git a/integrationtests/apigroups/server/dummy/internal/v1alpha2/server_generated.go b/integrationtests/apigroups/server/dummy/internal/v1alpha2/server_generated.go deleted file mode 100644 index 6d8f42a9..00000000 --- a/integrationtests/apigroups/server/dummy/internal/v1alpha2/server_generated.go +++ /dev/null @@ -1,47 +0,0 @@ -// Code generated by csi-proxy-api-gen. DO NOT EDIT. - -package v1alpha2 - -import ( - "context" - - "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/api/dummy/v1alpha2" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal" - "google.golang.org/grpc" -) - -var version = apiversion.NewVersionOrPanic("v1alpha2") - -type versionedAPI struct { - apiGroupServer internal.ServerInterface -} - -func NewVersionedServer(apiGroupServer internal.ServerInterface) internal.VersionedAPI { - return &versionedAPI{ - apiGroupServer: apiGroupServer, - } -} - -func (s *versionedAPI) Register(grpcServer *grpc.Server) { - v1alpha2.RegisterDummyServer(grpcServer, s) -} - -func (s *versionedAPI) ComputeDouble(context context.Context, versionedRequest *v1alpha2.ComputeDoubleRequest) (*v1alpha2.ComputeDoubleResponse, error) { - request := &internal.ComputeDoubleRequest{} - if err := Convert_v1alpha2_ComputeDoubleRequest_To_internal_ComputeDoubleRequest(versionedRequest, request); err != nil { - return nil, err - } - - response, err := s.apiGroupServer.ComputeDouble(context, request, version) - if err != nil { - return nil, err - } - - versionedResponse := &v1alpha2.ComputeDoubleResponse{} - if err := Convert_internal_ComputeDoubleResponse_To_v1alpha2_ComputeDoubleResponse(response, versionedResponse); err != nil { - return nil, err - } - - return versionedResponse, err -} diff --git a/integrationtests/apigroups/server/dummy/server.go b/integrationtests/apigroups/server/dummy/server.go index c190c5f5..21bec8ab 100644 --- a/integrationtests/apigroups/server/dummy/server.go +++ b/integrationtests/apigroups/server/dummy/server.go @@ -5,14 +5,14 @@ import ( "fmt" "github.com/kubernetes-csi/csi-proxy/client/apiversion" - "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/internal" + "github.com/kubernetes-csi/csi-proxy/integrationtests/apigroups/server/dummy/impl" ) -// Server is the internal server for the dummy API group. +// Server is the impl server for the dummy API group. type Server struct{} // ComputeDouble computes the double of the input. Real smart stuff! -func (s *Server) ComputeDouble(ctx context.Context, request *internal.ComputeDoubleRequest, version apiversion.Version) (*internal.ComputeDoubleResponse, error) { +func (s *Server) ComputeDouble(ctx context.Context, request *impl.ComputeDoubleRequest, version apiversion.Version) (*impl.ComputeDoubleResponse, error) { in := request.Input64 out := 2 * in @@ -21,7 +21,7 @@ func (s *Server) ComputeDouble(ctx context.Context, request *internal.ComputeDou return nil, fmt.Errorf("int64 overflow with input: %d", in) } - return &internal.ComputeDoubleResponse{ + return &impl.ComputeDoubleResponse{ Response: out, }, nil } @@ -38,7 +38,7 @@ func sign(x int64) int { } // TellMeAPoem returns a very poetic response. -func (s *Server) TellMeAPoem(ctx context.Context, request *internal.TellMeAPoemRequest, version apiversion.Version) (*internal.TellMeAPoemResponse, error) { +func (s *Server) TellMeAPoem(ctx context.Context, request *impl.TellMeAPoemRequest, version apiversion.Version) (*impl.TellMeAPoemResponse, error) { lines := []string{ `Not like the brazen giant of Greek fame,`, `With conquering limbs astride from land to land;`, @@ -56,7 +56,7 @@ func (s *Server) TellMeAPoem(ctx context.Context, request *internal.TellMeAPoemR `I lift my lamp beside the golden door!"`, } - response := &internal.TellMeAPoemResponse{ + response := &impl.TellMeAPoemResponse{ Lines: lines, }