Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

533 update golang references #554

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
8 changes: 4 additions & 4 deletions .goreleaser.local.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ builds:
flags:
- -trimpath
ldflags:
- -X github.com/Mirantis/mcc/version.Environment=development
- -X github.com/Mirantis/mcc/version.GitCommit={{ .FullCommit }}
- -X github.com/Mirantis/mcc/version.Version={{ .Version }}
- -X github.com/Mirantis/launchpad/version.Environment=development
- -X github.com/Mirantis/launchpad/version.GitCommit={{ .FullCommit }}
- -X github.com/Mirantis/launchpad/version.Version={{ .Version }}
# if segment analytics is to be active, set an env variable for the token
- -X github.com/Mirantis/mcc/pkg/analytics.SegmentToken={{ .Env.SEGMENT_TOKEN }}
- -X github.com/Mirantis/launchpad/pkg/analytics.SegmentToken={{ .Env.SEGMENT_TOKEN }}
binary: "{{ .ProjectName }}"
goos:
- linux
Expand Down
6 changes: 3 additions & 3 deletions .goreleaser.release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ builds:
flags:
- -trimpath
ldflags:
- -X github.com/Mirantis/mcc/version.GitCommit={{ .FullCommit }}
- -X github.com/Mirantis/mcc/version.Version={{ .Version }}
- -X github.com/Mirantis/launchpad/version.GitCommit={{ .FullCommit }}
- -X github.com/Mirantis/launchpad/version.Version={{ .Version }}
# if segment analytics is to be active, set an env variable for the token
- -X github.com/Mirantis/mcc/pkg/analytics.SegmentToken={{ .Env.SEGMENT_TOKEN }}
- -X github.com/Mirantis/launchpad/pkg/analytics.SegmentToken={{ .Env.SEGMENT_TOKEN }}
goos:
- linux
- darwin
Expand Down
8 changes: 4 additions & 4 deletions cmd/apply.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"os"
"time"

"github.com/Mirantis/mcc/pkg/analytics"
"github.com/Mirantis/mcc/pkg/config"
"github.com/Mirantis/mcc/pkg/util/logo"
"github.com/Mirantis/mcc/version"
"github.com/Mirantis/launchpad/pkg/analytics"
"github.com/Mirantis/launchpad/pkg/config"
"github.com/Mirantis/launchpad/pkg/util/logo"
"github.com/Mirantis/launchpad/version"
"github.com/mattn/go-isatty"
log "github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
Expand Down
4 changes: 2 additions & 2 deletions cmd/client_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"os"
"strings"

"github.com/Mirantis/mcc/pkg/analytics"
"github.com/Mirantis/mcc/pkg/config"
"github.com/Mirantis/launchpad/pkg/analytics"
"github.com/Mirantis/launchpad/pkg/config"
log "github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (
"os"
"path"

"github.com/Mirantis/mcc/pkg/analytics"
"github.com/Mirantis/mcc/pkg/constant"
mcclog "github.com/Mirantis/mcc/pkg/log"
"github.com/Mirantis/mcc/pkg/product/mke/phase"
"github.com/Mirantis/mcc/version"
"github.com/Mirantis/launchpad/pkg/analytics"
"github.com/Mirantis/launchpad/pkg/constant"
mcclog "github.com/Mirantis/launchpad/pkg/log"
"github.com/Mirantis/launchpad/pkg/product/mke/phase"
"github.com/Mirantis/launchpad/version"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/exec"
"github.com/mitchellh/go-homedir"
Expand Down
4 changes: 2 additions & 2 deletions cmd/describe.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"time"

"github.com/Mirantis/mcc/pkg/analytics"
"github.com/Mirantis/mcc/pkg/config"
"github.com/Mirantis/launchpad/pkg/analytics"
"github.com/Mirantis/launchpad/pkg/config"
log "github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
event "gopkg.in/segmentio/analytics-go.v3"
Expand Down
2 changes: 1 addition & 1 deletion cmd/download_launchpad.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"runtime"
"time"

"github.com/Mirantis/mcc/version"
"github.com/Mirantis/launchpad/version"
"github.com/schollz/progressbar/v3"
"github.com/urfave/cli/v2"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package cmd
import (
"fmt"

"github.com/Mirantis/mcc/pkg/config"
"github.com/Mirantis/launchpad/pkg/config"
"github.com/kballard/go-shellquote"
"github.com/urfave/cli/v2"
)
Expand Down
4 changes: 2 additions & 2 deletions cmd/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"os"
"strings"

"github.com/Mirantis/mcc/pkg/analytics"
"github.com/Mirantis/mcc/pkg/config"
"github.com/Mirantis/launchpad/pkg/analytics"
"github.com/Mirantis/launchpad/pkg/config"
"github.com/urfave/cli/v2"
"gopkg.in/yaml.v2"
)
Expand Down
6 changes: 3 additions & 3 deletions cmd/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"fmt"

