Adapt error handling, debug level and dav integration test setup

Author: kathap

.github/workflows/dav-integration.yml

@@ -21,12 +21,6 @@ jobs:
     name: DAV Integration Tests
     runs-on: ubuntu-latest
 
-    services:
-      webdav:
-        image: httpd:2.4
-        ports:
-          - 8443:443
-
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
@@ -39,93 +33,11 @@ jobs:
       - name: Install Ginkgo
         run: go install github.com/onsi/ginkgo/v2/ginkgo@latest
 
-      - name: Setup WebDAV Server Configuration
+      - name: Build and start WebDAV server
         run: |
-          # Create certificates
-          mkdir -p /tmp/webdav-certs
-          openssl req -x509 -nodes -days 365 -newkey rsa:2048 \
-            -keyout /tmp/webdav-certs/server.key \
-            -out /tmp/webdav-certs/server.crt \
-            -subj "/C=US/ST=Test/L=Test/O=Test/CN=localhost" \
-            -addext "subjectAltName=DNS:localhost,IP:127.0.0.1"
-
-          # Create WebDAV directory
-          mkdir -p /tmp/webdav-data
-          chmod 777 /tmp/webdav-data
-
-          # Create htpasswd file
-          docker run --rm httpd:2.4 htpasswd -nb testuser testpass > /tmp/webdav.passwd
-
-          # Create Apache config with DAV
-          cat > /tmp/httpd.conf << 'EOF'
-          ServerRoot "/usr/local/apache2"
-          Listen 443
-
-          LoadModule mpm_event_module modules/mod_mpm_event.so
-          LoadModule authn_file_module modules/mod_authn_file.so
-          LoadModule authn_core_module modules/mod_authn_core.so
-          LoadModule authz_host_module modules/mod_authz_host.so
-          LoadModule authz_user_module modules/mod_authz_user.so
-          LoadModule authz_core_module modules/mod_authz_core.so
-          LoadModule auth_basic_module modules/mod_auth_basic.so
-          LoadModule dav_module modules/mod_dav.so
-          LoadModule dav_fs_module modules/mod_dav_fs.so
-          LoadModule setenvif_module modules/mod_setenvif.so
-          LoadModule ssl_module modules/mod_ssl.so
-          LoadModule unixd_module modules/mod_unixd.so
-          LoadModule dir_module modules/mod_dir.so
-
-          User daemon
-          Group daemon
-
-          DAVLockDB /usr/local/apache2/var/DavLock
-
-          <IfModule ssl_module>
-              SSLRandomSeed startup builtin
-              SSLRandomSeed connect builtin
-          </IfModule>
-
-          <VirtualHost *:443>
-              SSLEngine on
-              SSLCertificateFile /usr/local/apache2/certs/server.crt
-              SSLCertificateKeyFile /usr/local/apache2/certs/server.key
-
-              DocumentRoot "/usr/local/apache2/webdav"
-
-              <Directory "/usr/local/apache2/webdav">
-                  Dav On
-                  Options +Indexes
-                  AuthType Basic
-                  AuthName "WebDAV"
-                  AuthUserFile /usr/local/apache2/webdav.passwd
-                  Require valid-user
-
-                  <LimitExcept GET OPTIONS>
-                      Require valid-user
-                  </LimitExcept>
-              </Directory>
-          </VirtualHost>
-          EOF
-
-          # Get the service container ID
-          CONTAINER_ID=$(docker ps --filter "ancestor=httpd:2.4" --format "{{.ID}}")
-          echo "WebDAV container ID: $CONTAINER_ID"
-
-          # Create required directories in container first
-          docker exec $CONTAINER_ID mkdir -p /usr/local/apache2/certs
-          docker exec $CONTAINER_ID mkdir -p /usr/local/apache2/webdav
-          docker exec $CONTAINER_ID mkdir -p /usr/local/apache2/var
-          docker exec $CONTAINER_ID chmod 777 /usr/local/apache2/webdav
-          docker exec $CONTAINER_ID chmod 777 /usr/local/apache2/var
-
-          # Copy files to container
-          docker cp /tmp/httpd.conf $CONTAINER_ID:/usr/local/apache2/conf/httpd.conf
-          docker cp /tmp/webdav.passwd $CONTAINER_ID:/usr/local/apache2/webdav.passwd
-          docker cp /tmp/webdav-certs/server.crt $CONTAINER_ID:/usr/local/apache2/certs/server.crt
-          docker cp /tmp/webdav-certs/server.key $CONTAINER_ID:/usr/local/apache2/certs/server.key
-
-          # Reload Apache
-          docker exec $CONTAINER_ID apachectl graceful
+          cd dav/integration/testdata
+          docker build -t webdav-test .
+          docker run -d --name webdav -p 8443:443 webdav-test
 
           # Wait for Apache to be ready
           sleep 5
@@ -140,7 +52,7 @@ jobs:
           DAV_PASSWORD: "testpass"
           DAV_SECRET: "test-secret-key"
         run: |
