-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #8 from burmanm/config-builder
Config builder replacements
- Loading branch information
Showing
16 changed files
with
3,759 additions
and
3 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/k8ssandra/k8ssandra-client/pkg/config" | ||
| "github.com/spf13/cobra" | ||
| "k8s.io/cli-runtime/pkg/genericclioptions" | ||
| ) | ||
|
|
||
| var ( | ||
| configBuilderExample = ` | ||
| # Process the config files from cass-operator input | ||
| %[1]s build [<args>] | ||
| ` | ||
| ) | ||
|
|
||
| type builderOptions struct { | ||
| configFlags *genericclioptions.ConfigFlags | ||
| genericclioptions.IOStreams | ||
|
|
||
| inputDir string | ||
| outputDir string | ||
| } | ||
|
|
||
| func newBuilderOptions(streams genericclioptions.IOStreams) *builderOptions { | ||
| return &builderOptions{ | ||
| configFlags: genericclioptions.NewConfigFlags(true), | ||
| IOStreams: streams, | ||
| } | ||
| } | ||
|
|
||
| // NewCmd provides a cobra command wrapping newAddOptions | ||
| func NewBuilderCmd(streams genericclioptions.IOStreams) *cobra.Command { | ||
| o := newBuilderOptions(streams) | ||
|
|
||
| cmd := &cobra.Command{ | ||
| Use: "build [flags]", | ||
| Short: "Build config files from cass-operator input", | ||
| Example: fmt.Sprintf(configBuilderExample, "kubectl k8ssandra config"), | ||
| RunE: func(c *cobra.Command, args []string) error { | ||
| if err := o.Complete(c, args); err != nil { | ||
| return err | ||
| } | ||
| if err := o.Validate(); err != nil { | ||
| return err | ||
| } | ||
| if err := o.Run(); err != nil { | ||
| return err | ||
| } | ||
|
|
||
| return nil | ||
| }, | ||
| } | ||
|
|
||
| fl := cmd.Flags() | ||
| fl.StringVar(&o.inputDir, "input", "", "read config files from this directory instead of default") | ||
| fl.StringVar(&o.outputDir, "output", "", "write config files to this directory instead of default") | ||
| o.configFlags.AddFlags(fl) | ||
| return cmd | ||
| } | ||
|
|
||
| // Complete parses the arguments and necessary flags to options | ||
| func (c *builderOptions) Complete(cmd *cobra.Command, args []string) error { | ||
| // TODO Instead of pkg doing the Getenv parameters, we should probably do them here | ||
| // since it's related to the command line interface and shell. Makes it easier to | ||
| // refactor later to more sane input | ||
| return nil | ||
| } | ||
|
|
||
| // Validate ensures that all required arguments and flag values are provided | ||
| func (c *builderOptions) Validate() error { | ||
| return nil | ||
| } | ||
|
|
||
| // Run processes the input, creates a connection to Kubernetes and processes a secret to add the users | ||
| func (c *builderOptions) Run() error { | ||
| ctx := context.Background() | ||
|
|
||
| builder := config.NewBuilder(c.inputDir, c.outputDir) | ||
| return builder.Build(ctx) | ||
| } |
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,37 @@ | ||
| package config | ||
|
|
||
| import ( | ||
| "github.com/spf13/cobra" | ||
| "k8s.io/cli-runtime/pkg/genericclioptions" | ||
| ) | ||
|
|
||
| type ClientOptions struct { | ||
| configFlags *genericclioptions.ConfigFlags | ||
| genericclioptions.IOStreams | ||
| } | ||
|
|
||
| // NewClientOptions provides an instance of ClientOptions with default values | ||
| func NewClientOptions(streams genericclioptions.IOStreams) *ClientOptions { | ||
| return &ClientOptions{ | ||
| configFlags: genericclioptions.NewConfigFlags(true), | ||
| IOStreams: streams, | ||
| } | ||
| } | ||
|
|
||
| // NewCmd provides a cobra command wrapping ClientOptions | ||
| func NewCmd(streams genericclioptions.IOStreams) *cobra.Command { | ||
| o := NewClientOptions(streams) | ||
|
|
||
| cmd := &cobra.Command{ | ||
| Use: "config [subcommand] [flags]", | ||
| } | ||
|
|
||
| // Add subcommands | ||
| cmd.AddCommand(NewBuilderCmd(streams)) | ||
| // TODO Add the idea of allowing to modify cassandra-yaml with interactive editor from the | ||
| // command line | ||
|
|
||
| o.configFlags.AddFlags(cmd.Flags()) | ||
|
|
||
| return cmd | ||
| } |
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.