Make tidy.

cmd/commands/server.go

@@ -1,6 +1,9 @@
 package commands
 
 import (
+	"os"
+	"time"
+
 	"github.com/go-logr/zapr"
 	"github.com/gregjones/httpcache"
 	"github.com/jlewi/hydros/pkg/app"
@@ -10,8 +13,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
-	"os"
-	"time"
 )
 
 const (

pkg/app/config.go

@@ -1,10 +1,11 @@
 package app
 
 import (
+	"io"
+
 	"github.com/jlewi/hydros/pkg/files"
 	"github.com/palantir/go-githubapp/githubapp"
 	"github.com/pkg/errors"
-	"io"
 )
 
 // Config is the configuration for the Hydros application

pkg/app/fetcher.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"context"
+
 	"github.com/jlewi/hydros/api/v1alpha1"
 
 	"github.com/google/go-github/v52/github"

pkg/app/handler.go

@@ -5,6 +5,10 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"os"
+	"path/filepath"
+	"time"
+
 	"github.com/go-logr/zapr"
 	"github.com/google/go-github/v52/github"
 	"github.com/jlewi/hydros/api/v1alpha1"
@@ -17,9 +21,6 @@ import (
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/proto"
-	"os"
-	"path/filepath"
-	"time"
 )
 
 const (

pkg/app/handler_test.go

@@ -3,6 +3,10 @@ package app
 import (
 	"context"
 	"encoding/json"
+	"os"
+	"testing"
+	"time"
+
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/go-logr/zapr"
@@ -16,9 +20,6 @@ import (
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/proto"
-	"os"
-	"testing"
-	"time"
 )
 
 func Test_HookManual(t *testing.T) {

pkg/app/server.go

@@ -4,21 +4,23 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"strings"
+
 	"github.com/go-logr/logr"
 	"github.com/go-logr/zapr"
 	"github.com/gorilla/mux"
 	"github.com/jlewi/hydros/pkg/util"
 	"github.com/palantir/go-githubapp/githubapp"
-	"strings"
 
 	// TODO(jeremy): We should move relevant code in jlewi/p22h to jlewi/monogo
-	"github.com/jlewi/p22h/backend/api"
-	"github.com/jlewi/p22h/backend/pkg/debug"
-	"go.uber.org/zap"
 	"net/http"
 	"os"
 	"os/signal"
 	"syscall"
+
+	"github.com/jlewi/p22h/backend/api"
+	"github.com/jlewi/p22h/backend/pkg/debug"
+	"go.uber.org/zap"
 )
 
 const (

pkg/gitops/manager.go

@@ -2,12 +2,13 @@ package gitops
 
 import (
 	"fmt"
+	"sync"
+	"time"
+
 	"github.com/go-logr/zapr"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	"k8s.io/client-go/util/workqueue"
-	"sync"
-	"time"
 )
 
 // Reconciler defines a common interface for reconcilers so that Manager can be used to manage different

pkg/gitops/renderer.go

@@ -3,6 +3,11 @@ package gitops
 import (
 	"context"
 	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"time"
+
 	"github.com/go-git/go-git/v5"
 	"github.com/go-logr/zapr"
 	ghAPI "github.com/google/go-github/v52/github"
@@ -14,10 +19,6 @@ import (
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/proto"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
 )
 
 const (

pkg/gitops/renderer_test.go

@@ -1,6 +1,10 @@
 package gitops
 
 import (
+	"io"
+	"os"
+	"testing"
+
 	"github.com/go-logr/zapr"
 	"github.com/jlewi/hydros/api/v1alpha1"
 	"github.com/jlewi/hydros/pkg/files"
@@ -9,9 +13,6 @@ import (
 	"github.com/jlewi/hydros/pkg/util"
 	"github.com/pkg/errors"
 	"go.uber.org/zap"
-	"io"
-	"os"
-	"testing"
 )
 
 func readSecret(secret string) ([]byte, error) {

pkg/kustomize/fns/ai/openai/openai.go

@@ -1,11 +1,12 @@
 package openai
 
 import (
-	"github.com/jlewi/hydros/pkg/files"
 	"io"
 	"os"
 	"path"
 
+	"github.com/jlewi/hydros/pkg/files"
+
 	"github.com/go-logr/zapr"
 	"go.uber.org/zap"
 )