-          export DAV_CA_CERT="$(cat /tmp/webdav-certs/server.crt)"
+          export DAV_CA_CERT="$(cat dav/integration/testdata/certs/server.crt)"
           cd dav
           ginkgo -v ./integration
 

dav/README.md

@@ -112,45 +112,16 @@ go test ./dav/client/...
 
 ### Integration Tests
 
-The DAV implementation includes Go-based integration tests that run against a real WebDAV server.
+The DAV implementation includes Go-based integration tests that run against a real WebDAV server. These tests require a WebDAV server to be available and the following environment variables to be set:
 
-**Prerequisites:**
-- Running WebDAV server (can be set up with Docker - see below)
-- Environment variables configured
+- `DAV_ENDPOINT` - WebDAV server URL
+- `DAV_USER` - Username for authentication
+- `DAV_PASSWORD` - Password for authentication
+- `DAV_CA_CERT` - CA certificate (optional, for HTTPS with custom CA)
+- `DAV_SECRET` - Secret for signed URLs (optional, for signed URL tests)
 
-**Setup WebDAV server with Docker:**
-```bash
-cd dav
-./setup-webdav-test.sh   # Sets up Apache WebDAV with HTTPS
-```
-
-**Run integration tests:**
-```bash
-# Set environment variables (from the dav/ directory after running setup)
-export DAV_ENDPOINT="https://localhost:8443"
-export DAV_USER="testuser"
-export DAV_PASSWORD="testpass"
-export DAV_CA_CERT="$(cat webdav-test/certs/ca.pem)"
-export DAV_SECRET="test-secret-key"  # Optional, for signed URL tests
-
-# Run integration tests
-ginkgo -v ./integration
-
-# Or using go test
-go test -v ./integration/...
-```
-
-These tests cover all operations: PUT, GET, DELETE, DELETE-RECURSIVE, EXISTS, LIST, COPY, PROPERTIES, and ENSURE-STORAGE-EXISTS.
+If these environment variables are not set, the integration tests will be skipped.
 
 ### End-to-End Tests
 
-The DAV implementation also includes shell-based end-to-end tests using the compiled storage-cli binary.
-
-**Quick start:**
-```bash
-cd dav
-./setup-webdav-test.sh   # Sets up Apache WebDAV with HTTPS
-./test-storage-cli.sh     # Runs complete test suite
-```
-
-**For detailed testing instructions, see [TESTING.md](TESTING.md).**
+The `dav/` directory includes shell-based end-to-end tests that test the compiled storage-cli binary against a WebDAV server. See [TESTING.md](TESTING.md) for local setup instructions.

dav/client/client.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"log/slog"
 	"os"
+	"strings"
 	"time"
 
-	bosherr "github.com/cloudfoundry/bosh-utils/errors"
 	"github.com/cloudfoundry/bosh-utils/httpclient"
 	boshlog "github.com/cloudfoundry/bosh-utils/logger"
 
