Merge c82cbbb into 2323f3f

.env.dist

@@ -10,7 +10,7 @@ API_BLOG_DESCRIPTION=Automated insight into your WordPress code
 API_BLOG_NAME=Tide
 API_CACHE=true
 API_CACHE_DEBUG=false
-API_CACHE_KEY_SALT=xbIm5y$i&mM#W9q93la#x*qoE0cvbjWxDTFq@4r3nHJc*ZcIiW@pI@2z$GC7BEz7
+API_CACHE_KEY_SALT=xbIm5y$i&mMtW9q93la5x*qoE0cvbjWxDTFq@4r3nHJc*ZcIiW@pI@2z$GC7BEz7
 API_CACHE_TTL=86400
 API_DB_HOST=api-mysql
 API_DB_NAME=wordpress
@@ -65,8 +65,8 @@ PHPCS_TEMP_FOLDER=/tmp
 SYNC_ACTIVE=off
 SYNC_API_BROWSE_CATEGORY=updated
 SYNC_DATA=./db
-SYNC_DATABASE_PROVIDER=local
 SYNC_DATABASE_DOCUMENT_PATH=sync-server/wporg
+SYNC_DATABASE_PROVIDER=local
 SYNC_DEFAULT_CLIENT=wporg
 SYNC_DEFAULT_VISIBILITY=public
 SYNC_FORCE_AUDITS=no

Makefile

@@ -18,15 +18,15 @@ LDFLAGS=-ldflags "-X main.Version=${VERSION} -X main.Build=${BUILD}"
 # Show available make commands.
 usage:
 	@echo "Please supply one of:"
-	@echo "\tdeps:\n\t\t- Install dependencies."
+	@echo "\tdeps:\n\t\t- Install Glide dependencies."
 	@echo "\tconfig:\n\t\t- Set GCP configurations."
 	@echo "\tbuild.bins:\n\t\t- Build all the GO binaries."
 	@echo "\tclean.bins:\n\t\t- Clean all the GO binaries."
 	@echo "\tbuild.images:\n\t\t- Build all the Docker images."
-	@echo "\tbuild.up:\n\t\t- Rebuild & run the Docker images with docker-compose up."
-	@echo "\tup:\n\t\t- Run the Docker images with docker-compose up."
-	@echo "\tdown:\n\t\t- Stop the Docker images with docker-compose down."
-	@echo "\ttest:\n\t\t- Run the GO test suite."
+	@echo "\tbuild.up:\n\t\t- Rebuild the Docker images & run the containers with docker-compose up."
+	@echo "\tup:\n\t\t- Run the Docker containers with docker-compose up."
+	@echo "\tdown:\n\t\t- Stop the Docker containers with docker-compose down."
+	@echo "\ttest:\n\t\t- Run the Go test suite."
 	@make api.usage
 	@make lighthouse.usage
 	@make phpcs.usage

cmd/sync-server/main.go

