From fcf231d398fa6b74ae7e00b06838ea52c5c295a1 Mon Sep 17 00:00:00 2001 From: AristoChen Date: Thu, 3 Sep 2020 23:39:34 +0800 Subject: [PATCH] Execute check_deprecated() function only if github token is set --- data/render/src/bin/main.rs | 10 +++++++++- data/render/src/lib.rs | 5 ++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/data/render/src/bin/main.rs b/data/render/src/bin/main.rs index e8ebe1e368..d19b91debb 100644 --- a/data/render/src/bin/main.rs +++ b/data/render/src/bin/main.rs @@ -28,7 +28,15 @@ fn main() -> Result<(), Box> { let mut tools = read_tools(tools)?; tools.sort(); validate(&tags, &tools)?; - tools = check_deprecated(&mut tools)?; + + let token = env::var("GITHUB_TOKEN"); + let token = match token { + Ok(token) => token, + Err(_error) => "".to_string(), + }; + if token.len() > 0 { + tools = check_deprecated(token, &mut tools)?; + } let catalog = group(&tags, tools)?; println!("{}", catalog.render()?); diff --git a/data/render/src/lib.rs b/data/render/src/lib.rs index c1e4222db4..fe52c32ca4 100644 --- a/data/render/src/lib.rs +++ b/data/render/src/lib.rs @@ -4,7 +4,6 @@ extern crate serde_derive; use std::error::Error; use hubcaps::{Credentials, Github}; use chrono::{Utc, NaiveDateTime}; -use std::env; mod lints; pub mod types; @@ -25,10 +24,10 @@ pub fn validate(tags: &Tags, entries: &Vec) -> Result<(), Box> } #[tokio::main] -pub async fn check_deprecated(entries: &mut Vec) -> Result, Box> { +pub async fn check_deprecated(token: std::string::String, entries: &mut Vec) -> Result, Box> { let github = Github::new( String::from("user-agent-name"), - env::var("GITHUB_TOKEN").ok().map(Credentials::Token), + Credentials::Token(token), )?; let mut entries_tmp: Vec = entries.to_vec();