Skip to content

Commit

Permalink
Set internal import
Browse files Browse the repository at this point in the history
  • Loading branch information
@glomex-sre-deploy
glomex-sre-deploy committed Aug 16, 2018
1 parent 93baadd commit 0c41d00
Show file tree
Hide file tree
Showing 43 changed files with 119 additions and 118 deletions.
2 changes: 1 addition & 1 deletion boot/boot.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/aws/aws-sdk-go/service/iam/iamiface"
"github.com/tj/go-prompt"

"github.com/glomex/apex/boot/boilerplate"
"apex/boot/boilerplate"
)

// TODO(tj): attempt creation of S3 bucket to streamline that as well
Expand Down
2 changes: 1 addition & 1 deletion cmd/apex/alias/alias.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"apex/cmd/apex/root"
)

// alias name.
Expand Down
4 changes: 2 additions & 2 deletions cmd/apex/autocomplete/autocomplete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/tj/cobra"
flag "github.com/tj/pflag"

"github.com/glomex/apex/cmd/apex/root"
"github.com/glomex/apex/utils"
"apex/cmd/apex/root"
"apex/utils"
)

// funcCommands is a list of commands which
Expand Down
4 changes: 2 additions & 2 deletions cmd/apex/build/build.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"github.com/glomex/apex/utils"
"apex/cmd/apex/root"
"apex/utils"
)

// name of function.
Expand Down
2 changes: 1 addition & 1 deletion cmd/apex/delete/delete.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"github.com/tj/cobra"
"github.com/tj/go-prompt"

"github.com/glomex/apex/cmd/apex/root"
"apex/cmd/apex/root"
)

// Force deletion.
Expand Down
4 changes: 2 additions & 2 deletions cmd/apex/deploy/deploy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"github.com/glomex/apex/utils"
"apex/cmd/apex/root"
"apex/utils"
)

// env vars.
Expand Down
4 changes: 2 additions & 2 deletions cmd/apex/docs/docs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"github.com/mattn/go-isatty"
"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
doc "github.com/glomex/apex/docs"
"apex/cmd/apex/root"
doc "apex/docs"
)

// Command config.
Expand Down
4 changes: 2 additions & 2 deletions cmd/apex/exec/exec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ package exec
import (
"errors"

"github.com/glomex/apex/exec"
"apex/exec"
"github.com/tj/cobra"

"os"

"github.com/glomex/apex/cmd/apex/root"
"apex/cmd/apex/root"
)

var dir string
Expand Down
4 changes: 2 additions & 2 deletions cmd/apex/infra/infra.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"github.com/glomex/apex/infra"
"apex/cmd/apex/root"
"apex/infra"
)

// example output.
Expand Down
4 changes: 2 additions & 2 deletions cmd/apex/init/init.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"github.com/aws/aws-sdk-go/service/iam"
"github.com/tj/cobra"

"github.com/glomex/apex/boot"
"github.com/glomex/apex/cmd/apex/root"
"apex/boot"
"apex/cmd/apex/root"
)

