Apply code styles

Author: chapterjason

env/environment.go

@@ -1,8 +1,9 @@
 package env
 
 import (
-	"github.com/pkg/errors"
 	"os"
+
+	"github.com/pkg/errors"
 )
 
 type Environment struct {

env/load_php_file.go

@@ -1,9 +1,9 @@
 package env
 
 import (
-	"github.com/SoureCode/kyx/internal/php"
 	"path/filepath"
 
+	"github.com/SoureCode/kyx/internal/php"
 	"github.com/pkg/errors"
 )
 

internal/php/load_file_dump.go

@@ -3,12 +3,13 @@ package php
 import (
 	"bytes"
 	"fmt"
-	"github.com/joho/godotenv"
-	"github.com/pkg/errors"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
+
+	"github.com/joho/godotenv"
+	"github.com/pkg/errors"
 )
 
 func LoadFileDump(f string) (map[string]string, error) {

internal/php/write_file_dump.go

@@ -3,11 +3,14 @@ package php
 import (
 	"os"
 	"strings"
+
+	"github.com/pkg/errors"
 )
 
 func WriteFileDump(file string, data map[string]string) error {
 	content := formatData(data)
-	return os.WriteFile(file, []byte(content), 0644)
+	err := os.WriteFile(file, []byte(content), 0644)
+	return errors.Wrap(err, "failed to write data to file")
 }
 
 func formatData(data map[string]string) string {

macro/sentry_deploys_new.go

@@ -2,12 +2,13 @@ package macro
 
 import (
 	"fmt"
-	"github.com/SoureCode/kyx/project"
-	"github.com/SoureCode/kyx/shell"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
+
+	"github.com/SoureCode/kyx/project"
+	"github.com/SoureCode/kyx/shell"
 )
 
 func SentryDeploysNew(repo string, startedAt, stoppedAt time.Time) {
@@ -38,9 +39,7 @@ func SentryDeploysNew(repo string, startedAt, stoppedAt time.Time) {
 		return
 	}
 
-	if strings.HasSuffix(sentryUrl, "/") {
-		sentryUrl = strings.TrimSuffix(sentryUrl, "/")
-	}
+	sentryUrl = strings.TrimSuffix(sentryUrl, "/")
 
 	sentryOrg, ok := env.Lookup("SENTRY_ORG")
 	if !ok {

macro/write_deployment_info.go

@@ -1,12 +1,13 @@
 package macro
 
 import (
-	"github.com/SoureCode/kyx/internal/php"
-	"github.com/SoureCode/kyx/project"
-	"github.com/SoureCode/kyx/shell"
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/SoureCode/kyx/internal/php"
+	"github.com/SoureCode/kyx/project"
+	"github.com/SoureCode/kyx/shell"
 )
 
 func WriteDeploymentInfo(repo string) {

project/get_directory.go

@@ -2,11 +2,11 @@ package project
 
 import (
 	"fmt"
-	"github.com/pkg/errors"
 	"os"
 	"path/filepath"
 
 	"github.com/SoureCode/kyx/git"
+	"github.com/pkg/errors"
 )
 
 func getDirectory() (string, error) {

project/project.go

@@ -69,11 +69,7 @@ func HasProject() bool {
 	composerPath := filepath.Join(directory, "composer.json")
 	_, err = loadComposerJson(composerPath)
 
-	if err != nil {
-		return false
-	}
-
-	return true
+	return err == nil
 }
 
 func (p *Project) HasDependency(dependency string) bool {

shell/command.go

@@ -73,7 +73,7 @@ func (e *Command) Execute() error {
 	if err := cmd.Start(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		e.exitCode = 1
-		return err
+		return errors.Wrap(err, "failed to start command")
 	}
 
 	waitChannel := make(chan error, 1)
@@ -122,8 +122,6 @@ func (e *Command) Execute() error {
 			}
 		}
 	}
-
-	return nil
 }
 
 func NewCommand(binary string) *Command {