Skip to content

Commit

Permalink
rename imports
Browse files Browse the repository at this point in the history
  • Loading branch information
reubenmiller committed Jun 10, 2022
1 parent 2efa366 commit 960e2ec
Show file tree
Hide file tree
Showing 413 changed files with 2,433 additions and 2,433 deletions.
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ builds:
binary: 'bin/{{ if index .Env "BINARY_INCLUDE_VERSION" }}{{ .ProjectName }}_{{ .RawVersion }}_{{ if eq .Os "darwin" }}macOS{{ else }}{{ .Os }}{{ end }}_{{ .Arch }}{{ else }}{{ .ProjectName }}{{ end }}'
main: ./cmd/c8y/main.go
ldflags:
- -s -w -X github.com/reubenmiller/go-c8y-cli/pkg/cmd.buildVersion={{.Version}} -X github.com/reubenmiller/go-c8y-cli/pkg/cmd.buildBranch={{.Branch}}
- -s -w -X github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd.buildVersion={{.Version}} -X github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd.buildBranch={{.Branch}}
hooks:
post:
- echo "Copying binaries for PowerShell Module"
Expand Down
2 changes: 1 addition & 1 deletion Taskfile.yml
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ tasks:
GOARCH: "{{.GOARCH | default ARCH}}"
cmds:
- echo "GOOS=$GOOS, GOARCH=$GOARCH"
- go build -o {{.OUTPUT}} -ldflags="-s -w -X 'github.com/reubenmiller/go-c8y-cli/pkg/cmd.buildVersion={{trimPrefix "v" .VERSION}}' -X 'github.com/reubenmiller/go-c8y-cli/pkg/cmd.buildBranch={{.GIT_BRANCH}}'" cmd/c8y/main.go
- go build -o {{.OUTPUT}} -ldflags="-s -w -X 'github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd.buildVersion={{trimPrefix "v" .VERSION}}' -X 'github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd.buildBranch={{.GIT_BRANCH}}'" cmd/c8y/main.go

build:
desc: Build
Expand Down
2 changes: 1 addition & 1 deletion cmd/c8y/main.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package main

import (
"github.com/reubenmiller/go-c8y-cli/pkg/cmd"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd"
)