"github.com/AlecAivazis/survey/v2/terminal"
"github.com/Mirantis/mcc/pkg/analytics"
"github.com/Mirantis/mcc/pkg/cmd/register"
"github.com/Mirantis/mcc/pkg/config/user"
"github.com/Mirantis/launchpad/pkg/analytics"
"github.com/Mirantis/launchpad/pkg/cmd/register"
"github.com/Mirantis/launchpad/pkg/config/user"
"github.com/urfave/cli/v2"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/reset.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"time"

"github.com/AlecAivazis/survey/v2"
"github.com/Mirantis/mcc/pkg/analytics"
"github.com/Mirantis/mcc/pkg/config"
"github.com/Mirantis/launchpad/pkg/analytics"
"github.com/Mirantis/launchpad/pkg/config"
"github.com/mattn/go-isatty"
"github.com/urfave/cli/v2"
event "gopkg.in/segmentio/analytics-go.v3"
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/Mirantis/mcc
module github.com/Mirantis/launchpad

go 1.23.2

Expand Down
6 changes: 3 additions & 3 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"os"
"path"

"github.com/Mirantis/mcc/cmd"
"github.com/Mirantis/mcc/pkg/completion"
"github.com/Mirantis/mcc/version"
"github.com/Mirantis/launchpad/cmd"
"github.com/Mirantis/launchpad/pkg/completion"
"github.com/Mirantis/launchpad/version"
log "github.com/sirupsen/logrus"
"github.com/urfave/cli/v2"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/analytics/analytics.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
logger "log"
"runtime"

"github.com/Mirantis/mcc/pkg/config/user"
"github.com/Mirantis/mcc/version"
"github.com/Mirantis/launchpad/pkg/config/user"
"github.com/Mirantis/launchpad/version"
"github.com/denisbrodbeck/machineid"
log "github.com/sirupsen/logrus"
analytics "gopkg.in/segmentio/analytics-go.v3"
Expand Down
2 changes: 1 addition & 1 deletion pkg/analytics/analytics_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package analytics
import (
"testing"

"github.com/Mirantis/mcc/pkg/config/user"
"github.com/Mirantis/launchpad/pkg/config/user"
"github.com/stretchr/testify/require"
"gopkg.in/segmentio/analytics-go.v3"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/analytics/user.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package analytics
import (
"errors"

"github.com/Mirantis/mcc/pkg/config/user"
"github.com/Mirantis/launchpad/pkg/config/user"
)

var errRegistrationRequired = errors.New("registration or license acceptance is required. please use `launchpad register` command to register")
Expand Down
4 changes: 2 additions & 2 deletions pkg/cmd/register/register.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"regexp"

"github.com/AlecAivazis/survey/v2"
"github.com/Mirantis/mcc/pkg/analytics"
"github.com/Mirantis/mcc/pkg/config/user"
"github.com/Mirantis/launchpad/pkg/analytics"
"github.com/Mirantis/launchpad/pkg/config/user"
log "github.com/sirupsen/logrus"
)

Expand Down
22 changes: 11 additions & 11 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,25 @@ import (
"regexp"
"strings"

"github.com/Mirantis/mcc/pkg/config/migration"
"github.com/Mirantis/launchpad/pkg/config/migration"
// needed to load the migrators.
_ "github.com/Mirantis/mcc/pkg/config/migration/v1"
_ "github.com/Mirantis/launchpad/pkg/config/migration/v1"
// needed to load the migrators.
_ "github.com/Mirantis/mcc/pkg/config/migration/v11"
_ "github.com/Mirantis/launchpad/pkg/config/migration/v11"
// needed to load the migrators.
_ "github.com/Mirantis/mcc/pkg/config/migration/v12"
_ "github.com/Mirantis/launchpad/pkg/config/migration/v12"
// needed to load the migrators.
_ "github.com/Mirantis/mcc/pkg/config/migration/v13"
_ "github.com/Mirantis/launchpad/pkg/config/migration/v13"
// needed to load the migrators.
_ "github.com/Mirantis/mcc/pkg/config/migration/v14"
_ "github.com/Mirantis/launchpad/pkg/config/migration/v14"
// needed to load the migrators.
_ "github.com/Mirantis/mcc/pkg/config/migration/v1beta1"
_ "github.com/Mirantis/launchpad/pkg/config/migration/v1beta1"
// needed to load the migrators.
_ "github.com/Mirantis/mcc/pkg/config/migration/v1beta2"
_ "github.com/Mirantis/launchpad/pkg/config/migration/v1beta2"
// needed to load the migrators.
_ "github.com/Mirantis/mcc/pkg/config/migration/v1beta3"
"github.com/Mirantis/mcc/pkg/product"
"github.com/Mirantis/mcc/pkg/product/mke"
_ "github.com/Mirantis/launchpad/pkg/config/migration/v1beta3"
"github.com/Mirantis/launchpad/pkg/product"
"github.com/Mirantis/launchpad/pkg/product/mke"
"github.com/a8m/envsubst"
"github.com/k0sproject/rig/exec"
log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/migration/v1/v1.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"regexp"
"strings"

"github.com/Mirantis/mcc/pkg/config/migration"
"github.com/Mirantis/launchpad/pkg/config/migration"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v2"
)
Expand Down
2 changes: 1 addition & 1 deletion pkg/config/migration/v11/v11.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package v11

