Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
go install
git diff --exit-code
- run: go build
- run: go build github.com/loilo-inc/canarycage/v5/cli/cage
- run: go build github.com/loilo-inc/canarycage/v6/cli/cage
- run: go test ./... -coverprofile=coverage.txt -covermode=count
- uses: codecov/codecov-action@v6
# skip if pr from dependabot, as it doesn't have access to secrets
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ A deployment tool for AWS ECS
via `go install` (Recommended)

```bash
$ go install github.com/loilo-inc/canarycage/cli/cage@latest
$ go install github.com/loilo-inc/canarycage/v6/cli/cage@latest
$ cage upgrade
```

Expand Down
6 changes: 3 additions & 3 deletions cage.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package cage

import (
"github.com/loilo-inc/canarycage/v5/key"
"github.com/loilo-inc/canarycage/v5/logger"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/key"
"github.com/loilo-inc/canarycage/v6/logger"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/loilo-inc/logos/v2/di"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cage/audit/aggregator.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"sort"

ecrtypes "github.com/aws/aws-sdk-go-v2/service/ecr/types"
"github.com/loilo-inc/canarycage/v5/logger"
"github.com/loilo-inc/canarycage/v6/logger"
"github.com/loilo-inc/logos/v2/set"
)

Expand Down
8 changes: 4 additions & 4 deletions cli/cage/audit/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package audit
import (
"context"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/key"
"github.com/loilo-inc/canarycage/v5/logger"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/key"
"github.com/loilo-inc/canarycage/v6/logger"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/loilo-inc/logos/v2/di"
)

Expand Down
10 changes: 5 additions & 5 deletions cli/cage/audit/command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"encoding/json"
"testing"

"github.com/loilo-inc/canarycage/v5/cli/cage/audit"
"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/key"
"github.com/loilo-inc/canarycage/v5/mocks/mock_audit"
"github.com/loilo-inc/canarycage/v5/test"
"github.com/loilo-inc/canarycage/v6/cli/cage/audit"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/key"
"github.com/loilo-inc/canarycage/v6/mocks/mock_audit"
"github.com/loilo-inc/canarycage/v6/test"
"github.com/loilo-inc/logos/v2/di"
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"
Expand Down
12 changes: 6 additions & 6 deletions cli/cage/audit/deps.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ import (
"github.com/aws/aws-sdk-go-v2/config"
"github.com/aws/aws-sdk-go-v2/service/ecr"
"github.com/aws/aws-sdk-go-v2/service/ecs"
"github.com/loilo-inc/canarycage/v5/awsiface"
"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/key"
"github.com/loilo-inc/canarycage/v5/logger"
"github.com/loilo-inc/canarycage/v5/timeout"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/awsiface"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/key"
"github.com/loilo-inc/canarycage/v6/logger"
"github.com/loilo-inc/canarycage/v6/timeout"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/loilo-inc/logos/v2/di"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cage/audit/deps_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
)

func TestProvideAuditCmd(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion cli/cage/audit/ecr.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/ecr"
ecrtypes "github.com/aws/aws-sdk-go-v2/service/ecr/types"
ecstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
"github.com/loilo-inc/canarycage/v5/awsiface"
"github.com/loilo-inc/canarycage/v6/awsiface"
)

const dockerManifestListMediaType = "application/vnd.docker.distribution.manifest.list.v2+json"
Expand Down
2 changes: 1 addition & 1 deletion cli/cage/audit/ecr_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/ecr"
ecrtypes "github.com/aws/aws-sdk-go-v2/service/ecr/types"
ecstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
"github.com/loilo-inc/canarycage/v5/mocks/mock_awsiface"
"github.com/loilo-inc/canarycage/v6/mocks/mock_awsiface"
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cage/audit/ecs.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (

"github.com/aws/aws-sdk-go-v2/service/ecs"
ecstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
"github.com/loilo-inc/canarycage/v5/awsiface"
"github.com/loilo-inc/canarycage/v6/awsiface"
)

type ecsTool struct {
Expand Down
2 changes: 1 addition & 1 deletion cli/cage/audit/ecs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"github.com/aws/aws-sdk-go-v2/aws"
"github.com/aws/aws-sdk-go-v2/service/ecs"
ecstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
"github.com/loilo-inc/canarycage/v5/mocks/mock_awsiface"
"github.com/loilo-inc/canarycage/v6/mocks/mock_awsiface"
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"
)
Expand Down
6 changes: 3 additions & 3 deletions cli/cage/audit/printer.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import (
"strings"

ecrtypes "github.com/aws/aws-sdk-go-v2/service/ecr/types"
"github.com/loilo-inc/canarycage/v5/key"
"github.com/loilo-inc/canarycage/v5/logger"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/key"
"github.com/loilo-inc/canarycage/v6/logger"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/loilo-inc/logos/v2/di"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/cage/audit/printer_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"testing"

ecrtypes "github.com/aws/aws-sdk-go-v2/service/ecr/types"
"github.com/loilo-inc/canarycage/v5/key"
"github.com/loilo-inc/canarycage/v5/test"
"github.com/loilo-inc/canarycage/v6/key"
"github.com/loilo-inc/canarycage/v6/test"
"github.com/loilo-inc/logos/v2/di"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cage/audit/scanner.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (

ecrtypes "github.com/aws/aws-sdk-go-v2/service/ecr/types"
smithy "github.com/aws/smithy-go"
"github.com/loilo-inc/canarycage/v5/awsiface"
"github.com/loilo-inc/canarycage/v6/awsiface"
)

type scanner struct {
Expand Down
2 changes: 1 addition & 1 deletion cli/cage/audit/scanner_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/aws/aws-sdk-go-v2/service/ecs"
ecstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
smithy "github.com/aws/smithy-go"
"github.com/loilo-inc/canarycage/v5/mocks/mock_awsiface"
"github.com/loilo-inc/canarycage/v6/mocks/mock_awsiface"
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"
)
Expand Down
4 changes: 2 additions & 2 deletions cli/cage/cageapp/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"io"

"github.com/loilo-inc/canarycage/v5/env"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/env"
"github.com/loilo-inc/canarycage/v6/types"
)

