JumpCloud pagination & template update

cli/cmd/ds-load/main.go

@@ -15,6 +15,7 @@ import (
 
 func main() {
 	pluginEnum := ""
+
 	pluginFinder, err := plugin.NewHomeDirFinder(true)
 	if err != nil {
 		os.Stderr.WriteString(err.Error())
@@ -26,9 +27,11 @@ func main() {
 		os.Stderr.WriteString(err.Error())
 		os.Exit(1)
 	}
+
 	for _, p := range plugins {
 		pluginEnum += (p.Name + "|")
 	}
+
 	pluginEnum = strings.TrimSuffix(pluginEnum, "|")
 
 	yamlLoader := kongyaml.NewYAMLResolver("")
@@ -52,9 +55,12 @@ func main() {
 	}
 
 	kongCtx := kong.Parse(&cli, options...)
+
 	ctx := cc.NewCommonContext(cli.Verbosity, string(cli.Config))
+
 	if err := kongCtx.Run(ctx); err != nil {
 		kongCtx.FatalIfErrorf(err)
 	}
+
 	os.Exit(common.GetExitCode())
 }

cli/pkg/app/cli.go

@@ -44,6 +44,7 @@ func (listPlugins *ListPluginsCmd) Run(c *cc.CommonCtx) error {
 	if err != nil {
 		return err
 	}
+
 	plugins, err := find.Find()
 	if err != nil {
 		return err
@@ -52,8 +53,8 @@ func (listPlugins *ListPluginsCmd) Run(c *cc.CommonCtx) error {
 	for _, p := range plugins {
 		os.Stdout.WriteString(p.Name + " " + p.Path + "\n")
 	}
-	return nil
 
+	return nil
 }
 
 type VersionCmd struct{}
@@ -63,5 +64,6 @@ func (cmd *VersionCmd) Run(c *cc.CommonCtx) error {
 		constants.AppName,
 		version.GetInfo().String(),
 	)
+
 	return nil
 }

cli/pkg/app/exec.go

@@ -32,8 +32,12 @@ type ExecCmd struct {
 
 func (e *ExecCmd) Run(c *cc.CommonCtx) error {
 	defaultPrintCmd := []string{"fetch", "version", "export-transform"}
-	var err error
-	var find *plugin.Finder
+
+	var (
+		err  error
+		find *plugin.Finder
+	)
+
 	if e.PluginFolder != "" {
 		find = plugin.NewFinder(true, e.PluginFolder)
 	} else {
@@ -42,24 +46,29 @@ func (e *ExecCmd) Run(c *cc.CommonCtx) error {
 			return err
 		}
 	}
+
 	pl := e.CommandArgs[0]
 
 	plugins, err := find.Find()
 	if err != nil {
 		return err
 	}
+
 	for _, p := range plugins {
 		if pl == p.Name {
 			e.execPlugin = p
 			break
 		}
 	}
+
 	if e.execPlugin == nil {
 		return errors.Errorf("plugin [%s] not found", pl)
 	}
 
 	e.pluginArgs = e.CommandArgs[1:]
+
 	var pluginSubCommand string
+
 	if len(e.CommandArgs) > 1 {
 		pluginSubCommand = e.CommandArgs[1]
 	}
@@ -73,6 +82,7 @@ func (e *ExecCmd) Run(c *cc.CommonCtx) error {
 		if err != nil {
 			return errors.Wrap(err, "Could not connect to the directory")
 		}
+
 		e.publisher = publish.NewDirectoryPublisher(c, dirClient)
 	}
 
@@ -83,9 +93,13 @@ func (e *ExecCmd) LaunchPlugin(c *cc.CommonCtx) error {
 	if (!slices.Contains(e.pluginArgs, "-c") || !slices.Contains(e.pluginArgs, "--config")) && c.ConfigPath != "" {
 		e.pluginArgs = append(e.pluginArgs, "-c", c.ConfigPath)
 	}
+
 	pluginCmd := exec.Command(e.execPlugin.Path, e.pluginArgs...) //nolint:gosec
-	var pStdout io.ReadCloser
-	var wg sync.WaitGroup
+
+	var (
+		pStdout io.ReadCloser
+		wg      sync.WaitGroup
+	)
 
 	pStderr, err := pluginCmd.StderrPipe()
 	if err != nil {
@@ -94,6 +108,7 @@ func (e *ExecCmd) LaunchPlugin(c *cc.CommonCtx) error {
 	defer pStderr.Close()
 
 	wg.Add(1)
+
 	go listenOnStderr(c, &wg, pStderr)
 
 	if e.Print {
@@ -110,6 +125,7 @@ func (e *ExecCmd) LaunchPlugin(c *cc.CommonCtx) error {
 	if err != nil {
 		return err
 	}
+
 	if (fi.Mode() & os.ModeCharDevice) == 0 {
 		pluginCmd.Stdin = os.Stdin
 	}
@@ -122,12 +138,14 @@ func (e *ExecCmd) LaunchPlugin(c *cc.CommonCtx) error {
 	if !e.Print {
 		err = e.publisher.Publish(c.Context, pStdout)
 	}
+
 	if err != nil {
 		wg.Wait()
 		return err
 	}
 
 	wg.Wait()
+
 	return pluginCmd.Wait()
 }
 
@@ -154,5 +172,6 @@ func listenOnStderr(c *cc.CommonCtx, wg *sync.WaitGroup, stderr io.ReadCloser) {
 			c.Log.Fatal().Err(err)
 		}
 	}
+
 	wg.Done()
 }

cli/pkg/app/publish.go

@@ -22,6 +22,7 @@ func (l *PublishCmd) Run(commonCtx *cc.CommonCtx) error {
 	if err != nil {
 		return errors.Wrap(err, "Could not connect to the directory")
 	}
+
 	publisher = publish.NewDirectoryPublisher(commonCtx, dirClient)
 
 	return l.processMessagesFromStdIn(commonCtx, publisher)

cli/pkg/clients/directory_client.go

@@ -71,11 +71,14 @@ func validate(cfg *Config) error {
 	opts := []grpc.DialOption{
 		grpc.WithUserAgent("ds-load " + version.GetInfo().Version),
 	}
+
 	if cfg.Insecure {
 		opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
 	}
+
 	if _, err := grpcurl.BlockingDial(ctx, "tcp", cfg.Host, creds, opts...); err != nil {
 		return err
 	}
+
 	return nil
 }

cli/pkg/plugin/finder.go

@@ -37,9 +37,11 @@ func NewHomeDirFinder(env bool) (*Finder, error) {
 func (f Finder) Find() ([]*Plugin, error) {
 	addedPlugins := []string{}
 	dirs := f.dirs
+
 	if f.env {
 		pathEnv := os.Getenv("PATH")
 		dirs = append(dirs, strings.Split(pathEnv, string(os.PathListSeparator))...)
+
 		pwd, err := os.Getwd()
 		if err != nil {
 			fmt.Println(err)
@@ -55,6 +57,7 @@ func (f Finder) Find() ([]*Plugin, error) {
 		if err != nil {
 			return nil, err
 		}
+
 		if len(files) > 0 {
 			for _, f := range files {
 				p := NewPlugin(f)

cli/pkg/plugin/plugin.go

@@ -23,8 +23,10 @@ func NewPlugin(path string) *Plugin {
 func pluginName(path string) string {
 	file := filepath.Base(path)
 	name := strings.TrimPrefix(file, constants.PluginPrefix)
+
 	if runtime.GOOS == "windows" {
 		name = strings.TrimSuffix(name, ".exe")
 	}
+
 	return name
 }

cli/pkg/publish/publisher_v3.go

@@ -47,13 +47,16 @@ func (p *DirectoryPublisher) Publish(ctx context.Context, reader io.Reader) erro
 
 	for {
 		var message msg.Transform
+
 		err := jsonReader.ReadProtoMessage(&message)
 		if err == io.EOF {
 			break
 		}
+
 		if err != nil {
 			return err
 		}
+
 		err = p.publishMessages(ctx, &message)
 		if err != nil {
 			return err
@@ -63,6 +66,7 @@ func (p *DirectoryPublisher) Publish(ctx context.Context, reader io.Reader) erro
 	if p.objCounter != nil {
 		printCounter(os.Stdout, p.objCounter)
 	}
+
 	if p.relCounter != nil {
 		printCounter(os.Stdout, p.relCounter)
 	}
@@ -77,11 +81,14 @@ func (p *DirectoryPublisher) Publish(ctx context.Context, reader io.Reader) erro
 
 func (p *DirectoryPublisher) publishMessages(ctx context.Context, message *msg.Transform) error {
 	errGroup, iCtx := errgroup.WithContext(ctx)
+
 	stream, err := p.importerClient.Import(iCtx)
 	if err != nil {
 		return err
 	}
+
 	errGroup.Go(p.receiver(stream))
+
 	errGroup.Go(p.doneHandler(stream.Context()))
 
 	opCode := message.OpCode
@@ -95,16 +102,19 @@ func (p *DirectoryPublisher) publishMessages(ctx context.Context, message *msg.T
 			fmt.Fprintf(os.Stderr, "validation failed, object: [%s] type [%s]\n", object.Id, object.Type)
 			continue
 		}
+
 		if (opCode == dsi3.Opcode_OPCODE_DELETE || opCode == dsi3.Opcode_OPCODE_DELETE_WITH_RELATIONS) && object.Type == "group" {
 			continue
 		}
+
 		fmt.Fprintf(os.Stdout, "object: [%s] type [%s]\n", object.Id, object.Type)
 		sErr := stream.Send(&dsi3.ImportRequest{
 			Msg: &dsi3.ImportRequest_Object{
 				Object: object,
 			},
 			OpCode: opCode,
 		})
+
 		p.handleStreamError(sErr)
 	}
 
@@ -114,13 +124,15 @@ func (p *DirectoryPublisher) publishMessages(ctx context.Context, message *msg.T
 			fmt.Fprintf(os.Stderr, "validation failed, relation: [%s] obj: [%s] subj [%s]\n", relation.Relation, relation.ObjectId, relation.SubjectId)
 			continue
 		}
+
 		fmt.Fprintf(os.Stdout, "relation: [%s] obj: [%s] subj [%s]\n", relation.Relation, relation.ObjectId, relation.SubjectId)
 		sErr := stream.Send(&dsi3.ImportRequest{
 			Msg: &dsi3.ImportRequest_Relation{
 				Relation: relation,
 			},
 			OpCode: opCode,
 		})
+
 		p.handleStreamError(sErr)
 	}
 
@@ -162,6 +174,7 @@ func (p *DirectoryPublisher) receiver(stream dsi3.Importer_ImportClient) func()
 				switch m := result.Msg.(type) {
 				case *dsi3.ImportResponse_Status:
 					p.errs = true
+
 					printStatus(os.Stderr, m.Status)
 				case *dsi3.ImportResponse_Counter:
 					switch m.Counter.Type {
@@ -179,11 +192,13 @@ func (p *DirectoryPublisher) receiver(stream dsi3.Importer_ImportClient) func()
 func (p *DirectoryPublisher) doneHandler(ctx context.Context) func() error {
 	return func() error {
 		<-ctx.Done()
+
 		err := ctx.Err()
 		if err != nil && !errors.Is(err, context.Canceled) {
 			p.Log.Trace().Err(err).Msg("subscriber-doneHandler")
 			return err
 		}
+
 		return nil
 	}
 }

plugins/auth0/pkg/app/cli.go

@@ -18,13 +18,13 @@ type CLI struct {
 	Verify          VerifyCmd          `cmd:"verify" help:"verify fetcher configuration and credentials"`
 }
 
-type VersionCmd struct {
-}
+type VersionCmd struct{}
 
 func (cmd *VersionCmd) Run() error {
 	fmt.Printf("%s - %s\n",
 		AppName,
 		version.GetInfo().String(),
 	)
+
 	return nil
 }

plugins/auth0/pkg/app/exec.go

@@ -29,12 +29,15 @@ func (cmd *ExecCmd) Run(ctx *cc.CommonCtx) error {
 	if err != nil {
 		return err
 	}
+
 	fetcher = fetcher.WithUserPID(cmd.UserPID).WithEmail(cmd.UserEmail).WithRoles(cmd.Roles)
 
 	templateContent, err := cmd.getTemplateContent()
 	if err != nil {
 		return err
 	}
+
 	transformer := transform.NewGoTemplateTransform(templateContent)
+
 	return exec.Execute(ctx.Context, ctx.Log, transformer, fetcher)
 }

plugins/auth0/pkg/app/export_transform.go

@@ -7,14 +7,14 @@ import (
 	"github.com/aserto-dev/ds-load/sdk/transform"
 )
 
-type ExportTransformCmd struct {
-}
+type ExportTransformCmd struct{}
 
 func (t *ExportTransformCmd) Run(ctx *cc.CommonCtx) error {
 	templateContent, err := Assets().ReadFile("assets/transform_template.tmpl")
 	if err != nil {
 		return err
 	}
+
 	transformer := transform.NewGoTemplateTransform(templateContent)
 
 	return transformer.ExportTransform(os.Stdout)

plugins/auth0/pkg/app/fetch.go

@@ -36,6 +36,7 @@ func (f *FetchCmd) Run(ctx *cc.CommonCtx) error {
 	if err != nil {
 		return err
 	}
+
 	fetcher = fetcher.WithUserPID(f.UserPID).WithEmail(f.UserEmail).WithRoles(f.Roles).WithOrgs(f.Orgs).WithSAML(f.SAML)
 
 	return fetcher.Fetch(ctx.Context, os.Stdout, os.Stderr)

plugins/auth0/pkg/app/transform.go

@@ -22,6 +22,7 @@ func (t *TransformCmd) Run(ctx *cc.CommonCtx) error {
 	}
 
 	goTemplateTransformer := transform.NewGoTemplateTransform(templateContent)
+
 	return t.transform(ctx.Context, goTemplateTransformer)
 }
 
@@ -36,6 +37,7 @@ func (t *TransformCmd) getTemplateContent() ([]byte, error) {
 	}
 
 	templateLoader := template.NewTemplateLoader(templateContent)
+
 	templateContent, err = templateLoader.Load(t.Template)
 	if err != nil {
 		return nil, err