Skip to content
Merged
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 .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ formatters:
settings:
goimports:
local-prefixes:
- github.com/harness/cli
- github.com/harness/cli/v3
exclusions:
generated: lax
paths:
Expand Down
10 changes: 5 additions & 5 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ builds:
- -trimpath
ldflags:
- -s -w
- -X github.com/harness/cli/pkg/hbase.Version={{.Version}}
- -X github.com/harness/cli/pkg/hbase.BuildTime={{.Date}}
- -X github.com/harness/cli/pkg/telemetry.segmentWriteKey={{.Env.SEGMENT_WRITE_KEY}}
- -X github.com/harness/cli/v3/pkg/hbase.Version={{.Version}}
- -X github.com/harness/cli/v3/pkg/hbase.BuildTime={{.Date}}
- -X github.com/harness/cli/v3/pkg/telemetry.segmentWriteKey={{.Env.SEGMENT_WRITE_KEY}}

- id: harness-plugin-har
main: ./modules/har/cmd/harness-har/main-harness-har.go
Expand All @@ -43,8 +43,8 @@ builds:
- -trimpath
ldflags:
- -s -w
- -X github.com/harness/cli/pkg/hbase.Version={{.Version}}
- -X github.com/harness/cli/pkg/hbase.BuildTime={{.Date}}
- -X github.com/harness/cli/v3/pkg/hbase.Version={{.Version}}
- -X github.com/harness/cli/v3/pkg/hbase.BuildTime={{.Date}}

archives:
- id: harness-bundle
Expand Down
12 changes: 6 additions & 6 deletions Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ vars:
sh: date -u +%Y%m%d%H%MZ
SEGMENT_WRITE_KEY: '{{default "" (env "SEGMENT_WRITE_KEY")}}'
LDFLAGS: >-
-X github.com/harness/cli/pkg/hbase.Version={{.VERSION}}
-X github.com/harness/cli/pkg/hbase.BuildTime={{.BUILD_TIME}}
-X github.com/harness/cli/pkg/telemetry.segmentWriteKey={{.SEGMENT_WRITE_KEY}}
-X github.com/harness/cli/v3/pkg/hbase.Version={{.VERSION}}
-X github.com/harness/cli/v3/pkg/hbase.BuildTime={{.BUILD_TIME}}
-X github.com/harness/cli/v3/pkg/telemetry.segmentWriteKey={{.SEGMENT_WRITE_KEY}}
HAR_LDFLAGS: >-
-X github.com/harness/cli/pkg/hbase.Version={{.HAR_VERSION}}
-X github.com/harness/cli/pkg/hbase.BuildTime={{.BUILD_TIME}}
-X github.com/harness/cli/pkg/telemetry.segmentWriteKey={{.SEGMENT_WRITE_KEY}}
-X github.com/harness/cli/v3/pkg/hbase.Version={{.HAR_VERSION}}
-X github.com/harness/cli/v3/pkg/hbase.BuildTime={{.BUILD_TIME}}
-X github.com/harness/cli/v3/pkg/telemetry.segmentWriteKey={{.SEGMENT_WRITE_KEY}}

tasks:
build:
Expand Down
30 changes: 15 additions & 15 deletions cmd/harness/main-harness.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ import (
"github.com/spf13/cobra"
"golang.org/x/mod/semver"

"github.com/harness/cli/modules/code"
"github.com/harness/cli/modules/core"
"github.com/harness/cli/modules/core/mgmt"
"github.com/harness/cli/modules/gitops"
"github.com/harness/cli/modules/iacm"
"github.com/harness/cli/modules/pipeline"
"github.com/harness/cli/modules/platform"
"github.com/harness/cli/modules/rt"
"github.com/harness/cli/modules/vibeapps"
"github.com/harness/cli/pkg/console"
"github.com/harness/cli/pkg/hbase"
"github.com/harness/cli/pkg/registry"
"github.com/harness/cli/pkg/rootcmd"
"github.com/harness/cli/pkg/spec"
"github.com/harness/cli/pkg/specloader"
"github.com/harness/cli/v3/modules/code"
"github.com/harness/cli/v3/modules/core"
"github.com/harness/cli/v3/modules/core/mgmt"
"github.com/harness/cli/v3/modules/gitops"
"github.com/harness/cli/v3/modules/iacm"
"github.com/harness/cli/v3/modules/pipeline"
"github.com/harness/cli/v3/modules/platform"
"github.com/harness/cli/v3/modules/rt"
"github.com/harness/cli/v3/modules/vibeapps"
"github.com/harness/cli/v3/pkg/console"
"github.com/harness/cli/v3/pkg/hbase"
"github.com/harness/cli/v3/pkg/registry"
"github.com/harness/cli/v3/pkg/rootcmd"
"github.com/harness/cli/v3/pkg/spec"
"github.com/harness/cli/v3/pkg/specloader"
)

