mirror of
https://github.com/Unidata/netcdf-c.git
synced 2025-01-06 15:34:44 +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*.
65 lines
1.6 KiB
Bash
Executable File
65 lines
1.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
if test "x$srcdir" = x ; then srcdir=`pwd`; fi
|
|
. ../test_common.sh
|
|
|
|
. "$srcdir/test_nczarr.sh"
|
|
|
|
# Build both ISOPATH and S3ISOPATH
|
|
s3isolate "testdir_notzarr"
|
|
THISDIR=`pwd`
|
|
cd $ISOPATH
|
|
|
|
# Test ability to detect NCZarr/Zarr files
|
|
|
|
URL="${NCZARR_S3_TEST_HOST}/${NCZARR_S3_TEST_BUCKET}"
|
|
KEY="/${S3ISOPATH}"
|
|
|
|
sometestfailed=
|
|
|
|
testfailed() {
|
|
if test "x$1" != "x-51" ; then
|
|
echo "*** Failed"
|
|
sometestfailed=1
|
|
fi
|
|
}
|
|
|
|
# Make test sets
|
|
cp ${srcdir}/ref_notzarr.tar.gz .
|
|
gunzip ref_notzarr.tar.gz
|
|
tar -xf ref_notzarr.tar
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then
|
|
${execdir}/s3util -f notzarr.file/notzarr.txt -u "https://${URL}" -k "/${S3ISOPATH}/notzarr.s3/notzarr.txt" upload
|
|
fi
|
|
|
|
echo "Test empty file"
|
|
RET=`${execdir}/tst_notzarr "file://empty.file#mode=zarr,file"`
|
|
testfailed "$RET"
|
|
echo "Test non-zarr file"
|
|
RET=`${execdir}/tst_notzarr "file://notzarr.file#mode=zarr,file"`
|
|
testfailed "$RET"
|
|
|
|
if test "x$FEATURE_NCZARR_ZIP" = xyes ; then
|
|
echo "Test empty zip file"
|
|
RET=`${execdir}/tst_notzarr "file://empty.zip#mode=zarr,zip"`
|
|
testfailed "$RET"
|
|
echo "Test non-zarr zip file"
|
|
RET=`${execdir}/tst_notzarr "file://notzarr.zip#mode=zarr,zip"`
|
|
testfailed "$RET"
|
|
fi
|
|
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then
|
|
if test 1 = 0 ; then
|
|
# This test is NA for S3
|
|
echo "Test empty S3 file"
|
|
KEY2="${KEY}/empty.s3"
|
|
RET=`${execdir}/tst_notzarr "https://$URL${KEY2}#mode=zarr,s3"`
|
|
testfailed "$RET"
|
|
fi
|
|
echo "Test non-zarr S3 file"
|
|
RET=`${execdir}/tst_notzarr "https://$URL/${S3ISOPATH}/notzarr.s3#mode=zarr,s3"`
|
|
testfailed "$RET"
|
|
fi
|
|
|
|
if test "x$FEATURE_S3TESTS" = xyes ; then s3sdkdelete "/${S3ISOPATH}" ; fi # Cleanup
|