Merge branch 'development' into 'rel/major'

Development

See merge request liermao/microservice-autodevopspipelines!14

devops/PipeLines/Creation/001_CI.sh

@@ -48,7 +48,7 @@ declare serviceName=""
 for service in ${services}
 do
 	servicePrefix=($(echo ${service} | awk '{print $9}')) 
-	isPublishable=($(grep -oP "(?<=${servicePrefix}Publishable>)[^<]+" "/tmp/cicd.props"))
+	IsPublishableOf ${servicePrefix} isPublishable
 	GetServiceName "${servicePrefix}" serviceName
 	CI "${servicePrefix}" "./src/${servicePrefix}/${serviceName}.csproj"
 done

devops/PipeLines/Functions.sh

@@ -4,15 +4,15 @@ set -e
 
 function GetServices()
 {
-    declare services=$(ls -l ./src/services | awk 'NR>1')
-	eval $1="${services}"
+    declare svcs=$(ls -l ./src/Services | awk 'NR>1')
+	eval $1="${svcs}"
 }
 
 function GetServiceName()
 {
-    declare servicePrefix=${1}
-	declare serviceName=$(ls ./src/services/${servicePrefix}|head -n 1|xargs -d '/' echo)
-	eval $2="${serviceName}"
+    declare prefix=${1}
+	declare name=$(ls ./src/Services/${prefix}|head -n 1|xargs -d '/' echo)
+	eval $2="${name}"
 }
 
 function GetAppName()
@@ -35,16 +35,16 @@ function GetImageUserName()
 
 function GetCiCdSettings()
 {
-    declare allPublishable=($(grep -oP '(?<=AllPublishable>)[^<]+' "/tmp/cicd.props"))
-    declare noPublishable=($(grep -oP '(?<=NoPublishable>)[^<]+' "/tmp/cicd.props"))
-	eval $1=${allPublishable}
-	eval $2=${noPublishable}
+    declare all=($(grep -oP '(?<=AllPublishable>)[^<]+' "/tmp/cicd.props"))
+    declare no=($(grep -oP '(?<=NoPublishable>)[^<]+' "/tmp/cicd.props"))
+	eval $1=${all}
+	eval $2=${no}
 }
 
 function GetMajor()
 {
-    declare major=($(grep -oP '(?<=VersionMajor>)[^<]+' "devops/version.props"))
-	eval $1=${major}
+    declare m=($(grep -oP '(?<=VersionMajor>)[^<]+' "devops/version.props"))
+	eval $1=${m}
 }
 
 function GetVersion()
@@ -52,8 +52,8 @@ function GetVersion()
     declare major=($(grep -oP '(?<=VersionMajor>)[^<]+' "devops/version.props"))
 	declare minor=($(grep -oP '(?<=VersionMinor>)[^<]+' "devops/version.props"))
 	declare patch=($(grep -oP '(?<=VersionPatch>)[^<]+' "devops/version.props"))
-	declare version=${major}.${minor}.${patch}
-	eval $1=${version}
+	declare v=${major}.${minor}.${patch}
+	eval $1=${v}
 }
 
 function GetImageRegistrySettings()
@@ -68,4 +68,11 @@ function GetAccessTokenOf()
 {
     declare token=($(grep -oP "(?<=${Environment}AccessToken>)[^<]+" "devops/deploy.props"))
 	eval $1="${token}"
+}
+
+function IsPublishableOf()
+{
+    declare prefix=$0
+    declare isP=($(grep -oP "(?<=${prefix}Publishable>)[^<]+" "/tmp/cicd.props"))
+	eval $1=isP
 }
\ No newline at end of file