restructure repo to clean up top-level (#82)

.github/workflows/release.yml

@@ -36,7 +36,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
-          args: release --rm-dist
+          args: -f build/.goreleaser.yml release --rm-dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

.goreleaser.yml → build/.goreleaser.yml

@@ -14,9 +14,9 @@ builds:
       - -trimpath
     ldflags:
       - -s -w -extldflags "-static"
-        -X github.com/netflix/weep/metadata.Version={{.Version}}
-        -X github.com/netflix/weep/metadata.Commit={{.CommitDate}}
-        -X github.com/netflix/weep/metadata.Date={{.Date}}
+        -X github.com/netflix/weep/internal/metadata.Version={{.Version}}
+        -X github.com/netflix/weep/internal/metadata.Commit={{.CommitDate}}
+        -X github.com/netflix/weep/internal/metadata.Date={{.Date}}
     mod_timestamp: '{{ .CommitTimestamp }}'
   -
     id: demo
@@ -71,6 +71,7 @@ dockers:
   -
     goos: linux
     goarch: amd64
+    dockerfile: build/Dockerfile
     ids:
       - default
     image_templates:

cmd/credential_process.go

@@ -21,10 +21,11 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/netflix/weep/util"
+	"github.com/netflix/weep/internal/creds"
+	"github.com/netflix/weep/internal/util"
+
 	"gopkg.in/ini.v1"
 
-	"github.com/netflix/weep/creds"
 	"github.com/spf13/cobra"
 )
 

cmd/export.go

@@ -21,7 +21,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/netflix/weep/creds"
+	"github.com/netflix/weep/internal/creds"
+
 	"github.com/spf13/cobra"
 )
 

cmd/file.go

@@ -22,11 +22,12 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/netflix/weep/internal/creds"
+	"github.com/netflix/weep/internal/util"
+
 	"gopkg.in/ini.v1"
 
 	"github.com/mitchellh/go-homedir"
-	"github.com/netflix/weep/creds"
-	"github.com/netflix/weep/util"
 	"github.com/spf13/cobra"
 )
 

cmd/info.go

@@ -8,9 +8,10 @@ import (
 	"os"
 	"strings"
 
+	"github.com/netflix/weep/internal/metadata"
+
 	"gopkg.in/yaml.v2"
 
-	"github.com/netflix/weep/metadata"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
 )
@@ -97,10 +98,10 @@ func DecodeWeepInfo(args []string, w io.Writer) error {
 	}
 	b64decoder := base64.NewDecoder(base64.StdEncoding, r)
 	zreader, err := zlib.NewReader(b64decoder)
-	defer zreader.Close()
 	if err != nil {
 		return err
 	}
+	defer zreader.Close()
 
 	io.Copy(w, zreader)
 

cmd/list.go

@@ -20,7 +20,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/netflix/weep/creds"
+	"github.com/netflix/weep/internal/creds"
+
 	"github.com/spf13/cobra"
 )
 

cmd/open.go

@@ -19,8 +19,9 @@ package cmd
 import (
 	"errors"
 
-	"github.com/netflix/weep/creds"
-	"github.com/netflix/weep/util"
+	"github.com/netflix/weep/internal/creds"
+	"github.com/netflix/weep/internal/util"
+
 	"github.com/spf13/cobra"
 )
 

cmd/root.go

@@ -21,10 +21,9 @@ import (
 	"os/signal"
 	"syscall"
 
-	"github.com/netflix/weep/metadata"
-
-	"github.com/netflix/weep/config"
-	"github.com/netflix/weep/logging"
+	"github.com/netflix/weep/internal/config"
+	"github.com/netflix/weep/internal/logging"
+	"github.com/netflix/weep/internal/metadata"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

cmd/serve.go

@@ -17,9 +17,9 @@
 package cmd
 
 import (
+	"github.com/netflix/weep/internal/server"
 	"github.com/spf13/viper"
 
-	"github.com/netflix/weep/server"
 	"github.com/spf13/cobra"
 )
 

cmd/version.go

@@ -19,7 +19,7 @@ package cmd
 import (
 	"fmt"
 
-	"github.com/netflix/weep/metadata"
+	"github.com/netflix/weep/internal/metadata"
 
 	"github.com/spf13/cobra"
 )

cache/cache.go → internal/cache/cache.go

@@ -20,10 +20,10 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/netflix/weep/logging"
+	"github.com/netflix/weep/internal/creds"
+	"github.com/netflix/weep/internal/errors"
+	"github.com/netflix/weep/internal/logging"
 
-	"github.com/netflix/weep/creds"
-	"github.com/netflix/weep/errors"
 	"github.com/sirupsen/logrus"
 )
 

cache/cache_test.go → internal/cache/cache_test.go

