tests/bud.bats: add git source

Signed-off-by: Danish Prakash <[email protected]>

add.go

@@ -22,6 +22,7 @@ import (
  "github.com/containers/buildah/pkg/chrootuser"
  "github.com/containers/storage/pkg/fileutils"
  "github.com/containers/storage/pkg/idtools"
+ "github.com/containers/storage/pkg/regexp"
  "github.com/hashicorp/go-multierror"
  digest "github.com/opencontainers/go-digest"
  "github.com/opencontainers/runtime-spec/specs-go"
@@ -75,14 +76,27 @@ type AddAndCopyOptions struct {
  StripStickyBit bool
 }
 
+// gitURLFragmentSuffix matches fragments to use as Git reference and build
+// context from the Git repository e.g.
+//
+// github.com/containers/buildah.git
+// github.com/containers/buildah.git#main
+// github.com/containers/buildah.git#v1.35.0
+var gitURLFragmentSuffix = regexp.Delayed(`\.git(?:#.+)?$`)
+
 // sourceIsGit returns true if "source" is a git location.
 func sourceIsGit(source string) bool {
- return strings.HasPrefix(source, "git://") || strings.Contains(source, ".git")
+ return isURL(source) && gitURLFragmentSuffix.MatchString(source)
+}
+
+func isURL(url string) bool {
+ return strings.HasPrefix(url, "http://") || strings.HasPrefix(url, "https://")
 }
 
-// sourceIsRemote returns true if "source" is a remote location.
+// sourceIsRemote returns true if "source" is a remote location
+// and *not* a git repo. Certain github urls such as raw.github.* are allowed.
 func sourceIsRemote(source string) bool {
- return (strings.HasPrefix(source, "http://") || strings.HasPrefix(source, "https://")) && !strings.Contains(source, ".git")
+ return isURL(source) && !gitURLFragmentSuffix.MatchString(source)
 }
 
 // getURL writes a tar archive containing the named content
@@ -439,7 +453,6 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
  var cloneDir string
  cloneDir, _, getErr = define.TempDirForURL(tmpdir.GetTempDir(), "", src)
 
- renamedItems := 0
  writer := io.WriteCloser(pipeWriter)
  writer = newTarFilterer(writer, func(hdr *tar.Header) (bool, bool, io.Reader) {
  return false, false, nil
@@ -459,9 +472,6 @@ func (b *Builder) Add(destination string, extract bool, options AddAndCopyOption
  }
  getErr = copier.Get(cloneDir, cloneDir, getOptions, []string{"."}, writer)
  closeErr = writer.Close()
- if renameTarget != "" && renamedItems > 1 {
- renameErr = fmt.Errorf("internal error: renamed %d items when we expected to only rename 1", renamedItems)
- }
  wg.Done()
  }()
  } else {

define/types.go

@@ -254,11 +254,11 @@ func parseGitBuildContext(url string) (string, string, string) {
  return gitBranchPart[0], gitSubdir, gitBranch
 }
 
-func isGitTag(remote, ref, dir string) (bool, error) {
+func isGitTag(remote, ref string) bool {
  if _, err := exec.Command("git", "ls-remote", "--exit-code", remote, ref).Output(); err != nil {
- return true, nil
+ return true
  }
- return false, nil
+ return false
 }
 
 func cloneToDirectory(url, dir string) ([]byte, string, error) {
@@ -279,7 +279,7 @@ func cloneToDirectory(url, dir string) ([]byte, string, error) {
  }
 
  if gitRef != "" {
- if ok, _ := isGitTag(url, gitRef, dir); ok {
+ if ok := isGitTag(url, gitRef); ok {
  gitRef += ":refs/tags/" + gitRef
  }
  }

tests/bud.bats

@@ -6825,3 +6825,30 @@ _EOF
  # both of these should have just been the base image's ID, which shouldn't have changed the second time around
  cmp ${TEST_SCRATCH_DIR}/image1.txt ${TEST_SCRATCH_DIR}/image2.txt
 }
+
+@test "bud with ADD with git repository source" {
+ _prefetch alpine
+
+ local contextdir=${TEST_SCRATCH_DIR}/add-git
+ mkdir -p $contextdir
+ cat > $contextdir/Dockerfile << _EOF
+FROM alpine
+RUN apk add git
+
+ADD https://github.com/containers/podman.git#v5.0 /podman-branch
+ADD https://github.com/containers/podman.git#v5.0.0 /podman-tag
+_EOF
+
+ run_buildah build -f $contextdir/Dockerfile -t git-image $contextdir
+ run_buildah from --quiet $WITH_POLICY_JSON --name testctr git-image
+
+ run_buildah run testctr -- sh -c 'cd podman-branch && git rev-parse HEAD'
+ local_head_hash=$output
+ run_buildah run testctr -- sh -c 'cd podman-branch && git ls-remote origin v5.0 | cut -f1'
+ assert "$output" = "$local_head_hash"
+
+ run_buildah run testctr -- sh -c 'cd podman-tag && git rev-parse HEAD'
+ local_head_hash=$output
+ run_buildah run testctr -- sh -c 'cd podman-tag && git ls-remote --tags origin v5.0.0^{} | cut -f1'
+ assert "$output" = "$local_head_hash"
+}