diff options
author | Kevin Quick <kquick@galois.com> | 2020-09-29 16:20:54 -0700 |
---|---|---|
committer | Kevin Quick <kquick@galois.com> | 2020-09-29 16:26:34 -0700 |
commit | 5e7838512e2b8de3c8fe271b8beae5ca9e1efaf9 (patch) | |
tree | 776f063a0faf1ef780f7725edb866e04e9a3d556 | |
parent | 66c3959e8ca73ff59faacc319a47b6f93a66be64 (diff) |
Remove github-access-token in favor of access-token.
-rw-r--r-- | src/libfetchers/github.cc | 10 | ||||
-rw-r--r-- | src/libstore/globals.hh | 3 |
2 files changed, 0 insertions, 13 deletions
diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc index 142b8b87c..8286edf75 100644 --- a/src/libfetchers/github.cc +++ b/src/libfetchers/github.cc @@ -147,17 +147,7 @@ struct GitArchiveInputScheme : InputScheme auto tokens = settings.accessTokens.get(); auto pat = tokens.find(host); if (pat == tokens.end()) - { - if ("github.com" == host) - { - auto oldcfg = settings.githubAccessToken.get(); - if (!oldcfg.empty()) { - warn("using deprecated 'github-access-token' config value; please use 'access-tokens' instead"); - return oldcfg; - } - } return std::nullopt; - } return pat->second; } diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 3b8ccadf3..0f0c0fe6f 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -859,9 +859,6 @@ public: are loaded as plugins (non-recursively). )"}; - Setting<std::string> githubAccessToken{this, "", "github-access-token", - "GitHub access token to get access to GitHub data through the GitHub API for `github:<..>` flakes (deprecated, please use 'access-tokens' instead)."}; - Setting<StringMap> accessTokens{this, {}, "access-tokens", R"( Access tokens used to access protected GitHub, GitLab, or |