[openwhisk-apigateway] branch master updated: Rename parsePolicies to parseSwaggerPolicies to avoid conflict (#377)

[st...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

style95 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-apigateway.git


The following commit(s) were added to refs/heads/master by this push:
     new 888f105  Rename parsePolicies to parseSwaggerPolicies to avoid conflict (#377)
888f105 is described below

commit 888f1058fd262f30ec7f0f0b74d3197f6d327c16
Author: jiangpch <ji...@navercorp.com>
AuthorDate: Wed Jul 8 07:19:55 2020 +0800

    Rename parsePolicies to parseSwaggerPolicies to avoid conflict (#377)
    
    * Rename parsePolicies to parseSwaggerPolicies to avoid conflict
    
    * Use `nightly` as tag for local build
    
    Co-authored-by: jiang.pengcheng <ji...@navercorp.com>
---
 scripts/lua/management/lib/swagger.lua | 4 ++--
 tools/travis/build.sh                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/lua/management/lib/swagger.lua b/scripts/lua/management/lib/swagger.lua
index 4a63ab6..d70c08c 100644
--- a/scripts/lua/management/lib/swagger.lua
+++ b/scripts/lua/management/lib/swagger.lua
@@ -25,7 +25,7 @@ local utils = require "lib/utils"
 -- @param swagger swagger file to parse
 function _M.parseSwagger(swagger)
   local backends = parseBackends(swagger)
-  local policies = parsePolicies(swagger)
+  local policies = parseSwaggerPolicies(swagger)
   local security = parseSecurity(swagger)
   local corsObj = parseCors(swagger)
   local decoded = {
@@ -115,7 +115,7 @@ end
 
 --- Parse policies in swagger
 -- @param swagger swagger file to parse
-function parsePolicies(swagger)
+function parseSwaggerPolicies(swagger)
   local policies = {}
   -- parse rate limit
   local rlObj = swagger["x-gateway-rate-limit"]
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
index a517275..a36c010 100755
--- a/tools/travis/build.sh
+++ b/tools/travis/build.sh
@@ -39,7 +39,7 @@ $ANSIBLE_CMD initdb.yml
 # build docker image locally
 pushd $ROOTDIR
 pwd
-docker build . -t "openwhisk/apigateway"
+docker build . -t "openwhisk/apigateway:nightly"
 popd
 
 $ANSIBLE_CMD wipe.yml