refactor: restructure for internal/service (#166)

Author: bernielomax

internal/cmd/local/local/log_utils.go renamed to internal/airbyte/log_scanner.go

@@ -1,23 +1,25 @@
-package local
+package airbyte
 
 import (
 	"bufio"
 	"encoding/json"
 	"io"
 )
 
-type logScanner struct {
+// LogScanner
+type LogScanner struct {
 	scanner *bufio.Scanner
-	line    logLine
+	Line    logLine
 }
 
-func newLogScanner(r io.Reader) *logScanner {
-	return &logScanner{
+// NewLogScanner returns an initialized Airbyte log scanner.
+func NewLogScanner(r io.Reader) *LogScanner {
+	return &LogScanner{
 		scanner: bufio.NewScanner(r),
 	}
 }
 
-func (j *logScanner) Scan() bool {
+func (j *LogScanner) Scan() bool {
 	for {
 		if ok := j.scanner.Scan(); !ok {
 			return false
@@ -27,16 +29,16 @@ func (j *logScanner) Scan() bool {
 		err := json.Unmarshal(j.scanner.Bytes(), &data)
 		// not all lines are JSON. don't propogate errors, just include the full line.
 		if err != nil {
-			j.line = logLine{Message: j.scanner.Text()}
+			j.Line = logLine{Message: j.scanner.Text()}
 		} else {
-			j.line = data
+			j.Line = data
 		}
 
 		return true
 	}
 }
 
-func (j *logScanner) Err() error {
+func (j *LogScanner) Err() error {
 	return j.scanner.Err()
 }
 

internal/cmd/local/local/log_utils_test.go renamed to internal/airbyte/log_scanner_test.go

@@ -1,4 +1,4 @@
-package local
+package airbyte
 
 import (
 	"strings"
@@ -11,16 +11,16 @@ nonjsonline
 `)
 
 func TestJavaLogScanner(t *testing.T) {
-	s := newLogScanner(strings.NewReader(testLogs))
+	s := NewLogScanner(strings.NewReader(testLogs))
 
 	expectLogLine := func(level, msg string) {
 		s.Scan()
 
-		if s.line.Level != level {
-			t.Errorf("expected level %q but got %q", level, s.line.Level)
+		if s.Line.Level != level {
+			t.Errorf("expected level %q but got %q", level, s.Line.Level)
 		}
-		if s.line.Message != msg {
-			t.Errorf("expected msg %q but got %q", msg, s.line.Message)
+		if s.Line.Message != msg {
+			t.Errorf("expected msg %q but got %q", msg, s.Line.Message)
 		}
 		if s.Err() != nil {
 			t.Errorf("unexpected error %v", s.Err())

internal/cmd/local/command.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 
 	"github.com/airbytehq/abctl/internal/airbyte"
-	"github.com/airbytehq/abctl/internal/cmd/local/local"
 	"github.com/airbytehq/abctl/internal/k8s"
+	"github.com/airbytehq/abctl/internal/service"
 	"github.com/airbytehq/abctl/internal/telemetry"
 	"github.com/pterm/pterm"
 	"go.opencensus.io/trace"
@@ -33,7 +33,7 @@ func (cc *CredentialsCmd) Run(ctx context.Context, provider k8s.Provider, telCli
 	spinner := &pterm.DefaultSpinner
 
 	return telClient.Wrap(ctx, telemetry.Credentials, func() error {
-		k8sClient, err := local.DefaultK8s(provider.Kubeconfig, provider.Context)
+		k8sClient, err := service.DefaultK8s(provider.Kubeconfig, provider.Context)
 		if err != nil {
 			pterm.Error.Println("No existing cluster found")
 			return nil

internal/cmd/local/local_credentials.go renamed to internal/cmd/local/credentials.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/airbytehq/abctl/internal/cmd/local/local"
 	"github.com/airbytehq/abctl/internal/k8s"
+	"github.com/airbytehq/abctl/internal/service"
 	"github.com/airbytehq/abctl/internal/telemetry"
 	"github.com/pterm/pterm"
 	"go.opencensus.io/trace"
@@ -19,7 +19,7 @@ func (d *DeploymentsCmd) Run(ctx context.Context, telClient telemetry.Client, pr
 	ctx, span := trace.StartSpan(ctx, "local deployments")
 	defer span.End()
 
-	k8sClient, err := local.DefaultK8s(provider.Kubeconfig, provider.Context)
+	k8sClient, err := service.DefaultK8s(provider.Kubeconfig, provider.Context)
 	if err != nil {
 		return err
 	}