Merge branch 'upgrade_1.39'

infinyon · Nov 17, 2019 · e36ea14 · e36ea14
2 parents 68288a3 + 4e9a24a
commit e36ea14
Show file tree

Hide file tree

Showing 56 changed files with 825 additions and 1,548 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,7 +9,7 @@ members = [
     "k8-diff",
     "kf-protocol",
     "kf-protocol/kf-protocol-dump",
-    "kf-protocol/kf-protocol-build",
+#    "kf-protocol/kf-protocol-build",
     "kf-socket",
     "kf-service",
     "k8-metadata",

diff --git a/DEVELOPER.md b/DEVELOPER.md
@@ -98,13 +98,31 @@ kubectl create -f k8-util/samples/crd/spu_5002.yaml
 kubectl create -f k8-util/samples/crd/spu_5003.yaml 
 ```
 
+## Starting SC
+```
+./dev-tools/log/debug-spu-min 5001 9005 9006
+```
+
 ## Starting custom SPU
 ```
 ./dev-tools/log/debug-spu-min 5001 9005 9006
 ./dev-tools/log/debug-spu-min 5002 9007 9008
 ./dev-tools/log/debug-spu-min 5003 9009 9010
 ```
 
+## Running CLI
+
+To connect with local SC, use "--sc" parameter as shown below.
+Please refer to fluvio web site for CLI operation.
+
+Get SPU
+
+```
+ fluvio spu list --sc 127.0.0.1:9003
+```
+
+
+
 
 
 

diff --git a/api/internal-api/Cargo.toml b/api/internal-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "internal-api"
-version = "0.1.0-alpha.1"
+version = "0.2.0-alpha.1"
 authors = ["fluvio.io"]
 edition = "2018"
 

diff --git a/api/sc-api/Cargo.toml b/api/sc-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sc-api"
-version = "0.1.0-alpha.1"
+version = "0.2.0-alpha.1"
 authors = ["fluvio.io"]
 edition = "2018"
 

diff --git a/api/spu-api/Cargo.toml b/api/spu-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spu-api"
-version = "0.1.0-alpha.1"
+version = "0.2.0-alpha.1"
 authors = ["fluvio.io"]
 edition = "2018"
 

diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fluvio"
-version = "0.1.0-alpha.1"
+version = "0.2.0-alpha.1"
 edition = "2018"
 authors = ["fluvio.io"]
 
@@ -24,7 +24,7 @@ serde_json = "1.0.39"
 serde_yaml =  "0.8.8"
 ctrlc = "3.1.3"
 regex = "1.1.6"
-futures-preview = { version = "0.3.0-alpha.17", features = ['nightly','async-await'] }
+futures = { version = "0.3.1", features = ['async-await'] }
 future-helper = { path = "../future-helper" }
 kf-protocol = { path = "../kf-protocol"}
 kf-socket = { path = "../kf-socket" }

diff --git a/cli/src/profile/profile_file.rs b/cli/src/profile/profile_file.rs
@@ -226,9 +226,9 @@ pub mod test {
 
         // expecting error
         assert!(result.is_err());
-        assert_eq!(
-            format!("{}", result.unwrap_err()),
-            "missing field `port` for key `sc`"
+        assert!(
+            format!("{}", result.unwrap_err()).contains(
+                "missing field `port` for key `sc`")
         );
     }
 

diff --git a/future-aio/Cargo.toml b/future-aio/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "future-aio"
-version = "0.1.0-alpha.1"
+version = "0.2.0-alpha.1"
 edition = "2018"
 authors = ["fluvio.io"]
 
@@ -12,7 +12,7 @@ bytes = "0.4.12"
 tokio_1 = { version = "0.1.18", package = "tokio" }
 tokio-threadpool-1 = { version = "0.1.13", package = "tokio-threadpool" }
 memmap = "0.7.0"
-futures-preview = { version = "0.3.0-alpha.17" }
+futures = { version = "0.3.1"  }
 future-helper = { path = "../future-helper"}
 futures_1 = { version = "0.1.25", package = "futures" }
 pin-utils = "0.1.0-alpha.4"

diff --git a/future-aio/src/fs/shared_file.rs b/future-aio/src/fs/shared_file.rs
@@ -10,7 +10,7 @@ use log::trace;
 
 use futures::io::AsyncRead;
 
-use futures::Poll;
+use std::task::Poll;
 use futures::Future;
 use pin_utils::unsafe_unpinned;
 use pin_utils::pin_mut;

diff --git a/future-aio/src/fs/sink.rs b/future-aio/src/fs/sink.rs
@@ -13,7 +13,7 @@ use futures::io::AsyncWrite;
 use futures::sink::Sink;
 use futures::ready;
 use futures::Future;
-use futures::Poll;
+use std::task::Poll;
 use pin_utils::unsafe_pinned;
 use pin_utils::unsafe_unpinned;
 

diff --git a/future-aio/src/write.rs b/future-aio/src/write.rs
@@ -1,34 +1,34 @@
-
 use std::io;
 use std::pin::Pin;
 use std::mem::replace;
 use std::task::Context;
 
 use futures::io::AsyncWrite;
-use futures::Poll;
+use std::task::Poll;
 use futures::ready;
 use futures::future::Future;
 
-
-
-/// Derived from future io Writeall, 
+/// Derived from future io Writeall,
 /// Instead of buf restricted to[u8], it supports asref
 #[derive(Debug)]
-pub struct WriteBufAll<'a, W: ?Sized + 'a + Unpin,B> {
+pub struct WriteBufAll<'a, W: ?Sized + 'a + Unpin, B> {
     writer: &'a mut W,
-    buf: B
+    buf: B,
 }
 
 // Pinning is never projected to fields
-impl<W: ?Sized + Unpin,B> Unpin for WriteBufAll<'_, W,B> {}
+impl<W: ?Sized + Unpin, B> Unpin for WriteBufAll<'_, W, B> {}
 
-impl<'a, W: AsyncWrite + ?Sized + Unpin,B> WriteBufAll<'a, W,B > {
+impl<'a, W: AsyncWrite + ?Sized + Unpin, B> WriteBufAll<'a, W, B> {
     pub(super) fn new(writer: &'a mut W, buf: B) -> Self {
         WriteBufAll { writer, buf }
     }
 }
 
-impl<W: AsyncWrite + ?Sized + Unpin,B> Future for WriteBufAll<'_, W,B> where B: AsRef<[u8]> {
+impl<W: AsyncWrite + ?Sized + Unpin, B> Future for WriteBufAll<'_, W, B>
+where
+    B: AsRef<[u8]>,
+{
     type Output = io::Result<()>;
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context) -> Poll<io::Result<()>> {
@@ -41,7 +41,7 @@ impl<W: AsyncWrite + ?Sized + Unpin,B> Future for WriteBufAll<'_, W,B> where B:
                 buf = rest;
             }
             if n == 0 {
-                return Poll::Ready(Err(io::ErrorKind::WriteZero.into()))
+                return Poll::Ready(Err(io::ErrorKind::WriteZero.into()));
             }
         }
 
@@ -50,8 +50,10 @@ impl<W: AsyncWrite + ?Sized + Unpin,B> Future for WriteBufAll<'_, W,B> where B:
 }
 
 pub trait AsyncWrite2: AsyncWrite + Unpin {
-
-    fn write_buf_all<'a,B>(&'a mut self, buf: B) -> WriteBufAll<'a, Self,B> where B: AsRef<[u8]> {
+    fn write_buf_all<'a, B>(&'a mut self, buf: B) -> WriteBufAll<'a, Self, B>
+    where
+        B: AsRef<[u8]>,
+    {
         WriteBufAll::new(self, buf)
     }
 }