Skip to content

Commit a074241

Browse files
mettkemettke
committed
Test corrections and slack openid adaptations
1 parent 118a40e commit a074241

File tree

183 files changed

+2073
-957
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

183 files changed

+2073
-957
lines changed

‎Cargo.toml

-5
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,6 @@ features = [
5151
"reqwest_blocking",
5252
]
5353

54-
[[example]]
55-
name = "start_rtm"
56-
path = "examples/start_rtm.rs"
57-
required-features = ["reqwest"]
58-
5954
[[example]]
6055
name = "channel_history"
6156
path = "examples/channel_history.rs"

‎codegen/src/adapt.rs

+130
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
#![allow(clippy::single_match)]
2+
3+
use crate::rust::{Method, Module, ResponseType};
4+
5+
pub fn correct(modules: &mut [Module]) {
6+
for module in modules {
7+
match module.name.as_str() {
8+
"conversations" => correct_conversations(module),
9+
_ => {}
10+
}
11+
}
12+
}
13+
14+
fn correct_conversations(module: &mut Module) {
15+
for mut method in &mut module.methods {
16+
match method.name.as_str() {
17+
"history" => correct_conversations_history(&mut method),
18+
"info" => correct_conversations_info(&mut method),
19+
"list" => correct_conversations_list(&mut method),
20+
_ => {}
21+
}
22+
}
23+
}
24+
25+
fn correct_conversations_info(method: &mut Method) {
26+
for mut param in &mut method.parameters {
27+
match param.name.as_str() {
28+
// The channel parameter is required
29+
"channel" => param.required = true,
30+
// The Token parameter is required
31+
"token" => param.required = true,
32+
_ => {}
33+
}
34+
}
35+
if let ResponseType::Object(o) = &mut method.response.r#type {
36+
for t in o {
37+
match t.name.as_str() {
38+
// channel is defined as Vec<_> but returns a single _
39+
"channel" => {
40+
if let ResponseType::Vec(v) = &mut t.r#type.r#type {
41+
t.r#type = (**v).clone();
42+
}
43+
}
44+
_ => {}
45+
}
46+
}
47+
}
48+
}
49+
50+
fn correct_conversations_list(method: &mut Method) {
51+
for mut param in &mut method.parameters {
52+
match param.name.as_str() {
53+
// The Token parameter is required
54+
"token" => param.required = true,
55+
_ => {}
56+
}
57+
}
58+
if let ResponseType::Object(o) = &mut method.response.r#type {
59+
for t in o {
60+
match t.name.as_str() {
61+
// channels is defined as Vec<Vec<_>> but the endpoint returns Vec<_>
62+
"channels" => dedup_vec(&mut t.r#type.r#type),
63+
_ => {}
64+
}
65+
}
66+
}
67+
}
68+
69+
fn correct_conversations_history(method: &mut Method) {
70+
for mut param in &mut method.parameters {
71+
match param.name.as_str() {
72+
// The channel parameter is required
73+
"channel" => param.required = true,
74+
// The Token parameter is required
75+
"token" => param.required = true,
76+
_ => {}
77+
}
78+
}
79+
if let ResponseType::Object(o) = &mut method.response.r#type {
80+
for t in o {
81+
match t.name.as_str() {
82+
// messages can be null
83+
"messages" => {
84+
t.r#type.required = false;
85+
if let ResponseType::Vec(v) = &mut t.r#type.r#type {
86+
if let ResponseType::Object(o) = &mut v.r#type {
87+
for t in o {
88+
match t.name.as_str() {
89+
// attachments is not a vec
90+
"attachments" => {
91+
if let ResponseType::Vec(v) = &mut t.r#type.r#type {
92+
if let ResponseType::Object(o) = &mut v.r#type {
93+
for t in o {
94+
match t.name.as_str() {
95+
// id is not required
96+
"id" => t.r#type.required = false,
97+
_ => {}
98+
}
99+
}
100+
}
101+
}
102+
}
103+
// bot_id is not a vec
104+
"bot_id" => {
105+
if let ResponseType::Vec(v) = &t.r#type.r#type {
106+
t.r#type = (**v).clone();
107+
t.r#type.required = false;
108+
}
109+
}
110+
_ => {}
111+
}
112+
}
113+
}
114+
}
115+
}
116+
// channel_actions_ts can be null
117+
"channel_actions_ts" => t.r#type.required = false,
118+
_ => {}
119+
}
120+
}
121+
}
122+
}
123+
124+
fn dedup_vec(r#type: &mut ResponseType) {
125+
if let ResponseType::Vec(v) = r#type {
126+
if let ResponseType::Vec(vi) = &v.r#type {
127+
*v = vi.clone();
128+
}
129+
}
130+
}

‎codegen/src/main.rs

+6-23
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@
33

