From ba05c1e0fb4cffc58f4ffa205272b27fc3ec6917 Mon Sep 17 00:00:00 2001 From: LEDUNOIS Simon Date: Thu, 13 Apr 2023 14:26:38 -0400 Subject: [PATCH] chore: add `--secret` option to `init tenant` cmd #76 --- docs/bbsctl.md | 2 +- docs/bbsctl_apply.md | 2 +- docs/bbsctl_cluster-info.md | 2 +- docs/bbsctl_delete.md | 2 +- docs/bbsctl_delete_tenant.md | 2 +- docs/bbsctl_describe.md | 2 +- docs/bbsctl_describe_config.md | 2 +- docs/bbsctl_describe_tenant.md | 2 +- docs/bbsctl_get.md | 2 +- docs/bbsctl_get_instances.md | 2 +- docs/bbsctl_get_tenants.md | 2 +- docs/bbsctl_init.md | 2 +- docs/bbsctl_init_config.md | 2 +- docs/bbsctl_init_instances.md | 2 +- docs/bbsctl_init_tenant.md | 14 ++++++++++++-- pkg/cmd/init/flags.go | 1 + pkg/cmd/init/tenant.go | 16 +++++++++++++++- 17 files changed, 42 insertions(+), 17 deletions(-) diff --git a/docs/bbsctl.md b/docs/bbsctl.md index aa0008e..a8213ef 100644 --- a/docs/bbsctl.md +++ b/docs/bbsctl.md @@ -26,4 +26,4 @@ bbsctl [flags] * [bbsctl get](bbsctl_get.md) - Display a resource * [bbsctl init](bbsctl_init.md) - Initialize a resource -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_apply.md b/docs/bbsctl_apply.md index c168662..62f6737 100644 --- a/docs/bbsctl_apply.md +++ b/docs/bbsctl_apply.md @@ -27,4 +27,4 @@ bbsctl apply -f [filepath] [flags] * [bbsctl](bbsctl.md) - BigBlueSwarm controller cli -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_cluster-info.md b/docs/bbsctl_cluster-info.md index 3b34f70..fe5613a 100644 --- a/docs/bbsctl_cluster-info.md +++ b/docs/bbsctl_cluster-info.md @@ -26,4 +26,4 @@ bbsctl cluster-info [flags] * [bbsctl](bbsctl.md) - BigBlueSwarm controller cli -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_delete.md b/docs/bbsctl_delete.md index 4aa5b89..cdf1c9a 100644 --- a/docs/bbsctl_delete.md +++ b/docs/bbsctl_delete.md @@ -27,4 +27,4 @@ bbsctl delete [flags] * [bbsctl](bbsctl.md) - BigBlueSwarm controller cli * [bbsctl delete tenant](bbsctl_delete_tenant.md) - delete a tenant based on hostname -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_delete_tenant.md b/docs/bbsctl_delete_tenant.md index aa358d9..c1ffc57 100644 --- a/docs/bbsctl_delete_tenant.md +++ b/docs/bbsctl_delete_tenant.md @@ -26,4 +26,4 @@ bbsctl delete tenant [flags] * [bbsctl delete](bbsctl_delete.md) - Delete a specific resource -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_describe.md b/docs/bbsctl_describe.md index 8735a10..a65f547 100644 --- a/docs/bbsctl_describe.md +++ b/docs/bbsctl_describe.md @@ -28,4 +28,4 @@ bbsctl describe [flags] * [bbsctl describe config](bbsctl_describe_config.md) - describe BigBlueSwarm configuration. * [bbsctl describe tenant](bbsctl_describe_tenant.md) - Describe B3L tenant. -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_describe_config.md b/docs/bbsctl_describe_config.md index 36d47e1..4a6f08f 100644 --- a/docs/bbsctl_describe_config.md +++ b/docs/bbsctl_describe_config.md @@ -26,4 +26,4 @@ bbsctl describe config [flags] * [bbsctl describe](bbsctl_describe.md) - Show details of a specific resource or group of resources -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_describe_tenant.md b/docs/bbsctl_describe_tenant.md index c0a3bea..475faee 100644 --- a/docs/bbsctl_describe_tenant.md +++ b/docs/bbsctl_describe_tenant.md @@ -26,4 +26,4 @@ bbsctl describe tenant [flags] * [bbsctl describe](bbsctl_describe.md) - Show details of a specific resource or group of resources -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_get.md b/docs/bbsctl_get.md index 635b8d1..1bbcfd7 100644 --- a/docs/bbsctl_get.md +++ b/docs/bbsctl_get.md @@ -28,4 +28,4 @@ bbsctl get [flags] * [bbsctl get instances](bbsctl_get_instances.md) - Display all BigBlueButton instances available in your BigBlueSwarm cluster * [bbsctl get tenants](bbsctl_get_tenants.md) - Display all BigBlueSwarm tenants available in your BigBlueSwarm cluster -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_get_instances.md b/docs/bbsctl_get_instances.md index acba0e5..5b77b2d 100644 --- a/docs/bbsctl_get_instances.md +++ b/docs/bbsctl_get_instances.md @@ -28,4 +28,4 @@ bbsctl get instances [flags] * [bbsctl get](bbsctl_get.md) - Display a resource -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_get_tenants.md b/docs/bbsctl_get_tenants.md index b05e6c3..f88ffec 100644 --- a/docs/bbsctl_get_tenants.md +++ b/docs/bbsctl_get_tenants.md @@ -28,4 +28,4 @@ bbsctl get tenants [flags] * [bbsctl get](bbsctl_get.md) - Display a resource -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_init.md b/docs/bbsctl_init.md index c2a0e14..f3a65ce 100644 --- a/docs/bbsctl_init.md +++ b/docs/bbsctl_init.md @@ -29,4 +29,4 @@ bbsctl init [flags] * [bbsctl init instances](bbsctl_init_instances.md) - Initialize bigblueswarm instances file * [bbsctl init tenant](bbsctl_init_tenant.md) - Initialize a new bigblueswarm tenant configuration file -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_init_config.md b/docs/bbsctl_init_config.md index 5eac66a..4b4ef2b 100644 --- a/docs/bbsctl_init_config.md +++ b/docs/bbsctl_init_config.md @@ -55,4 +55,4 @@ bbsctl init config --bbs http://bbs.example.com --key api_key * [bbsctl init](bbsctl_init.md) - Initialize a resource -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_init_instances.md b/docs/bbsctl_init_instances.md index 319cc77..cd7c904 100644 --- a/docs/bbsctl_init_instances.md +++ b/docs/bbsctl_init_instances.md @@ -41,4 +41,4 @@ bbsctl init instances * [bbsctl init](bbsctl_init.md) - Initialize a resource -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/docs/bbsctl_init_tenant.md b/docs/bbsctl_init_tenant.md index 938307c..69927a3 100644 --- a/docs/bbsctl_init_tenant.md +++ b/docs/bbsctl_init_tenant.md @@ -19,7 +19,16 @@ bbsctl init tenant --host bbs.example.com # # kind: Tenant # spec: - host: bbs.example.com +# host: bbs.example.com +# instances: [] + +bbsctl init tenant --host bbs.example.com --secret dummy_secret +# generates the following file +# +# kind: Tenant +# spec: +# host: bbs.example.com +# secret: dummy_secret # instances: [] bbsctl init tenant --host bbs.example.com --dest /path/to/file @@ -52,6 +61,7 @@ bbsctl init tenant --host bbs.example.com --meeting_pool 10 --user_pool 100 -h, --help help for tenant --host string Tenant hostname --meeting_pool int Tenant meeting pool. This means the tenant can't create more meetings than the configured meeting pool. -1 is ignored. (default -1) + --secret string Tenant secret --user_pool int Tenant user pool. This means the tenant can't have more users than the configured user pool. -1 is ignored. (default -1) ``` @@ -65,4 +75,4 @@ bbsctl init tenant --host bbs.example.com --meeting_pool 10 --user_pool 100 * [bbsctl init](bbsctl_init.md) - Initialize a resource -###### Auto generated by spf13/cobra on 3-Jan-2023 +###### Auto generated by spf13/cobra on 13-Apr-2023 diff --git a/pkg/cmd/init/flags.go b/pkg/cmd/init/flags.go index 357bf20..dbac8bb 100644 --- a/pkg/cmd/init/flags.go +++ b/pkg/cmd/init/flags.go @@ -26,6 +26,7 @@ func NewInitInstancesFlags() *InstancesFlags { // TenantFlags represents `bbsctl init tenant` flags type TenantFlags struct { Hostname string + Secret string Destination string UserPool int64 MeetingPool int64 diff --git a/pkg/cmd/init/tenant.go b/pkg/cmd/init/tenant.go index d51e163..52fca77 100644 --- a/pkg/cmd/init/tenant.go +++ b/pkg/cmd/init/tenant.go @@ -21,7 +21,16 @@ bbsctl init tenant --host bbs.example.com # # kind: Tenant # spec: - host: bbs.example.com +# host: bbs.example.com +# instances: [] + +bbsctl init tenant --host bbs.example.com --secret dummy_secret +# generates the following file +# +# kind: Tenant +# spec: +# host: bbs.example.com +# secret: dummy_secret # instances: [] bbsctl init tenant --host bbs.example.com --dest /path/to/file @@ -82,6 +91,7 @@ func NewInitTenantCmd() *cobra.Command { func (cmd *TenantCmd) ApplyFlags() { cmd.Command.Flags().StringVarP(&cmd.Flags.Destination, "dest", "d", bbsconfig.DefaultConfigFolder, "File folder destination") cmd.Command.Flags().StringVarP(&cmd.Flags.Hostname, "host", "", "", "Tenant hostname") + cmd.Command.Flags().StringVarP(&cmd.Flags.Secret, "secret", "", "", "Tenant secret") cmd.Command.Flags().Int64VarP(&cmd.Flags.MeetingPool, "meeting_pool", "", -1, "Tenant meeting pool. This means the tenant can't create more meetings than the configured meeting pool. -1 is ignored.") cmd.Command.Flags().Int64VarP(&cmd.Flags.UserPool, "user_pool", "", -1, "Tenant user pool. This means the tenant can't have more users than the configured user pool. -1 is ignored.") cmd.Command.MarkFlagRequired("host") @@ -102,6 +112,10 @@ func (cmd *TenantCmd) init(command *cobra.Command, args []string) error { Instances: []string{}, } + if cmd.Flags.Secret != "" { + tenant.Spec.Secret = cmd.Flags.Secret + } + if cmd.Flags.MeetingPool != -1 { tenant.Spec.MeetingsPool = &cmd.Flags.MeetingPool }