style: rename cli and server (#555)

* style: rename cli and server

* fix: problem of jmeter script

Co-authored-by: RockyJin <fahua.jin@gmail.com>

Makefile

@@ -48,14 +48,14 @@ build_prepare:
 .PHONY: build_without_edgex
 build_without_edgex: build_prepare
 	@if [ ! -z $(GOOS) ] && [ ! -z $(GOARCH) ] && [ $(CGO_ENABLED) == 0 ];then \
-		GO111MODULE=on GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -o cli xstream/cli/main.go; \
-		GO111MODULE=on GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -o server xstream/server/main.go; \
+		GO111MODULE=on GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -o kuiper xstream/cli/main.go; \
+		GO111MODULE=on GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -o kuiperd xstream/server/main.go; \
 	else \
-		GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -o cli xstream/cli/main.go; \
-		GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -o server xstream/server/main.go; \
+		GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -o kuiper xstream/cli/main.go; \
+		GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -o kuiperd xstream/server/main.go; \
 	fi
-	@if [ ! -z $$(which upx) ] && [ "$$(uname -m)" != "aarch64" ]; then upx ./cli; upx ./server; fi
-	@mv ./cli ./server $(BUILD_PATH)/$(PACKAGE_NAME)/bin
+	@if [ ! -z $$(which upx) ] && [ "$$(uname -m)" != "aarch64" ]; then upx ./kuiper; upx ./kuiperd; fi
+	@mv ./kuiper ./kuiperd $(BUILD_PATH)/$(PACKAGE_NAME)/bin
 	@echo "Build successfully"
 
 .PHONY: pkg_without_edgex
@@ -65,14 +65,14 @@ pkg_without_edgex: build_without_edgex
 .PHONY: build_with_edgex
 build_with_edgex: build_prepare
 	@if [ ! -z $(GOOS) ] && [ ! -z $(GOARCH) ] && [ $(CGO_ENABLED) == 0 ];then \
-		GO111MODULE=on GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -tags edgex -o cli xstream/cli/main.go; \
-		GO111MODULE=on GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -tags edgex -o server xstream/server/main.go; \
+		GO111MODULE=on GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -tags edgex -o kuiper xstream/cli/main.go; \
+		GO111MODULE=on GOOS=$(GOOS) GOARCH=$(GOARCH) CGO_ENABLED=0 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -tags edgex -o kuiperd xstream/server/main.go; \
 	else \
-		GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -tags edgex -o cli xstream/cli/main.go; \
-		GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -tags edgex -o server xstream/server/main.go; \
+		GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -tags edgex -o kuiper xstream/cli/main.go; \
+		GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(VERSION) -X main.LoadFileType=relative" -tags edgex -o kuiperd xstream/server/main.go; \
 	fi
-	@if [ ! -z $$(which upx) ] && [ "$$(uname -m)" != "aarch64" ]; then upx ./cli; upx ./server; fi
-	@mv ./cli ./server $(BUILD_PATH)/$(PACKAGE_NAME)/bin
+	@if [ ! -z $$(which upx) ] && [ "$$(uname -m)" != "aarch64" ]; then upx ./kuiper; upx ./kuiperd; fi
+	@mv ./kuiper ./kuiperd $(BUILD_PATH)/$(PACKAGE_NAME)/bin
 	@echo "Build successfully"
 
 .PHONY: pkg_with_edgex

deploy/chart/kuiper/templates/StatefulSet.yaml

@@ -79,7 +79,7 @@ spec:
         - name: kuiper
           image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}-alpine"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command: ["./bin/server"]
+          command: ["./bin/kuiperd"]
           ports:
           {{ $restPort := index .Values "kuiperConfig" "kuiper.yaml" "basic" "restPort" }}
           - name: restapi

deploy/docker/Dockerfile

@@ -25,4 +25,4 @@ WORKDIR /usr/local/kuiper
 VOLUME ["/usr/local/kuiper/etc", "/usr/local/kuiper/data", "/usr/local/kuiper/plugins", "/usr/local/kuiper/log"]
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
 
-CMD ["./bin/server"]
+CMD ["./bin/kuiperd"]

deploy/docker/Dockerfile-alpine

@@ -28,4 +28,4 @@ EXPOSE 9081 20498
 
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
 
-CMD ["./bin/server"]
+CMD ["./bin/kuiperd"]

deploy/docker/Dockerfile-slim

@@ -28,4 +28,4 @@ EXPOSE 9081 20498
 
 ENTRYPOINT ["/usr/bin/docker-entrypoint.sh"]
 
