Merge pull request #99 from GSA-TTS/sandbox-deploy-fix-0125

Fixes deploy to Cloud.gov

.circleci/config.yml

@@ -53,6 +53,11 @@ commands:
       - run:
           name: "generate sqlc models"
           command: make generate
+      - run: 
+          name: "create files for embed"
+          command: |
+            cd config
+            make all
 jobs:
   lint:
     docker:

Makefile

@@ -9,19 +9,21 @@ clean:
 	rm -f cmd/*/service.exe
 
 .PHONY: generate
-generate: config
+generate:
 	cd internal/postgres ; make generate
+	# cd internal/postgres/search_db ; make generate
 
 .PHONY: config
-config: clean
+config:
 	cd config ; make all || exit 1
 
 docker: 
 	docker build -t jemison/dev -f Dockerfile.dev .
 	docker build -t jemison/build -f Dockerfile.build .
 
 .PHONY: build
-build: generate 
+# lint
+build: clean config generate 
 	echo "build migrate"
 	cd cmd/migrate ; make build
 	echo "build admin"
@@ -38,19 +40,11 @@ build: generate
 	cd cmd/pack ; make build
 	echo "build serve"
 	cd cmd/serve ; make build
-	# echo "build validate"
-	# cd cmd/validate ; make build
+	echo "build validate"
+	cd cmd/validate ; make build
 	echo "build walk"
 	cd cmd/walk ; make build
 
-.PHONY: lint
-lint: generate
-	golangci-lint run -v
-
-.PHONY: containerlint
-containerlint:
-	docker run -v ${PWD}:/app -t jemison/build lint
-
 .PHONY: up
 up: build
 	docker compose up
@@ -74,46 +68,28 @@ macup:
 
 .PHONY: run
 run: clean generate
-	cd assets ; unzip -qq -o static.zip > /dev/null 2>&1
 	docker compose up
 
 .PHONY: cloc
 cloc:
 	docker run --rm -v ${PWD}:/tmp aldanial/cloc --exclude-dir=assets .
 
-delete_admin:
-	cf delete -f admin
-
-delete_entree:
-	cf delete -f entree
-
-delete_extract:
-	cf delete -f extract
-
-delete_fetch:
-	cf delete -f fetch
-
-delete_pack:
-	cf delete -f pack
-
-delete_serve:
-	cf delete -f serve
-
-delete_walk:
-	cf delete -f walk
-
 .PHONY: delete_all
-delete_all: delete_admin delete_entree delete_extract delete_fetch delete_pack delete_serve delete_walk
-
+delete_all: 
+	cd terraform ; make cfclean
 
 # I need to delete_all every time, because there is not enough RAM
 # in the sandbox to rolling deploy
 .PHONY: terraform
-terraform: delete_all
+terraform: delete_all build
 	docker run -v ${PWD}:/app -t jemison/build
 	cd terraform ; make apply_all
 
 .PHONY: docker_full_clean
 docker_full_clean:
 	-docker stop $(docker ps -a -q)
 	-docker rm $(docker ps -a -q)
+
+.PHONY: lint
+lint:
+	-golangci-lint run -v

cmd/serve/main.go

@@ -69,6 +69,7 @@ func main() {
 	templateFilesPath := s.GetParamString("template_files_path")
 	staticFilesPath := s.GetParamString("static_files_path")
 
+	externalScheme := s.GetParamString("external_scheme")
 	externalHost := s.GetParamString("external_host")
 	externalPort := s.GetParamInt64("external_port")
 
@@ -97,9 +98,9 @@ func main() {
 	engine.LoadHTMLGlob(templateFilesPath + "/*")
 
 	baseParams := gin.H{
-		"scheme":      "http",
-		"search_host": "localhost",
-		"search_port": "10000",
+		"scheme":      externalScheme,
+		"search_host": externalHost,
+		"search_port": externalPort,
 	}
 
 	engine.GET("/:tld", func(c *gin.Context) {

cmd/serve/templates/index.tmpl

@@ -55,7 +55,7 @@
         function DoTheSearch() {
           // :{{.search_port}}
           var host = window.location.host; 
-          var post_url = "{{.scheme}}://" + host + "/api/search"
+          var post_url = "{{.scheme}}://{{.search_host}}:{{.search_port}}/api/search"
           console.log("post_url", post_url);
           var query = document.getElementById('six-search').value
           console.log(query);

config/Makefile

@@ -2,7 +2,9 @@
 all:
 	cd domain64 ; make all
 	cd services ; make all
+	cd hosts ; make all
 	mv services/*.yaml .
+	mv hosts/*.yaml . 
 
 # .PHONY: system
 # system: *.jsonnet

config/hosts/Makefile

@@ -0,0 +1,18 @@
+SOURCES = $(wildcard *.jsonnet)
+
+all: clean $(patsubst %.jsonnet,%.yaml, ${SOURCES})
+
+clean: 
+	rm -f *.json
+
+%.yaml: %.jsonnet
+	@echo "IN" $<  "OUT" $@
+	jsonnetfmt \
+		-i \
+		--indent 2 \
+		--max-blank-lines 2 \
+		--sort-imports \
+		--string-style s \
+		--comment-style s \
+		$<
+	jsonnet $< > $@

config/services/base.libsonnet

@@ -14,7 +14,7 @@ local parameters = [
   [
     'allowed_hosts',
     {
-      cf: 'all',
+      cf: 'dec15',
       container: 'dec15',
       localhost: 'nih',
     },

config/services/cf.jsonnet

@@ -1,6 +1,7 @@
 local A = import 'admin.libsonnet';
 local C = import 'collect.libsonnet';
-local E = import 'extract.libsonnet';
+local EN = import 'entree.libsonnet';
+local EX = import 'extract.libsonnet';
 local F = import 'fetch.libsonnet';
 local M = import 'migrate.libsonnet';
 local P = import 'pack.libsonnet';
@@ -13,7 +14,8 @@ local W = import 'walk.libsonnet';
   EIGHT_SERVICES: {
     'user-provided': [
       A.cf,
-      E.cf,
+      EN.cf,
+      EX.cf,
       F.cf,
       M.cf,
       P.cf,

config/services/entree.libsonnet

@@ -22,7 +22,8 @@ local parameters = [
 {
   creds:: [[service] + x for x in credentials],
   params:: [[service] + x for x in parameters],
-  cf: B.params('credentials', 'cf', service, self.creds) +
+  cf: { name: service } +
+      B.params('credentials', 'cf', service, self.creds) +
       B.params('parameters', 'cf', service, self.params),
   container: { name: service } +
              B.params('credentials', 'container', service, self.creds) +

config/services/extract.libsonnet

@@ -34,7 +34,8 @@ local parameters = [
 {
   creds:: [[service] + x for x in credentials],
   params:: [[service] + x for x in parameters],
-  cf: B.params('credentials', 'cf', service, self.creds) +
+  cf: { name: service } +
+      B.params('credentials', 'cf', service, self.creds) +
       B.params('parameters', 'cf', service, self.params),
   container: { name: service } +
              B.params('credentials', 'container', service, self.creds) +

config/services/fetch.libsonnet

@@ -14,7 +14,7 @@ local parameters = [
   // With 'one_per_domain', 10 is appropriate... but largely immaterial.
   [
     'queue_model',
-    { cf: 'round_robin', container: 'round_robin' },
+    { cf: 'simple', container: 'simple' },
   ],
   [
     'workers',
@@ -45,7 +45,8 @@ local parameters = [
 {
   creds:: [[service] + x for x in credentials],
   params:: [[service] + x for x in parameters],
-  cf: B.params('credentials', 'cf', service, self.creds) +
+  cf: { name: service } +
+      B.params('credentials', 'cf', service, self.creds) +
       B.params('parameters', 'cf', service, self.params),
   container: { name: service } +
              B.params('credentials', 'container', service, self.creds) +

config/services/migrate.libsonnet

@@ -13,7 +13,8 @@ local parameters = [
 {
   creds:: [[service] + x for x in credentials],
   params:: [[service] + x for x in parameters],
-  cf: B.params('credentials', 'cf', service, self.creds) +
+  cf: { name: service } +
+      B.params('credentials', 'cf', service, self.creds) +
       B.params('parameters', 'cf', service, self.params),
   container: { name: service } +
              B.params('credentials', 'container', service, self.creds) +

config/services/pack.libsonnet

@@ -22,7 +22,8 @@ local parameters = [
 {
   creds:: [[service] + x for x in credentials],
   params:: [[service] + x for x in parameters],
-  cf: B.params('credentials', 'cf', service, self.creds) +
+  cf: { name: service } + 
+      B.params('credentials', 'cf', service, self.creds) +
       B.params('parameters', 'cf', service, self.params),
   container: { name: service } +
              B.params('credentials', 'container', service, self.creds) +

config/services/serve.libsonnet

@@ -59,7 +59,8 @@ local parameters = [
 {
   creds:: [[service] + x for x in credentials],
   params:: [[service] + x for x in parameters],
-  cf: B.params('credentials', 'cf', service, self.creds) +
+  cf: { name: service } +
+      B.params('credentials', 'cf', service, self.creds) +
       B.params('parameters', 'cf', service, self.params),
   container: { name: service } +
              B.params('credentials', 'container', service, self.creds) +

config/services/validate.libsonnet

@@ -22,7 +22,8 @@ local parameters = [
 {
   creds:: [[service] + x for x in credentials],
   params:: [[service] + x for x in parameters],
-  cf: B.params('credentials', 'cf', service, self.creds) +
+  cf: { name: service } +
+      B.params('credentials', 'cf', service, self.creds) +
       B.params('parameters', 'cf', service, self.params),
   container: { name: service } +
              B.params('credentials', 'container', service, self.creds) +

config/services/walk.libsonnet

@@ -34,7 +34,8 @@ local parameters = [
 {
   creds:: [[service] + x for x in credentials],
   params:: [[service] + x for x in parameters],
-  cf: B.params('credentials', 'cf', service, self.creds) +
+  cf: { name: service } +
+      B.params('credentials', 'cf', service, self.creds) +
       B.params('parameters', 'cf', service, self.params),
   container: { name: service } +
              B.params('credentials', 'container', service, self.creds) +