-
Notifications
You must be signed in to change notification settings - Fork 24
Revert "Remove RemoteProjectName" #1925
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.
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
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package client | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
|
|
||
| "github.com/DefangLabs/defang/src/pkg/term" | ||
| ) | ||
|
|
||
| // Deprecated: should use stacks instead of ProjectName fallback. | ||
| func LoadProjectNameWithFallback(ctx context.Context, loader Loader, provider Provider) (string, error) { | ||
| var loadErr error | ||
| if loader != nil { | ||
| projectName, _, err := loader.LoadProjectName(ctx) | ||
| if err == nil { | ||
| return projectName, nil | ||
| } | ||
| term.Debug("Failed to load local project:", err) | ||
| loadErr = err | ||
| } | ||
| term.Debug("Trying to get the remote project name from the provider") | ||
| projectName, err := provider.RemoteProjectName(ctx) | ||
| if err != nil { | ||
| return "", fmt.Errorf("%w and %w", loadErr, err) | ||
| } | ||
| return projectName, nil | ||
| } | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: DefangLabs/defang
Length of output: 5526
🏁 Script executed:
Repository: DefangLabs/defang
Length of output: 2258
🏁 Script executed:
Repository: DefangLabs/defang
Length of output: 1972
🏁 Script executed:
Repository: DefangLabs/defang
Length of output: 2585
🏁 Script executed:
Repository: DefangLabs/defang
Length of output: 2458
🏁 Script executed:
Repository: DefangLabs/defang
Length of output: 1123
Add nil check for
providerparameter to prevent panic.The function checks if
loaderis nil (line 13) but doesn't check ifprovideris nil before callingprovider.RemoteProjectName(ctx)on line 22. Although the test file explicitly passes a nil provider (when the loader succeeds and returns early), there's no test coverage for the case where both the loader fails and the provider is nil, which would cause a nil pointer dereference panic. Add a nil check after the loader block for consistency and defensive programming.Proposed fix
func LoadProjectNameWithFallback(ctx context.Context, loader Loader, provider Provider) (string, error) { var loadErr error if loader != nil { projectName, _, err := loader.LoadProjectName(ctx) if err == nil { return projectName, nil } term.Debug("Failed to load local project:", err) loadErr = err } + if provider == nil { + return "", loadErr + } term.Debug("Trying to get the remote project name from the provider") projectName, err := provider.RemoteProjectName(ctx)📝 Committable suggestion
🤖 Prompt for AI Agents