Commit 5da9cd0

authored

fix: rebuild & list (#1811)

1 parent fb8081e commit 5da9cd0Copy full SHA for 5da9cd0

File tree

2 files changed

+10

-5

lines changed

hack
- rebuild.sh
pkg/workspace
- list.go

2 files changed

+10

-5

lines changed

`‎hack/rebuild.sh‎`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,17 @@ for os in $BUILD_PLATFORMS; do`
`31`	`31`	`done`
`32`	`32`	`echo "[INFO] Built binaries for all platforms in test/ directory"`
`33`	`33`
`34`		`-if [[ -z "${SKIP_INSTALL}" ]]; then`
	`34`	`+# if not true, install the binary`
	`35`	`+if [[ "${SKIP_INSTALL}" != "true" ]]; then`
`35`	`36`	`if command -v sudo &> /dev/null; then`
`36`	`37`	`go build -o test/devpod && sudo mv test/devpod /usr/local/bin/`
`37`	`38`	`else`
`38`	`39`	`go install .`
`39`	`40`	`fi`
	`41`	`+ echo "[INFO] Installed devpod binary to /usr/local/bin"`
	`42`	`+else`
	`43`	`+ echo "[INFO] Skipping install of devpod binary"`
`40`	`44`	`fi`
`41`		`-echo "[INFO] Built devpod binary and moved to /usr/local/bin"`
`42`	`45`
`43`	`46`	`if [[ $BUILD_PLATFORMS == "linux" ]]; then`
`44`	`47`	`cp test/devpod-cli-linux-amd64 test/devpod-linux-amd64`

`‎pkg/workspace/list.go‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ func List(ctx context.Context, devPodConfig *config.Config, skipPro bool, owner`
`40`	`40`	`if err != nil {`
`41`	`41`	`return nil, err`
`42`	`42`	`}`
	`43`	`+`
`43`	`44`	`// extract pure workspace list first`
`44`	`45`	`for _, result := range proWorkspaceResults {`
`45`	`46`	`proWorkspaces = append(proWorkspaces, result.workspaces...)`
`@@ -135,6 +136,7 @@ type listProWorkspacesResult struct {`
`135`	`136`
`136`	`137`	`func listProWorkspaces(ctx context.Context, devPodConfig *config.Config, owner platform.OwnerFilter, log log.Logger) (map[string]listProWorkspacesResult, error) {`
`137`	`138`	`results := map[string]listProWorkspacesResult{}`
	`139`	`+`
`138`	`140`	// lock around `results`
`139`	`141`	`var mu sync.Mutex`
`140`	`142`	`wg := sync.WaitGroup{}`
`@@ -143,12 +145,14 @@ func listProWorkspaces(ctx context.Context, devPodConfig *config.Config, owner p`
`143`	`145`	`if !providerContextConfig.Initialized {`
`144`	`146`	`continue`
`145`	`147`	`}`
	`148`	`+`
`146`	`149`	`l := log.ErrorStreamOnly()`
`147`	`150`	`providerConfig, err := providerpkg.LoadProviderConfig(devPodConfig.DefaultContext, provider)`
`148`	`151`	`if err != nil {`
`149`	`152`	`l.Warnf("load provider config for provider \"%s\": %v", provider, err)`
`150`	`153`	`continue`
`151`	`154`	`}`
	`155`	`+`
`152`	`156`	`// only get pro providers`
`153`	`157`	`if !providerConfig.IsProxyProvider() && !providerConfig.IsDaemonProvider() {`
`154`	`158`	`continue`
`@@ -184,9 +188,7 @@ func listProWorkspacesForProvider(ctx context.Context, devPodConfig *config.Conf`
`184`	`188`	`return nil, fmt.Errorf("cannot list pro workspaces with provider %s", provider)`
`185`	`189`	`}`
`186`	`190`	`if err != nil {`
`187`		`- if log.GetLevel() < logrus.DebugLevel {`
`188`		`- log.Warnf("Failed to list pro workspaces for provider %s", provider)`
`189`		`- } else {`
	`191`	`+ if log.GetLevel() >= logrus.DebugLevel {`
`190`	`192`	`log.Warnf("Failed to list pro workspaces for provider %s: %v", provider, err)`
`191`	`193`	`}`
`192`	`194`	`return nil, err`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 5da9cd0

File tree

2 files changed

2 files changed

`‎hack/rebuild.sh‎`

`‎pkg/workspace/list.go‎`

0 commit comments