//go:embed noargs.txt
Expand Down
2 changes: 1 addition & 1 deletion cmd/testexpr/main-testexpr.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

"github.com/expr-lang/expr"

"github.com/harness/cli/pkg/exprenv"
"github.com/harness/cli/v3/pkg/exprenv"
)

func main() {
Expand Down
4 changes: 2 additions & 2 deletions docs/plugins.md
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ If the plugin binary is not on `PATH`, `harness` prints a clear error with insta
5. Add `./modules/<name>` to `go.work` for local development.
6. Add the `replace` directive in the module's `go.mod` for local dev:
```
replace github.com/harness/cli => ../../
replace github.com/harness/cli/v3 => ../../
```
7. Run `task check:specs` to validate.
8. No change to `cmd/harness/main-harness.go` is needed — plugin dispatch is driven by the spec.
Expand All @@ -122,7 +122,7 @@ If the plugin binary is not on `PATH`, `harness` prints a clear error with insta
|---|---|---|
| `pkg/` | external libs | anything under `modules/` |
| `modules/<name>/` (builtin) | `pkg/`, external libs | other modules |
| `modules/<name>/` (plugin) | root module (`github.com/harness/cli`), external libs | other modules |
| `modules/<name>/` (plugin) | root module (`github.com/harness/cli/v3`), external libs | other modules |
| `cmd/harness/` | `pkg/`, builtin modules | plugin modules |

Modules must not import each other.
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/harness/cli
module github.com/harness/cli/v3

go 1.26.7

Expand Down
2 changes: 1 addition & 1 deletion local-setup.zsh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
if [[ ! -f "$(pwd)/go.mod" ]] || ! grep -q '^module github.com/harness/cli$' "$(pwd)/go.mod"; then
if [[ ! -f "$(pwd)/go.mod" ]] || ! grep -q '^module github.com/harness/cli/v3$' "$(pwd)/go.mod"; then
echo "local-setup.zsh must be sourced from the root of the harness CLI repo" >&2
return 1
fi
Expand Down
2 changes: 1 addition & 1 deletion modules/code/activity.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"strings"
"time"

"github.com/harness/cli/pkg/console"
"github.com/harness/cli/v3/pkg/console"
)

// activityItem is a normalized view of one raw activity map, as returned by
Expand Down
2 changes: 1 addition & 1 deletion modules/code/code.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package code

import "github.com/harness/cli/pkg/registry"
import "github.com/harness/cli/v3/pkg/registry"

const (
mergePRBodyFnID = "merge_pr_body"
Expand Down
6 changes: 3 additions & 3 deletions modules/code/codeowners.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
package code

import (
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/endpoint"
"github.com/harness/cli/pkg/spec"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/endpoint"
"github.com/harness/cli/v3/pkg/spec"
)

const codeownersPRFetchFnID = "codeowners_pr_fetch"
Expand Down
2 changes: 1 addition & 1 deletion modules/code/comment.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"fmt"
"strings"

"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/cmdctx"
)

// createPRCommentBodyFn builds the comment create body.
Expand Down
4 changes: 2 additions & 2 deletions modules/code/conversation.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strconv"
"strings"

"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/console"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/console"
)

// prConversationTextFormatter renders a pull request's activity timeline the way
Expand Down
4 changes: 2 additions & 2 deletions modules/code/insight.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"io"
"strings"

"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/console"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/console"
)

const (
Expand Down
10 changes: 5 additions & 5 deletions modules/code/insight_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ import (
"testing"
"time"

"github.com/harness/cli/pkg/auth"
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/extractutil"
"github.com/harness/cli/pkg/registry"
"github.com/harness/cli/pkg/spec"
"github.com/harness/cli/v3/pkg/auth"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/extractutil"
"github.com/harness/cli/v3/pkg/registry"
"github.com/harness/cli/v3/pkg/spec"
)

// ---------------------------------------------------------------------------
Expand Down
4 changes: 2 additions & 2 deletions modules/code/merge.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package code
import (
"fmt"

"github.com/harness/cli/pkg/client"
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/client"
"github.com/harness/cli/v3/pkg/cmdctx"
)

// mergePRBodyFn builds the merge request body for execute pr:merge.
Expand Down
6 changes: 3 additions & 3 deletions modules/code/mine.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"fmt"
"maps"

"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/endpoint"
"github.com/harness/cli/pkg/spec"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/endpoint"
"github.com/harness/cli/v3/pkg/spec"
)