-CMD ["./bin/server"]
+CMD ["./bin/kuiperd"]

deploy/packages/deb/debian/rules

@@ -16,8 +16,8 @@ PKG_VSN ?= develop
 ## note that it is necessary to use overlay_vars relative to .. as
 ## the generate command EXECUTES in rel/
 build:
-	GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(PKG_VSN) -X main.LoadFileType=absolute" -o cli xstream/cli/main.go
-	GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(PKG_VSN) -X main.LoadFileType=absolute" -o server xstream/server/main.go
+	GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(PKG_VSN) -X main.LoadFileType=absolute" -o kuiper xstream/cli/main.go
+	GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=$(PKG_VSN) -X main.LoadFileType=absolute" -o kuiperd xstream/server/main.go
 
 clean:
 	dh_clean
@@ -39,8 +39,8 @@ install: build
 	mkdir -p debian/kuiper/lib/systemd/system
 	
 	cp deploy/packages/service_helper.sh debian/kuiper/usr/lib/kuiper/bin
-	cp cli debian/kuiper/usr/lib/kuiper/bin/
-	cp server debian/kuiper/usr/lib/kuiper/bin/
+	cp kuiper debian/kuiper/usr/lib/kuiper/bin/
+	cp kuiperd debian/kuiper/usr/lib/kuiper/bin/
 	cp -R etc/* debian/kuiper/etc/kuiper/
 	cp -R plugins/* debian/kuiper/var/lib/kuiper/plugins/
 

deploy/packages/rpm/kuiper.spec

@@ -25,8 +25,8 @@ A lightweight IoT edge analytics software
 
 %build
 cd %{_code_source}
-GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=%{_version}-%{_release} -X main.LoadFileType=absolute" -o %{_code_source}/cli %{_code_source}/xstream/cli/main.go
-GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=%{_version}-%{_release} -X main.LoadFileType=absolute" -o %{_code_source}/server %{_code_source}/xstream/server/main.go
+GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=%{_version}-%{_release} -X main.LoadFileType=absolute" -o %{_code_source}/kuiper %{_code_source}/xstream/cli/main.go
+GO111MODULE=on CGO_ENABLED=1 go build -ldflags="-s -w -X main.Version=%{_version}-%{_release} -X main.LoadFileType=absolute" -o %{_code_source}/kuiperd %{_code_source}/xstream/server/main.go
 cd -
 
 %install
@@ -42,8 +42,8 @@ mkdir -p %{buildroot}%{_initddir}
 
 
 cp %{_code_source}/deploy/packages/service_helper.sh %{buildroot}%{_lib_home}/bin/
-cp %{_code_source}/cli %{buildroot}%{_lib_home}/bin/
-cp %{_code_source}/server %{buildroot}%{_lib_home}/bin/
+cp %{_code_source}/kuiper %{buildroot}%{_lib_home}/bin/
+cp %{_code_source}/kuiperd %{buildroot}%{_lib_home}/bin/
 cp -R %{_code_source}/etc/* %{buildroot}%{_conf_dir}/
 cp -R %{_code_source}/plugins/* %{buildroot}%{_var_home}/plugins/
 install -m644 %{_service_src} %{buildroot}%{_service_dst}
@@ -59,8 +59,8 @@ fi
 
 %post
 if [ $1 = 1 ]; then
-    ln -s %{_lib_home}/bin/server %{_bindir}/kuiperd
-    ln -s %{_lib_home}/bin/cli %{_bindir}/kuiper
+    ln -s %{_lib_home}/bin/kuiperd %{_bindir}/kuiperd
+    ln -s %{_lib_home}/bin/kuiper %{_bindir}/kuiper
 fi
 %{_post_addition}
 if [ -e %{_initddir}/%{_name} ] ; then

fvt_scripts/rule_test.jmx

@@ -342,7 +342,7 @@
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="CLI_CreateStream" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-            <stringProp name="SystemSampler.command">bin/cli</stringProp>
+            <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
             <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
               <collectionProp name="Arguments.arguments">
                 <elementProp name="" elementType="Argument">
@@ -387,7 +387,7 @@
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="CLI_CreateRule" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-            <stringProp name="SystemSampler.command">bin/cli</stringProp>
+            <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
             <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
               <collectionProp name="Arguments.arguments">
                 <elementProp name="" elementType="Argument">
@@ -437,7 +437,7 @@
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="CLI_ShowRules" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-            <stringProp name="SystemSampler.command">bin/cli</stringProp>
+            <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
             <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
               <collectionProp name="Arguments.arguments">
                 <elementProp name="" elementType="Argument">
@@ -472,7 +472,7 @@
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="CLI_DescribeRule" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-            <stringProp name="SystemSampler.command">bin/cli</stringProp>
+            <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
             <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
               <collectionProp name="Arguments.arguments">
                 <elementProp name="" elementType="Argument">
@@ -512,7 +512,7 @@
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="CLI_GetRuleStatus" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-            <stringProp name="SystemSampler.command">bin/cli</stringProp>
+            <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
             <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
               <collectionProp name="Arguments.arguments">
                 <elementProp name="" elementType="Argument">
@@ -552,7 +552,7 @@
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="CLI_DropRule" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-            <stringProp name="SystemSampler.command">bin/cli</stringProp>
+            <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
             <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
               <collectionProp name="Arguments.arguments">
                 <elementProp name="" elementType="Argument">
@@ -592,7 +592,7 @@
           <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="CLI_DropStream" enabled="true">
             <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
             <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-            <stringProp name="SystemSampler.command">bin/cli</stringProp>
+            <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
             <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
               <collectionProp name="Arguments.arguments">
                 <elementProp name="" elementType="Argument">

fvt_scripts/setup_env.sh

@@ -14,7 +14,7 @@ else
   #done
 fi
 
-pids=`ps aux|grep "server" | grep "bin"|awk '{printf $2 " "}'`
+pids=`ps aux|grep "kuiperd" | grep "bin"|awk '{printf $2 " "}'`
 if [ "$pids" = "" ] ; then
    echo "No kuiper server was started"
 else

fvt_scripts/start_kuiper.sh

@@ -6,11 +6,11 @@ os=`uname -s | tr "[A-Z]" "[a-z]"`
 base_dir=_build/kuiper-"$ver"-"$os"-x86_64
 
 rm -rf $base_dir/data/*
-ls -l $base_dir/bin/server
+ls -l $base_dir/bin/kuiperd
 
 cd $base_dir/
 touch log/kuiper.out
 export BUILD_ID=dontKillMe
-nohup bin/server > log/kuiper.out 2>&1 &
+nohup bin/kuiperd > log/kuiper.out 2>&1 &
 echo "starting kuiper at " $base_dir
 

fvt_scripts/streams_test.jmx

@@ -345,7 +345,7 @@
         <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="Get_Empty_Streams" enabled="true">
           <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
           <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-          <stringProp name="SystemSampler.command">bin/cli</stringProp>
+          <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
           <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="" elementType="Argument">
@@ -380,7 +380,7 @@
         <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="Create_Stream" enabled="true">
           <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
           <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-          <stringProp name="SystemSampler.command">bin/cli</stringProp>
+          <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
           <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="" elementType="Argument">
@@ -425,7 +425,7 @@
         <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="Create_Duplicated_Stream" enabled="true">
           <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
           <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-          <stringProp name="SystemSampler.command">bin/cli</stringProp>
+          <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
           <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="" elementType="Argument">
@@ -470,7 +470,7 @@
         <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="Get_Streams" enabled="true">
           <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
           <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-          <stringProp name="SystemSampler.command">bin/cli</stringProp>
+          <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
           <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="" elementType="Argument">
@@ -505,7 +505,7 @@
         <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="Describe_Stream" enabled="true">
           <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
           <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-          <stringProp name="SystemSampler.command">bin/cli</stringProp>
+          <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
           <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="" elementType="Argument">
@@ -545,7 +545,7 @@
         <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="Drop_Stream" enabled="true">
           <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
           <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-          <stringProp name="SystemSampler.command">bin/cli</stringProp>
+          <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
           <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="" elementType="Argument">
@@ -585,7 +585,7 @@
         <SystemSampler guiclass="SystemSamplerGui" testclass="SystemSampler" testname="Get_Empty_Streams" enabled="true">
           <boolProp name="SystemSampler.checkReturnCode">false</boolProp>
           <stringProp name="SystemSampler.expectedReturnCode">0</stringProp>
-          <stringProp name="SystemSampler.command">bin/cli</stringProp>
+          <stringProp name="SystemSampler.command">bin/kuiper</stringProp>
           <elementProp name="SystemSampler.arguments" elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" testname="User Defined Variables" enabled="true">
             <collectionProp name="Arguments.arguments">
               <elementProp name="" elementType="Argument">