Flatten project structure (#117)
* Flatten project structure
* Add dockerignore
diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..93a444c
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,8 @@
+doc
+.gitignore
+.travis.yml
+CONTRIBUTING.md
+Dockerfile
+LICENSE.txt
+Makefile
+README.md
diff --git a/.gitignore b/.gitignore
index 021d01b..a9d0ef1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-api-gateway-config/target
-api-gateway-config/target/*
-api-gateway-config/conf.d/includes/resolvers.conf
+target
+target/*
+conf.d/includes/resolvers.conf
*.iml
.DS_STORE
lua_modules
diff --git a/.travis.yml b/.travis.yml
index 7cc1918..eea4fce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@
- export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH
install:
- - cd api-gateway-config/tests
+ - cd tests
- ./install-deps.sh
script:
diff --git a/Dockerfile b/Dockerfile
index 18c7c26..5554ec2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -190,10 +190,10 @@
ONBUILD COPY init.sh /etc/init-container.sh
# add the default configuration for the Gateway
-COPY api-gateway-config /etc/api-gateway
+COPY . /etc/api-gateway
RUN adduser -S nginx-api-gateway \
&& addgroup -S nginx-api-gateway
-ONBUILD COPY api-gateway-config /etc/api-gateway
+ONBUILD COPY . /etc/api-gateway
EXPOSE 80 8080 8423 9000
diff --git a/Makefile b/Makefile
index fcfb4b2..a98303e 100644
--- a/Makefile
+++ b/Makefile
@@ -10,11 +10,11 @@
.PHONY: test-build
test-build:
- cd api-gateway-config/tests; ./install-deps.sh
+ cd tests; ./install-deps.sh
.PHONY: test-run
test-run:
- cd api-gateway-config/tests; ./run-tests.sh
+ cd tests; ./run-tests.sh
.PHONY: docker-run
docker-run:
@@ -30,17 +30,17 @@
docker-debug:
#Volumes directories must be under your Users directory
mkdir -p ${HOME}/tmp/apiplatform/apigateway
- rm -rf ${HOME}/tmp/apiplatform/apigateway/api-gateway-config
- cp -r `pwd`/api-gateway-config ${HOME}/tmp/apiplatform/apigateway/
+ rm -rf ${HOME}/tmp/apiplatform/apigateway
+ cp -r `pwd` ${HOME}/tmp/apiplatform/apigateway/
docker run --name="apigateway" \
-p 80:80 -p 5000:5000 \
-e "LOG_LEVEL=info" -e "DEBUG=true" \
- -v ${HOME}/tmp/apiplatform/apigateway/api-gateway-config/:/etc/api-gateway \
+ -v ${HOME}/tmp/apiplatform/apigateway/:/etc/api-gateway \
openwhisk/apigateway:latest ${DOCKER_ARGS}
.PHONY: docker-reload
docker-reload:
- cp -r `pwd`/api-gateway-config ${HOME}/tmp/apiplatform/apigateway/
+ cp -r `pwd` ${HOME}/tmp/apiplatform/apigateway/
docker exec apigateway api-gateway -t -p /usr/local/api-gateway/ -c /etc/api-gateway/api-gateway.conf
docker exec apigateway api-gateway -s reload
diff --git a/api-gateway-config/api-gateway.conf b/api-gateway.conf
similarity index 100%
rename from api-gateway-config/api-gateway.conf
rename to api-gateway.conf
diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
deleted file mode 100644
index 83c0bc1..0000000
--- a/concourse/pipeline.yml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-jobs:
- - name: PR unit tests
- public: true
- serial: true
- plan:
- - get: apigateway
- trigger: true
- - put: apigateway
- params:
- path: apigateway
- status: pending
- - task: run-unit-tests
- file: apigateway/concourse/tasks/run-unit-tests.yml
- on_success:
- put: apigateway
- params:
- path: apigateway
- status: success
- on_failure:
- put: apigateway
- params:
- path: apigateway
- status: failure
-
-resource_types:
- - name: pull-request
- type: docker-image
- source:
- repository: jtarchie/pr
-
-resources:
- - name: apigateway
- type: pull-request
- source:
- repo: openwhisk/apigateway
- access_token: {{access_token}}
diff --git a/concourse/tasks/run-unit-tests.sh b/concourse/tasks/run-unit-tests.sh
deleted file mode 100755
index 015b307..0000000
--- a/concourse/tasks/run-unit-tests.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -e
-
-apk add --update git
-
-cd apigateway/api-gateway-config/tests
-./install-deps.sh
-./run-tests.sh
\ No newline at end of file
diff --git a/concourse/tasks/run-unit-tests.yml b/concourse/tasks/run-unit-tests.yml
deleted file mode 100644
index b5a0291..0000000
--- a/concourse/tasks/run-unit-tests.yml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-platform: linux
-
-image_resource:
- type: docker-image
- source: {repository: abaez/luarocks, tag: lua5.1}
-
-inputs:
- - name: apigateway
-
-run:
- path: apigateway/concourse/tasks/run-unit-tests.sh
diff --git a/api-gateway-config/conf.d/api_gateway_init.conf b/conf.d/api_gateway_init.conf
similarity index 100%
rename from api-gateway-config/conf.d/api_gateway_init.conf
rename to conf.d/api_gateway_init.conf
diff --git a/api-gateway-config/conf.d/api_gateway_logging.conf b/conf.d/api_gateway_logging.conf
similarity index 100%
rename from api-gateway-config/conf.d/api_gateway_logging.conf
rename to conf.d/api_gateway_logging.conf
diff --git a/api-gateway-config/conf.d/blacklist.conf b/conf.d/blacklist.conf
similarity index 100%
rename from api-gateway-config/conf.d/blacklist.conf
rename to conf.d/blacklist.conf
diff --git a/api-gateway-config/conf.d/commons/common-headers.conf b/conf.d/commons/common-headers.conf
similarity index 100%
rename from api-gateway-config/conf.d/commons/common-headers.conf
rename to conf.d/commons/common-headers.conf
diff --git a/api-gateway-config/conf.d/default.conf b/conf.d/default.conf
similarity index 100%
rename from api-gateway-config/conf.d/default.conf
rename to conf.d/default.conf
diff --git a/api-gateway-config/conf.d/includes/analytics_endpoints.conf b/conf.d/includes/analytics_endpoints.conf
similarity index 100%
rename from api-gateway-config/conf.d/includes/analytics_endpoints.conf
rename to conf.d/includes/analytics_endpoints.conf
diff --git a/api-gateway-config/conf.d/includes/basic_endpoints.conf b/conf.d/includes/basic_endpoints.conf
similarity index 100%
rename from api-gateway-config/conf.d/includes/basic_endpoints.conf
rename to conf.d/includes/basic_endpoints.conf
diff --git a/api-gateway-config/conf.d/managed_endpoints.conf b/conf.d/managed_endpoints.conf
similarity index 100%
rename from api-gateway-config/conf.d/managed_endpoints.conf
rename to conf.d/managed_endpoints.conf
diff --git a/api-gateway-config/conf.d/management_apis.conf b/conf.d/management_apis.conf
similarity index 100%
rename from api-gateway-config/conf.d/management_apis.conf
rename to conf.d/management_apis.conf
diff --git a/api-gateway-config/html/index.html b/html/index.html
similarity index 100%
rename from api-gateway-config/html/index.html
rename to html/index.html
diff --git a/api-gateway-config/naxsi_core.rules b/naxsi_core.rules
similarity index 100%
rename from api-gateway-config/naxsi_core.rules
rename to naxsi_core.rules
diff --git a/api-gateway-config/scripts/lua/api_gateway_init.lua b/scripts/lua/api_gateway_init.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/api_gateway_init.lua
rename to scripts/lua/api_gateway_init.lua
diff --git a/api-gateway-config/scripts/lua/cors.lua b/scripts/lua/cors.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/cors.lua
rename to scripts/lua/cors.lua
diff --git a/api-gateway-config/scripts/lua/lib/logger.lua b/scripts/lua/lib/logger.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/lib/logger.lua
rename to scripts/lua/lib/logger.lua
diff --git a/api-gateway-config/scripts/lua/lib/redis.lua b/scripts/lua/lib/redis.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/lib/redis.lua
rename to scripts/lua/lib/redis.lua
diff --git a/api-gateway-config/scripts/lua/lib/request.lua b/scripts/lua/lib/request.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/lib/request.lua
rename to scripts/lua/lib/request.lua
diff --git a/api-gateway-config/scripts/lua/lib/resty/limit/req.lua b/scripts/lua/lib/resty/limit/req.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/lib/resty/limit/req.lua
rename to scripts/lua/lib/resty/limit/req.lua
diff --git a/api-gateway-config/scripts/lua/lib/utils.lua b/scripts/lua/lib/utils.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/lib/utils.lua
rename to scripts/lua/lib/utils.lua
diff --git a/api-gateway-config/scripts/lua/management/apis.lua b/scripts/lua/management/apis.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/management/apis.lua
rename to scripts/lua/management/apis.lua
diff --git a/api-gateway-config/scripts/lua/management/resources.lua b/scripts/lua/management/resources.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/management/resources.lua
rename to scripts/lua/management/resources.lua
diff --git a/api-gateway-config/scripts/lua/management/subscriptions.lua b/scripts/lua/management/subscriptions.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/management/subscriptions.lua
rename to scripts/lua/management/subscriptions.lua
diff --git a/api-gateway-config/scripts/lua/management/tenants.lua b/scripts/lua/management/tenants.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/management/tenants.lua
rename to scripts/lua/management/tenants.lua
diff --git a/api-gateway-config/scripts/lua/oauth/facebook.lua b/scripts/lua/oauth/facebook.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/oauth/facebook.lua
rename to scripts/lua/oauth/facebook.lua
diff --git a/api-gateway-config/scripts/lua/oauth/github.lua b/scripts/lua/oauth/github.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/oauth/github.lua
rename to scripts/lua/oauth/github.lua
diff --git a/api-gateway-config/scripts/lua/oauth/google.lua b/scripts/lua/oauth/google.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/oauth/google.lua
rename to scripts/lua/oauth/google.lua
diff --git a/api-gateway-config/scripts/lua/oauth/mock.lua b/scripts/lua/oauth/mock.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/oauth/mock.lua
rename to scripts/lua/oauth/mock.lua
diff --git a/api-gateway-config/scripts/lua/policies/mapping.lua b/scripts/lua/policies/mapping.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/policies/mapping.lua
rename to scripts/lua/policies/mapping.lua
diff --git a/api-gateway-config/scripts/lua/policies/rateLimit.lua b/scripts/lua/policies/rateLimit.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/policies/rateLimit.lua
rename to scripts/lua/policies/rateLimit.lua
diff --git a/api-gateway-config/scripts/lua/policies/security.lua b/scripts/lua/policies/security.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/policies/security.lua
rename to scripts/lua/policies/security.lua
diff --git a/api-gateway-config/scripts/lua/policies/security/apiKey.lua b/scripts/lua/policies/security/apiKey.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/policies/security/apiKey.lua
rename to scripts/lua/policies/security/apiKey.lua
diff --git a/api-gateway-config/scripts/lua/policies/security/oauth2.lua b/scripts/lua/policies/security/oauth2.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/policies/security/oauth2.lua
rename to scripts/lua/policies/security/oauth2.lua
diff --git a/api-gateway-config/scripts/lua/routing.lua b/scripts/lua/routing.lua
similarity index 100%
rename from api-gateway-config/scripts/lua/routing.lua
rename to scripts/lua/routing.lua
diff --git a/api-gateway-config/tests/fakengx.lua b/tests/fakengx.lua
similarity index 100%
rename from api-gateway-config/tests/fakengx.lua
rename to tests/fakengx.lua
diff --git a/api-gateway-config/tests/fakeredis.lua b/tests/fakeredis.lua
similarity index 100%
rename from api-gateway-config/tests/fakeredis.lua
rename to tests/fakeredis.lua
diff --git a/api-gateway-config/tests/install-deps.sh b/tests/install-deps.sh
similarity index 100%
rename from api-gateway-config/tests/install-deps.sh
rename to tests/install-deps.sh
diff --git a/api-gateway-config/tests/run-tests.sh b/tests/run-tests.sh
similarity index 100%
rename from api-gateway-config/tests/run-tests.sh
rename to tests/run-tests.sh
diff --git a/api-gateway-config/tests/scripts/lua/lib/logger.lua b/tests/scripts/lua/lib/logger.lua
similarity index 100%
rename from api-gateway-config/tests/scripts/lua/lib/logger.lua
rename to tests/scripts/lua/lib/logger.lua
diff --git a/api-gateway-config/tests/scripts/lua/lib/redis.lua b/tests/scripts/lua/lib/redis.lua
similarity index 100%
rename from api-gateway-config/tests/scripts/lua/lib/redis.lua
rename to tests/scripts/lua/lib/redis.lua
diff --git a/api-gateway-config/tests/scripts/lua/lib/request.lua b/tests/scripts/lua/lib/request.lua
similarity index 100%
rename from api-gateway-config/tests/scripts/lua/lib/request.lua
rename to tests/scripts/lua/lib/request.lua
diff --git a/api-gateway-config/tests/scripts/lua/lib/utils.lua b/tests/scripts/lua/lib/utils.lua
similarity index 100%
rename from api-gateway-config/tests/scripts/lua/lib/utils.lua
rename to tests/scripts/lua/lib/utils.lua
diff --git a/api-gateway-config/tests/scripts/lua/routing.lua b/tests/scripts/lua/routing.lua
similarity index 100%
rename from api-gateway-config/tests/scripts/lua/routing.lua
rename to tests/scripts/lua/routing.lua
diff --git a/api-gateway-config/tests/scripts/lua/security.lua b/tests/scripts/lua/security.lua
similarity index 100%
rename from api-gateway-config/tests/scripts/lua/security.lua
rename to tests/scripts/lua/security.lua
diff --git a/api-gateway-config/tests/set_paths.lua b/tests/set_paths.lua
similarity index 100%
rename from api-gateway-config/tests/set_paths.lua
rename to tests/set_paths.lua
diff --git a/api-gateway-config/tests/test_initialization.t b/tests/test_initialization.t
similarity index 100%
rename from api-gateway-config/tests/test_initialization.t
rename to tests/test_initialization.t