44
use std::collections::HashMap;
55
use std::convert::TryFrom;
6-
use std::fmt;
76
use std::fs;
8-
use std::io::Write;
97
use std::iter::Peekable;
108
use std::path::{Path, PathBuf};
119

1210
use anyhow::{bail, Context, Result};
1311
use clap::{App, Arg};
1412
use reqwest::blocking::Client;
15-
use serde::Serialize;
1613

1714
mod rust;
1815
use rust::{GenMode, HttpMethod, Method, Module, ModuleBuilder, Parameter, Response};
1916

2017
mod schema;
2118
use schema::{EnumValues, Operation, PathItem, Spec};
2219

20+
mod adapt;
21+
use adapt::correct;
22+
2323
mod vec_or_single;
2424

2525
const DEFAULT_OUT_DIR: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/../src");
@@ -33,9 +33,8 @@ fn main() -> Result<()> {
3333
let arguments = handle_arguments()?;
3434
let mut spec = fetch_slack_api_spec()?;
3535
spec.replace_refs()?;
36-
let modules = transform_to_modules(&spec)?;
37-
debug(&modules);
38-
debug_json(&spec.paths);
36+
let mut modules = transform_to_modules(&spec)?;
37+
correct(&mut modules);
3938
generate(&arguments.outdir, &modules)?;
4039
Ok(())
4140
}
@@ -78,21 +77,6 @@ fn fetch_slack_api_spec() -> Result<Spec> {
7877
.context("Unable to deserialize slack server response")
7978
}
8079

