Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for remote_files for http_archive #22155

Closed
wants to merge 18 commits into from
Closed
Show file tree
Hide file tree
Changes from 9 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions MODULE.bazel.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2917,7 +2917,7 @@
"bzlTransitiveDigest": "tunTSmgwd2uvTzkCLtdbuCp0AI+WR+ftiPNqZ0rmcZk=",
"recordedFileInputs": {
"@@//MODULE.bazel": "eba5503742af5785c2d0d81d88e7407c7f23494b5162c055227435549b8774d1",
"@@//src/test/tools/bzlmod/MODULE.bazel.lock": "24f151a4b72d795d8290fe7b2f1a0a6d0a20110d644bc9d804ea881baadb8c52"
"@@//src/test/tools/bzlmod/MODULE.bazel.lock": "e032fcfc777d1c2f48c9c0a2105ba30a8960e0c492e071fe602449b19dd3de5c"
},
"recordedDirentsInputs": {},
"envVariables": {},
Expand Down Expand Up @@ -3469,7 +3469,7 @@
},
"//tools/android:android_extensions.bzl%android_sdk_proxy_extensions": {
"general": {
"bzlTransitiveDigest": "JQoCqdz3xQGJ+/ILJLx/pnLPCjAYRvq3Tmj3wkpmflI=",
"bzlTransitiveDigest": "QerwBCIYj/EAH3c1kdful6Y7/A5SL/b7U1QCf/u0PO8=",
"recordedFileInputs": {},
"recordedDirentsInputs": {},
"envVariables": {},
Expand All @@ -3485,7 +3485,7 @@
},
"//tools/android:android_extensions.bzl%remote_android_tools_extensions": {
"general": {
"bzlTransitiveDigest": "JQoCqdz3xQGJ+/ILJLx/pnLPCjAYRvq3Tmj3wkpmflI=",
"bzlTransitiveDigest": "QerwBCIYj/EAH3c1kdful6Y7/A5SL/b7U1QCf/u0PO8=",
"recordedFileInputs": {},
"recordedDirentsInputs": {},
"envVariables": {},
Expand All @@ -3512,7 +3512,7 @@
},
"//tools/test:extensions.bzl%remote_coverage_tools_extension": {
"general": {
"bzlTransitiveDigest": "kcwMubtgxBru6ttbkwo5IjUmLeSz0AODaQoox5L4zVU=",
"bzlTransitiveDigest": "VIBSlpRUiSe7j84Linr1zQfp67EuM3u+CSRdgTTYouE=",
"recordedFileInputs": {},
"recordedDirentsInputs": {},
"envVariables": {},
Expand Down
11 changes: 11 additions & 0 deletions src/test/shell/bazel/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,17 @@ sh_test(
shard_count = 3,
)

sh_test(
name = "external_remote_file_test",
size = "small",
srcs = ["external_remote_file_test.sh"],
data = [
":test-deps",
"@bazel_tools//tools/bash/runfiles",
],
# shard_count = 3,
)

sh_test(
name = "external_path_test",
size = "medium",
Expand Down
294 changes: 294 additions & 0 deletions src/test/shell/bazel/external_remote_file_test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,294 @@
#!/bin/bash
#
# Copyright 2017 The Bazel Authors. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
# Tests the patching functionality of external repositories.

set -euo pipefail
# --- begin runfiles.bash initialization ---
if [[ ! -d "${RUNFILES_DIR:-/dev/null}" && ! -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
if [[ -f "$0.runfiles_manifest" ]]; then
export RUNFILES_MANIFEST_FILE="$0.runfiles_manifest"
elif [[ -f "$0.runfiles/MANIFEST" ]]; then
export RUNFILES_MANIFEST_FILE="$0.runfiles/MANIFEST"
elif [[ -f "$0.runfiles/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
export RUNFILES_DIR="$0.runfiles"
fi
fi
if [[ -f "${RUNFILES_DIR:-/dev/null}/bazel_tools/tools/bash/runfiles/runfiles.bash" ]]; then
source "${RUNFILES_DIR}/bazel_tools/tools/bash/runfiles/runfiles.bash"
elif [[ -f "${RUNFILES_MANIFEST_FILE:-/dev/null}" ]]; then
source "$(grep -m1 "^bazel_tools/tools/bash/runfiles/runfiles.bash " \
"$RUNFILES_MANIFEST_FILE" | cut -d ' ' -f 2-)"
else
echo >&2 "ERROR: cannot find @bazel_tools//tools/bash/runfiles:runfiles.bash"
exit 1
fi
# --- end runfiles.bash initialization ---

source "$(rlocation "io_bazel/src/test/shell/integration_test_setup.sh")" \
|| { echo "integration_test_setup.sh not found!" >&2; exit 1; }

# `uname` returns the current platform, e.g "MSYS_NT-10.0" or "Linux".
# `tr` converts all upper case letters to lower case.
# `case` matches the result if the `uname | tr` expression to string prefixes
# that use the same wildcards as names do in Bash, i.e. "msys*" matches strings
# starting with "msys", and "*" matches everything (it's the default case).
case "$(uname -s | tr [:upper:] [:lower:])" in
msys*)
# As of 2019-01-15, Bazel on Windows only supports MSYS Bash.
declare -r is_windows=true
;;
*)
declare -r is_windows=false
;;
esac

if "$is_windows"; then
# Disable MSYS path conversion that converts path-looking command arguments to
# Windows paths (even if they arguments are not in fact paths).
export MSYS_NO_PATHCONV=1
export MSYS2_ARG_CONV_EXCL="*"
fi


if $is_windows; then
export MSYS_NO_PATHCONV=1
export MSYS2_ARG_CONV_EXCL="*"
fi

set_up() {
fzakaria marked this conversation as resolved.
Show resolved Hide resolved
WRKDIR=$(mktemp -d "${TEST_TMPDIR}/testXXXXXX")
fzakaria marked this conversation as resolved.
Show resolved Hide resolved
cd "${WRKDIR}"
write_default_lockfile "MODULE.bazel.lock"
# create an archive file with files interesting for patching
mkdir hello_world-0.1.2
cat > hello_world-0.1.2/hello_world.c <<'EOF'
#include <stdio.h>
int main() {
printf("Hello, world!\n");
return 0;
}
EOF
zip hello_world.zip hello_world-0.1.2/*
rm -rf hello_world-0.1.2
}

function get_extrepourl() {
if $is_windows; then
echo "file:///$(cygpath -m $1)"
else
echo "file://$1"
fi
}


test_overlay_remote_file_with_integrity() {
fzakaria marked this conversation as resolved.
Show resolved Hide resolved
EXTREPODIR=`pwd`
EXTREPOURL="$(get_extrepourl ${EXTREPODIR})"

# Generate the remote files to overlay
# this could be like the Bazel Central Repository
# Generate the remote patch file
fzakaria marked this conversation as resolved.
Show resolved Hide resolved
cat > BUILD.bazel <<'EOF'
load("@rules_cc//cc:defs.bzl", "cc_binary")

cc_binary(
name = "hello_world",
srcs = ["hello_world.c"],
)
EOF
touch WORKSPACE

# Test that the patches attribute of http_archive is honored
fzakaria marked this conversation as resolved.
Show resolved Hide resolved
mkdir main
cd main
cat > WORKSPACE <<EOF
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name="hello_world",
strip_prefix="hello_world-0.1.2",
urls=["${EXTREPOURL}/hello_world.zip"],
remote_file_urls={
"WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
"BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
},
remote_file_integrity={
"WORKSPACE": "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=",
"BUILD.bazel": "sha256-0bs+dwSOzHTbNAgDS02I3giLAZu2/NLn7BJWwQGN/Pk=",
},
)
EOF
write_default_lockfile "MODULE.bazel.lock"

bazel build @hello_world//:hello_world
}

test_overlay_remote_file_fail_with_integrity() {
EXTREPODIR=`pwd`
EXTREPOURL="$(get_extrepourl ${EXTREPODIR})"

# Generate the remote files to overlay
# this could be like the Bazel Central Repository
# Generate the remote patch file
cat > BUILD.bazel <<'EOF'
load("@rules_cc//cc:defs.bzl", "cc_binary")

cc_binary(
name = "hello_world",
srcs = ["hello_world.c"],
)
EOF
touch WORKSPACE

# Test that the patches attribute of http_archive is honored
fzakaria marked this conversation as resolved.
Show resolved Hide resolved
mkdir main
cd main
cat > WORKSPACE <<EOF
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name="hello_world",
strip_prefix="hello_world-0.1.2",
urls=["${EXTREPOURL}/hello_world.zip"],
remote_file_urls={
"WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
"BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
},
remote_file_integrity={
"WORKSPACE": "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFZ=",
"BUILD.bazel": "sha256-0bs+dwSOzHTbNAgDS02I3giLAZu2/NLn7BJWwQGN/Pk=",
},
)
EOF
write_default_lockfile "MODULE.bazel.lock"

bazel build @hello_world//:hello_world &> $TEST_log 2>&1 && fail "Expected to fail"
expect_log "but wanted sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFY="
}

test_overlay_remote_file_without_integrity() {
EXTREPODIR=`pwd`
EXTREPOURL="$(get_extrepourl ${EXTREPODIR})"

# Generate the remote files to overlay
# this could be like the Bazel Central Repository
# Generate the remote patch file
cat > BUILD.bazel <<'EOF'
load("@rules_cc//cc:defs.bzl", "cc_binary")

cc_binary(
name = "hello_world",
srcs = ["hello_world.c"],
)
EOF
touch WORKSPACE

# Test that the patches attribute of http_archive is honored
mkdir main
cd main
cat > WORKSPACE <<EOF
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name="hello_world",
strip_prefix="hello_world-0.1.2",
urls=["${EXTREPOURL}/hello_world.zip"],
remote_file_urls={
"WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
"BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
fzakaria marked this conversation as resolved.
Show resolved Hide resolved
},
)
EOF
write_default_lockfile "MODULE.bazel.lock"

bazel build @hello_world//:hello_world
}

test_overlay_remote_file_disallow_relative_outside_repo() {
EXTREPODIR=`pwd`
EXTREPOURL="$(get_extrepourl ${EXTREPODIR})"

# Generate the remote files to overlay
# this could be like the Bazel Central Repository
# Generate the remote patch file
cat > BUILD.bazel <<'EOF'
load("@rules_cc//cc:defs.bzl", "cc_binary")

cc_binary(
name = "hello_world",
srcs = ["hello_world.c"],
)
EOF
touch WORKSPACE

# Test that the patches attribute of http_archive is honored
mkdir main
cd main
cat > WORKSPACE <<EOF
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name="hello_world",
strip_prefix="hello_world-0.1.2",
urls=["${EXTREPOURL}/hello_world.zip"],
remote_file_urls={
"../../../WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
"BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
},
)
EOF
write_default_lockfile "MODULE.bazel.lock"

bazel build @hello_world//:hello_world &> $TEST_log 2>&1 && fail "Expected to fail"
expect_log "Error in download: Cannot write outside of the repository directory"
}

test_overlay_remote_file_disallow_absolute_path() {
EXTREPODIR=`pwd`
EXTREPOURL="$(get_extrepourl ${EXTREPODIR})"

# Generate the remote files to overlay
# this could be like the Bazel Central Repository
# Generate the remote patch file
cat > BUILD.bazel <<'EOF'
load("@rules_cc//cc:defs.bzl", "cc_binary")

cc_binary(
name = "hello_world",
srcs = ["hello_world.c"],
)
EOF
touch WORKSPACE

# Test that the patches attribute of http_archive is honored
mkdir main
cd main
cat > WORKSPACE <<EOF
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name="hello_world",
strip_prefix="hello_world-0.1.2",
urls=["${EXTREPOURL}/hello_world.zip"],
remote_file_urls={
"/tmp/WORKSPACE": ["${EXTREPOURL}/WORKSPACE"],
"BUILD.bazel": ["${EXTREPOURL}/BUILD.bazel"],
},
)
EOF
write_default_lockfile "MODULE.bazel.lock"

bazel build @hello_world//:hello_world &> $TEST_log 2>&1 && fail "Expected to fail"
expect_log "Error in download: Cannot write outside of the repository directory"
}

run_suite "external remote file tests"