Release 2.0.0 (#172)

* Update to latest version of fiberplane-rs

* Bump version to 1.0.0

* Add support for members

Add role to output

Bump machine to bigger node

.github/workflows/build.yml

@@ -15,7 +15,7 @@ env:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-8-cores
     steps:
       - uses: actions/checkout@v2
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "fp"
-version = "0.14.0"
+version = "2.0.0"
 authors = ["Team Fiberplane"]
 edition = "2018"
 build = "build.rs"

src/workspaces.rs

@@ -19,7 +19,7 @@ use fp_api_client::apis::default_api::{
     workspace_user_update, workspace_users_list,
 };
 use fp_api_client::models::{
-    NewWorkspace, NewWorkspaceInvite, SelectedDataSource, UpdateWorkspace, User, Workspace,
+    Membership, NewWorkspace, NewWorkspaceInvite, SelectedDataSource, UpdateWorkspace, Workspace,
     WorkspaceInvite, WorkspaceInviteResponse, WorkspaceUserUpdate,
 };
 use std::collections::HashMap;
@@ -433,7 +433,7 @@ async fn handle_user_list(args: UserListArgs) -> Result<()> {
 
     match args.output {
         UserListOutput::Table => {
-            let rows: Vec<UserRow> = users.into_iter().map(Into::into).collect();
+            let rows: Vec<MembershipRow> = users.into_iter().map(Into::into).collect();
             output_list(rows)
         }
         UserListOutput::Json => output_json(&users),
@@ -933,7 +933,7 @@ impl From<(String, SelectedDataSource)> for SelectedDataSourceRow {
 }
 
 #[derive(Table)]
-struct UserRow {
+struct MembershipRow {
     #[table(title = "ID")]
     pub id: String,
 
@@ -942,14 +942,18 @@ struct UserRow {
 
     #[table(title = "Email")]
     pub email: String,
+
+    #[table(title = "Role")]
+    pub role: String,
 }
 
-impl From<User> for UserRow {
-    fn from(user: User) -> Self {
+impl From<Membership> for MembershipRow {
+    fn from(user: Membership) -> Self {
         Self {
             id: user.id,
             name: user.name,
             email: user.email.unwrap_or_else(|| "unknown".to_string()),
+            role: user.role.to_string(),
         }
     }
 }