Merge pull request #19 from hiro-o918/feature/not-serlect-profile

ignore profiles which is not selected

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "awsctx"
-version = "0.2.5"
+version = "0.3.0"
 authors = ["Hironoiri Yamamoto <[email protected]>"]
 edition = "2018"
 description = "Context Manager for AWS Profiles"

src/aws.rs

@@ -3,7 +3,7 @@ use crate::ctx;
 
 use anyhow::{anyhow, Result};
 use dirs::home_dir;
-use skim::prelude::{unbounded, SkimOptionsBuilder};
+use skim::prelude::{unbounded, Key, SkimOptionsBuilder};
 use skim::{Skim, SkimItemReceiver, SkimItemSender};
 use std::path::PathBuf;
 use std::sync::Arc;
@@ -65,13 +65,14 @@ impl ctx::CTX for AWS {
         drop(tx_item);
 
         let selected_items = Skim::run_with(&options, Some(rx_item))
-            .map(|out| out.selected_items)
-            .unwrap_or_else(Vec::new);
+            .map(|out| match out.final_key {
+                Key::Enter => Ok(out.selected_items),
+                _ => Err(ctx::CTXError::NoContextIsSelected {}),
+            })
+            .unwrap_or(Ok(Vec::new()))?;
         let item = selected_items
             .get(0)
-            .ok_or(ctx::CTXError::InvalidArgument {
-                source: anyhow!("no context is selected"),
-            })?;
+            .ok_or(ctx::CTXError::NoContextIsSelected {})?;
         let context = (*item)
             .as_any()
             .downcast_ref::<ctx::Context>()

src/creds.rs

@@ -66,7 +66,7 @@ impl Credentials {
         let items =
             self.data
                 .get(&format!("[{}]", name))
-                .ok_or(ctx::CTXError::UnknownContextName {
+                .ok_or(ctx::CTXError::InvalidArgument {
                     source: anyhow!(format!("unknown context name: {}", name)),
                 })?;
         Ok(Profile {
@@ -78,12 +78,9 @@ impl Credentials {
 
     pub fn set_default_profile(&mut self, name: &str) -> Result<Profile, ctx::CTXError> {
         let key = name_to_profile_key(name);
-        let items = self
-            .data
-            .get(&key)
-            .ok_or(ctx::CTXError::UnknownContextName {
-                source: anyhow!(format!("unknown context name: {}", name)),
-            })?;
+        let items = self.data.get(&key).ok_or(ctx::CTXError::InvalidArgument {
+            source: anyhow!(format!("unknown context name: {}", name)),
+        })?;
         self.current_key = Some(key);
         Ok(Profile {
             name: name.into(),
@@ -97,11 +94,11 @@ impl Credentials {
         credentials_path: P,
     ) -> Result<(), ctx::CTXError> {
         let mut file = fs::File::create(credentials_path)
-            .map_err(|e| ctx::CTXError::IOError { source: e.into() })?;
+            .map_err(|e| ctx::CTXError::UnexpectedError { source: e.into() })?;
         file.write_all(self.to_string().as_bytes())
-            .map_err(|e| ctx::CTXError::IOError { source: e.into() })?;
+            .map_err(|e| ctx::CTXError::UnexpectedError { source: e.into() })?;
         file.flush()
-            .map_err(|e| ctx::CTXError::IOError { source: e.into() })?;
+            .map_err(|e| ctx::CTXError::UnexpectedError { source: e.into() })?;
         Ok(())
     }
 

src/ctx.rs

@@ -17,10 +17,8 @@ pub enum CTXError {
     ConfigurationIsBroken { source: anyhow::Error },
     #[error("Invalid input")]
     InvalidArgument { source: anyhow::Error },
-    #[error("Unknown context name")]
-    UnknownContextName { source: anyhow::Error },
-    #[error("IOError")]
-    IOError { source: anyhow::Error },
+    #[error("No context is selected")]
+    NoContextIsSelected {},
     #[error("Unexpected error")]
     UnexpectedError { source: anyhow::Error },
 }

src/main.rs

@@ -1,6 +1,10 @@
 use std::io;
 
-use awsctx::{aws::AWS, ctx::CTX, view::show_contexts};
+use awsctx::{
+    aws::AWS,
+    ctx::{CTXError, CTX},
+    view::show_contexts,
+};
 
 use clap::{IntoApp, Parser, Subcommand};
 use clap_complete::{generate, Generator, Shell};
@@ -46,9 +50,15 @@ fn main() {
         Opts::UseContext { profile } => {
             aws.use_context(profile.as_str()).unwrap();
         }
-        Opts::UseContextByInteractiveFinder {} => {
-            aws.use_context_interactive().unwrap();
+        Opts::UseContextByInteractiveFinder {} => match aws.use_context_interactive() {
+            Ok(_) => Ok(()),
+            Err(err) => match err {
+                CTXError::NoContextIsSelected {} => Ok(()),
+                _ => Err(err),
+            },
         }
+        .unwrap(),
+
         Opts::ListContexts {} => {
             let contexts = aws.list_contexts().unwrap();
             show_contexts(&contexts)