-
Notifications
You must be signed in to change notification settings - Fork 345
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(cmd): move database management commands from immuclient to i…
…mmuadmin. Fixes #440 Signed-off-by: Michele Meloni <[email protected]>
- Loading branch information
Showing
10 changed files
with
237 additions
and
164 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| /* | ||
| Copyright 2019-2020 vChain, Inc. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package immuadmin | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "github.com/codenotary/immudb/pkg/api/schema" | ||
| "github.com/spf13/cobra" | ||
| "google.golang.org/protobuf/types/known/emptypb" | ||
| ) | ||
|
|
||
| func (cl *commandline) database(cmd *cobra.Command) { | ||
| ccmd := &cobra.Command{ | ||
| Use: "database", | ||
| Short: "Issue all database commands", | ||
| Aliases: []string{"d"}, | ||
| PersistentPreRunE: cl.connect, | ||
| PersistentPostRun: cl.disconnect, | ||
| ValidArgs: []string{"list", "create", "use"}, | ||
| } | ||
| ccd := &cobra.Command{ | ||
| Use: "list", | ||
| Short: "List all databases", | ||
| Aliases: []string{"l"}, | ||
| PersistentPreRunE: cl.connect, | ||
| PersistentPostRun: cl.disconnect, | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| resp, err := cl.immuClient.DatabaseList(cl.context, &emptypb.Empty{}) | ||
| if err != nil { | ||
| cl.quit(err) | ||
| } | ||
| var dbList string | ||
| for _, val := range resp.Databases { | ||
| if cl.options.CurrentDatabase == val.Databasename { | ||
| dbList += fmt.Sprintf("*") | ||
| } | ||
| dbList += fmt.Sprintf("%s\n", val.Databasename) | ||
|
|
||
| } | ||
| fmt.Fprintf(cmd.OutOrStdout(), dbList+"\n") | ||
| return nil | ||
| }, | ||
| Args: cobra.ExactArgs(0), | ||
| } | ||
| cc := &cobra.Command{ | ||
| Use: "create", | ||
| Short: "Create a new database", | ||
| PersistentPreRunE: cl.connect, | ||
| PersistentPostRun: cl.disconnect, | ||
| Example: "create {database_name}", | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| if err := cl.immuClient.CreateDatabase(cl.context, &schema.Database{ | ||
| Databasename: args[0], | ||
| }); err != nil { | ||
| return err | ||
| } | ||
| fmt.Fprintf(cmd.OutOrStdout(), "database successfully created\n") | ||
| return nil | ||
| }, | ||
| Args: cobra.ExactArgs(1), | ||
| } | ||
|
|
||
| ccu := &cobra.Command{ | ||
| Use: "use command", | ||
| Short: "Select database", | ||
| Example: "use {database_name}", | ||
| PersistentPreRunE: cl.connect, | ||
| PersistentPostRun: cl.disconnect, | ||
| ValidArgs: []string{"databasename"}, | ||
| RunE: func(cmd *cobra.Command, args []string) error { | ||
| resp, err := cl.immuClient.UseDatabase(cl.context, &schema.Database{ | ||
| Databasename: args[0], | ||
| }) | ||
| if err != nil { | ||
| cl.quit(err) | ||
| } | ||
| if err != nil { | ||
| return err | ||
| } | ||
| cl.immuClient.GetOptions().CurrentDatabase = args[0] | ||
| tokenFileName := cl.immuClient.GetOptions().TokenFileName | ||
| if err = cl.hds.WriteFileToUserHomeDir([]byte(resp.Token), tokenFileName); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| fmt.Fprintf(cmd.OutOrStdout(), "Now using %s\n", args[0]) | ||
| return nil | ||
| }, | ||
| Args: cobra.MaximumNArgs(2), | ||
| } | ||
|
|
||
| ccmd.AddCommand(ccu) | ||
| ccmd.AddCommand(ccd) | ||
| ccmd.AddCommand(cc) | ||
| cmd.AddCommand(ccmd) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,121 @@ | ||
| package immuadmin | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "github.com/codenotary/immudb/cmd/immuclient/immuclienttest" | ||
| "github.com/codenotary/immudb/pkg/client" | ||
| "github.com/codenotary/immudb/pkg/server" | ||
| "github.com/codenotary/immudb/pkg/server/servertest" | ||
| "github.com/spf13/cobra" | ||
| "google.golang.org/grpc" | ||
| "io/ioutil" | ||
| "strings" | ||
| "testing" | ||
| ) | ||
|
|
||
| func TestDatabaseList(t *testing.T) { | ||
| bs := servertest.NewBufconnServer(server.DefaultOptions().WithAuth(true).WithInMemoryStore(true)) | ||
| bs.Start() | ||
|
|
||
| pr := &immuclienttest.PasswordReader{ | ||
| Pass: []string{"immudb"}, | ||
| } | ||
| hds := &immuclienttest.HomedirServiceMock{} | ||
| ctx := context.Background() | ||
| dialOptions := []grpc.DialOption{ | ||
| grpc.WithContextDialer(bs.Dialer), grpc.WithInsecure(), | ||
| } | ||
| cliopt := Options().WithDialOptions(&dialOptions).WithPasswordReader(pr). | ||
| WithHomedirService(hds) | ||
| cliopt.PasswordReader = pr | ||
| cliopt.DialOptions = &dialOptions | ||
| clientb, _ := client.NewImmuClient(cliopt) | ||
| token, err := clientb.Login(ctx, []byte("immudb"), []byte("immudb")) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if err = hds.WriteFileToUserHomeDir(token.Token, ""); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| cmdl := commandline{ | ||
| options: cliopt, | ||
| immuClient: clientb, | ||
| passwordReader: pr, | ||
| context: ctx, | ||
| hds: hds, | ||
| } | ||
|
|
||
| cmd := cobra.Command{} | ||
|
|
||
| cmdl.database(&cmd) | ||
| b := bytes.NewBufferString("") | ||
| cmd.SetOut(b) | ||
|
|
||
| cmd.SetArgs([]string{"database", "list"}) | ||
| err = cmd.Execute() | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| msg, err := ioutil.ReadAll(b) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if !strings.Contains(string(msg), "defaultdb") { | ||
| t.Fatal(err) | ||
| } | ||
| } | ||
|
|
||
| func TestDatabaseCreate(t *testing.T) { | ||
| bs := servertest.NewBufconnServer(server.DefaultOptions().WithAuth(true).WithInMemoryStore(true)) | ||
| bs.Start() | ||
|
|
||
| pr := &immuclienttest.PasswordReader{ | ||
| Pass: []string{"immudb"}, | ||
| } | ||
| hds := &immuclienttest.HomedirServiceMock{} | ||
| ctx := context.Background() | ||
| dialOptions := []grpc.DialOption{ | ||
| grpc.WithContextDialer(bs.Dialer), grpc.WithInsecure(), | ||
| } | ||
| cliopt := Options().WithDialOptions(&dialOptions).WithPasswordReader(pr). | ||
| WithHomedirService(hds) | ||
| cliopt.PasswordReader = pr | ||
| cliopt.DialOptions = &dialOptions | ||
| clientb, _ := client.NewImmuClient(cliopt) | ||
| token, err := clientb.Login(ctx, []byte("immudb"), []byte("immudb")) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if err = hds.WriteFileToUserHomeDir(token.Token, ""); err != nil { | ||
| t.Fatal(err) | ||
| } | ||
|
|
||
| cmdl := commandline{ | ||
| options: cliopt, | ||
| immuClient: clientb, | ||
| passwordReader: pr, | ||
| context: ctx, | ||
| hds: hds, | ||
| } | ||
|
|
||
| cmd := cobra.Command{} | ||
|
|
||
| cmdl.database(&cmd) | ||
| b := bytes.NewBufferString("") | ||
| cmd.SetOut(b) | ||
|
|
||
| cmd.SetArgs([]string{"database", "create", "mynewdb"}) | ||
| err = cmd.Execute() | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| msg, err := ioutil.ReadAll(b) | ||
| if err != nil { | ||
| t.Fatal(err) | ||
| } | ||
| if !strings.Contains(string(msg), "database successfully created") { | ||
| t.Fatal(string(msg)) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.