Skip to content

Commit 02b4144

Browse files
committed
Fail agent setup if unexpected deployers are found
1 parent ba96214 commit 02b4144

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

internal/agentdeployer/factory.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func selectAgentDeployerType(options FactoryOptions) (string, error) {
9797
}
9898

9999
agentDeployerName, err := findAgentDeployer(devDeployPath, options.DeployerName)
100-
if errors.Is(err, os.ErrNotExist) || agentDeployerName == "" {
100+
if errors.Is(err, os.ErrNotExist) || (err == nil && agentDeployerName == "") {
101101
logger.Debugf("Not agent deployer found, using default one")
102102
return "default", nil
103103
}
@@ -136,5 +136,5 @@ func findAgentDeployer(devDeployPath, expectedDeployer string) (string, error) {
136136
return deployers[0], nil
137137
}
138138

139-
return "", fmt.Errorf("expected to find only one agent deployer in \"%s\"", devDeployPath)
139+
return "", fmt.Errorf("expected to find only one agent deployer in \"%s\" (found %d deployers)", devDeployPath, len(deployers))
140140
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<error>could not create service runner: can&#39;t find any valid service deployer: expected to find &#34;tf&#34; service deployer in &#34;([[:alnum:]]|/|-|_)+/test/packages/false_positives/nginx_missing_deployer/data_stream/access/_dev/deploy&#34;</error>
2-
<error>could not create service runner: can&#39;t find any valid service deployer: expected to find only one service deployer in &#34;([[:alnum:]]|/|-|_)+/test/packages/false_positives/nginx_missing_deployer/_dev/deploy&#34; \(found 2 service deployers\)</error>
2+
<error>could not create agent runner: failed to select agent deployer type: failed to find agent deployer: expected to find only one agent deployer in &#34;([[:alnum:]]|/|-|_)+/test/packages/false_positives/nginx_missing_deployer/_dev/deploy&#34; \(found 2 service deployers\)</error>

0 commit comments

Comments
 (0)