Restructure directory and dependency order (#3)

Author: ardikabs

Makefile

@@ -1,6 +1,6 @@
 Version := $(shell git describe --tags --dirty)
 GitCommit := $(shell git rev-parse HEAD)
-LDFLAGS := "-s -w -X awssh/internal/cli.Version=$(Version) -X awssh/internal/cli.GitCommit=$(GitCommit)"
+LDFLAGS := "-s -w -X awssh/cmd.Version=$(Version) -X awssh/cmd.GitCommit=$(GitCommit)"
 OUTDIR := bin
 
 .PHONY: test pretty mod tidy
@@ -17,13 +17,13 @@ pretty:
 	gofmt -s -w **/*.go
 
 build:
-	CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o awssh app/cli/main.go
+	CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o awssh
 
 .PHONY: dist
 dist:
 	mkdir -p $(OUTDIR)
-	CGO_ENABLED=0 GOOS=linux go build -ldflags $(LDFLAGS) -o $(OUTDIR)/awssh app/cli/main.go
-	CGO_ENABLED=0 GOOS=darwin go build -ldflags $(LDFLAGS) -o $(OUTDIR)/awssh-darwin app/cli/main.go
-	CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -ldflags $(LDFLAGS) -o $(OUTDIR)/awssh-armhf app/cli/main.go
-	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -o $(OUTDIR)/awssh-arm64 app/cli/main.go
-	CGO_ENABLED=0 GOOS=windows go build -ldflags $(LDFLAGS) -o $(OUTDIR)/awssh.exe app/cli/main.go
+	CGO_ENABLED=0 GOOS=linux go build -ldflags $(LDFLAGS) -o $(OUTDIR)/awssh
+	CGO_ENABLED=0 GOOS=darwin go build -ldflags $(LDFLAGS) -o $(OUTDIR)/awssh-darwin
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm GOARM=6 go build -ldflags $(LDFLAGS) -o $(OUTDIR)/awssh-armhf
+	CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -o $(OUTDIR)/awssh-arm64
+	CGO_ENABLED=0 GOOS=windows go build -ldflags $(LDFLAGS) -o $(OUTDIR)/awssh.exe

app/cli/main.go

@@ -1,16 +1,16 @@
-package cli
+package cmd
 
 import (
-	"awssh/config"
-	"awssh/internal/aws"
-	"awssh/internal/logging"
-
 	"fmt"
 	"regexp"
 	"strings"
 
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"
+
+	"awssh/config"
+	"awssh/internal/aws"
+	"awssh/internal/logging"
 )
 
 var (

internal/cli/root.go renamed to cmd/root.go

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

internal/cli/version.go renamed to cmd/version.go

@@ -1,14 +1,14 @@
 package aws
 
 import (
-	"awssh/internal/logging"
-
 	"fmt"
 	"strings"
 
 	"github.com/aws/aws-sdk-go/aws"
 	aws_session "github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
+
+	"awssh/internal/logging"
 )
 
 // NewSession creates a new AWS session from region input or region environment variables (ex: AWS_DEFAULT_REGION, AWS_REGION)

internal/aws/aws.go

@@ -6,15 +6,15 @@ import (
 	"os/exec"
 	"strings"
 
-	"awssh/config"
-	"awssh/internal/logging"
-	"awssh/internal/ssh"
-
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	aws_session "github.com/aws/aws-sdk-go/aws/session"
 	"github.com/aws/aws-sdk-go/service/ec2"
 	"github.com/aws/aws-sdk-go/service/ec2instanceconnect"
+
+	"awssh/config"
+	"awssh/internal/logging"
+	"awssh/internal/ssh"
 )
 
 // EC2Instance represent all the necessary EC2 components

internal/aws/instance.go

@@ -5,11 +5,11 @@ import (
 	"net"
 	"os"
 
-	"awssh/config"
-	"awssh/internal/logging"
-
 	gossh "golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/agent"
+
+	"awssh/config"
+	"awssh/internal/logging"
 )
 
 // Session represent an SSH data model consist of a SSH PublicKey

internal/ssh/ssh.go

@@ -0,0 +1,22 @@
+package main
+
+import (
+	"os"
+
+	"awssh/cmd"
+	"awssh/config"
+)
+
+func main() {
+
+	config.Load()
+
+	rootCmd := cmd.MakeRoot()
+	versionCmd := cmd.MakeVersion()
+
+	rootCmd.AddCommand(versionCmd)
+
+	if err := rootCmd.Execute(); err != nil {
+		os.Exit(1)
+	}
+}