Conversation
NautiluX
force-pushed
the
cs-up
branch
9 times, most recently
from
2e168d2 to
8e9017a
Compare
NautiluX
force-pushed
the
cs-up
branch
2 times, most recently
from
ff4c79c to
22cdf83
Compare
Signed-off-by: NautiluX <2600004+NautiluX@users.noreply.github.com>
Member
OliverTrautvetter
left a comment
OliverTrautvetter
left a comment
There was a problem hiding this comment.
big pr, not sure if I catched everything in the first review 😄
Comment on lines
40
to
56
| func (e *Environment) GetWorkspaceId() (int, error) { | ||
| prefixedId, err := e.ReadNumericEnv("CS_WORKSPACE_ID") | ||
| if prefixedId != -1 && err == nil { | ||
| return prefixedId, nil | ||
| } | ||
|
|
||
| upState := &UpState{} | ||
| err = upState.Load(e.statefile, &api.RealTime{}, util.NewOSFileSystem(".")) | ||
|
|
||
| if err == nil && upState.WorkspaceId > -1 { | ||
| return upState.WorkspaceId, nil | ||
| } | ||
|
|
||
| return e.ReadNumericEnv("WORKSPACE_ID") | ||
| } | ||
|
|
||
| func (e *Environment) GetTeamId() (int, error) { |
Member
There was a problem hiding this comment.
GetWorkspaceId checks CS_WORKSPACE_ID first and after that the state file
GetTeamId loads the state file first and falls back to CS_TEAM_ID
Should we not check the env first in both cases
Comment on lines
+21
to
+25
| type ServerStatus struct { | ||
| Server string `json:"server"` | ||
| ReplicaCount int `json:"state"` | ||
| ReplicaRunning int `json:"replica"` | ||
| } |
Member
There was a problem hiding this comment.
json looks wrong for count and running
| return fmt.Errorf("timeout waiting for workspace to be healthy at %s", url) | ||
| } | ||
|
|
||
| time.Sleep(delay) |
| return nil | ||
| } | ||
|
|
||
| if time.Now().After(maxWaitTime) { |
| func (c *RealClient) waitForWorkspaceHealthy(devDomain string, token string, timeout time.Duration) error { | ||
| url := fmt.Sprintf("https://%s", devDomain) | ||
| delay := 5 * time.Second | ||
| maxWaitTime := time.Now().Add(timeout) |
Comment on lines
+60
to
+64
| t := io.GetTableWriter() | ||
| t.AppendHeader(table.Row{"Server", "Replica (running/desired)"}) | ||
| for _, stat := range serverStatus { | ||
| t.AppendRow(table.Row{stat.Server, fmt.Sprintf("%d/%d", stat.ReplicaRunning, stat.ReplicaCount)}) | ||
| } |
Member
There was a problem hiding this comment.
Should we not sort the keys of the map first to have the same order each run? I think maps have a random iteration order by default
| } | ||
| } | ||
|
|
||
| func NewPipelineRunnerWidthCustomDeps(client api.Client, profile string, time api.Time, timeout time.Duration, verboseOutput bool) *PipelineRunner { |
Member
There was a problem hiding this comment.
typo "width" should be "with"
| cmd: &cobra.Command{ | ||
| Use: "up", | ||
| Short: "Deploy your local code to Codesphere", | ||
| Long: io.Long(`Deploys your local code to a new or existing Codepshere workspace. |
| rootCmd.PersistentFlags().IntVarP(&opts.TeamId, "team", "t", -1, "Team ID (relevant for some commands, can also be CS_TEAM_ID)") | ||
| rootCmd.PersistentFlags().IntVarP(&opts.WorkspaceId, "workspace", "w", -1, "Workspace ID (relevant for some commands, can also be CS_WORKSPACE_ID)") | ||
| rootCmd.PersistentFlags().BoolVarP(&opts.Verbose, "verbose", "v", false, "Verbose output") | ||
| rootCmd.PersistentFlags().StringVarP(&opts.StateFile, "state-file", "", ".cs-up.yaml", "Path to the state file, defaults to .cs-up.yaml") |
Member
There was a problem hiding this comment.
why as a global flag, should we not use a local flag where we use it
| stat.ReplicaRunning++ | ||
| } | ||
| stat.ReplicaCount++ | ||
| continue |
Member
There was a problem hiding this comment.
continue is useless as we are already at the bottom of the loop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.