@@ -396,10 +396,10 @@ func getServiceConfig() map[string]map[string]string {
 		"app": {
 			"syncActive":           env.GetEnv("SYNC_ACTIVE", "off"),
 			"syncPHPCSActive":      env.GetEnv("SYNC_PHPCS_ACTIVE", "on"),
-			"syncLighthouseActive": env.GetEnv("SYNC_LH_ACTIVE", "off"),
+			"syncLighthouseActive": env.GetEnv("SYNC_LH_ACTIVE", "on"),
 			"perPage":              env.GetEnv("SYNC_ITEMS_PER_PAGE", "250"),
-			"poolSize":             env.GetEnv("SYNC_POOL_WORKERS", "250"),
-			"poolDelay":            env.GetEnv("SYNC_POOL_DELAY", "300"),
+			"poolSize":             env.GetEnv("SYNC_POOL_WORKERS", "125"),
+			"poolDelay":            env.GetEnv("SYNC_POOL_DELAY", "600"),
 			"browseCategory":       env.GetEnv("SYNC_API_BROWSE_CATEGORY", "updated"),
 			"syncDBProvider":       env.GetEnv("SYNC_DATABASE_PROVIDER", "local"),
 			"messageProvider":      env.GetEnv("SYNC_MESSAGE_PROVIDER", "local"),

service/api/Makefile

@@ -1,12 +1,12 @@
 # Show available make commands.
 api.usage:
-	@echo "\tapi.up:\n\t\t- Run the API Docker images in isolation with docker-compose up."
-	@echo "\tapi.down:\n\t\t- Take the isolated API Docker images down."
-	@echo "\tapi.stop:\n\t\t- Stop the isolated API Docker images with docker-compose stop."
-	@echo "\tapi.rm:\n\t\t- Remove the isolated API Docker images with docker-compose rm."
-	@echo "\tapi.composer:\n\t\t- Install the Composer dependencies."
+	@echo "\tapi.up:\n\t\t- Run the API Docker containers in isolation with docker-compose up."
+	@echo "\tapi.down:\n\t\t- Take the isolated API Docker containers down."
+	@echo "\tapi.stop:\n\t\t- Stop the isolated API Docker containers with docker-compose stop."
+	@echo "\tapi.rm:\n\t\t- Remove the stopped API Docker containers with docker-compose rm."
+	@echo "\tapi.composer:\n\t\t- Install the Composer dependencies. Runs make api.tpl automatically before installing the dependencies."
 	@echo "\tapi.setup:\n\t\t- Run the setup script; API containers must be running to exec into."
-	@echo "\tapi.tpl:\n\t\t- Generate the API templates."
+	@echo "\tapi.tpl:\n\t\t- Generate the API YAML & PHP templates."
 	@echo "\tapi.deploy.sql:\n\t\t- Deploy the Cloud SQL database & setup the users."
 	@echo "\tapi.deploy.app:\n\t\t- Deploy the API to Google App Engine."
 	@echo "\tapi.deploy.redis:\n\t\t- Deploy the Google Cloud Memorystore Redis instance."

service/lighthouse-server/Makefile

@@ -7,14 +7,14 @@ LH_PKG_PATH=./cmd/lighthouse-server/...
 
 # Show available make commands.
 lighthouse.usage:
-	@echo "\tlighthouse.build.bin:\n\t\t- Build the Lighthouse Server GO binary."
-	@echo "\tlighthouse.clean.bin:\n\t\t- Clean the Lighthouse Server GO binary."
+	@echo "\tlighthouse.build.bin:\n\t\t- Build the Lighthouse Server Go binary."
+	@echo "\tlighthouse.clean.bin:\n\t\t- Clean the Lighthouse Server Go binary."
 	@echo "\tlighthouse.build.image:\n\t\t- Build the Lighthouse Server Docker image."
-	@echo "\tlighthouse.build.up:\n\t\t- Rebuild & run the Lighthouse Server Docker image in isolation with docker-compose up."
+	@echo "\tlighthouse.build.up:\n\t\t- Rebuild the Lighthouse Server Docker image and run the container in isolation with docker-compose up."
 	@echo "\tlighthouse.up:\n\t\t- Run the Lighthouse Server Docker image in isolation with docker-compose up."
-	@echo "\tlighthouse.down:\n\t\t- Take the isolated Lighthouse Server Docker image down."
-	@echo "\tlighthouse.stop:\n\t\t- Stop the isolated Lighthouse Server Docker image with docker-compose stop."
-	@echo "\tlighthouse.rm:\n\t\t- Remove the isolated Lighthouse Server Docker image with docker-compose rm."
+	@echo "\tlighthouse.down:\n\t\t- Take the isolated Lighthouse Server Docker container down."
+	@echo "\tlighthouse.stop:\n\t\t- Stop the isolated Lighthouse Server Docker container with docker-compose stop."
+	@echo "\tlighthouse.rm:\n\t\t- Remove the stopped Lighthouse Server Docker container with docker-compose rm."
 	@echo "\tlighthouse.push.image:\n\t\t- Push the Lighthouse Server Docker image to GCR."
 	@echo "\tlighthouse.clean.image:\n\t\t- Clean the Lighthouse Server Docker image from the host machine."
 	@echo "\tlighthouse.build.cluster:\n\t\t- Build the Lighthouse Server GKE cluster."

service/lighthouse-server/docker/Dockerfile

@@ -9,7 +9,7 @@ ENV CI true
 COPY bin/lh /usr/bin/lh
 
 # Install software.
-RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories \
+RUN echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \
     && apk add --no-cache --upgrade --virtual .build-deps \
         apk-tools \
         nodejs-npm \
@@ -20,7 +20,7 @@ RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repos
         ttf-freefont \
         udev \
     && npm i -g npm \
-    && npm i -g lighthouse@latest \
+    && npm i -g lighthouse \
     && runDeps="$( \
         scanelf --needed --nobanner --recursive /usr/local \
             | awk '{ gsub(/,/, "\nso:", $2); print "so:" $2 }' \

service/phpcs-server/Makefile

@@ -7,14 +7,14 @@ PHPCS_PKG_PATH=./cmd/phpcs-server/...
 
 # Show available make commands.
 phpcs.usage:
-	@echo "\tphpcs.build.bin:\n\t\t- Build the PHPCS Server GO binary."
-	@echo "\tphpcs.clean.bin:\n\t\t- Clean the PHPCS Server GO binary."
+	@echo "\tphpcs.build.bin:\n\t\t- Build the PHPCS Server Go binary."
+	@echo "\tphpcs.clean.bin:\n\t\t- Clean the PHPCS Server Go binary."
 	@echo "\tphpcs.build.image:\n\t\t- Build the PHPCS Server Docker image."
-	@echo "\tphpcs.build.up:\n\t\t- Rebuild & run the PHPCS Server Docker image in isolation with docker-compose up."
-	@echo "\tphpcs.up:\n\t\t- Run the PHPCS Server Docker image in isolation with docker-compose up."
-	@echo "\tphpcs.down:\n\t\t- Take the isolated PHPCS Server Docker image down."
-	@echo "\tphpcs.stop:\n\t\t- Stop the isolated PHPCS Server Docker image with docker-compose stop."
-	@echo "\tphpcs.rm:\n\t\t- Remove the isolated PHPCS Server Docker image with docker-compose rm."
+	@echo "\tphpcs.build.up:\n\t\t- Rebuild the PHPCS Server Docker image and run the container in isolation with docker-compose up."
+	@echo "\tphpcs.up:\n\t\t- Run the PHPCS Server Docker container in isolation with docker-compose up."
+	@echo "\tphpcs.down:\n\t\t- Take the isolated PHPCS Server Docker container down."
+	@echo "\tphpcs.stop:\n\t\t- Stop the isolated PHPCS Server Docker container with docker-compose stop."
+	@echo "\tphpcs.rm:\n\t\t- Remove the stopped PHPCS Server Docker container with docker-compose rm."
 	@echo "\tphpcs.push.image:\n\t\t- Push the PHPCS Server Docker image to GCR."
 	@echo "\tphpcs.clean.image:\n\t\t- Clean the PHPCS Server Docker image from the host machine."
 	@echo "\tphpcs.build.cluster:\n\t\t- Build the PHPCS Server GKE cluster."

service/sync-server/Makefile

@@ -7,14 +7,14 @@ SYNC_PKG_PATH=./cmd/sync-server/...
 
 # Show available make commands.
 sync.usage:
-	@echo "\tsync.build.bin:\n\t\t- Build the Sync Server GO binary."
-	@echo "\tsync.clean.bin:\n\t\t- Clean the Sync Server GO binary."
+	@echo "\tsync.build.bin:\n\t\t- Build the Sync Server Go binary."
+	@echo "\tsync.clean.bin:\n\t\t- Clean the Sync Server Go binary."
 	@echo "\tsync.build.image:\n\t\t- Build the Sync Server Docker image."
-	@echo "\tsync.build.up:\n\t\t- Rebuild & run the Sync Server Docker image in isolation with docker-compose up."
-	@echo "\tsync.up:\n\t\t- Run the Sync Server Docker image in isolation with docker-compose up."
-	@echo "\tsync.down:\n\t\t- Take the isolated Sync Server Docker image down."
-	@echo "\tsync.stop:\n\t\t- Stop the isolated Sync Server Docker image with docker-compose stop."
-	@echo "\tsync.rm:\n\t\t- Remove the isolated Sync Server Docker image with docker-compose rm."
+	@echo "\tsync.build.up:\n\t\t- Rebuild the Sync Server Docker image & run the container in isolation with docker-compose up."
+	@echo "\tsync.up:\n\t\t- Run the Sync Server Docker container in isolation with docker-compose up."
+	@echo "\tsync.down:\n\t\t- Take the isolated Sync Server Docker container down."
+	@echo "\tsync.stop:\n\t\t- Stop the isolated Sync Server Docker container with docker-compose stop."
+	@echo "\tsync.rm:\n\t\t- Remove the stopped Sync Server Docker container with docker-compose rm."
 	@echo "\tsync.push.image:\n\t\t- Push the Sync Server Docker image to GCR."
 	@echo "\tsync.clean.image:\n\t\t- Clean the Sync Server Docker image from the host machine."
 	@echo "\tsync.build.disk:\n\t\t- Build the Sync Server GKE persistent disk."