func main() {
Expand Down
16 changes: 8 additions & 8 deletions cmd/gen-docs/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import (
"os"
"strings"

"github.com/reubenmiller/go-c8y-cli/internal/docs"
"github.com/reubenmiller/go-c8y-cli/pkg/activitylogger"
"github.com/reubenmiller/go-c8y-cli/pkg/cmd/factory"
"github.com/reubenmiller/go-c8y-cli/pkg/cmd/root"
"github.com/reubenmiller/go-c8y-cli/pkg/config"
"github.com/reubenmiller/go-c8y-cli/pkg/console"
"github.com/reubenmiller/go-c8y-cli/pkg/dataview"
"github.com/reubenmiller/go-c8y-cli/pkg/logger"
"github.com/reubenmiller/go-c8y-cli/v2/internal/docs"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/activitylogger"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/factory"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/root"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/config"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/console"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/dataview"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/logger"
"github.com/reubenmiller/go-c8y/pkg/c8y"
"github.com/spf13/pflag"
"github.com/spf13/viper"
Expand Down
6 changes: 3 additions & 3 deletions cmd/gen-tests/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (
"go.uber.org/zap/zapcore"

"github.com/google/shlex"
"github.com/reubenmiller/go-c8y-cli/internal/integration/models"
"github.com/reubenmiller/go-c8y-cli/pkg/flatten"
"github.com/reubenmiller/go-c8y-cli/pkg/jsonUtilities"
"github.com/reubenmiller/go-c8y-cli/v2/internal/integration/models"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/flatten"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/jsonUtilities"
"gopkg.in/yaml.v3"
)

Expand Down
2 changes: 1 addition & 1 deletion docs/go-c8y-cli/docs/concepts/sessions.md
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,7 @@ Remove-Item ~/.cumulocity/.key

```json
{
"$schema": "https://raw.githubusercontent.com/reubenmiller/go-c8y-cli/master/tools/schema/session.schema.json",
"$schema": "https://raw.githubusercontent.com/reubenmiller/go-c8y-cli/v2/tools/schema/session.schema.json",
"host": "https://example.cumulocity.com",
"tenant": "t12345",
"username": "[email protected]",
Expand Down
4 changes: 2 additions & 2 deletions docs/go-c8y-cli/docs/configuration/settings.md
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ Global settings can be controlled by creating a `settings.json` file in the `$C8

```json title="file: ~/.cumulocity/settings.json"
{
"$schema": "https://raw.githubusercontent.com/exampleuser/go-c8y-cli/master/tools/schema/session.schema.json",
"$schema": "https://raw.githubusercontent.com/exampleuser/go-c8y-cli/v2/tools/schema/session.schema.json",
"settings": {
"storage": {
"storepassword": false,
Expand All @@ -169,7 +169,7 @@ Below shows an example of a session (json) file with a `settings` section, where

```json title="file: ~/.cumulocity/my-session01.json"
{
"$schema": "https://raw.githubusercontent.com/exampleuser/go-c8y-cli/master/tools/schema/session.schema.json",
"$schema": "https://raw.githubusercontent.com/exampleuser/go-c8y-cli/v2/tools/schema/session.schema.json",
"host": "https://example.zz-latest.cumulocity.com",
"tenant": "t12345",
"username": "[email protected]",
Expand Down
4 changes: 2 additions & 2 deletions docs/go-c8y-cli/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ const baseUrl = `${process.env.BASE_URL || '/'}`;
docs: {
sidebarPath: require.resolve('./sidebars.js'),
editUrl:
'https://github.com/reubenmiller/go-c8y-cli/edit/master/docs/go-c8y-cli/',
'https://github.com/reubenmiller/go-c8y-cli/edit/v2/docs/go-c8y-cli/',
},
googleAnalytics: {
trackingID: 'UA-155263011-1',
Expand All @@ -232,7 +232,7 @@ const baseUrl = `${process.env.BASE_URL || '/'}`;
showReadingTime: true,
// Please change this to your repo.
editUrl:
'https://github.com/reubenmiller/go-c8y-cli/edit/master/docs/go-c8y-cli/',
'https://github.com/reubenmiller/go-c8y-cli/edit/v2/docs/go-c8y-cli/',
},
},
],
Expand Down
2 changes: 1 addition & 1 deletion examples/settings.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "https://raw.githubusercontent.com/reubenmiller/go-c8y-cli/master/tools/schema/session.schema.json",
"$schema": "https://raw.githubusercontent.com/reubenmiller/go-c8y-cli/v2/tools/schema/session.schema.json",
"settings": {
"activitylog": {
"path": "~/.cumulocity/activityLog"
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/reubenmiller/go-c8y-cli
module github.com/reubenmiller/go-c8y-cli/v2

require (
github.com/AlecAivazis/survey/v2 v2.3.5
Expand Down
2 changes: 1 addition & 1 deletion pkg/activitylogger/activitylogger.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"sync"
"time"

"github.com/reubenmiller/go-c8y-cli/pkg/fileutilities"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/fileutilities"
"github.com/spf13/cobra"
"github.com/tidwall/gjson"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/c8ydata/c8ydata_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package c8ydata
import (
"testing"

"github.com/reubenmiller/go-c8y-cli/pkg/assert"
"github.com/reubenmiller/go-c8y-cli/pkg/jsonUtilities"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/assert"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/jsonUtilities"
)

func Test_RemoveCumulocityPropertiesWithID(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions pkg/c8yfetcher/c8yfetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strconv"
"strings"

"github.com/reubenmiller/go-c8y-cli/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/pkg/flags"
"github.com/reubenmiller/go-c8y-cli/pkg/iterator"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/flags"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/iterator"
"github.com/reubenmiller/go-c8y/pkg/c8y"

"github.com/spf13/cobra"
Expand Down
2 changes: 1 addition & 1 deletion pkg/c8yfetcher/roleFetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"strings"

"github.com/pkg/errors"
"github.com/reubenmiller/go-c8y-cli/pkg/matcher"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/matcher"
"github.com/reubenmiller/go-c8y/pkg/c8y"
)

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

"github.com/pkg/errors"
"github.com/reubenmiller/go-c8y-cli/pkg/matcher"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/matcher"
"github.com/reubenmiller/go-c8y/pkg/c8y"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/c8yfetcher/userGroupFetcher.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package c8yfetcher

import (
"github.com/pkg/errors"
"github.com/reubenmiller/go-c8y-cli/pkg/matcher"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/matcher"
"github.com/reubenmiller/go-c8y/pkg/c8y"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/c8ylogin/c8ylogin.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (

"github.com/manifoldco/promptui"
"github.com/mdp/qrterminal"
"github.com/reubenmiller/go-c8y-cli/pkg/logger"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/logger"
"github.com/reubenmiller/go-c8y/pkg/c8y"
)

Expand Down
8 changes: 4 additions & 4 deletions pkg/c8yquerycmd/querycmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ import (
"net/url"
"strings"

"github.com/reubenmiller/go-c8y-cli/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/pkg/cmdutil"
"github.com/reubenmiller/go-c8y-cli/pkg/flags"
"github.com/reubenmiller/go-c8y-cli/pkg/mapbuilder"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmdutil"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/flags"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/mapbuilder"
"github.com/reubenmiller/go-c8y/pkg/c8y"
"github.com/spf13/cobra"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/c8ysession/c8ysession.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strings"

"github.com/fatih/color"
"github.com/reubenmiller/go-c8y-cli/pkg/config"
"github.com/reubenmiller/go-c8y-cli/pkg/logger"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/config"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/logger"
"github.com/reubenmiller/go-c8y/pkg/c8y"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/c8ysubscribe/c8ysubscribe.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"time"

"github.com/reubenmiller/go-c8y-cli/pkg/jsonUtilities"
"github.com/reubenmiller/go-c8y-cli/pkg/logger"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/jsonUtilities"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/logger"
"github.com/reubenmiller/go-c8y/pkg/c8y"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/c8ywaiter/alarms.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package c8ywaiter
import (
"context"

"github.com/reubenmiller/go-c8y-cli/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/pkg/timestamp"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/timestamp"
"github.com/reubenmiller/go-c8y/pkg/c8y"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/c8ywaiter/events.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package c8ywaiter
import (
"context"

"github.com/reubenmiller/go-c8y-cli/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/pkg/timestamp"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/timestamp"
"github.com/reubenmiller/go-c8y/pkg/c8y"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/c8ywaiter/inventory.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"regexp"
"strings"

"github.com/reubenmiller/go-c8y-cli/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmderrors"
"github.com/reubenmiller/go-c8y/pkg/c8y"
"github.com/tidwall/gjson"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/c8ywaiter/measurements.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package c8ywaiter
import (
"context"

"github.com/reubenmiller/go-c8y-cli/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/pkg/timestamp"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/timestamp"
"github.com/reubenmiller/go-c8y/pkg/c8y"
)

Expand Down
4 changes: 2 additions & 2 deletions pkg/c8ywaiter/operations.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"strings"

"github.com/reubenmiller/go-c8y-cli/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/pkg/timestamp"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmderrors"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/timestamp"
"github.com/reubenmiller/go-c8y/pkg/c8y"
)

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

import (
cmdList "github.com/reubenmiller/go-c8y-cli/pkg/cmd/activitylog/list"
"github.com/reubenmiller/go-c8y-cli/pkg/cmd/subcommand"
"github.com/reubenmiller/go-c8y-cli/pkg/cmdutil"
cmdList "github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/activitylog/list"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/subcommand"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmdutil"
"github.com/spf13/cobra"
)

Expand Down
10 changes: 5 additions & 5 deletions pkg/cmd/activitylog/list/list.manual.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"strings"

"github.com/MakeNowJust/heredoc/v2"
"github.com/reubenmiller/go-c8y-cli/pkg/activitylogger"
"github.com/reubenmiller/go-c8y-cli/pkg/cmd/subcommand"
"github.com/reubenmiller/go-c8y-cli/pkg/cmdutil"
"github.com/reubenmiller/go-c8y-cli/pkg/completion"
"github.com/reubenmiller/go-c8y-cli/pkg/timestamp"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/activitylogger"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/subcommand"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmdutil"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/completion"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/timestamp"
"github.com/spf13/cobra"
)

Expand Down
12 changes: 6 additions & 6 deletions pkg/cmd/agents/agents.auto.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package agents

import (
cmdCreate "github.com/reubenmiller/go-c8y-cli/pkg/cmd/agents/create"
cmdDelete "github.com/reubenmiller/go-c8y-cli/pkg/cmd/agents/delete"
cmdGet "github.com/reubenmiller/go-c8y-cli/pkg/cmd/agents/get"
cmdUpdate "github.com/reubenmiller/go-c8y-cli/pkg/cmd/agents/update"
"github.com/reubenmiller/go-c8y-cli/pkg/cmd/subcommand"
"github.com/reubenmiller/go-c8y-cli/pkg/cmdutil"
cmdCreate "github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/agents/create"
cmdDelete "github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/agents/delete"
cmdGet "github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/agents/get"
cmdUpdate "github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/agents/update"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmd/subcommand"
"github.com/reubenmiller/go-c8y-cli/v2/pkg/cmdutil"
"github.com/spf13/cobra"
)

Expand Down
12 changes: 6 additions & 6 deletions pkg/cmd/agents/create/create.auto.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions pkg/cmd/agents/delete/delete.auto.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions pkg/cmd/agents/get/get.auto.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 960e2ec

Please sign in to comment.