@@ -26,7 +26,7 @@ func New(config davconf.Config) (*DavBlobstore, error) {
 	var httpClientBase httpclient.Client
 	var certPool, err = getCertPool(config)
 	if err != nil {
-		return nil, bosherr.WrapErrorf(err, "Failed to create certificate pool")
+		return nil, fmt.Errorf("failed to create certificate pool: %w", err)
 	}
 
 	httpClientBase = httpclient.CreateDefaultClient(certPool)
@@ -53,7 +53,7 @@ func New(config davconf.Config) (*DavBlobstore, error) {
 
 // Put uploads a file to the WebDAV server
 func (d *DavBlobstore) Put(sourceFilePath string, dest string) error {
-	slog.Debug("Uploading file to WebDAV", "source", sourceFilePath, "dest", dest)
+	slog.Info("Uploading file to WebDAV", "source", sourceFilePath, "dest", dest)
 
 	source, err := os.Open(sourceFilePath)
 	if err != nil {
@@ -71,13 +71,13 @@ func (d *DavBlobstore) Put(sourceFilePath string, dest string) error {
 		return fmt.Errorf("upload failure: %w", err)
 	}
 
-	slog.Debug("Successfully uploaded file", "dest", dest)
+	slog.Info("Successfully uploaded file", "dest", dest)
 	return nil
 }
 
 // Get downloads a file from the WebDAV server
 func (d *DavBlobstore) Get(source string, dest string) error {
-	slog.Debug("Downloading file from WebDAV", "source", source, "dest", dest)
+	slog.Info("Downloading file from WebDAV", "source", source, "dest", dest)
 
 	destFile, err := os.Create(dest)
 	if err != nil {
@@ -96,48 +96,48 @@ func (d *DavBlobstore) Get(source string, dest string) error {
 		return fmt.Errorf("failed to write to destination file: %w", err)
 	}
 
-	slog.Debug("Successfully downloaded file", "dest", dest)
+	slog.Info("Successfully downloaded file", "dest", dest)
 	return nil
 }
 
 // Delete removes a file from the WebDAV server
 func (d *DavBlobstore) Delete(dest string) error {
-	slog.Debug("Deleting file from WebDAV", "dest", dest)
+	slog.Info("Deleting file from WebDAV", "dest", dest)
 	return d.storageClient.Delete(dest)
 }
 
 // DeleteRecursive deletes all files matching a prefix
 func (d *DavBlobstore) DeleteRecursive(prefix string) error {
-	slog.Debug("Deleting files recursively from WebDAV", "prefix", prefix)
+	slog.Info("Deleting files recursively from WebDAV", "prefix", prefix)
 
 	// List all blobs with the prefix
 	blobs, err := d.storageClient.List(prefix)
 	if err != nil {
 		return fmt.Errorf("failed to list blobs with prefix '%s': %w", prefix, err)
 	}
 
-	slog.Debug("Found blobs to delete", "count", len(blobs), "prefix", prefix)
+	slog.Info("Found blobs to delete", "count", len(blobs), "prefix", prefix)
 
 	// Delete each blob
 	for _, blob := range blobs {
 		if err := d.storageClient.Delete(blob); err != nil {
 			return fmt.Errorf("failed to delete blob '%s': %w", blob, err)
 		}
-		slog.Debug("Deleted blob", "blob", blob)
+		slog.Info("Deleted blob", "blob", blob)
 	}
 
-	slog.Debug("Successfully deleted all blobs", "prefix", prefix)
+	slog.Info("Successfully deleted all blobs", "prefix", prefix)
 	return nil
 }
 
 // Exists checks if a file exists on the WebDAV server
 func (d *DavBlobstore) Exists(dest string) (bool, error) {
-	slog.Debug("Checking if file exists on WebDAV", "dest", dest)
+	slog.Info("Checking if file exists on WebDAV", "dest", dest)
 
 	err := d.storageClient.Exists(dest)
 	if err != nil {
 		// Check if it's a "not found" error
-		if bosherr.WrapError(err, "").Error() == fmt.Sprintf("%s not found", dest) {
+		if strings.Contains(err.Error(), "not found") {
 			return false, nil
 		}
 		return false, err
@@ -148,7 +148,7 @@ func (d *DavBlobstore) Exists(dest string) (bool, error) {
 
 // Sign generates a pre-signed URL for the blob
 func (d *DavBlobstore) Sign(dest string, action string, expiration time.Duration) (string, error) {
-	slog.Debug("Signing URL for WebDAV", "dest", dest, "action", action, "expiration", expiration)
+	slog.Info("Signing URL for WebDAV", "dest", dest, "action", action, "expiration", expiration)
 
 	signedURL, err := d.storageClient.Sign(dest, action, expiration)
 	if err != nil {
@@ -160,38 +160,38 @@ func (d *DavBlobstore) Sign(dest string, action string, expiration time.Duration
 
 // List returns a list of blob paths that match the given prefix
 func (d *DavBlobstore) List(prefix string) ([]string, error) {
-	slog.Debug("Listing files on WebDAV", "prefix", prefix)
+	slog.Info("Listing files on WebDAV", "prefix", prefix)
 
 	blobs, err := d.storageClient.List(prefix)
 	if err != nil {
 		return nil, fmt.Errorf("failed to list blobs: %w", err)
 	}
 
-	slog.Debug("Found blobs", "count", len(blobs), "prefix", prefix)
+	slog.Info("Found blobs", "count", len(blobs), "prefix", prefix)
 	return blobs, nil
 }
 
 // Copy copies a blob from source to destination
 func (d *DavBlobstore) Copy(srcBlob string, dstBlob string) error {
-	slog.Debug("Copying blob on WebDAV", "source", srcBlob, "dest", dstBlob)
+	slog.Info("Copying blob on WebDAV", "source", srcBlob, "dest", dstBlob)
 
 	err := d.storageClient.Copy(srcBlob, dstBlob)
 	if err != nil {
 		return fmt.Errorf("copy failure: %w", err)
 	}
 
-	slog.Debug("Successfully copied blob", "source", srcBlob, "dest", dstBlob)
+	slog.Info("Successfully copied blob", "source", srcBlob, "dest", dstBlob)
 	return nil
 }
 
 // Properties retrieves metadata for a blob
 func (d *DavBlobstore) Properties(dest string) error {
-	slog.Debug("Getting properties for blob on WebDAV", "dest", dest)
+	slog.Info("Getting properties for blob on WebDAV", "dest", dest)
 	return d.storageClient.Properties(dest)
 }
 
 // EnsureStorageExists ensures the WebDAV directory structure exists
 func (d *DavBlobstore) EnsureStorageExists() error {
-	slog.Debug("Ensuring WebDAV storage exists")
+	slog.Info("Ensuring WebDAV storage exists")
 	return d.storageClient.EnsureStorageExists()
 }