Merge pull request #724 from loft-sh/revert-704-przemekbialon/eng-204…

…3-ssh-provider-should-fail-early-on-noexec-filesystem Revert "fail fast if mounted filesystem for agent is noexec"
loft-sh · Oct 4, 2023 · fefd303 · fefd303
2 parents d287fd3 + d9243d2
commit fefd303
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 46 deletions.
diff --git a/pkg/agent/inject.go b/pkg/agent/inject.go
@@ -113,11 +113,6 @@ func InjectAgentAndExecute(
 			log,
 		)
 		if err != nil {
-			// noexec filesystem - no need to retry
-			if errors.Is(err, inject.ErrNoExecFilesystem) {
-				return err
-			}
-
 			if time.Since(now) > waitForInstanceConnectionTimeout {
 				return errors.Wrap(err, "timeout waiting for instance connection")
 			} else if wasExecuted {

diff --git a/pkg/inject/filesystem_linux.go b/pkg/inject/filesystem_linux.go
diff --git a/pkg/inject/filesystem_other.go b/pkg/inject/filesystem_other.go
diff --git a/pkg/inject/inject.go b/pkg/inject/inject.go
@@ -31,16 +31,6 @@ type injectResult struct {
 	err         error
 }
 
-type NoexecFilesystemError struct {
-	msg string
-}
-
-func (e NoexecFilesystemError) Error() string {
-	return e.msg
-}
-
-var ErrNoExecFilesystem = NoexecFilesystemError{msg: "filesystem is noexec"}
-
 func InjectAndExecute(
 	ctx context.Context,
 	exec ExecFunc,
@@ -75,15 +65,6 @@ func InjectAndExecute(
 		return true, err
 	}
 
-	log.Debugf("ensure agent path's filesystem is not noexec")
-	noExec, err := isNoExec(path.Dir(remotePath))
-	if err != nil {
-		return false, perrors.Wrapf(err, "check if filesystem is noexec")
-	}
-	if noExec {
-		return false, ErrNoExecFilesystem
-	}
-
 	log.Debugf("execute inject script")
 	if preferDownload {
 		log.Debugf("download agent from %s", downloadBase)