Fix the output of get profiles ... command

internal/runners/accounts.go

@@ -5,7 +5,6 @@
 package runners
 
 import (
-	"embed"
 	"fmt"
 
 	"github.com/itential/ipctl/pkg/client"
@@ -14,9 +13,6 @@ import (
 	"github.com/itential/ipctl/pkg/services"
 )
 
-//go:embed templates/accounts/*.tmpl
-var content embed.FS
-
 type AccountRunner struct {
 	config  *config.Config
 	service *services.AccountService
@@ -65,15 +61,14 @@ func (r *AccountRunner) Describe(in Request) (*Response, error) {
 		return nil, fmt.Errorf("account `%s` does not exist", in.Args[0])
 	}
 
-	tmpl, err := content.ReadFile("describe.tmpl")
+	tmpl, err := templates.ReadFile("templates/accounts/describe.tmpl")
 	if err != nil {
 		logger.Fatal(err, "failed to load template")
 	}
 
 	return &Response{
 		Object:   account,
 		Template: string(tmpl),
-		//Template: "Username: {{.Username}}",
 	}, nil
 }
 

internal/runners/profiles.go

@@ -32,9 +32,11 @@ func NewProfileRunner(client client.Client, cfg *config.Config) *ProfileRunner {
 	}
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// Reader Interface
-//
+/*
+******************************************************************************
+Reader interface
+******************************************************************************
+*/
 
 // Get implements the `get profiles` command
 func (r *ProfileRunner) Get(in Request) (*Response, error) {
@@ -46,7 +48,7 @@ func (r *ProfileRunner) Get(in Request) (*Response, error) {
 	}
 
 	return &Response{
-		Keys:   []string{"name", "description"},
+		Keys:   []string{"id", "description"},
 		Object: profiles,
 	}, nil
 }
@@ -62,14 +64,22 @@ func (r *ProfileRunner) Describe(in Request) (*Response, error) {
 		return nil, err
 	}
 
+	tmpl, err := templates.ReadFile("templates/profiles/describe.tmpl")
+	if err != nil {
+		logger.Fatal(err, "failed to load template")
+	}
+
 	return &Response{
-		Object: profile,
+		Object:   profile,
+		Template: string(tmpl),
 	}, nil
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// Writer Interface
-//
+/*
+******************************************************************************
+Writer interface
+******************************************************************************
+*/
 
 // Create is the implementation of the command `ccreate profile <name>`
 func (r *ProfileRunner) Create(in Request) (*Response, error) {
@@ -128,9 +138,11 @@ func (r *ProfileRunner) Clear(in Request) (*Response, error) {
 	}, nil
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// Copier Interface
-//
+/*
+******************************************************************************
+Copier interface
+******************************************************************************
+*/
 
 // Copy implements the `copy profile <name> <dst>` command
 func (r *ProfileRunner) Copy(in Request) (*Response, error) {
@@ -191,9 +203,11 @@ func (r *ProfileRunner) CopyTo(profile string, in any, replace bool) (any, error
 	return svc.Import(in.(services.Profile))
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// Importer Interface
-//
+/*
+******************************************************************************
+Importer interface
+******************************************************************************
+*/
 
 // Import implements the command `import profile <path>`
 func (r *ProfileRunner) Import(in Request) (*Response, error) {
@@ -216,9 +230,11 @@ func (r *ProfileRunner) Import(in Request) (*Response, error) {
 	}, nil
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// Exporter Interface
-//
+/*
+******************************************************************************
+Exporter interface
+******************************************************************************
+*/
 
 // Export is the implementation of the command `export profile <name>`
 func (r *ProfileRunner) Export(in Request) (*Response, error) {
@@ -242,9 +258,11 @@ func (r *ProfileRunner) Export(in Request) (*Response, error) {
 	}, nil
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// Dumper Interface
-//
+/*
+******************************************************************************
+Dumper interface
+******************************************************************************
+*/
 
 // Dump implements the `dump prorfiles` command
 func (r *ProfileRunner) Dump(in Request) (*Response, error) {
@@ -270,9 +288,11 @@ func (r *ProfileRunner) Dump(in Request) (*Response, error) {
 	}, nil
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// Loader Interface
-//
+/*
+******************************************************************************
+Loader interface
+******************************************************************************
+*/
 
 // Load implements the `load profiles ...` command
 func (r *ProfileRunner) Load(in Request) (*Response, error) {
@@ -318,9 +338,11 @@ func (r *ProfileRunner) Load(in Request) (*Response, error) {
 	}, nil
 }
 
-//////////////////////////////////////////////////////////////////////////////
-// Private functions
-//
+/*
+******************************************************************************
+Private functions
+******************************************************************************
+*/
 
 func (r *ProfileRunner) importProfile(in services.Profile, replace bool) error {
 	logger.Trace()

internal/runners/runners.go

@@ -3,3 +3,8 @@
 // Proprietary and confidential
 
 package runners
+
+import "embed"
+
+//go:embed templates/*
+var templates embed.FS

internal/runners/templates/accounts/describe.tmpl

@@ -1,4 +1,4 @@
-Username: {{ .Username }} ({{ .Idi }})
+Username: {{ .Username }} ({{ .Id }})
 Email: {{ .Email }}
 Provenance: {{ .Provenance }}
 Currently logged in: {{ .LoggedIn }}

internal/runners/templates/profiles/describe.tmpl

@@ -0,0 +1,2 @@
+Name: {{.Id}}
+Description: {{.Description}}