Fix missing __typename checks and standalone var declarations

Add __typename to GraphQL queries and type guards in risk view,
risk list, user view, and user list commands to prevent silent
garbage output when a wrong node type ID is passed. Wrap
standalone var declarations in var () blocks per style guide.

Signed-off-by: Bryan Frimin <bryan@getprobo.com>

cmd/proboctl/main.go

@@ -24,7 +24,9 @@ import (
 	"go.probo.inc/probo/pkg/cmd/root"
 )
 
-var version string = "unknown"
+var (
+	version string = "unknown"
+)
 
 func main() {
 	ios := iostreams.System()

pkg/cli/config/config.go

@@ -44,13 +44,15 @@ type (
 	}
 )
 
-var ValidKeys = []string{
+var (
-	"editor",
+	ValidKeys = []string{
-	"browser",
+		"editor",
-	"pager",
+		"browser",
-	"prompt",
+		"pager",
-	"http_timeout",
+		"prompt",
-}
+		"http_timeout",
+	}
+)
 
 func (c *Config) Get(key string) (string, error) {
 	switch key {

pkg/cmd/api/api.go

@@ -26,10 +26,12 @@ import (
 	"go.probo.inc/probo/pkg/cmd/cmdutil"
 )
 
-var schemaEndpoints = map[string]string{
+var (
-	"console": "/api/console/v1/graphql",
+	schemaEndpoints = map[string]string{
-	"connect": "/api/connect/v1/graphql",
+		"console": "/api/console/v1/graphql",
-}
+		"connect": "/api/connect/v1/graphql",
+	}
+)
 
 func NewCmdAPI(f *cmdutil.Factory) *cobra.Command {
 	var (

pkg/cmd/risk/list/list.go

@@ -26,6 +26,7 @@ import (
 const listQuery = `
 query($id: ID!, $first: Int, $after: CursorKey, $orderBy: RiskOrder, $filter: RiskFilter) {
   node(id: $id) {
+    __typename
     ... on Organization {
       risks(first: $first, after: $after, orderBy: $orderBy, filter: $filter) {
         totalCount
@@ -138,13 +139,20 @@ func NewCmdList(f *cmdutil.Factory) *cobra.Command {
 				flagLimit,
 				func(data json.RawMessage) (*api.Connection[risk], error) {
 					var resp struct {
-						Node struct {
+						Node *struct {
-							Risks api.Connection[risk] `json:"risks"`
+							Typename string                `json:"__typename"`
+							Risks    api.Connection[risk] `json:"risks"`
 						} `json:"node"`
 					}
 					if err := json.Unmarshal(data, &resp); err != nil {
 						return nil, err
 					}
+					if resp.Node == nil {
+						return nil, fmt.Errorf("organization %s not found", flagOrg)
+					}
+					if resp.Node.Typename != "Organization" {
+						return nil, fmt.Errorf("expected Organization node, got %s", resp.Node.Typename)
+					}
 					return &resp.Node.Risks, nil
 				},
 			)

pkg/cmd/risk/view/view.go

@@ -27,6 +27,7 @@ import (
 const viewQuery = `
 query($id: ID!) {
   node(id: $id) {
+    __typename
     ... on Risk {
       id
       name
@@ -49,6 +50,7 @@ query($id: ID!) {
 
 type viewResponse struct {
 	Node *struct {
+		Typename            string  `json:"__typename"`
 		ID                  string  `json:"id"`
 		Name                string  `json:"name"`
 		Description         *string `json:"description"`
@@ -112,6 +114,10 @@ func NewCmdView(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("risk %s not found", args[0])
 			}
 
+			if resp.Node.Typename != "Risk" {
+				return fmt.Errorf("expected Risk node, got %s", resp.Node.Typename)
+			}
+
 			if *flagOutput == cmdutil.OutputJSON {
 				return cmdutil.PrintJSON(f.IOStreams.Out, resp.Node)
 			}

pkg/cmd/user/list/list.go

@@ -26,6 +26,7 @@ import (
 const listQuery = `
 query($id: ID!, $first: Int, $after: CursorKey, $orderBy: ProfileOrder, $filter: ProfileFilter) {
   node(id: $id) {
+    __typename
     ... on Organization {
       profiles(first: $first, after: $after, orderBy: $orderBy, filter: $filter) {
         totalCount
@@ -135,13 +136,20 @@ func NewCmdList(f *cmdutil.Factory) *cobra.Command {
 				flagLimit,
 				func(data json.RawMessage) (*api.Connection[profile], error) {
 					var resp struct {
-						Node struct {
+						Node *struct {
+							Typename string                   `json:"__typename"`
 							Profiles api.Connection[profile] `json:"profiles"`
 						} `json:"node"`
 					}
 					if err := json.Unmarshal(data, &resp); err != nil {
 						return nil, err
 					}
+					if resp.Node == nil {
+						return nil, fmt.Errorf("organization %s not found", flagOrg)
+					}
+					if resp.Node.Typename != "Organization" {
+						return nil, fmt.Errorf("expected Organization node, got %s", resp.Node.Typename)
+					}
 					return &resp.Node.Profiles, nil
 				},
 			)

pkg/cmd/user/view/view.go

@@ -27,6 +27,7 @@ import (
 const viewQuery = `
 query($id: ID!) {
   node(id: $id) {
+    __typename
     ... on Profile {
       id
       fullName
@@ -46,6 +47,7 @@ query($id: ID!) {
 
 type viewResponse struct {
 	Node *struct {
+		Typename                 string   `json:"__typename"`
 		ID                       string   `json:"id"`
 		FullName                 string   `json:"fullName"`
 		EmailAddress             string   `json:"emailAddress"`
@@ -106,6 +108,10 @@ func NewCmdView(f *cmdutil.Factory) *cobra.Command {
 				return fmt.Errorf("user %s not found", args[0])
 			}
 
+			if resp.Node.Typename != "Profile" {
+				return fmt.Errorf("expected Profile node, got %s", resp.Node.Typename)
+			}
+
 			if *flagOutput == cmdutil.OutputJSON {
 				return cmdutil.PrintJSON(f.IOStreams.Out, resp.Node)
 			}