Move lp_files to separate package to allow excluding headers validation

Signed-off-by: Guillaume Tardif <[email protected]>
docker-archive · Nov 5, 2020 · da09c9c · da09c9c
1 parent 41a1553
commit da09c9c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/cli/mobycli/exec.go b/cli/mobycli/exec.go
@@ -29,6 +29,7 @@ import (
 	apicontext "github.com/docker/compose-cli/context"
 	"github.com/docker/compose-cli/context/store"
 	"github.com/docker/compose-cli/metrics"
+	"github.com/docker/compose-cli/cli/mobycli/resolvepath"
 )
 
 var delegatedContextTypes = []string{store.DefaultContextType}
@@ -60,7 +61,7 @@ func mustDelegateToMoby(ctxType string) bool {
 
 // Exec delegates to com.docker.cli if on moby context
 func Exec(root *cobra.Command) {
-	execBinary, err := LookPath(ComDockerCli)
+	execBinary, err := resolvepath.LookPath(ComDockerCli)
 	if err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)

diff --git a/cli/mobycli/lp_unix.go → cli/mobycli/resolvepath/lp_unix.go b/cli/mobycli/lp_unix.go → cli/mobycli/resolvepath/lp_unix.go
@@ -16,7 +16,7 @@
    limitations under the License.
 */
 
-package mobycli
+package resolvepath
 
 import (
 	"os/exec"

diff --git a/cli/mobycli/lp_windows.go → cli/mobycli/resolvepath/lp_windows.go b/cli/mobycli/lp_windows.go → cli/mobycli/resolvepath/lp_windows.go
@@ -28,7 +28,7 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-package mobycli
+package resolvepath
 
 import (
 	"errors"

diff --git a/scripts/validate/fileheader b/scripts/validate/fileheader
@@ -24,4 +24,4 @@ fi
 
 BASEPATH="${1-}"
 
-ltag -t "${BASEPATH}scripts/validate/template" -excludes "validate testdata cli/mobycli/lp_windows.go" --check -v
+ltag -t "${BASEPATH}scripts/validate/template" -excludes "validate testdata resolvepath" --check -v
Original file line number	Diff line number	Diff line change
Expand Up		@@ -24,4 +24,4 @@ fi

		BASEPATH="${1-}"

		ltag -t "${BASEPATH}scripts/validate/template" -excludes "validate testdata cli/mobycli/lp_windows.go" --check -v
		ltag -t "${BASEPATH}scripts/validate/template" -excludes "validate testdata resolvepath" --check -v