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 cmd/pro/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func NewListCmd(flags *proflags.GlobalFlags) *cobra.Command {
listCmd := &cobra.Command{
Use: "list",
Aliases: []string{"ls"},
Short: "List available Devsy Pro instances",
Short: "List available Devsy Platform instances",
Args: cobra.NoArgs,
Annotations: telemetry.SkipInUIAnnotation(),
RunE: func(cobraCmd *cobra.Command, args []string) error {
Expand Down
14 changes: 7 additions & 7 deletions cmd/pro/login.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func NewLoginCmd(flags *proflags.GlobalFlags) *cobra.Command {
}
loginCmd := &cobra.Command{
Use: "login HOST",
Short: "Log into a Devsy Pro instance",
Short: "Log into a Devsy Platform instance",
Args: cobra.ExactArgs(1),
RunE: func(cobraCmd *cobra.Command, args []string) error {
return cmd.Run(cobraCmd.Context(), args[0])
Expand All @@ -66,7 +66,7 @@ func NewLoginCmd(flags *proflags.GlobalFlags) *cobra.Command {
&cmd.Login,
names.Login,
true,
"If enabled will automatically try to log into Devsy Pro",
"If enabled will automatically try to log into Devsy Platform",
),
cliflags.Bool(
&cmd.Use,
Expand All @@ -78,7 +78,7 @@ func NewLoginCmd(flags *proflags.GlobalFlags) *cobra.Command {
&cmd.Provider,
names.Provider,
"",
"Optional name how the Devsy Pro provider will be named",
"Optional name how the Devsy Platform provider will be named",
),
cliflags.String(
&cmd.Version,
Expand Down Expand Up @@ -176,7 +176,7 @@ func (cmd *LoginCmd) prepareProvider(ctx context.Context, fullURL string) (*conf

func (cmd *LoginCmd) normalizeURL(fullURL string) (string, error) {
if strings.HasPrefix(fullURL, "http://") {
return "", fmt.Errorf("http is not supported for Devsy Pro, use https:// instead")
return "", fmt.Errorf("http is not supported for Devsy Platform, use https:// instead")
}
if !strings.HasPrefix(fullURL, "https://") {
return "https://" + fullURL, nil
Expand Down Expand Up @@ -346,7 +346,7 @@ func (cmd *LoginCmd) loginAndConfigure(
if err != nil {
return err
}
log.Infof("logged into Devsy Pro instance: url=%s", fullURL)
log.Infof("logged into Devsy Platform instance: url=%s", fullURL)
}

if cmd.Use {
Expand Down Expand Up @@ -380,7 +380,7 @@ func (cmd *LoginCmd) loginAndConfigure(
}
}

log.Info("configured Devsy Pro")
log.Info("configured Devsy Platform")
return nil
}

Expand All @@ -396,7 +396,7 @@ func (cmd *LoginCmd) addDevsyProvider(
}

// add the provider
log.Infof("Add Devsy Pro provider")
log.Infof("Add Devsy Platform provider")

// is development?
if cmd.ProviderSource == config.RepoSlug+"@v0.0.0" {
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/logout.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func NewLogoutCmd(flags *proflags.GlobalFlags) *cobra.Command {
}
logoutCmd := &cobra.Command{
Use: "logout",
Short: "Log out of a Devsy Pro instance",
Short: "Log out of a Devsy Platform instance",
RunE: func(cobraCmd *cobra.Command, args []string) error {
return cmd.Run(cobraCmd.Context(), args)
},
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/pro.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ func NewPlatformCmd(flags *flags.GlobalFlags) *cobra.Command {
globalFlags := &proflags.GlobalFlags{GlobalFlags: flags}
platformCmd := &cobra.Command{
Use: "pro",
Short: "Devsy Pro commands",
Short: "Devsy Platform commands",
SilenceUsage: true,
SilenceErrors: true,
Args: cobra.NoArgs,
Expand Down
32 changes: 16 additions & 16 deletions cmd/pro/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ func NewStartCmd(flags *proflags.GlobalFlags) *cobra.Command {
}
startCmd := &cobra.Command{
Use: "start",
Short: "Start a Devsy Pro instance",
Short: "Start a Devsy Platform instance",
RunE: func(cobraCmd *cobra.Command, args []string) error {
return cmd.Run(cobraCmd.Context())
},
Expand Down Expand Up @@ -131,7 +131,7 @@ func (cmd *StartCmd) Run(ctx context.Context) error {
}

// Install Devsy
log.Info("Welcome to Devsy Pro!")
log.Info("Welcome to Devsy Platform!")
log.Info("This installer will help you to get started.")

// make sure we are ready for installing
Expand Down Expand Up @@ -331,7 +331,7 @@ func (cmd *StartCmd) upgrade(ctx context.Context) error {
if !cmd.Reset {
return errors.New(
err.Error() + fmt.Sprintf(
"\n\nIf want to purge and reinstall Devsy Pro, run: %s\n",
"\n\nIf want to purge and reinstall Devsy Platform, run: %s\n",
greenBold("devsy pro start --reset"),
),
)
Expand Down Expand Up @@ -451,7 +451,7 @@ func (cmd *StartCmd) successRemote(ctx context.Context, host string) error {
return err
}

log.Info("Devsy Pro is reachable at https://" + host)
log.Info("Devsy Platform is reachable at https://" + host)

cmd.printRemoteSuccessMessage(host)
return nil
Expand Down Expand Up @@ -481,9 +481,9 @@ Follow this guide to add a valid certificate: %s

#################################################################

Devsy Pro was successfully installed and can now be reached at: %s
Devsy Platform was successfully installed and can now be reached at: %s

Thanks for using Devsy Pro!
Thanks for using Devsy Platform!
`,
greenBold(url),
greenBold("devsy pro login "+url),
Expand All @@ -509,12 +509,12 @@ EXTERNAL-IP may be 'pending' for a while until your cloud provider has created a

#########################################################################################################

The command will wait until Devsy Pro is reachable under the host.
The command will wait until Devsy Platform is reachable under the host.

`)

log.Info(
"Waiting for you to configure DNS, so Devsy Pro can be reached on https://" + host,
"Waiting for you to configure DNS, so Devsy Platform can be reached on https://" + host,
)
}

Expand Down Expand Up @@ -559,9 +559,9 @@ Login via CLI: %s

#################################################################

Devsy Pro was successfully installed.
Devsy Platform was successfully installed.

Thanks for using Devsy Pro!
Thanks for using Devsy Platform!
`, greenBold(url), greenBold("devsy pro login"+" --insecure "+url))
blockChan := make(chan bool)
<-blockChan
Expand Down Expand Up @@ -844,7 +844,7 @@ func (cmd *StartCmd) ensureHostAndIngress(ctx context.Context) error {

func (cmd *StartCmd) waitForDeployment(ctx context.Context) (*corev1.Pod, error) {
// wait for devsy pod to start
log.Info("waiting for Devsy Pro pod to be running")
log.Info("waiting for Devsy Platform pod to be running")
devsyPod, err := platform.WaitForPodReady(ctx, cmd.KubeClient, cmd.Namespace)
log.Infof("release Pod started")
if err != nil {
Expand Down Expand Up @@ -895,7 +895,7 @@ func (cmd *StartCmd) pingDevsyRouter(ctx context.Context, devsyPod *corev1.Pod)
},
},
}
log.Infof("Waiting until Devsy Pro is reachable at https://%s", devsyRouterDomain)
log.Infof("Waiting until Devsy Platform is reachable at https://%s", devsyRouterDomain)
err = wait.PollUntilContextTimeout(
ctx,
time.Second*3,
Expand Down Expand Up @@ -954,9 +954,9 @@ Login via CLI: %s

#################################################################

Devsy Pro was successfully installed and can now be reached at: %s
Devsy Platform was successfully installed and can now be reached at: %s

Thanks for using Devsy Pro!
Thanks for using Devsy Platform!
`,
greenBold(url),
greenBold("devsy pro login"+" "+url),
Expand Down Expand Up @@ -1146,7 +1146,7 @@ func enterHostNameQuestion() (string, error) {
return log.QuestionDefault(&survey.QuestionOptions{
Question: fmt.Sprintf(
"Enter a hostname for your %s instance (e.g. loft.my-domain.tld): \n ",
config.ProductNamePro,
config.ProductNamePlatform,
),
ValidationFunc: func(answer string) error {
u, err := netUrl.Parse("https://" + answer)
Expand Down Expand Up @@ -1500,7 +1500,7 @@ func upgradeRelease(
return fmt.Errorf("error during helm command: %s (%w)", string(output), err)
}

log.Infof("Devsy Pro has been deployed to your cluster!")
log.Infof("Devsy Platform has been deployed to your cluster!")
return nil
}

Expand Down
22 changes: 11 additions & 11 deletions cmd/pro/start_docker.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

var (
ErrMissingContainer = errors.New("missing container")
//nolint:staticcheck // ST1005: "Devsy Pro" is a proper noun
ErrPlatformNotReachable = errors.New("Devsy Pro is not reachable")
//nolint:staticcheck // ST1005: "Devsy Platform" is a proper noun
ErrPlatformNotReachable = errors.New("Devsy Platform is not reachable")
)

type ContainerDetails struct {
Expand Down Expand Up @@ -59,7 +59,7 @@ type ContainerDetailsState struct {
}

func (cmd *StartCmd) startDocker(ctx context.Context) error {
log.Infof("Starting Devsy Pro in Docker")
log.Infof("Starting Devsy Platform in Docker")
name := config.PlatformReleaseName

// prepare installation
Expand Down Expand Up @@ -92,7 +92,7 @@ func (cmd *StartCmd) startDocker(ctx context.Context) error {
}

// Install Devsy
log.Info("Welcome to Devsy Pro!")
log.Info("Welcome to Devsy Platform!")
log.Info("This installer will help you get started.")

// make sure we are ready for installing
Expand Down Expand Up @@ -138,7 +138,7 @@ func (cmd *StartCmd) successDocker(ctx context.Context, containerID string) erro
}

// wait for domain to become reachable
log.Infof("Wait for Devsy Pro to become available at %s", host)
log.Infof("Wait for Devsy Platform to become available at %s", host)
err = wait.PollUntilContextTimeout(
ctx,
time.Second,
Expand All @@ -162,7 +162,7 @@ func (cmd *StartCmd) successDocker(ctx context.Context, containerID string) erro
},
)
if err != nil {
return fmt.Errorf("error waiting for Devsy Pro: %w", err)
return fmt.Errorf("error waiting for Devsy Platform: %w", err)
}

// print success message
Expand All @@ -184,9 +184,9 @@ Login via CLI: %s

#################################################################

Devsy Pro was successfully installed and can now be reached at: %s
Devsy Platform was successfully installed and can now be reached at: %s

Thanks for using Devsy Pro!
Thanks for using Devsy Platform!
`,
greenBold(url),
greenBold("devsy pro login"+" "+url),
Expand All @@ -195,7 +195,7 @@ Thanks for using Devsy Pro!
}

func (cmd *StartCmd) waitForDevsyDocker(ctx context.Context, containerID string) (string, error) {
log.Info("Wait for Devsy Pro to become available")
log.Info("Wait for Devsy Platform to become available")

// check for local port
containerDetails, err := cmd.inspectContainer(ctx, containerID)
Expand All @@ -211,7 +211,7 @@ func (cmd *StartCmd) waitForDevsyDocker(ctx context.Context, containerID string)
return "", fmt.Errorf(
"%w: %s",
ErrPlatformNotReachable,
"cannot connect to Devsy Pro as it has no exposed port and --no-tunnel is enabled",
"cannot connect to Devsy Platform as it has no exposed port and --no-tunnel is enabled",
)
}

Expand Down Expand Up @@ -316,7 +316,7 @@ func (cmd *StartCmd) runInDocker(ctx context.Context, name string) (string, erro
args = append(args, "ghcr.io/devsy-org/devsy-pro:latest")
}

log.Infof("Start Devsy Pro via 'docker %s'", strings.Join(args, " "))
log.Infof("Start Devsy Platform via 'docker %s'", strings.Join(args, " "))
runCmd := cmd.buildDockerCmd(ctx, args...)
runCmd.Stdout = os.Stdout
runCmd.Stderr = os.Stderr
Expand Down
10 changes: 5 additions & 5 deletions cmd/pro/start_flags.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func (cmd *StartCmd) registerDockerFlags(startCmd *cobra.Command) {
&cmd.Docker,
names.Docker,
false,
"If enabled will try to deploy Devsy Pro to the local docker installation.",
"If enabled will try to deploy Devsy Platform to the local docker installation.",
),
cliflags.String(&cmd.DockerImage, names.DockerImage, "", "The docker image to install."),
cliflags.StringArray(&cmd.DockerArgs, names.DockerArg, []string{}, "Extra docker args"),
Expand Down Expand Up @@ -76,13 +76,13 @@ func (cmd *StartCmd) registerChartFlags(startCmd *cobra.Command) {
&cmd.ChartPath,
names.ChartPath,
"",
"The local chart path to deploy Devsy Pro",
"The local chart path to deploy Devsy Platform",
),
cliflags.String(
&cmd.ChartRepo,
names.ChartRepo,
"https://charts.devsy.sh/",
"The chart repo to deploy Devsy Pro",
"The chart repo to deploy Devsy Platform",
),
)
}
Expand Down Expand Up @@ -113,7 +113,7 @@ func (cmd *StartCmd) registerLifecycleFlags(startCmd *cobra.Command) {
&cmd.Reset,
names.Reset,
false,
"If true, an existing instance will be deleted before installing Devsy Pro",
"If true, an existing instance will be deleted before installing Devsy Platform",
),
cliflags.Bool(
&cmd.NoWait,
Expand All @@ -131,7 +131,7 @@ func (cmd *StartCmd) registerLifecycleFlags(startCmd *cobra.Command) {
&cmd.NoLogin,
names.NoLogin,
false,
"If true, will not login to a Devsy Pro instance on start",
"If true, will not login to a Devsy Platform instance on start",
),
)
}
6 changes: 3 additions & 3 deletions cmd/pro/start_uninstall.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ import (
"k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
)

// uninstallTarget identifies the kube context and namespace Devsy Pro is installed in.
// uninstallTarget identifies the kube context and namespace Devsy Platform is installed in.
type uninstallTarget struct {
kubeContext string
namespace string
}

// Helm flags used when uninstalling Devsy Pro.
// Helm flags used when uninstalling Devsy Platform.
const (
helmKubeContextFlag = "--kube-context"
helmNamespaceFlag = "--namespace"
Expand All @@ -44,7 +44,7 @@ func uninstall(
}

fmt.Fprint(os.Stderr, "\n")
log.Info("uninstalled Devsy Pro")
log.Info("uninstalled Devsy Platform")
fmt.Fprint(os.Stderr, "\n")

return nil
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const (
// EnvDisableTelemetry disables telemetry collection.
EnvDisableTelemetry = "DEVSY_DISABLE_TELEMETRY"

// EnvPlatformRunner is set by the Devsy Pro runner pod to mark runner-side CLI invocations.
// EnvPlatformRunner is set by the Devsy Platform runner pod to mark runner-side CLI invocations.
EnvPlatformRunner = "DEVSY_PRO_RUNNER"

// EnvTelemetryDistinctID is set by the desktop app on spawned CLI
Expand Down Expand Up @@ -114,7 +114,7 @@ const (
// EnvFlagsStatus holds extra flags for the status command.
EnvFlagsStatus = "DEVSY_FLAGS_STATUS"

// EnvSubdomain is the subdomain configuration for Devsy Pro.
// EnvSubdomain is the subdomain configuration for Devsy Platform.
EnvSubdomain = "DEVSY_SUBDOMAIN"

// EnvPrefix is the base prefix for all Devsy environment variables.
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/product.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ const (
// ProductName is the display name for the product.
ProductName = "Devsy"

// ProductNamePro is the display name for the Pro product.
ProductNamePro = ProductName + " Pro"
// ProductNamePlatform is the display name for the Platform product.
ProductNamePlatform = ProductName + " Platform"

// DaemonServiceDescription is the system daemon service description.
DaemonServiceDescription = ProductName + " Agent Service"
Expand Down
Loading
Loading