mirror of
https://github.com/Unidata/netcdf-c.git
synced 2024-11-21 03:13:42 +08:00
49737888ca
## Improvements to S3 Documentation * Create a new document *quickstart_paths.md* that give a summary of the legal path formats used by netcdf-c. This includes both file paths and URL paths. * Modify *nczarr.md* to remove most of the S3 related text. * Move the S3 text from *nczarr.md* to a new document *cloud.md*. * Add some S3-related text to the *byterange.md* document. Hopefully, this will make it easier for users to find the information they want. ## Rebuild NCZarr Testing In order to avoid problems with running make check in parallel, two changes were made: 1. The *nczarr_test* test system was rebuilt. Now, for each test. any generated files are kept in a test-specific directory, isolated from all other test executions. 2. Similarly, since the S3 test bucket is shared, any generated S3 objects are isolated using a test-specific key path. ## Other S3 Related Changes * Add code to ensure that files created on S3 are reclaimed at end of testing. * Used the bash "trap" command to ensure S3 cleanup even if the test fails. * Cleanup the S3 related configure.ac flag set since S3 is used in several places. So now one should use the option *--enable-s3* instead of *--enable-nczarr-s3*, although the latter is still kept as a deprecated alias for the former. * Get some of the github actions yml to work with S3; required fixing various test scripts adding a secret to access the Unidata S3 bucket. * Cleanup S3 portion of libnetcdf.settings.in and netcdf_meta.h.in and test_common.in. * Merge partial S3 support into dhttp.c. * Create an experimental s3 access library especially for use with Windows. It is enabled by using the options *--enable-s3-internal* (automake) or *-DENABLE_S3_INTERNAL=ON* (CMake). Also add a unit-test for it. * Move some definitions from ncrc.h to ncs3sdk.h ## Other Changes * Provide a default implementation of strlcpy and move this and similar defaults into *dmissing.c*.
106 lines
2.4 KiB
Bash
Executable File
106 lines
2.4 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
. "$srcdir/test_nczarr.sh"
|
|
|
|
#TR="-T10"
|
|
|
|
set -e
|
|
|
|
s3isolate "testdir_mapapi"
|
|
THISDIR=`pwd`
|
|
cd $ISOPATH
|
|
|
|
# Test map implementations for consistency at the zmap API
|
|
# level. This allows testing of implementations that do not admit
|
|
# of easy examination of the actual storage. For example it is
|
|
# not easy to look inside S3 storage except using the aws-cli, if
|
|
# available.
|
|
|
|
CMD="${execdir}/ut_mapapi${ext}"
|
|
|
|
testmapcreate() {
|
|
echo ""; echo "*** Test zmap create -k $1"
|
|
extfor "$1"
|
|
tag=mapapi
|
|
base="tmp_$tag"
|
|
fileargs $base
|
|
|
|
deletemap $1 $file
|
|
|
|
# Create the test file
|
|
$CMD $TR -k$1 -x create -f $file
|
|
cdl="ut_${tag}_create_${zext}.cdl"
|
|
ref="ref_ut_${tag}_create.cdl"
|
|
${ZMD} $fileurl > ./$cdl
|
|
diff -wb $srcdir/$ref ./$cdl
|
|
# delete the test file
|
|
$CMD $TR -k$1 -x delete -f $file
|
|
rm -f $cdl
|
|
|
|
mapstillexists $1
|
|
if test mapstillexists = 0 ; then exit 1; fi
|
|
# re-create the test file
|
|
$CMD -k$1 -x create -o $file
|
|
}
|
|
|
|
testmapmeta() {
|
|
echo ""; echo "*** Test zmap read/write meta -k $1"
|
|
extfor "$1"
|
|
tag=mapapi
|
|
base="tmp_$tag"
|
|
fileargs $base
|
|
$CMD $TR -k$1 -x simplemeta -f $file
|
|
cdl="ut_${tag}_meta_${zext}.cdl"
|
|
ref="ref_ut_${tag}_meta.cdl"
|
|
${ZMD} $fileurl > ./$cdl
|
|
diff -wb ${srcdir}/$ref ./$cdl
|
|
}
|
|
|
|
testmapdata() {
|
|
echo ""; echo "*** Test zmap read/write data -k $1"
|
|
extfor "$1"
|
|
tag=mapapi
|
|
base="tmp_$tag"
|
|
fileargs $base
|
|
$CMD $TR -k$1 -x "simpledata" -f $file
|
|
cdl="ut_${tag}_data_${zext}.cdl"
|
|
ref="ref_ut_${tag}_data.cdl"
|
|
${ZMD} $fileurl > ./$cdl
|
|
diff -wb ${srcdir}/$ref ./$cdl
|
|
}
|
|
|
|
testmapsearch() {
|
|
echo ""; echo "*** Test zmap search -k $1"
|
|
extfor "$1"
|
|
tag=mapapi
|
|
base="tmp_$tag"
|
|
fileargs $base
|
|
txt=ut_${tag}_search_$zext.txt
|
|
ref=ref_ut_${tag}_search.txt
|
|
rm -f $txt
|
|
$CMD $TR -k$1 -x "search" -f $file > $txt
|
|
diff -wb ${srcdir}/$ref ./$txt
|
|
}
|
|
|
|
main() {
|
|
echo ""
|
|
echo "*** Map Unit Testing"
|
|
echo ""; echo "*** Test zmap_file"
|
|
testmapcreate file; testmapmeta file; testmapdata file; testmapsearch file
|
|
if test "x$FEATURE_NCZARR_ZIP" = xyes ; then
|
|
echo ""; echo "*** Test zmap_zip"
|
|
testmapcreate zip; testmapmeta zip; testmapdata zip; testmapsearch zip
|
|
fi
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then
|
|
echo ""; echo "*** Test zmap_s3sdk"
|
|
export PROFILE="-p default"
|
|
testmapcreate s3; testmapmeta s3; testmapdata s3; testmapsearch s3
|
|
s3sdkdelete "/${S3ISOPATH}" # Cleanup
|
|
fi
|
|
}
|
|
|
|
main
|