Skip to content

CLOUDP-279322 Error: currently there are no deployments when atlas deployments are present #3358

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 31, 2024
Merged

CLOUDP-279322 Error: currently there are no deployments when atlas deployments are present #3358

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 12 additions & 11 deletions internal/cli/deployments/options/deployment_opts_pre_run.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,17 +74,18 @@ func (opts *DeploymentOpts) SelectDeployments(ctx context.Context, projectID str
return Deployment{}, errors.New("failed to retrieve atlas and local deployments")
}

deployments = opts.filterDeploymentByName(deployments...)
if opts.DeploymentName == "" {
deployments = opts.filterDeploymentByState(deployments, states...)
var ok bool
deployments, ok = opts.filterDeploymentByName(deployments...)
if !ok {
deployments, _ = opts.filterDeploymentByStateLocal(deployments, states...)
}

d, err := opts.Select(deployments)
if err != nil {
return Deployment{}, err
}

if len(states) > 0 && !slices.Contains(states, d.StateName) {
if d.Type == "LOCAL" && len(states) > 0 && !slices.Contains(states, d.StateName) {
return Deployment{}, fmt.Errorf("%w: %s", errDeploymentUnexpectedState, d.StateName)
}

Expand All @@ -100,9 +101,9 @@ func isUnauthenticatedErr(err error) bool {
return ok && target.GetReason() == "Unauthorized"
}

func (opts *DeploymentOpts) filterDeploymentByName(deployments ...Deployment) []Deployment {
func (opts *DeploymentOpts) filterDeploymentByName(deployments ...Deployment) ([]Deployment, bool) {
if opts.DeploymentName == "" {
return deployments
return deployments, false
}

filteredDeployments := []Deployment{}
Expand All @@ -113,23 +114,23 @@ func (opts *DeploymentOpts) filterDeploymentByName(deployments ...Deployment) []
}
}

return filteredDeployments
return filteredDeployments, true
}

func (*DeploymentOpts) filterDeploymentByState(deployments []Deployment, states ...string) []Deployment {
func (*DeploymentOpts) filterDeploymentByStateLocal(deployments []Deployment, states ...string) ([]Deployment, bool) {
if len(states) == 0 {
return deployments
return deployments, false
}

filteredDeployments := []Deployment{}

for _, d := range deployments {
if slices.Contains(states, d.StateName) {
if d.Type == "ATLAS" || slices.Contains(states, d.StateName) {
filteredDeployments = append(filteredDeployments, d)
}
}

return filteredDeployments
return filteredDeployments, true
}

func (opts *DeploymentOpts) AtlasDeployments(projectID string) ([]Deployment, error) {
Expand Down