chore: moving utils under pkg umbrella (#68)

* Updating env variables to Prepend crda * chore: move utils under pkg umbrellia
fabric8-analytics · Jun 9, 2021 · 516f001 · 516f001
1 parent 734eec0
commit 516f001
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 9 deletions.
diff --git a/cmd/root.go b/cmd/root.go
@@ -17,7 +17,7 @@ import (
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 
-	"github.com/fabric8-analytics/cli-tools/utils"
+	"github.com/fabric8-analytics/cli-tools/pkg/utils"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )

diff --git a/pkg/analyses/stackanalyses/controller.go b/pkg/analyses/stackanalyses/controller.go
@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/fabric8-analytics/cli-tools/pkg/telemetry"
 	"io"
 	"mime/multipart"
 	"net/http"
@@ -23,7 +22,8 @@ import (
 	"github.com/fabric8-analytics/cli-tools/pkg/analyses/pypi"
 	"github.com/fabric8-analytics/cli-tools/pkg/analyses/summary"
 	"github.com/fabric8-analytics/cli-tools/pkg/analyses/verbose"
-	"github.com/fabric8-analytics/cli-tools/utils"
+	"github.com/fabric8-analytics/cli-tools/pkg/telemetry"
+	"github.com/fabric8-analytics/cli-tools/pkg/utils"
 )
 
 // Controller is a control structure.

diff --git a/pkg/analyses/summary/helpers.go b/pkg/analyses/summary/helpers.go
@@ -4,14 +4,15 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/fabric8-analytics/cli-tools/pkg/telemetry"
 	"os"
 
+	"github.com/fabric8-analytics/cli-tools/pkg/telemetry"
+
 	"github.com/fatih/color"
 	"github.com/rs/zerolog/log"
 
 	"github.com/fabric8-analytics/cli-tools/pkg/analyses/driver"
-	"github.com/fabric8-analytics/cli-tools/utils"
+	"github.com/fabric8-analytics/cli-tools/pkg/utils"
 )
 
 // ProcessSummary processes summary results, return true if Vul found

diff --git a/pkg/analyses/verbose/helper.go b/pkg/analyses/verbose/helper.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/fabric8-analytics/cli-tools/pkg/telemetry"
 	"os"
 	"sort"
 
-	"github.com/fabric8-analytics/cli-tools/utils"
+	"github.com/fabric8-analytics/cli-tools/pkg/telemetry"
+
+	"github.com/fabric8-analytics/cli-tools/pkg/utils"
 
 	"github.com/fatih/color"
 	"github.com/rs/zerolog/log"

diff --git a/pkg/auth/server.go b/pkg/auth/server.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"encoding/json"
 	"errors"
-	"github.com/fabric8-analytics/cli-tools/pkg/telemetry"
 	"net/http"
 
-	"github.com/fabric8-analytics/cli-tools/utils"
+	"github.com/fabric8-analytics/cli-tools/pkg/telemetry"
+
+	"github.com/fabric8-analytics/cli-tools/pkg/utils"
 	"github.com/rs/zerolog/log"
 )
 

diff --git a/pkg/segment/segment.go b/pkg/segment/segment.go
@@ -93,6 +93,7 @@ func (c *Client) Upload(ctx context.Context, action string, duration time.Durati
 	properties = properties.
 		Set("success", err == nil).
 		Set("platform", runtime.GOOS).
+		Set("version", version.GetCRDAVersion()).
 		Set("duration", duration.Milliseconds())
 
 	if err != nil {

diff --git a/utils/api.go → pkg/utils/api.go b/utils/api.go → pkg/utils/api.go
diff --git a/utils/args.go → pkg/utils/args.go b/utils/args.go → pkg/utils/args.go
diff --git a/utils/args_test.go → pkg/utils/args_test.go b/utils/args_test.go → pkg/utils/args_test.go
diff --git a/utils/constants.go → pkg/utils/constants.go b/utils/constants.go → pkg/utils/constants.go
diff --git a/utils/errors.go → pkg/utils/errors.go b/utils/errors.go → pkg/utils/errors.go