diff options
| author | Dan Engelbrecht <[email protected]> | 2023-08-01 14:16:50 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2023-08-01 14:16:50 +0200 |
| commit | e5d756efda7150b161653b02a4476e28b58412f3 (patch) | |
| tree | d583cc013d102858db17b9e91b8ab6e6d468c217 /src | |
| parent | make sure we validate pointers returned from zen::Memory::Alloc (#341) (diff) | |
| download | zen-e5d756efda7150b161653b02a4476e28b58412f3.tar.xz zen-e5d756efda7150b161653b02a4476e28b58412f3.zip | |
try to resolve access token via env variable local first (#337)
* try to resolve access token via env variable local first, on zenserver side second
Diffstat (limited to 'src')
| -rw-r--r-- | src/zen/cmds/projectstore.cpp | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/src/zen/cmds/projectstore.cpp b/src/zen/cmds/projectstore.cpp index ed59a8f98..e68563938 100644 --- a/src/zen/cmds/projectstore.cpp +++ b/src/zen/cmds/projectstore.cpp @@ -3,6 +3,7 @@ #include "projectstore.h" #include <zencore/compactbinarybuilder.h> +#include <zencore/filesystem.h> #include <zencore/logging.h> #include <zencore/stream.h> #include <zenhttp/httpcommon.h> @@ -569,7 +570,16 @@ ExportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg } if (!m_CloudAccessTokenEnv.empty()) { - Writer.AddString("access-token-env"sv, m_CloudAccessTokenEnv); + std::string ResolvedCloudAccessTokenEnv = zen::GetEnvVariable(m_CloudAccessTokenEnv); + + if (!ResolvedCloudAccessTokenEnv.empty()) + { + Writer.AddString("access-token"sv, ResolvedCloudAccessTokenEnv); + } + else + { + Writer.AddString("access-token-env"sv, m_CloudAccessTokenEnv); + } } if (m_DisableBlocks) { @@ -813,7 +823,16 @@ ImportOplogCommand::Run(const ZenCliOptions& GlobalOptions, int argc, char** arg } if (!m_CloudAccessTokenEnv.empty()) { - Writer.AddString("access-token-env"sv, m_CloudAccessTokenEnv); + std::string ResolvedCloudAccessTokenEnv = zen::GetEnvVariable(m_CloudAccessTokenEnv); + + if (!ResolvedCloudAccessTokenEnv.empty()) + { + Writer.AddString("access-token"sv, ResolvedCloudAccessTokenEnv); + } + else + { + Writer.AddString("access-token-env"sv, m_CloudAccessTokenEnv); + } } } Writer.EndObject(); // "cloud" |