Merge branch 'development' into 'rel/major'

Development

See merge request liermao/microservice-autodevopspipelines!58

.gitlab-ci.yml

@@ -34,9 +34,7 @@ staging-major_job:
 prod-major_job:
   stage: prod-release-major
   script:
-   - export RegistryHost='dockerhub.geekbuying.com:8100'
    - export Environment='Production'
-   - export K8sApiServer='https://10.76.134.3:6443'
 
    # 001 Continuous integration image to registry.
    - bash ./devops/PipeLines/Creation/001_CI.sh
@@ -48,10 +46,8 @@ prod-major_job:
    - bash ./devops/PipeLines/Creation/003_ReleaseMajor.sh
 
    # 004 Create gateway route.
-   - export KongApiServer='http://10.76.134.4:81'
-   - export KongRouteDomain='s.geekbuying.com'
    - bash ./devops/PipeLines/Creation/Gateways/Kong/004_CreateGatewayRoute.sh
   only:
    - rel/major
   tags:
-   - staging
\ No newline at end of file
+   - production
\ No newline at end of file

devops/Gateways/kong.props

-<Project>
-  <PropertyGroup>
-    <ServiceUrl></ServiceUrl>
-  </PropertyGroup>
-</Project>

devops/PipeLines/Build.sh

@@ -3,8 +3,8 @@
 set -e
 
 # Import external functions
-chmod +x ./devops/PipeLines/Functions.core.sh
-source ./devops/PipeLines/Functions.core.sh
+chmod +x ./devops/PipeLines/Functions.common.sh
+source ./devops/PipeLines/Functions.common.sh
 
 GetSolutionName SolutionName
 

devops/PipeLines/Creation/Gateways/Kong/004_CreateGatewayRoute.sh

@@ -78,13 +78,14 @@ do
   Replace ${serviceName} '.' '-' serviceName
   ToLower "${serviceName}-${releaseVersion}" serviceNameWithVersion
   ToLower "${serviceName}.${fdnOfK8s}" serviceFdn
+  ToLower ${servicePrefix} prefix
   ToLower "http://${serviceFdn}/api/${prefix}" serviceUrl
 
   echo "Begin creating service[${serviceNameWithVersion}]"
   createService ${kongServiceBaseUrl} ${maxConnectTime} ${maxTime} ${retryCount} ${serviceNameWithVersion} ${serviceUrl}
 
   echo "Begin creating route of service[${serviceNameWithVersion}]" 
-  ToLower "/api/${releaseVersion}/${servicePrefix}" serviceRouteUrl
+  ToLower "/api/${releaseVersion}/${prefix}" serviceRouteUrl
   createRoute ${kongRouteBaseUrl} ${maxConnectTime} ${maxTime} ${retryCount} ${serviceNameWithVersion} ${serviceRouteUrl} true
 done
 

devops/PipeLines/Functions.common.sh

+#!/bin/bash
+
+set -e
+
+function ToLower()
+{
+   declare input=$1
+   declare output=($(echo "${input}" | tr 'A-Z' 'a-z'))
+   eval $2=${output}
+}
+
+function Replace()
+{
+  declare input=$1
+  declare sourceExpr=$2
+  declare targetExpr=$3
+  declare output=${input//${sourceExpr}/${targetExpr}}
+  eval $4=${output}
+}
\ No newline at end of file

devops/PipeLines/Functions.core.sh

@@ -2,21 +2,9 @@
 
 set -e
 
-function ToLower()
-{
-   declare input=$1
-   declare output=($(echo "${input}" | tr 'A-Z' 'a-z'))
-   eval $2=${output}
-}
-
-function Replace()
-{
-  declare input=$1
-  declare sourceExpr=$2
-  declare targetExpr=$3
-  declare output=${input//${sourceExpr}/${targetExpr}}
-  eval $4=${output}
-}
+# Import external functions
+chmod +x ./devops/PipeLines/Functions.common.sh
+source ./devops/PipeLines/Functions.common.sh
 
 # function GetServices()
 # {

src/Services/Basket/Basket.API/Controllers/ValuesController.cs

-using System;
+using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Basket.API.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("[controller]")]
     [ApiController]
     public class ValuesController : ControllerBase
     {

src/Services/Catalog/Catalog.API/Controllers/ValuesController.cs

-using System;
+using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Catalog.API.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("[controller]")]
     [ApiController]
     public class ValuesController : ControllerBase
     {

src/Services/Identity/Identity.API/Controllers/ValuesController.cs

-using System;
+using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Identity.API.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("[controller]")]
     [ApiController]
     public class ValuesController : ControllerBase
     {

src/Services/Marketing/Marketing.API/Controllers/ValuesController.cs

-using System;
+using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Marketing.API.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("[controller]")]
     [ApiController]
     public class ValuesController : ControllerBase
     {

src/Services/Ordering/Ordering.API/Controllers/ValuesController.cs

-using System;
+using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Ordering.API.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("[controller]")]
     [ApiController]
     public class ValuesController : ControllerBase
     {

src/Services/Payment/Payment.API/Controllers/ValuesController.cs

-using System;
+using Microsoft.AspNetCore.Mvc;
 using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
 
 namespace Payment.API.Controllers
 {
-    [Route("api/[controller]")]
+    [Route("[controller]")]
     [ApiController]
     public class ValuesController : ControllerBase
     {