[render-test] Add access token to the test manifest
Needed if we want to run tests online. Will default to the MAPBOX_ACCESS_TOKEN environment value.
This commit is contained in:
@@ -22,7 +22,13 @@ std::string prependFileScheme(const std::string& url) {
|
||||
}
|
||||
} // namespace
|
||||
|
||||
Manifest::Manifest() = default;
|
||||
Manifest::Manifest() {
|
||||
const char* envToken = getenv("MAPBOX_ACCESS_TOKEN");
|
||||
if (envToken != nullptr) {
|
||||
accessToken = envToken;
|
||||
}
|
||||
}
|
||||
|
||||
Manifest::~Manifest() = default;
|
||||
|
||||
const std::vector<TestPaths>& Manifest::getTestPaths() const {
|
||||
@@ -48,6 +54,10 @@ const std::string& Manifest::getCachePath() const {
|
||||
return cachePath;
|
||||
}
|
||||
|
||||
const std::string& Manifest::getAccessToken() const {
|
||||
return accessToken;
|
||||
}
|
||||
|
||||
const std::set<std::string>& Manifest::getProbes() const {
|
||||
return probes;
|
||||
}
|
||||
@@ -321,6 +331,19 @@ mbgl::optional<Manifest> ManifestParser::parseManifest(const std::string& manife
|
||||
return mbgl::nullopt;
|
||||
}
|
||||
}
|
||||
if (document.HasMember("access_token")) {
|
||||
const auto& accessTokenValue = document["access_token"];
|
||||
if (!accessTokenValue.IsString()) {
|
||||
mbgl::Log::Warning(mbgl::Event::General,
|
||||
"Invalid access_token is provided inside the manifest file: %s",
|
||||
filePath.c_str());
|
||||
return mbgl::nullopt;
|
||||
}
|
||||
manifest.accessToken = accessTokenValue.GetString();
|
||||
if (manifest.accessToken.empty()) {
|
||||
return mbgl::nullopt;
|
||||
}
|
||||
}
|
||||
mbgl::filesystem::path baseTestPath;
|
||||
if (document.HasMember("base_test_path")) {
|
||||
const auto& testPathValue = document["base_test_path"];
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
#include <mbgl/util/optional.hpp>
|
||||
#include <mbgl/util/rapidjson.hpp>
|
||||
|
||||
#include <cstdlib>
|
||||
#include <regex>
|
||||
#include <string>
|
||||
#include <utility>
|
||||
@@ -21,6 +22,7 @@ public:
|
||||
const std::string& getManifestPath() const;
|
||||
const std::string& getResultPath() const;
|
||||
const std::string& getCachePath() const;
|
||||
const std::string& getAccessToken() const;
|
||||
const std::set<std::string>& getProbes() const;
|
||||
void doShuffle(uint32_t seed);
|
||||
|
||||
@@ -49,6 +51,7 @@ private:
|
||||
std::string assetPath;
|
||||
std::string resultPath;
|
||||
std::string cachePath;
|
||||
std::string accessToken;
|
||||
std::vector<std::pair<std::string, std::string>> ignores;
|
||||
std::vector<TestPaths> testPaths;
|
||||
std::set<std::string> probes;
|
||||
|
||||
Reference in New Issue
Block a user