From c5b612510de65c39369a5bae1ba003d88f74b77e Mon Sep 17 00:00:00 2001 From: sfc-gh-tclinkenbeard Date: Sat, 26 Jun 2021 11:14:23 -0700 Subject: [PATCH] Added invalid_encryption_key_file error --- fdbclient/BackupContainerFileSystem.actor.cpp | 3 +++ flow/error_definitions.h | 1 + 2 files changed, 4 insertions(+) diff --git a/fdbclient/BackupContainerFileSystem.actor.cpp b/fdbclient/BackupContainerFileSystem.actor.cpp index 94b2c10d99..741ed55ce0 100644 --- a/fdbclient/BackupContainerFileSystem.actor.cpp +++ b/fdbclient/BackupContainerFileSystem.actor.cpp @@ -1454,6 +1454,9 @@ void BackupContainerFileSystem::setEncryptionKey(Optional const& en encryptionSetupFuture = BackupContainerFileSystemImpl::readEncryptionKey(encryptionKeyFileName.get()); } } +Future BackupContainerFileSystem::createTestEncryptionKeyFile(std::string const &filename) { + return BackupContainerFileSystemImpl::createTestEncryptionKeyFile(filename); +} namespace backup_test { diff --git a/flow/error_definitions.h b/flow/error_definitions.h index 0fd42b3ac0..8ffb54f290 100755 --- a/flow/error_definitions.h +++ b/flow/error_definitions.h @@ -227,6 +227,7 @@ ERROR( restore_destination_not_empty, 2370, "Attempted to restore into a non-emp ERROR( restore_duplicate_uid, 2371, "Attempted to restore using a UID that had been used for an aborted restore") ERROR( task_invalid_version, 2381, "Invalid task version") ERROR( task_interrupted, 2382, "Task execution stopped due to timeout, abort, or completion by another worker") +ERROR( invalid_encryption_key_file, 2383, "The provided encryption key file has invalid contents" ) ERROR( key_not_found, 2400, "Expected key is missing") ERROR( json_malformed, 2401, "JSON string was malformed")