Skip to content
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
Add comments
  • Loading branch information
mrodm committed Jun 6, 2025
commit 6c1b880c6d43c2eb4e844b5a4ea1ba58d12f9eb3
7 changes: 5 additions & 2 deletions internal/servicedeployer/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ func Factory(options FactoryOptions) (ServiceDeployer, error) {
if err != nil {
return nil, fmt.Errorf("can't find any valid service deployer: %w", err)
}
// It's allowed to not define a service deployer in system tests
// if deployerName is not defined in the test configuration.
if serviceDeployerName == "" {
return nil, nil
}
Expand Down Expand Up @@ -166,7 +168,7 @@ func FindAllServiceDeployers(devDeployPath string) ([]string, error) {
func findServiceDeployer(devDeployPath, expectedDeployer string) (string, error) {
names, err := FindAllServiceDeployers(devDeployPath)
if err != nil {
return "", fmt.Errorf("failed to find service deployers in \"%s\": %w", devDeployPath, err)
return "", fmt.Errorf("failed to find service deployers in %q: %w", devDeployPath, err)
}
deployers := slices.DeleteFunc(names, func(name string) bool {
return expectedDeployer != "" && name != expectedDeployer
Expand All @@ -181,9 +183,10 @@ func findServiceDeployer(devDeployPath, expectedDeployer string) (string, error)
}

// If "_dev/deploy" directory exists, but it is empty. It does not have any service deployer,
// package-spec does not disallow to be empty this folder.
if len(deployers) == 0 {
return "", nil
}

return "", fmt.Errorf("expected to find only one service deployer in \"%s\" (found %d service deployers)", devDeployPath, len(deployers))
return "", fmt.Errorf("expected to find only one service deployer in %q (found %d service deployers)", devDeployPath, len(deployers))
}