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 CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ as well as successful calls.

The browser tunnel regression in `pkg/ide/opener` injects a failing `/dev/null`
open on Linux and macOS. It checks that a failed helper launch releases its
reserved port. Platform reachability tests in `cmd/pro` use local HTTP servers
reserved port. Platform reachability tests in `cmd/platform` use local HTTP servers
to check connection cleanup between probes.

Cross-compilation checks platform buildability, not runtime behavior. Windows
Expand Down
2 changes: 1 addition & 1 deletion cmd/env_flags_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ func TestOptInEnvFlags_EnvSatisfiesRequired(t *testing.T) {

// TestOptInEnvFlags_PlatformSubcommandSweep asserts that DEVSY_HOST applies to
// every platform subcommand that exposes --host (and similarly for --project).
// This catches the regression where a future addition to cmd/pro/ forgets
// This catches the regression where a future addition to cmd/platform/ forgets
// the inline BindEnv call.
func TestOptInEnvFlags_PlatformSubcommandSweep(t *testing.T) {
t.Setenv(envPlatformEnabled, "true")
Expand Down
6 changes: 3 additions & 3 deletions cmd/pro/check_update.go → cmd/platform/check_update.go
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package pro
package platform

import (
"context"
"encoding/json"
"fmt"
"os"

"github.com/devsy-org/devsy/cmd/pro/cmdutil"
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/cmdutil"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
"github.com/devsy-org/devsy/pkg/platform"
"github.com/devsy-org/devsy/pkg/provider"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/cluster/add.go → cmd/platform/cluster/add.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1"
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
"github.com/devsy-org/devsy/pkg/log"
"github.com/devsy-org/devsy/pkg/platform"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cluster

import (
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
cliflags "github.com/devsy-org/devsy/pkg/flags"
"github.com/devsy-org/devsy/pkg/flags/names"
"github.com/spf13/cobra"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package cluster

import (
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/spf13/cobra"
)

Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/cluster/list.go → cmd/platform/cluster/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"

managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
"github.com/devsy-org/devsy/cmd/pro/cmdutil"
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/cmdutil"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/client/proxycmd"
"github.com/devsy-org/devsy/pkg/config"
cliflags "github.com/devsy-org/devsy/pkg/flags"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
// Package cmdutil contains shared helpers used by the 'devsy platform' command and
// its resource sub-groups (workspace, cluster, project, template). It exists to
// avoid an import cycle between cmd/pro and its child packages.
// avoid an import cycle between cmd/platform and its child packages.
package cmdutil

import (
"context"
"fmt"

"github.com/devsy-org/devsy/cmd/pro/completion"
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/completion"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
cliflags "github.com/devsy-org/devsy/pkg/flags"
"github.com/devsy-org/devsy/pkg/flags/names"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"testing"

rootflags "github.com/devsy-org/devsy/cmd/flags"
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
cliflags "github.com/devsy-org/devsy/pkg/flags"
"github.com/devsy-org/devsy/pkg/flags/names"
Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/daemon/daemon.go → cmd/platform/daemon/daemon.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package daemon

import (
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/spf13/cobra"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"strconv"

"github.com/devsy-org/devsy/cmd/pro/cmdutil"
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/cmdutil"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
daemon "github.com/devsy-org/devsy/pkg/daemon/platform"
providerpkg "github.com/devsy-org/devsy/pkg/provider"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/daemon/start.go → cmd/platform/daemon/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"syscall"

managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
"github.com/devsy-org/devsy/cmd/pro/cmdutil"
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/cmdutil"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
daemon "github.com/devsy-org/devsy/pkg/daemon/platform"
"github.com/devsy-org/devsy/pkg/log"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/daemon/status.go → cmd/platform/daemon/status.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"os"

"github.com/devsy-org/devsy/cmd/pro/cmdutil"
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/cmdutil"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
platformdaemon "github.com/devsy-org/devsy/pkg/daemon/platform"
providerpkg "github.com/devsy-org/devsy/pkg/provider"
Expand Down
File renamed without changes.
6 changes: 3 additions & 3 deletions cmd/pro/health.go → cmd/platform/health.go
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package pro
package platform

import (
"context"

"github.com/devsy-org/devsy/cmd/pro/cmdutil"
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/cmdutil"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/client/proxycmd"
"github.com/devsy-org/devsy/pkg/config"
"github.com/devsy-org/devsy/pkg/provider"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/list.go → cmd/platform/list.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pro
package platform

import (
"context"
Expand All @@ -7,7 +7,7 @@ import (
"sort"
"time"

platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
cliflags "github.com/devsy-org/devsy/pkg/flags"
"github.com/devsy-org/devsy/pkg/flags/names"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/login.go → cmd/platform/login.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pro
package platform

import (
"context"
Expand All @@ -7,7 +7,7 @@ import (
"strings"

"github.com/blang/semver/v4"
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
providercmd "github.com/devsy-org/devsy/cmd/provider"
"github.com/devsy-org/devsy/pkg/config"
cliflags "github.com/devsy-org/devsy/pkg/flags"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/login_test.go → cmd/platform/login_test.go
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package pro
package platform

import (
"context"
"testing"
"time"

rootflags "github.com/devsy-org/devsy/cmd/flags"
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
"github.com/devsy-org/devsy/pkg/provider"
"github.com/stretchr/testify/suite"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/logout.go → cmd/platform/logout.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pro
package platform

import (
"context"
Expand All @@ -7,7 +7,7 @@ import (
"sync"
"time"

platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
providercmd "github.com/devsy-org/devsy/cmd/provider"
"github.com/devsy-org/devsy/pkg/client/clientimplementation"
"github.com/devsy-org/devsy/pkg/config"
Expand Down
18 changes: 9 additions & 9 deletions cmd/pro/pro.go → cmd/platform/platform.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package pro
package platform

import (
"github.com/devsy-org/devsy/cmd/flags"
procluster "github.com/devsy-org/devsy/cmd/pro/cluster"
"github.com/devsy-org/devsy/cmd/pro/daemon"
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
proproject "github.com/devsy-org/devsy/cmd/pro/project"
"github.com/devsy-org/devsy/cmd/pro/provider"
protemplate "github.com/devsy-org/devsy/cmd/pro/template"
prouser "github.com/devsy-org/devsy/cmd/pro/user"
proworkspace "github.com/devsy-org/devsy/cmd/pro/workspace"
procluster "github.com/devsy-org/devsy/cmd/platform/cluster"
"github.com/devsy-org/devsy/cmd/platform/daemon"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
proproject "github.com/devsy-org/devsy/cmd/platform/project"
"github.com/devsy-org/devsy/cmd/platform/provider"
protemplate "github.com/devsy-org/devsy/cmd/platform/template"
prouser "github.com/devsy-org/devsy/cmd/platform/user"
proworkspace "github.com/devsy-org/devsy/cmd/platform/workspace"
"github.com/spf13/cobra"
)

Expand Down
2 changes: 1 addition & 1 deletion cmd/pro/pro_test.go → cmd/platform/platform_test.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package pro
package platform

import (
"testing"
Expand Down
4 changes: 2 additions & 2 deletions cmd/pro/project/list.go → cmd/platform/project/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"encoding/json"

managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
"github.com/devsy-org/devsy/cmd/pro/cmdutil"
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/cmdutil"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/client/proxycmd"
"github.com/devsy-org/devsy/pkg/config"
"github.com/devsy-org/devsy/pkg/provider"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package project

import (
platformflags "github.com/devsy-org/devsy/cmd/pro/flags"
platformflags "github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/spf13/cobra"
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package create

import (
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/spf13/cobra"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"os"

managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
"github.com/devsy-org/devsy/pkg/platform"
"github.com/devsy-org/devsy/pkg/platform/client"
Expand Down Expand Up @@ -162,7 +162,7 @@
workspaceContext, workspaceID string,
) error {
// once we have the instance, update workspace and save config
// TODO: Do we need a file lock?

Check notice on line 165 in cmd/platform/provider/create/workspace.go

View check run for this annotation

codefactor.io / CodeFactor

warning-comment

Warning comment detected, consider resolving the issue.
workspaceConfig, err := provider.LoadWorkspaceConfig(workspaceContext, workspaceID)
if err != nil {
return fmt.Errorf("load workspace config: %w", err)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"io"
"os"

"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/platform"
"github.com/devsy-org/devsy/pkg/platform/client"
"github.com/spf13/cobra"
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package get

import (
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/spf13/cobra"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"
"os"

"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/platform/client"
"github.com/spf13/cobra"
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"io"
"os"

"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
"github.com/devsy-org/devsy/pkg/platform"
"github.com/devsy-org/devsy/pkg/platform/client"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"fmt"
"os"

"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/platform"
"github.com/devsy-org/devsy/pkg/platform/client"
"github.com/spf13/cobra"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"net/url"
"os"

"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
devsyhttp "github.com/devsy-org/devsy/pkg/http"
"github.com/devsy-org/devsy/pkg/platform/client"
"github.com/spf13/cobra"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"strings"
"testing"

"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
devsyhttp "github.com/devsy-org/devsy/pkg/http"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"

managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/platform"
"github.com/devsy-org/devsy/pkg/platform/client"
"github.com/spf13/cobra"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package list

import (
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/spf13/cobra"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"

managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/platform/client"
"github.com/spf13/cobra"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/blang/semver/v4"
managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
storagev1 "github.com/devsy-org/api/pkg/apis/storage/v1"
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/platform"
"github.com/devsy-org/devsy/pkg/platform/client"
"github.com/devsy-org/devsy/pkg/platform/kube"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"os"

managementv1 "github.com/devsy-org/api/pkg/apis/management/v1"
"github.com/devsy-org/devsy/cmd/pro/flags"
"github.com/devsy-org/devsy/cmd/platform/flags"
"github.com/devsy-org/devsy/pkg/config"
"github.com/devsy-org/devsy/pkg/log"
"github.com/devsy-org/devsy/pkg/platform"
Expand Down
Loading
Loading