Remove auth oper generate

Signed-off-by: R.I.Pienaar <[email protected]>

AUTH.md

@@ -111,7 +111,7 @@ Permissions:
 
 ## Configuring NATS Server
 
-TODO: Full resolver generate
+Using `nats server generate` create a configuration file which will pre-load the important JWTs.
 
 ```
 $ nats-server --config nats-server.conf

cli/auth_operator_command.go

@@ -14,7 +14,6 @@
 package cli
 
 import (
-	"bytes"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
@@ -23,10 +22,7 @@ import (
 	"net/url"
 	"os"
 	"sort"
-	"text/template"
 
-	"github.com/choria-io/scaffold/forms"
-	"github.com/ghodss/yaml"
 	au "github.com/nats-io/natscli/internal/auth"
 	iu "github.com/nats-io/natscli/internal/util"
 
@@ -51,7 +47,6 @@ type authOperatorCommand struct {
 	pubKey               string
 	outputFile           string
 	encKey               string
-	jetstream            bool
 	tags                 []string
 	rmTags               []string
 }
@@ -88,11 +83,6 @@ func configureAuthOperatorCommand(auth commandHost) {
 	sel := op.Command("select", "Selects the default operator").Action(c.selectAction)
 	sel.Arg("name", "Operator to select").StringVar(&c.operatorName)
 
-	scaffold := op.Command("generate", "Guided creation of a Operator managed NATS Server").Alias("scaffold").Alias("gen").Action(c.generateAction)
-	scaffold.Arg("name", "Operator to act on").StringVar(&c.operatorName)
-	scaffold.Flag("output", "Location to store the configuration").Short('O').StringVar(&c.outputFile)
-	scaffold.Flag("jetstream", "Enables JetStream").BoolVar(&c.jetstream)
-
 	backup := op.Command("backup", "Creates a backup of an operator").Action(c.backupAction)
 	backup.Arg("name", "Operator to act on").Required().StringVar(&c.operatorName)
 	backup.Arg("output", "File to write backup to").Required().StringVar(&c.outputFile)
@@ -117,58 +107,6 @@ func configureAuthOperatorCommand(auth commandHost) {
 	skrm.Flag("force", "Remove without prompting").Short('f').UnNegatableBoolVar(&c.force)
 }
 
-func (c *authOperatorCommand) generateAction(_ *fisk.ParseContext) error {
-	_, oper, err := au.SelectOperator(c.operatorName, true, false)
-	if err != nil {
-		return err
-	}
-
-	var f forms.Form
-	err = yaml.Unmarshal(au.ResolverForm, &f)
-	if err != nil {
-		return err
-	}
-
-	res, err := forms.ProcessForm(f, map[string]any{
-		"jetstream": c.jetstream,
-		"operator":  oper,
-	})
-	if err != nil {
-		return err
-	}
-
-	t, err := template.New("nats-server.conf").Parse(au.ResolverTemplate)
-	if err != nil {
-		return err
-	}
-
-	res["operator"] = oper
-	res["system"], _ = oper.Accounts().Get("SYSTEM")
-
-	buff := bytes.NewBuffer([]byte{})
-	err = t.Execute(buff, res)
-	if err != nil {
-		return err
-	}
-
-	fmt.Println()
-
-	if c.outputFile == "" {
-		fmt.Println("Generated Server Config")
-		fmt.Println()
-		fmt.Println(buff.String())
-		return nil
-	}
-
-	err = os.WriteFile(c.outputFile, buff.Bytes(), 0600)
-	if err != nil {
-		return err
-	}
-	fmt.Printf("Generated server configuration written to %s\n", c.outputFile)
-
-	return nil
-}
-
 func (c *authOperatorCommand) selectAction(_ *fisk.ParseContext) error {
 	_, oper, err := au.SelectOperator(c.operatorName, true, false)
 	if err != nil {

cli/server_generate.go

@@ -34,7 +34,7 @@ type serverGenerateCmd struct {
 func configureServerGenerateCommand(srv *fisk.CmdClause) {
 	c := &serverGenerateCmd{}
 
-	gen := srv.Command("generate", `Generate server configurations`).Hidden().Alias("gen").Action(c.generateAction)
+	gen := srv.Command("generate", `Generate server configurations`).Alias("gen").Action(c.generateAction)
 	gen.Arg("target", "Write the output to a specific location").Required().StringVar(&c.target)
 	gen.Flag("source", "Fetch the configuration bundle from a file or URL").StringVar(&c.source)
 }

internal/auth/auth.go

@@ -30,12 +30,6 @@ import (
 	"github.com/synadia-io/jwt-auth-builder.go/providers/nsc"
 )
 
-//go:embed resolver_form.yaml
-var ResolverForm []byte
-
-//go:embed resolver_template.txt
-var ResolverTemplate string
-
 type listWithNames interface {
 	Name() string
 }