81-
fn debug<D: fmt::Debug>(data: D) {
82-
std::fs::File::create("/tmp_crypt/slack.debug")
83-
.unwrap()
84-
.write_all(format!("{:#?}", data).as_bytes())
85-
.unwrap();
86-
}
87-
88-
fn debug_json<D: Serialize>(data: D) {
89-
let data = serde_json::to_string_pretty(&data).expect("Unable to serialize debug data");
90-
std::fs::File::create("/tmp_crypt/slack.json")
91-
.unwrap()
92-
.write_all(data.as_bytes())
93-
.unwrap();
94-
}
95-
9680
fn transform_to_modules(spec: &Spec) -> Result<Vec<Module>> {
9781
let mut modules: HashMap<&str, ModuleBuilder> = HashMap::new();
9882
for (full_name, path) in &spec.paths {
@@ -219,8 +203,7 @@ fn create_method(
219203
};
220204
for parameter in &op.parameters {
221205
let parameter = match parameter.location.as_ref() {
222-
"header" if parameter.name == "token" => continue,
223-
"query" if parameter.name == "token" => continue,
206+
"header" if parameter.name == "token" => Parameter::try_from(parameter)?,
224207
"formData" | "query" => Parameter::try_from(parameter)?,
225208
loc => bail!(format!(
226209
"Unsupported paramter location {} for {}",

‎codegen/src/rust.rs

+45-10
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ impl Module {
180180
};
181181
let data = format!(
182182
"{header}
183-
#![allow(unused_variables)]
184183
#![allow(unused_imports)]
185-
#![allow(dead_code)]
184+
#![allow(clippy::match_single_binding)]
185+
#![allow(clippy::blacklisted_name)]
186186
187187
{modules}{imports}
188188
@@ -290,6 +290,7 @@ impl Method {
290290
let parameters = self
291291
.parameters
292292
.iter()
293+
.filter(|p| p.name != "token")
293294
.map(Parameter::to_rust)
294295
.collect::<Vec<_>>()
295296
.join("\n");
@@ -415,6 +416,7 @@ impl Method {
415416
HttpMethod::Get => self
416417
.parameters
417418
.iter()
419+
.filter(|p| p.name != "token")
418420
.map(Parameter::to_rust_fn)
419421
.collect::<Vec<_>>()
420422
.join("\n"),
@@ -426,34 +428,59 @@ impl Method {
426428
.collect::<Vec<_>>()
427429
.join("\n"),
428430
};
431+
let token = self.parameters.iter().find(|p| p.name == "token");
429432
let headers = match self.http_method {
430433
HttpMethod::Get => "",
431434
HttpMethod::Post => {
432-
if let Some(token) = self.parameters.iter().find(|p| p.name == "token") {
435+
if let Some(token) = token {
433436
if token.required {
434-
", &[(\"token\", request.token.clone())]"
437+
", &[(\"token\", token.to_string())]"
435438
} else {
436-
", &request.token.as_ref().map_or(vec![], |t| vec![(\"token\", t.into())])"
439+
", &token.map_or(vec![], |t| vec![(\"token\", t.to_string())])"
437440
}
438441
} else {
439442
", &[]"
440443
}
441444
}
442445
};
446+
let params = match self.http_method {
447+
HttpMethod::Post => "",
448+
HttpMethod::Get => {
449+
if let Some(token) = token {
450+
if token.required {
451+
"Some((\"token\", token.to_string())),"
452+
} else {
453+
"token.map(|token| (\"token\", token.to_string())),"
454+
}
455+
} else {
456+
""
457+
}
458+
}
459+
};
460+
let token_param = if let Some(token) = token {
461+
if token.required {
462+
"token: &str,"
463+
} else {
464+
"token: Option<&str>,"
465+
}
466+
} else {
467+
""
468+
};
469+
let empty_param = if parameters.is_empty() { "_" } else { "" };
443470
let out = format!(
444471
"/// {description}
445472
///
446473
/// Wraps {doc_url}
447474
448475
pub {fn_type} {fn_name}<R>(
449-
client: &R,
450-
request: &{request_type},
476+
client: &R,{token_param}
477+
{empty_param}request: &{request_type},
451478
) -> Result<{response_type}, {error_type}<R::Error>>
452479
where
453480
R: SlackWebRequestSender,
454481
{{
455482
let params = vec![
456-
{parameters}
483+
{params}{parameters}
457484
];
458485
let params: Vec<(&str, String)> = params.into_iter().filter_map(|x| x).collect::<Vec<_>>();
459486
let url = crate::get_slack_url_for_method(\"{full_name}\");
@@ -477,6 +504,9 @@ impl Method {
477504
parameters = parameters,
478505
method=self.http_method.method(),
479506
headers=headers,
507+
token_param=token_param,
508+
params = params,
509+
empty_param = empty_param
480510
);
481511
Ok(out)
482512
}
@@ -538,6 +568,7 @@ impl TryFrom<&schema::Parameter> for Parameter {
538568
#[derive(Clone, Debug)]
539569
pub enum ParameterDataType {
540570
Bool,
571+
Decimal,
541572
Int,
542573
String,
543574
}
@@ -546,6 +577,7 @@ impl ParameterDataType {
546577
pub fn to_rust(&self, required: bool) -> String {
547578
let r#type = match self {
548579
Self::Bool => "bool",
580+
Self::Decimal => "f64",
549581
Self::Int => "u64",
550582
Self::String => "String",
551583
};
@@ -563,7 +595,8 @@ impl FromStr for ParameterDataType {
563595
fn from_str(s: &str) -> Result<Self, Self::Err> {
564596
let r#type = match s {
565597
"boolean" => Self::Bool,
566-
"integer" | "number" => Self::Int,
598+
"integer" => Self::Int,
599+
"number" => Self::Decimal,
567600
"string" => Self::String,
568601
t => bail!(format!("Type {} currently not supported", t)),
569602
};
@@ -590,6 +623,7 @@ impl Response {
590623
let res = match &self.r#type {
591624
// Inner
592625
ResponseType::Bool if !top => ("bool".into(), Vec::new()),
626+
ResponseType::Decimal if !top => ("f64".into(), Vec::new()),
593627
ResponseType::Int if !top => ("u64".into(), Vec::new()),
594628
ResponseType::String if !top => ("String".into(), Vec::new()),
595629
ResponseType::RawJson if !top => ("serde_json::Value".into(), Vec::new()),
@@ -742,6 +776,7 @@ impl TryFrom<(&str, &schema::Schema)> for Member {
742776
#[derive(Clone, Debug)]
743777
pub enum ResponseType {
744778
Bool,
779+
Decimal,
745780
Int,
746781
String,
747782
Object(Vec<Member>),
@@ -770,7 +805,7 @@ impl TryFrom<&schema::Schema> for ResponseType {
770805
// Primitives
771806
(Some(schema), _, _) if schema.contains(&"boolean") => Self::Bool,
772807
(Some(schema), _, _) if schema.contains(&"integer") => Self::Int,
773-
(Some(schema), _, _) if schema.contains(&"number") => Self::Int,
808+
(Some(schema), _, _) if schema.contains(&"number") => Self::Decimal,
774809
(Some(schema), _, _) if schema.contains(&"string") => Self::String,
775810

776811
// Object

‎examples/channel_history.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
99
let token = env::var("SLACK_API_TOKEN").map_err(|_| "SLACK_API_TOKEN env var must be set")?;
1010
let client = slack::default_client().map_err(|_| "Could not get default_client")?;
1111

12-
let response = slack::channels::history(
12+
let response = slack::conversations::history(
1313
&client,
1414
&token,
15-
&slack::channels::HistoryRequest {
16-
channel: &env::args()
15+
&slack::conversations::HistoryRequest {
16+
channel: env::args()
1717
.nth(1)
1818
.ok_or("must specify channel id as argument e.g. C09123456")?,
19-
..slack::channels::HistoryRequest::default()
19+
..slack::conversations::HistoryRequest::default()
2020
},
2121
)
2222
.await;

0 commit comments

Comments
 (0)