adapt for change in gocloud/aws/s3