@@ -20,8 +20,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/netflix/weep/creds"
-	"github.com/netflix/weep/errors"
+	"github.com/netflix/weep/internal/creds"
+	"github.com/netflix/weep/internal/errors"
 )
 
 func TestCredentialCache_Get(t *testing.T) {

config/config.go → internal/config/config.go

@@ -21,7 +21,7 @@ import (
 	"path/filepath"
 	"runtime"
 
-	"github.com/netflix/weep/logging"
+	"github.com/netflix/weep/internal/logging"
 
 	"github.com/mitchellh/go-homedir"
 	"github.com/pkg/errors"

creds/consoleme.go → internal/creds/consoleme.go

@@ -30,16 +30,14 @@ import (
 	"strings"
 	"time"
 
-	"github.com/netflix/weep/metadata"
+	werrors "github.com/netflix/weep/internal/errors"
+	"github.com/netflix/weep/internal/httpAuth/challenge"
+	"github.com/netflix/weep/internal/httpAuth/mtls"
+	"github.com/netflix/weep/internal/logging"
+	"github.com/netflix/weep/internal/metadata"
 
-	"github.com/netflix/weep/logging"
-
-	werrors "github.com/netflix/weep/errors"
 	"github.com/spf13/viper"
 
-	"github.com/netflix/weep/httpAuth/challenge"
-	"github.com/netflix/weep/httpAuth/mtls"
-
 	"github.com/pkg/errors"
 )
 

creds/refreshable.go → internal/creds/refreshable.go

@@ -21,12 +21,12 @@ import (
 	"strings"
 	"time"
 
+	"github.com/netflix/weep/internal/errors"
+
 	"github.com/sirupsen/logrus"
 
 	"github.com/spf13/viper"
 
-	"github.com/netflix/weep/errors"
-
 	"github.com/aws/aws-sdk-go/aws/credentials"
 )
 

creds/refreshable_test.go → internal/creds/refreshable_test.go

@@ -20,9 +20,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws/credentials"
+	"github.com/netflix/weep/internal/errors"
 
-	"github.com/netflix/weep/errors"
+	"github.com/aws/aws-sdk-go/aws/credentials"
 )
 
 var (

creds/types.go → internal/creds/types.go

@@ -21,7 +21,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/netflix/weep/metadata"
+	"github.com/netflix/weep/internal/metadata"
 
 	"github.com/aws/aws-sdk-go/aws/credentials"
 )

httpAuth/challenge/challenge.go → internal/httpAuth/challenge/challenge.go

@@ -33,16 +33,16 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/mitchellh/go-homedir"
+	"github.com/netflix/weep/internal/config"
+	"github.com/netflix/weep/internal/util"
 
-	"github.com/netflix/weep/config"
+	"github.com/mitchellh/go-homedir"
 
 	"github.com/manifoldco/promptui"
 
 	"github.com/spf13/viper"
 
 	"github.com/golang/glog"
-	"github.com/netflix/weep/util"
 	log "github.com/sirupsen/logrus"
 )
 

httpAuth/mtls/certificate.go → internal/httpAuth/mtls/certificate.go

@@ -11,7 +11,7 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/netflix/weep/metadata"
+	"github.com/netflix/weep/internal/metadata"
 
 	"github.com/sirupsen/logrus"
 

httpAuth/mtls/mtls.go → internal/httpAuth/mtls/mtls.go

@@ -23,7 +23,9 @@ import (
 	"io/ioutil"
 	"net/http"
 
-	"github.com/netflix/weep/logging"
+	"github.com/netflix/weep/internal/config"
+	"github.com/netflix/weep/internal/logging"
+	"github.com/netflix/weep/internal/util"
 
 	"github.com/spf13/viper"
 
@@ -32,8 +34,6 @@ import (
 	"strings"
 
 	"github.com/mitchellh/go-homedir"
-	"github.com/netflix/weep/config"
-	"github.com/netflix/weep/util"
 )
 
 var log = logging.GetLogger()

metadata/metadata.go → internal/metadata/metadata.go

@@ -21,7 +21,7 @@ import (
 	"os/user"
 	"time"
 
-	"github.com/netflix/weep/logging"
+	"github.com/netflix/weep/internal/logging"
 )
 
 var (

metadata/version.go → internal/metadata/version.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"fmt"
 
-	"github.com/netflix/weep/config"
+	"github.com/netflix/weep/internal/config"
 )
 
 var (

server/baseHandler.go → internal/server/baseHandler.go

@@ -20,9 +20,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/netflix/weep/util"
-
-	"github.com/netflix/weep/logging"
+	"github.com/netflix/weep/internal/logging"
+	"github.com/netflix/weep/internal/util"
 )
 
 var log = logging.GetLogger()

server/credentialsHandler.go → internal/server/credentialsHandler.go

@@ -21,9 +21,8 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/netflix/weep/util"
-
-	"github.com/netflix/weep/cache"
+	"github.com/netflix/weep/internal/cache"
+	"github.com/netflix/weep/internal/util"
 )
 
 func RoleHandler(w http.ResponseWriter, r *http.Request) {

server/ecsCredentialsHandler.go → internal/server/ecsCredentialsHandler.go

@@ -22,12 +22,12 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/aws/aws-sdk-go/aws/arn"
-	"github.com/netflix/weep/cache"
-	"github.com/netflix/weep/util"
+	"github.com/netflix/weep/internal/cache"
+	"github.com/netflix/weep/internal/creds"
+	"github.com/netflix/weep/internal/util"
 
+	"github.com/aws/aws-sdk-go/aws/arn"
 	"github.com/gorilla/mux"
-	"github.com/netflix/weep/creds"
 )
 
 // parseAssumeRoleQuery extracts the assume query string argument, splits it on commas, validates that each element

server/healthcheckHandler.go → internal/server/healthcheckHandler.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/netflix/weep/health"
+	"github.com/netflix/weep/internal/health"
 )
 
 type healthcheckResponse struct {

server/iamInfoHandler.go → internal/server/iamInfoHandler.go

@@ -20,9 +20,8 @@ import (
 	"encoding/json"
 	"net/http"
 
-	"github.com/netflix/weep/cache"
-
-	"github.com/netflix/weep/util"
+	"github.com/netflix/weep/internal/cache"
+	"github.com/netflix/weep/internal/util"
 )
 
 func IamInfoHandler(w http.ResponseWriter, r *http.Request) {