-
-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11108 from obsidiansystems/remote-store-constructors
Ensure we can construct remote store configs in isolation
- Loading branch information
Showing
11 changed files
with
120 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
src/libstore/ssh-store-config.cc → src/libstore/common-ssh-store-config.cc
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
#pragma once | ||
///@file | ||
|
||
#include "common-ssh-store-config.hh" | ||
#include "store-api.hh" | ||
#include "remote-store.hh" | ||
|
||
namespace nix { | ||
|
||
struct SSHStoreConfig : virtual RemoteStoreConfig, virtual CommonSSHStoreConfig | ||
{ | ||
using CommonSSHStoreConfig::CommonSSHStoreConfig; | ||
using RemoteStoreConfig::RemoteStoreConfig; | ||
|
||
SSHStoreConfig(std::string_view scheme, std::string_view authority, const Params & params); | ||
|
||
const Setting<Strings> remoteProgram{ | ||
this, {"nix-daemon"}, "remote-program", "Path to the `nix-daemon` executable on the remote machine."}; | ||
|
||
const std::string name() override | ||
{ | ||
return "Experimental SSH Store"; | ||
} | ||
|
||
std::string doc() override; | ||
}; | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
#include <gtest/gtest.h> | ||
|
||
#include "legacy-ssh-store.hh" | ||
|
||
namespace nix { | ||
|
||
TEST(LegacySSHStore, constructConfig) | ||
{ | ||
LegacySSHStoreConfig config{ | ||
"ssh", | ||
"localhost", | ||
StoreConfig::Params{ | ||
{ | ||
"remote-program", | ||
// TODO #11106, no more split on space | ||
"foo bar", | ||
}, | ||
}}; | ||
EXPECT_EQ( | ||
config.remoteProgram.get(), | ||
(Strings{ | ||
"foo", | ||
"bar", | ||
})); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
#include <gtest/gtest.h> | ||
|
||
#include "ssh-store.hh" | ||
|
||
namespace nix { | ||
|
||
TEST(SSHStore, constructConfig) | ||
{ | ||
SSHStoreConfig config{ | ||
"ssh", | ||
"localhost", | ||
StoreConfig::Params{ | ||
{ | ||
"remote-program", | ||
// TODO #11106, no more split on space | ||
"foo bar", | ||
}, | ||
}}; | ||
EXPECT_EQ( | ||
config.remoteProgram.get(), | ||
(Strings{ | ||
"foo", | ||
"bar", | ||
})); | ||
} | ||
} |