import (
"github.com/Mirantis/mcc/pkg/config/migration"
"github.com/Mirantis/launchpad/pkg/config/migration"
log "github.com/sirupsen/logrus"
)

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

import (
"github.com/Mirantis/mcc/pkg/config/migration"
"github.com/Mirantis/launchpad/pkg/config/migration"
log "github.com/sirupsen/logrus"
)

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

import (
"github.com/Mirantis/mcc/pkg/config/migration"
"github.com/Mirantis/launchpad/pkg/config/migration"
log "github.com/sirupsen/logrus"
)

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

import (
"github.com/Mirantis/mcc/pkg/config/migration"
"github.com/Mirantis/launchpad/pkg/config/migration"
log "github.com/sirupsen/logrus"
)

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

import (
"github.com/Mirantis/mcc/pkg/config/migration"
"github.com/Mirantis/launchpad/pkg/config/migration"
log "github.com/sirupsen/logrus"
)

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

import (
"github.com/Mirantis/mcc/pkg/config/migration"
"github.com/Mirantis/launchpad/pkg/config/migration"
log "github.com/sirupsen/logrus"
)

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

import (
"github.com/Mirantis/mcc/pkg/config/migration"
"github.com/Mirantis/launchpad/pkg/config/migration"
log "github.com/sirupsen/logrus"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/configurer/centos/centos.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package centos
import (
"fmt"

"github.com/Mirantis/mcc/pkg/configurer/enterpriselinux"
"github.com/Mirantis/launchpad/pkg/configurer/enterpriselinux"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/registry"
Expand Down
2 changes: 1 addition & 1 deletion pkg/configurer/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"errors"
"fmt"

common "github.com/Mirantis/mcc/pkg/product/common/api"
common "github.com/Mirantis/launchpad/pkg/product/common/api"
"github.com/k0sproject/rig/log"
"github.com/k0sproject/rig/os"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/configurer/enterpriselinux/el.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/Mirantis/mcc/pkg/configurer"
common "github.com/Mirantis/mcc/pkg/product/common/api"
"github.com/Mirantis/launchpad/pkg/configurer"
common "github.com/Mirantis/launchpad/pkg/product/common/api"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/linux"
Expand Down
6 changes: 3 additions & 3 deletions pkg/configurer/linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"strconv"
"strings"

"github.com/Mirantis/mcc/pkg/constant"
common "github.com/Mirantis/mcc/pkg/product/common/api"
"github.com/Mirantis/mcc/pkg/util/iputil"
"github.com/Mirantis/launchpad/pkg/constant"
common "github.com/Mirantis/launchpad/pkg/product/common/api"
"github.com/Mirantis/launchpad/pkg/util/iputil"
escape "github.com/alessio/shellescape"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/os"
Expand Down
4 changes: 2 additions & 2 deletions pkg/configurer/mkex/mkex.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ package mkex
// so that our registry.RegisterOSModule() call is run second, giving
// our register priority.
import (
"github.com/Mirantis/mcc/pkg/configurer/enterpriselinux"
common "github.com/Mirantis/mcc/pkg/product/common/api"
"github.com/Mirantis/launchpad/pkg/configurer/enterpriselinux"
common "github.com/Mirantis/launchpad/pkg/product/common/api"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/registry"
log "github.com/sirupsen/logrus"
Expand Down
2 changes: 1 addition & 1 deletion pkg/configurer/oracle/oracle.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package oracle

import (
"github.com/Mirantis/mcc/pkg/configurer/enterpriselinux"
"github.com/Mirantis/launchpad/pkg/configurer/enterpriselinux"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/os/registry"
)
Expand Down
4 changes: 2 additions & 2 deletions pkg/configurer/sles/sles.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"strings"

"github.com/Mirantis/mcc/pkg/configurer"
common "github.com/Mirantis/mcc/pkg/product/common/api"
"github.com/Mirantis/launchpad/pkg/configurer"
common "github.com/Mirantis/launchpad/pkg/product/common/api"
"github.com/k0sproject/rig"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/os"
Expand Down
4 changes: 2 additions & 2 deletions pkg/configurer/ubuntu/ubuntu.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ubuntu
import (
"fmt"

"github.com/Mirantis/mcc/pkg/configurer"
common "github.com/Mirantis/mcc/pkg/product/common/api"
"github.com/Mirantis/launchpad/pkg/configurer"
common "github.com/Mirantis/launchpad/pkg/product/common/api"
"github.com/k0sproject/rig/exec"
"github.com/k0sproject/rig/os"
"github.com/k0sproject/rig/os/linux"
Expand Down
Loading