type CageCmdInput struct {
Expand Down
4 changes: 2 additions & 2 deletions cli/cage/commands/audit.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"context"
"errors"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/env"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/env"
"github.com/urfave/cli/v3"
)

Expand Down
6 changes: 3 additions & 3 deletions cli/cage/commands/audit_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"errors"
"testing"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/mocks/mock_types"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/mocks/mock_types"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/stretchr/testify/assert"
"github.com/urfave/cli/v3"
"go.uber.org/mock/gomock"
Expand Down
6 changes: 3 additions & 3 deletions cli/cage/commands/command.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"

"github.com/aws/aws-sdk-go-v2/service/ecs"
"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/env"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/env"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/urfave/cli/v3"
)

Expand Down
4 changes: 2 additions & 2 deletions cli/cage/commands/command_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"path/filepath"
"testing"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/stretchr/testify/assert"
)

Expand Down
16 changes: 8 additions & 8 deletions cli/cage/commands/provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"github.com/aws/aws-sdk-go-v2/service/ecr"
"github.com/aws/aws-sdk-go-v2/service/ecs"
"github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2"
cage "github.com/loilo-inc/canarycage/v5"
"github.com/loilo-inc/canarycage/v5/awsiface"
"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/key"
"github.com/loilo-inc/canarycage/v5/logger"
"github.com/loilo-inc/canarycage/v5/task"
"github.com/loilo-inc/canarycage/v5/timeout"
"github.com/loilo-inc/canarycage/v5/types"
cage "github.com/loilo-inc/canarycage/v6"
"github.com/loilo-inc/canarycage/v6/awsiface"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/key"
"github.com/loilo-inc/canarycage/v6/logger"
"github.com/loilo-inc/canarycage/v6/task"
"github.com/loilo-inc/canarycage/v6/timeout"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/loilo-inc/logos/v2/di"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cage/commands/provider_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/stretchr/testify/assert"
)

Expand Down
6 changes: 3 additions & 3 deletions cli/cage/commands/rollout.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package commands
import (
"context"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/cli/cage/prompt"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/cli/cage/prompt"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/urfave/cli/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cage/commands/rollout_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"
)
Expand Down
6 changes: 3 additions & 3 deletions cli/cage/commands/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"

ecstypes "github.com/aws/aws-sdk-go-v2/service/ecs/types"
"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/cli/cage/prompt"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/cli/cage/prompt"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/urfave/cli/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cage/commands/run_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"
)
Expand Down
8 changes: 4 additions & 4 deletions cli/cage/commands/tools_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ import (
"io"
"testing"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/cli/cage/commands"
"github.com/loilo-inc/canarycage/v5/mocks/mock_types"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/cli/cage/commands"
"github.com/loilo-inc/canarycage/v6/mocks/mock_types"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/urfave/cli/v3"
"go.uber.org/mock/gomock"
)
Expand Down
4 changes: 2 additions & 2 deletions cli/cage/commands/up.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package commands
import (
"context"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/cli/cage/prompt"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/cli/cage/prompt"
"github.com/urfave/cli/v3"
)

Expand Down
2 changes: 1 addition & 1 deletion cli/cage/commands/up_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/stretchr/testify/assert"
"go.uber.org/mock/gomock"
)
Expand Down
2 changes: 1 addition & 1 deletion cli/cage/commands/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package commands
import (
"context"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/urfave/cli/v3"
)

Expand Down
8 changes: 4 additions & 4 deletions cli/cage/commands/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"context"
"testing"

"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/cli/cage/commands"
"github.com/loilo-inc/canarycage/v5/mocks/mock_types"
"github.com/loilo-inc/canarycage/v5/types"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/cli/cage/commands"
"github.com/loilo-inc/canarycage/v6/mocks/mock_types"
"github.com/loilo-inc/canarycage/v6/types"
"github.com/stretchr/testify/assert"
"github.com/urfave/cli/v3"
"go.uber.org/mock/gomock"
Expand Down
8 changes: 4 additions & 4 deletions cli/cage/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"log"
"os"

"github.com/loilo-inc/canarycage/v5/cli/cage/audit"
"github.com/loilo-inc/canarycage/v5/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v5/cli/cage/commands"
"github.com/loilo-inc/canarycage/v5/cli/cage/upgrade"
"github.com/loilo-inc/canarycage/v6/cli/cage/audit"
"github.com/loilo-inc/canarycage/v6/cli/cage/cageapp"
"github.com/loilo-inc/canarycage/v6/cli/cage/commands"
"github.com/loilo-inc/canarycage/v6/cli/cage/upgrade"
"github.com/urfave/cli/v3"
)

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

"github.com/loilo-inc/canarycage/v5/env"
"github.com/loilo-inc/canarycage/v6/env"
)

type Prompter struct {
Expand Down
Loading