const (
Expand Down
16 changes: 8 additions & 8 deletions modules/code/pr.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,14 @@ import (
"strings"
"time"

"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/console"
"github.com/harness/cli/pkg/exprenv"
"github.com/harness/cli/pkg/extractutil"
"github.com/harness/cli/pkg/format"
"github.com/harness/cli/pkg/hlog"
"github.com/harness/cli/pkg/registry"
"github.com/harness/cli/pkg/spec"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/console"
"github.com/harness/cli/v3/pkg/exprenv"
"github.com/harness/cli/v3/pkg/extractutil"
"github.com/harness/cli/v3/pkg/format"
"github.com/harness/cli/v3/pkg/hlog"
"github.com/harness/cli/v3/pkg/registry"
"github.com/harness/cli/v3/pkg/spec"
)

const getPRWorkflowID = "get_pr"
Expand Down
6 changes: 3 additions & 3 deletions modules/code/pr_check_detail.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
package code

import (
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/registry"
"github.com/harness/cli/pkg/spec"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/registry"
"github.com/harness/cli/v3/pkg/spec"
)

const getPRCheckWorkflowID = "get_pr_check"
Expand Down
10 changes: 5 additions & 5 deletions modules/code/pr_check_log.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
"strings"
"time"

"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/endpoint"
"github.com/harness/cli/pkg/exprenv"
"github.com/harness/cli/pkg/extractutil"
"github.com/harness/cli/pkg/logstream"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/endpoint"
"github.com/harness/cli/v3/pkg/exprenv"
"github.com/harness/cli/v3/pkg/extractutil"
"github.com/harness/cli/v3/pkg/logstream"
)

const getPRCheckLogWorkflowID = "get_pr_check_log"
Expand Down
4 changes: 2 additions & 2 deletions modules/code/principals.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"strings"
"sync"

"github.com/harness/cli/pkg/client"
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/client"
"github.com/harness/cli/v3/pkg/cmdctx"
)

// harnessUIDRe matches a Harness UID: exactly 22 base64url characters ([A-Za-z0-9_-]).
Expand Down
4 changes: 2 additions & 2 deletions modules/code/pull_pr.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"os/exec"
"strings"

"github.com/harness/cli/pkg/client"
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/client"
"github.com/harness/cli/v3/pkg/cmdctx"
)

const pullPRWorkflowID = "pull_pr"
Expand Down
6 changes: 3 additions & 3 deletions modules/code/pull_repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"os/exec"
"strings"

"github.com/harness/cli/pkg/client"
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/hlog"
"github.com/harness/cli/v3/pkg/client"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/hlog"
)

const pullRepositoryWorkflowID = "pull_repository"
Expand Down
4 changes: 2 additions & 2 deletions modules/code/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package code
import (
"fmt"

"github.com/harness/cli/pkg/client"
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/client"
"github.com/harness/cli/v3/pkg/cmdctx"
)

// DefaultBranch returns the default branch name for the given repository.
Expand Down
4 changes: 2 additions & 2 deletions modules/code/review.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package code
import (
"fmt"

"github.com/harness/cli/pkg/client"
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/client"
"github.com/harness/cli/v3/pkg/cmdctx"
)

const reviewPRBodyFnID = "review_pr_body"
Expand Down
10 changes: 5 additions & 5 deletions modules/core/auth/debug_ssolog.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ import (
"strings"
"time"

"github.com/harness/cli/pkg/auth"
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/config"
"github.com/harness/cli/pkg/hbase"
"github.com/harness/cli/pkg/logstream"
"github.com/harness/cli/v3/pkg/auth"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/config"
"github.com/harness/cli/v3/pkg/hbase"
"github.com/harness/cli/v3/pkg/logstream"
)

// debugSSOLogBodyLimit caps how much of each response body we print inline.
Expand Down
6 changes: 3 additions & 3 deletions modules/core/auth/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"fmt"
"os"

"github.com/harness/cli/pkg/auth"
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/hbase"
"github.com/harness/cli/v3/pkg/auth"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/hbase"
)

func EnvHandler(ctx *cmdctx.Ctx) error {
Expand Down
10 changes: 5 additions & 5 deletions modules/core/auth/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"strings"
"time"

"github.com/harness/cli/pkg/auth"
"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/config"
"github.com/harness/cli/pkg/console"
"github.com/harness/cli/pkg/hlog"
"github.com/harness/cli/v3/pkg/auth"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/config"
"github.com/harness/cli/v3/pkg/console"
"github.com/harness/cli/v3/pkg/hlog"
)

var profileNameRe = regexp.MustCompile(`^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$`)
Expand Down
4 changes: 2 additions & 2 deletions modules/core/auth/login_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
"strings"
"testing"

"github.com/harness/cli/pkg/cmdctx"
"github.com/harness/cli/pkg/hbase"
"github.com/harness/cli/v3/pkg/cmdctx"
"github.com/harness/cli/v3/pkg/hbase"
)

// testCtx builds a bare Ctx with only FlagValues set.
Expand Down
Loading