Moved connectors to their own package

cmd/configure.go

@@ -5,14 +5,14 @@ import (
 	"bufio"
 	"context"
 	"fmt"
-	"github.com/sailpoint-oss/sp-cli/client"
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
 	"log"
 	"path/filepath"
 
-	"os"
+	"github.com/sailpoint-oss/sp-cli/client"
+	"github.com/spf13/cobra"
+	"github.com/spf13/viper"
 
+	"os"
 )
 
 const (

cmd/connector/conn.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"encoding/json"
@@ -29,7 +29,7 @@ func connResourceUrl(endpoint string, resourceParts ...string) string {
 	return u.String()
 }
 
-func newConnCmd(client client.Client) *cobra.Command {
+func NewConnCmd(client client.Client) *cobra.Command {
 	conn := &cobra.Command{
 		Use:     "connectors",
 		Short:   "Manage Connectors",

cmd/connector/conn_create.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_create_test.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_create_version.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"archive/zip"

cmd/connector/conn_create_version_test.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_get.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"encoding/json"

cmd/connector/conn_get_test.go

@@ -1,4 +1,4 @@
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_init.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_init_test.go

@@ -1,4 +1,4 @@
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_invoke.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"encoding/json"

cmd/connector/conn_invoke_account_create.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"encoding/json"

cmd/connector/conn_invoke_account_delete.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/connector/conn_invoke_account_discover_schema.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/connector/conn_invoke_account_list.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/connector/conn_invoke_account_read.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/connector/conn_invoke_account_update.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"encoding/json"

cmd/connector/conn_invoke_entitlement_list.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/connector/conn_invoke_entitlement_read.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/connector/conn_invoke_raw.go

@@ -1,4 +1,4 @@
-package cmd
+package connector
 
 import (
 	"encoding/json"

cmd/connector/conn_invoke_test.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_invoke_test_connection.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/connector/conn_list.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"encoding/json"

cmd/connector/conn_list_test.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_logs.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"fmt"
@@ -113,7 +113,7 @@ func formatDates(cmd *cobra.Command) error {
 	return nil
 }
 
-//Format log message for display
+// Format log message for display
 func formatLog(logMessage client.LogMessage) string {
 	green := color.New(color.FgGreen).SprintFunc()
 	yellow := color.New(color.FgYellow).SprintFunc()

cmd/connector/conn_logs_tail.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"time"

cmd/connector/conn_logs_tail_test.go

@@ -1,4 +1,4 @@
-package cmd
+package connector
 
 import (
 	"testing"

cmd/connector/conn_stats.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/connector/conn_stats_test.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"testing"

cmd/connector/conn_tag.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/connector/conn_tag_create.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_tag_list.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"encoding/json"

cmd/connector/conn_tag_update.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_test.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"bytes"
@@ -32,7 +32,7 @@ func TestNewConnCmd_noArgs(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	defer ctrl.Finish()
 
-	cmd := newConnCmd(mocks.NewMockClient(ctrl))
+	cmd := NewConnCmd(mocks.NewMockClient(ctrl))
 	if len(cmd.Commands()) != numConnSubcommands {
 		t.Fatalf("expected: %d, actual: %d", len(cmd.Commands()), numConnSubcommands)
 	}

cmd/connector/conn_update.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_update_test.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/conn_validate.go

@@ -1,4 +1,4 @@
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/connector/conn_validate_sources.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2022, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"context"
@@ -19,6 +19,7 @@ import (
 	"github.com/logrusorgru/aurora"
 	"github.com/olekukonko/tablewriter"
 	"github.com/sailpoint-oss/sp-cli/client"
+	"github.com/sailpoint-oss/sp-cli/util"
 	"github.com/sailpoint-oss/sp-cli/validate"
 	"github.com/spf13/cobra"
 	"gopkg.in/alessio/shellescape.v1"
@@ -247,7 +248,7 @@ func runInstanceForValidation(source Source) (*exec.Cmd, string, error) {
 
 	log.Println("Npm install is finished")
 
-	err = ExecCommand("/bin/sh", "-c", fmt.Sprintf("npm run dev --prefix %s", path))
+	err = util.ExecCommand("/bin/sh", "-c", fmt.Sprintf("npm run dev --prefix %s", path))
 	if err != nil {
 		return nil, "", err
 	}

cmd/connector/conn_versions.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"encoding/json"

cmd/connector/conn_versions_test.go

@@ -1,6 +1,6 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
 
-package cmd
+package connector
 
 import (
 	"bytes"

cmd/connector/models.go

@@ -1,5 +1,5 @@
 // Copyright (c) 2021, SailPoint Technologies, Inc. All rights reserved.
-package cmd
+package connector
 
 import (
 	"fmt"

cmd/root.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 
 	"github.com/sailpoint-oss/sp-cli/client"
+	"github.com/sailpoint-oss/sp-cli/cmd/connector"
 	"github.com/sailpoint-oss/sp-cli/cmd/transform"
 	"github.com/spf13/cobra"
 )
@@ -24,8 +25,8 @@ func NewRootCmd(client client.Client) *cobra.Command {
 		},
 	}
 	root.AddCommand(
-		newConnCmd(client),
 		newConfigureCmd(client),
+		connector.NewConnCmd(client),
 		transform.NewTransformCmd(client),
 	)
 	return root

util/exec.go

@@ -3,7 +3,7 @@
 //go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd
 // +build linux darwin dragonfly freebsd netbsd openbsd
 
-package cmd
+package util
 
 import (
 	"os/exec"

util/exec_windows.go

@@ -3,7 +3,7 @@
 //go:build windows
 // +build windows
 
-package cmd
+package util
 
 import (
 	"os/exec"