Skip to content

Commit

Permalink
Renaming module from gimlet-cli to gimlet (#839)
Browse files Browse the repository at this point in the history
  • Loading branch information
laszlocph authored Mar 14, 2024
1 parent b677cfe commit 510b90d
Show file tree
Hide file tree
Showing 135 changed files with 438 additions and 438 deletions.
56 changes: 28 additions & 28 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
GOFILES = $(shell find . -type f -name '*.go' -not -path "./.git/*")
LDFLAGS = '-s -w -extldflags "-static" -X github.com/gimlet-io/gimlet-cli/pkg/version.Version='${VERSION}
LDFLAGS = '-s -w -extldflags "-static" -X github.com/gimlet-io/gimlet/pkg/version.Version='${VERSION}

.PHONY: format test
.PHONY: build-cli dist-cli build-cli-frontend build-stack-frontend fast-dist-cli fast-dist
Expand All @@ -18,10 +18,10 @@ test-prep:

test: test-prep
go test -timeout 60s $(shell go list ./...)
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet-cli/pkg/dashboard/store -run TestEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet-cli/pkg/dashboard/store -run TestReEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet-cli/pkg/dashboard/store -run TestInitEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet-cli/pkg/dashboard/store -run TestUnquote
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet/pkg/dashboard/store -run TestEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet/pkg/dashboard/store -run TestReEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet/pkg/dashboard/store -run TestInitEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet/pkg/dashboard/store -run TestUnquote

test-dashboard-frontend:
(cd web/dashboard; npm install; npm run test)
Expand All @@ -32,48 +32,48 @@ test-with-postgres:
export DATABASE_DRIVER=postgres
export DATABASE_CONFIG=postgres://postgres:mysecretpassword@127.0.0.1:5432/postgres?sslmode=disable

go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet-cli/pkg/dashboard/store -run TestEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet-cli/pkg/dashboard/store -run TestReEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet-cli/pkg/dashboard/store -run TestInitEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet-cli/pkg/dashboard/store -run TestUnquote
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet/pkg/dashboard/store -run TestEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet/pkg/dashboard/store -run TestReEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet/pkg/dashboard/store -run TestInitEncryption
go test -timeout 60s -tags=encryption github.com/gimlet-io/gimlet/pkg/dashboard/store -run TestUnquote

docker stop testpostgres || true

build-cli:
CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/gimlet github.com/gimlet-io/gimlet-cli/cmd/cli
CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/gimlet github.com/gimlet-io/gimlet/cmd/cli
build-agent:
CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/gimlet-agent github.com/gimlet-io/gimlet-cli/cmd/agent
CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/gimlet-agent github.com/gimlet-io/gimlet/cmd/agent
build-dashboard:
CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/gimlet-dashboard github.com/gimlet-io/gimlet-cli/cmd/dashboard
CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/gimlet-dashboard github.com/gimlet-io/gimlet/cmd/dashboard
build-image-builder:
CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/image-builder github.com/gimlet-io/gimlet-cli/cmd/image-builder
CGO_ENABLED=0 go build -ldflags $(LDFLAGS) -o build/image-builder github.com/gimlet-io/gimlet/cmd/image-builder

dist-dashboard:
mkdir -p bin
GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/amd64/gimlet-dashboard github.com/gimlet-io/gimlet-cli/cmd/dashboard
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/amd64/gimlet-agent github.com/gimlet-io/gimlet-cli/cmd/agent
GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/amd64/gimlet-dashboard github.com/gimlet-io/gimlet/cmd/dashboard
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/amd64/gimlet-agent github.com/gimlet-io/gimlet/cmd/agent

GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/arm64/gimlet-dashboard github.com/gimlet-io/gimlet-cli/cmd/dashboard
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/arm64/gimlet-agent github.com/gimlet-io/gimlet-cli/cmd/agent
GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/arm64/gimlet-dashboard github.com/gimlet-io/gimlet/cmd/dashboard
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/arm64/gimlet-agent github.com/gimlet-io/gimlet/cmd/agent
fast-dist:
mkdir -p bin
GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/amd64/gimlet-dashboard github.com/gimlet-io/gimlet-cli/cmd/dashboard
GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/linux/amd64/gimlet-dashboard github.com/gimlet-io/gimlet/cmd/dashboard
dist-cli:
mkdir -p bin
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-darwin-x86_64 github.com/gimlet-io/gimlet-cli/cmd/cli
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-darwin-arm64 github.com/gimlet-io/gimlet-cli/cmd/cli
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-linux-arm64 github.com/gimlet-io/gimlet-cli/cmd/cli
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-linux-x86_64 github.com/gimlet-io/gimlet-cli/cmd/cli
CGO_ENABLED=0 GOOS=windows go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet.exe github.com/gimlet-io/gimlet-cli/cmd/cli
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-darwin-x86_64 github.com/gimlet-io/gimlet/cmd/cli
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-darwin-arm64 github.com/gimlet-io/gimlet/cmd/cli
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-linux-arm64 github.com/gimlet-io/gimlet/cmd/cli
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-linux-x86_64 github.com/gimlet-io/gimlet/cmd/cli
CGO_ENABLED=0 GOOS=windows go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet.exe github.com/gimlet-io/gimlet/cmd/cli
fast-dist-cli:
mkdir -p bin
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-linux-x86_64 github.com/gimlet-io/gimlet-cli/cmd/cli
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-darwin-x86_64 github.com/gimlet-io/gimlet-cli/cmd/cli
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-darwin-arm64 github.com/gimlet-io/gimlet-cli/cmd/cli
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-linux-x86_64 github.com/gimlet-io/gimlet/cmd/cli
CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-darwin-x86_64 github.com/gimlet-io/gimlet/cmd/cli
CGO_ENABLED=0 GOOS=darwin GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/gimlet-darwin-arm64 github.com/gimlet-io/gimlet/cmd/cli
dist-image-builder:
mkdir -p bin
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/image-builder-linux-x86_64 github.com/gimlet-io/gimlet-cli/cmd/image-builder
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/image-builder-linux-arm64 github.com/gimlet-io/gimlet-cli/cmd/image-builder
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/image-builder-linux-x86_64 github.com/gimlet-io/gimlet/cmd/image-builder
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags $(LDFLAGS) -a -installsuffix cgo -o bin/image-builder-linux-arm64 github.com/gimlet-io/gimlet/cmd/image-builder

build-cli-frontend:
(cd web/cli; npm install; npm run build)
Expand Down
10 changes: 5 additions & 5 deletions cmd/agent/agent.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ import (
"time"

capacitorFlux "github.com/gimlet-io/capacitor/pkg/flux"
"github.com/gimlet-io/gimlet-cli/cmd/agent/config"
"github.com/gimlet-io/gimlet-cli/pkg/agent"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/api"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/server/streaming"
"github.com/gimlet-io/gimlet-cli/pkg/dx"
"github.com/gimlet-io/gimlet/cmd/agent/config"
"github.com/gimlet-io/gimlet/pkg/agent"
"github.com/gimlet-io/gimlet/pkg/dashboard/api"
"github.com/gimlet-io/gimlet/pkg/dashboard/server/streaming"
"github.com/gimlet-io/gimlet/pkg/dx"
"github.com/go-chi/chi/v5"
"github.com/gorilla/websocket"
"github.com/joho/godotenv"
Expand Down
6 changes: 3 additions & 3 deletions cmd/agent/imagebuild.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ import (
"strings"
"time"

"github.com/gimlet-io/gimlet-cli/pkg/agent"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/server/streaming"
"github.com/gimlet-io/gimlet-cli/pkg/dx"
"github.com/gimlet-io/gimlet/pkg/agent"
"github.com/gimlet-io/gimlet/pkg/dashboard/server/streaming"
"github.com/gimlet-io/gimlet/pkg/dx"
"github.com/sirupsen/logrus"
batchv1 "k8s.io/api/batch/v1"
corev1 "k8s.io/api/core/v1"
Expand Down
16 changes: 8 additions & 8 deletions cmd/cli/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"os"

"github.com/enescakir/emoji"
"github.com/gimlet-io/gimlet-cli/pkg/commands/artifact"
"github.com/gimlet-io/gimlet-cli/pkg/commands/chart"
"github.com/gimlet-io/gimlet-cli/pkg/commands/environment"
"github.com/gimlet-io/gimlet-cli/pkg/commands/gitops"
"github.com/gimlet-io/gimlet-cli/pkg/commands/manifest"
"github.com/gimlet-io/gimlet-cli/pkg/commands/release"
"github.com/gimlet-io/gimlet-cli/pkg/commands/stack"
"github.com/gimlet-io/gimlet-cli/pkg/version"
"github.com/gimlet-io/gimlet/pkg/commands/artifact"
"github.com/gimlet-io/gimlet/pkg/commands/chart"
"github.com/gimlet-io/gimlet/pkg/commands/environment"
"github.com/gimlet-io/gimlet/pkg/commands/gitops"
"github.com/gimlet-io/gimlet/pkg/commands/manifest"
"github.com/gimlet-io/gimlet/pkg/commands/release"
"github.com/gimlet-io/gimlet/pkg/commands/stack"
"github.com/gimlet-io/gimlet/pkg/version"
"github.com/urfave/cli/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/dashboard/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strconv"
"strings"

"github.com/gimlet-io/gimlet-cli/pkg/dx"
"github.com/gimlet-io/gimlet/pkg/dx"
"github.com/kelseyhightower/envconfig"
"github.com/sirupsen/logrus"
)
Expand Down
22 changes: 11 additions & 11 deletions cmd/dashboard/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@ import (
"syscall"
"time"

"github.com/gimlet-io/gimlet-cli/cmd/dashboard/config"
"github.com/gimlet-io/gimlet-cli/cmd/dashboard/dynamicconfig"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/alert"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/model"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/notifications"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/server"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/server/streaming"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/store"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/worker"
"github.com/gimlet-io/gimlet-cli/pkg/git/customScm"
"github.com/gimlet-io/gimlet-cli/pkg/git/nativeGit"
"github.com/gimlet-io/gimlet/cmd/dashboard/config"
"github.com/gimlet-io/gimlet/cmd/dashboard/dynamicconfig"
"github.com/gimlet-io/gimlet/pkg/dashboard/alert"
"github.com/gimlet-io/gimlet/pkg/dashboard/model"
"github.com/gimlet-io/gimlet/pkg/dashboard/notifications"
"github.com/gimlet-io/gimlet/pkg/dashboard/server"
"github.com/gimlet-io/gimlet/pkg/dashboard/server/streaming"
"github.com/gimlet-io/gimlet/pkg/dashboard/store"
"github.com/gimlet-io/gimlet/pkg/dashboard/worker"
"github.com/gimlet-io/gimlet/pkg/git/customScm"
"github.com/gimlet-io/gimlet/pkg/git/nativeGit"
"github.com/go-chi/chi/v5"
"github.com/joho/godotenv"
"github.com/prometheus/client_golang/prometheus/promhttp"
Expand Down
8 changes: 4 additions & 4 deletions cmd/dashboard/dashboard_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"testing"
"time"

"github.com/gimlet-io/gimlet-cli/cmd/dashboard/config"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/model"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/store"
"github.com/gimlet-io/gimlet-cli/pkg/server/token"
"github.com/gimlet-io/gimlet/cmd/dashboard/config"
"github.com/gimlet-io/gimlet/pkg/dashboard/model"
"github.com/gimlet-io/gimlet/pkg/dashboard/store"
"github.com/gimlet-io/gimlet/pkg/server/token"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions cmd/dashboard/dynamicconfig/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"encoding/json"
"reflect"

"github.com/gimlet-io/gimlet-cli/cmd/dashboard/config"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/model"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/store"
"github.com/gimlet-io/gimlet/cmd/dashboard/config"
"github.com/gimlet-io/gimlet/pkg/dashboard/model"
"github.com/gimlet-io/gimlet/pkg/dashboard/store"
"github.com/kelseyhightower/envconfig"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/dashboard/dynamicconfig/config_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package dynamicconfig
import (
"testing"

"github.com/gimlet-io/gimlet-cli/cmd/dashboard/config"
"github.com/gimlet-io/gimlet/cmd/dashboard/config"
"gotest.tools/assert"
)

Expand Down
12 changes: 6 additions & 6 deletions cmd/dashboard/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (
"runtime"
"time"

"github.com/gimlet-io/gimlet-cli/cmd/dashboard/config"
"github.com/gimlet-io/gimlet-cli/cmd/dashboard/dynamicconfig"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/model"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/notifications"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/store"
"github.com/gimlet-io/gimlet-cli/pkg/git/customScm"
"github.com/gimlet-io/gimlet/cmd/dashboard/config"
"github.com/gimlet-io/gimlet/cmd/dashboard/dynamicconfig"
"github.com/gimlet-io/gimlet/pkg/dashboard/model"
"github.com/gimlet-io/gimlet/pkg/dashboard/notifications"
"github.com/gimlet-io/gimlet/pkg/dashboard/store"
"github.com/gimlet-io/gimlet/pkg/git/customScm"
"github.com/gorilla/securecookie"
"github.com/sirupsen/logrus"
)
Expand Down
14 changes: 7 additions & 7 deletions cmd/dashboard/initBuiltInEnv.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ import (
"os"
"os/exec"

"github.com/gimlet-io/gimlet-cli/cmd/dashboard/config"
"github.com/gimlet-io/gimlet-cli/cmd/dashboard/dynamicconfig"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/model"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/server"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/store"
"github.com/gimlet-io/gimlet-cli/pkg/git/nativeGit"
"github.com/gimlet-io/gimlet-cli/pkg/gitops"
"github.com/gimlet-io/gimlet/cmd/dashboard/config"
"github.com/gimlet-io/gimlet/cmd/dashboard/dynamicconfig"
"github.com/gimlet-io/gimlet/pkg/dashboard/model"
"github.com/gimlet-io/gimlet/pkg/dashboard/server"
"github.com/gimlet-io/gimlet/pkg/dashboard/store"
"github.com/gimlet-io/gimlet/pkg/git/nativeGit"
"github.com/gimlet-io/gimlet/pkg/gitops"
"github.com/go-git/go-git/v5"
gitConfig "github.com/go-git/go-git/v5/config"
"github.com/go-git/go-git/v5/plumbing"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/gimlet-io/gimlet-cli
module github.com/gimlet-io/gimlet

go 1.22.1

Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import (
"net/http"
"time"

"github.com/gimlet-io/gimlet-cli/pkg/dashboard/api"
"github.com/gimlet-io/gimlet/pkg/dashboard/api"
log "github.com/sirupsen/logrus"
networking_v1 "k8s.io/api/networking/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/deploymentController.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package agent

import (
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/api"
"github.com/gimlet-io/gimlet/pkg/dashboard/api"
apps_v1 "k8s.io/api/apps/v1"
v1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/ingressController.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package agent

import (
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/api"
"github.com/gimlet-io/gimlet/pkg/dashboard/api"
v1 "k8s.io/api/core/v1"
networking_v1 "k8s.io/api/networking/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/kube.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"time"

"github.com/gimlet-io/capacitor/pkg/flux"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/api"
"github.com/gimlet-io/gimlet/pkg/dashboard/api"
"github.com/prometheus/client_golang/prometheus"
"github.com/sirupsen/logrus"
appsv1 "k8s.io/api/apps/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/agent/podController.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package agent
import (
"context"

"github.com/gimlet-io/gimlet-cli/pkg/dashboard/api"
"github.com/gimlet-io/gimlet/pkg/dashboard/api"
v1 "k8s.io/api/core/v1"
meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/fields"
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"strings"
"time"

"github.com/gimlet-io/gimlet-cli/pkg/dashboard/model"
"github.com/gimlet-io/gimlet-cli/pkg/dx"
"github.com/gimlet-io/gimlet/pkg/dashboard/model"
"github.com/gimlet-io/gimlet/pkg/dx"
)

const (
Expand Down
14 changes: 7 additions & 7 deletions pkg/client/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ import (
"net/http/httptest"
"testing"

"github.com/gimlet-io/gimlet-cli/cmd/dashboard/config"
"github.com/gimlet-io/gimlet-cli/cmd/dashboard/dynamicconfig"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/model"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/server"
"github.com/gimlet-io/gimlet-cli/pkg/dashboard/store"
"github.com/gimlet-io/gimlet-cli/pkg/dx"
"github.com/gimlet-io/gimlet-cli/pkg/server/token"
"github.com/gimlet-io/gimlet/cmd/dashboard/config"
"github.com/gimlet-io/gimlet/cmd/dashboard/dynamicconfig"
"github.com/gimlet-io/gimlet/pkg/dashboard/model"
"github.com/gimlet-io/gimlet/pkg/dashboard/server"
"github.com/gimlet-io/gimlet/pkg/dashboard/store"
"github.com/gimlet-io/gimlet/pkg/dx"
"github.com/gimlet-io/gimlet/pkg/server/token"
"github.com/gorilla/securecookie"
"github.com/sirupsen/logrus"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions pkg/client/interface.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"net/http"
"time"

"github.com/gimlet-io/gimlet-cli/pkg/dashboard/model"
"github.com/gimlet-io/gimlet-cli/pkg/dx"
"github.com/gimlet-io/gimlet/pkg/dashboard/model"
"github.com/gimlet-io/gimlet/pkg/dx"
)

// Client is used to communicate with a Drone server.
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/artifact/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io/ioutil"
"strings"

"github.com/gimlet-io/gimlet-cli/pkg/dx"
"github.com/gimlet-io/gimlet/pkg/dx"
"github.com/joho/godotenv"
"github.com/urfave/cli/v2"
"gopkg.in/yaml.v3"
Expand Down
4 changes: 2 additions & 2 deletions pkg/commands/artifact/add_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"testing"

"github.com/gimlet-io/gimlet-cli/pkg/commands"
"github.com/gimlet-io/gimlet-cli/pkg/dx"
"github.com/gimlet-io/gimlet/pkg/commands"
"github.com/gimlet-io/gimlet/pkg/dx"
"github.com/urfave/cli/v2"
)

Expand Down
5 changes: 3 additions & 2 deletions pkg/commands/artifact/create.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,11 @@ import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"

"github.com/btubbs/datetime"
"github.com/gimlet-io/gimlet-cli/pkg/dx"
"github.com/gimlet-io/gimlet/pkg/dx"
"github.com/urfave/cli/v2"
"io/ioutil"
)

var artifactCreateCmd = cli.Command{
Expand Down
Loading

0 comments on commit 510b90d

Please sign in to comment.