var credentialsError = `
Expand Down
2 changes: 1 addition & 1 deletion cmd/apex/invoke/invoke.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/mattn/go-isatty"
"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"apex/cmd/apex/root"
)

// alias.
Expand Down
4 changes: 2 additions & 2 deletions cmd/apex/list/list.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"github.com/glomex/apex/colors"
"apex/cmd/apex/root"
"apex/colors"
)

// tfvars output format.
Expand Down
4 changes: 2 additions & 2 deletions cmd/apex/logs/logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"github.com/glomex/apex/logs"
"apex/cmd/apex/root"
"apex/logs"
)

// filter pattern.
Expand Down
54 changes: 27 additions & 27 deletions cmd/apex/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,37 +6,37 @@ import (
"github.com/apex/log"
"github.com/apex/log/handlers/cli"

"github.com/glomex/apex/cmd/apex/root"
"apex/cmd/apex/root"

// commands
_ "github.com/glomex/apex/cmd/apex/alias"
_ "github.com/glomex/apex/cmd/apex/autocomplete"
_ "github.com/glomex/apex/cmd/apex/build"
_ "github.com/glomex/apex/cmd/apex/delete"
_ "github.com/glomex/apex/cmd/apex/deploy"
_ "github.com/glomex/apex/cmd/apex/docs"
_ "github.com/glomex/apex/cmd/apex/exec"
_ "github.com/glomex/apex/cmd/apex/infra"
_ "github.com/glomex/apex/cmd/apex/init"
_ "github.com/glomex/apex/cmd/apex/invoke"
_ "github.com/glomex/apex/cmd/apex/list"
_ "github.com/glomex/apex/cmd/apex/logs"
_ "github.com/glomex/apex/cmd/apex/metrics"
_ "github.com/glomex/apex/cmd/apex/rollback"
_ "github.com/glomex/apex/cmd/apex/upgrade"
_ "github.com/glomex/apex/cmd/apex/version"
_ "apex/cmd/apex/alias"
_ "apex/cmd/apex/autocomplete"
_ "apex/cmd/apex/build"
_ "apex/cmd/apex/delete"
_ "apex/cmd/apex/deploy"
_ "apex/cmd/apex/docs"
_ "apex/cmd/apex/exec"
_ "apex/cmd/apex/infra"
_ "apex/cmd/apex/init"
_ "apex/cmd/apex/invoke"
_ "apex/cmd/apex/list"
_ "apex/cmd/apex/logs"
_ "apex/cmd/apex/metrics"
_ "apex/cmd/apex/rollback"
_ "apex/cmd/apex/upgrade"
_ "apex/cmd/apex/version"

// plugins
_ "github.com/glomex/apex/plugins/clojure"
_ "github.com/glomex/apex/plugins/golang"
_ "github.com/glomex/apex/plugins/hooks"
_ "github.com/glomex/apex/plugins/inference"
_ "github.com/glomex/apex/plugins/java"
_ "github.com/glomex/apex/plugins/nodejs"
_ "github.com/glomex/apex/plugins/python"
_ "github.com/glomex/apex/plugins/rust_gnu"
_ "github.com/glomex/apex/plugins/rust_musl"
_ "github.com/glomex/apex/plugins/shim"
_ "apex/plugins/clojure"
_ "apex/plugins/golang"
_ "apex/plugins/hooks"
_ "apex/plugins/inference"
_ "apex/plugins/java"
_ "apex/plugins/nodejs"
_ "apex/plugins/python"
_ "apex/plugins/rust_gnu"
_ "apex/plugins/rust_musl"
_ "apex/plugins/shim"
)

// Terraform commands.
Expand Down
8 changes: 4 additions & 4 deletions cmd/apex/metrics/metrics.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"github.com/dustin/go-humanize"
"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"github.com/glomex/apex/colors"
"github.com/glomex/apex/cost"
"github.com/glomex/apex/metrics"
"apex/cmd/apex/root"
"apex/colors"
"apex/cost"
"apex/metrics"
)

// duration of results.
Expand Down
2 changes: 1 addition & 1 deletion cmd/apex/rollback/rollback.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ package rollback
import (
"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"apex/cmd/apex/root"
)

// alias.
Expand Down
6 changes: 3 additions & 3 deletions cmd/apex/root/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"github.com/pkg/errors"
"github.com/tj/cobra"

"github.com/glomex/apex/dryrun"
"github.com/glomex/apex/project"
"apex/dryrun"
"apex/project"
//"apex/project"
"github.com/glomex/apex/utils"
"apex/utils"
)

// environment for project.
Expand Down
6 changes: 3 additions & 3 deletions cmd/apex/upgrade/upgrade.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ package upgrade
import (
"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"github.com/glomex/apex/cmd/apex/version"
"github.com/glomex/apex/upgrade"
"apex/cmd/apex/root"
"apex/cmd/apex/version"
"apex/upgrade"
)

// Command config.
Expand Down
2 changes: 1 addition & 1 deletion cmd/apex/version/version.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/tj/cobra"

"github.com/glomex/apex/cmd/apex/root"
"apex/cmd/apex/root"
)

// Version of program.
Expand Down
2 changes: 1 addition & 1 deletion common/progressreader/progressreader.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/tj/go-progress"
"github.com/tj/go/term"

"github.com/glomex/apex/common/util"
"apex/common/util"
)

// reader wrapping a progress bar.
Expand Down
2 changes: 1 addition & 1 deletion common/util/util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/tj/go/term"
"golang.org/x/net/publicsuffix"

"github.com/glomex/apex/common/colors"
"apex/common/colors"
)

// Fields retained when clearing.
Expand Down
2 changes: 1 addition & 1 deletion docs/docs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/golang-commonmark/markdown"
"github.com/mitchellh/go-wordwrap"

"github.com/glomex/apex/colors"
"apex/colors"
)

// page of documentation.
Expand Down
2 changes: 1 addition & 1 deletion dryrun/dryrun.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/aws/aws-sdk-go/service/lambda"
"github.com/dustin/go-humanize"

"github.com/glomex/apex/utils"
"apex/utils"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion exec/exec.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"os/exec"

"github.com/glomex/apex/function"
"apex/function"
"github.com/apex/log"
)

Expand Down
8 changes: 4 additions & 4 deletions function/function.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"github.com/pkg/errors"
"gopkg.in/validator.v2"

"github.com/glomex/apex/archive"
"github.com/glomex/apex/hooks"
"github.com/glomex/apex/utils"
"github.com/glomex/apex/vpc"
"apex/archive"
"apex/hooks"
"apex/utils"
"apex/vpc"
)

// timelessInfo is used to zero mtime which causes function checksums
Expand Down
18 changes: 9 additions & 9 deletions function/function_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"errors"
"testing"

_ "github.com/glomex/apex/plugins/golang"
_ "github.com/glomex/apex/plugins/hooks"
_ "github.com/glomex/apex/plugins/inference"
_ "github.com/glomex/apex/plugins/nodejs"
_ "github.com/glomex/apex/plugins/python"
_ "github.com/glomex/apex/plugins/shim"
_ "apex/plugins/golang"
_ "apex/plugins/hooks"
_ "apex/plugins/inference"
_ "apex/plugins/nodejs"
_ "apex/plugins/python"
_ "apex/plugins/shim"

"github.com/apex/log"
"github.com/apex/log/handlers/discard"
Expand All @@ -19,9 +19,9 @@ import (
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/assert"

"github.com/glomex/apex/function"
"github.com/glomex/apex/mock"
"github.com/glomex/apex/utils"
"apex/function"
"apex/mock"
"apex/utils"
)

func init() {
Expand Down
2 changes: 1 addition & 1 deletion function/plugin.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package function

import "github.com/glomex/apex/archive"
import "apex/archive"

// A Plugin is a chunk of isolated(ish) logic which reacts to various
// hooks within the system in order to implement specific features
Expand Down
2 changes: 1 addition & 1 deletion infra/infra.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"path/filepath"
"strings"

"github.com/glomex/apex/function"
"apex/function"
"github.com/apex/log"
)

Expand Down
2 changes: 1 addition & 1 deletion infra/tfvars.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"strings"

"github.com/glomex/apex/function"
"apex/function"
"github.com/apex/log"
"github.com/aws/aws-sdk-go/service/lambda"
)
Expand Down
4 changes: 2 additions & 2 deletions plugins/clojure/clojure.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/pkg/errors"

"github.com/glomex/apex/archive"
"github.com/glomex/apex/function"
"apex/archive"
"apex/function"
)

func init() {
Expand Down
Loading

0 comments on commit 0c41d00

Please sign in to comment.