Merge pull request #17 from mccutchen/appengine

Deploy to App Engine

.travis.yml

@@ -4,6 +4,7 @@ go:
   - '1.9'
   - '1.10'
   - '1.11'
+  - '1.12'
 go_import_path: github.com/mccutchen/go-httpbin
 script:
   - make lint

.upignore

-*
-!server
-!main
-!*.js

Makefile

-.PHONY: clean deps image imagepush run test testcover
+.PHONY: clean deploy deps image imagepush lint run stagedeploy test testcover
+
+GCLOUD_PROJECT ?= httpbingo
+TEST_ARGS      ?= -race
+VERSION        ?= $(shell git rev-parse --short HEAD)
 
-COMMIT := $(shell git rev-parse --short HEAD)
 GENERATED_ASSETS_PATH := httpbin/assets/assets.go
+
 BIN_DIR   := $(GOPATH)/bin
 GOLINT    := $(BIN_DIR)/golint
 GOBINDATA := $(BIN_DIR)/go-bindata
-TEST_ARGS := -race
 
+# =============================================================================
+# build
+# =============================================================================
 build: dist/go-httpbin
 
-dist/go-httpbin: $(GENERATED_ASSETS_PATH) cmd/go-httpbin/*.go httpbin/*.go go.mod
+dist/go-httpbin: assets cmd/go_httpbin/*.go httpbin/*.go go.mod
 	mkdir -p dist
-	go build -o dist/go-httpbin ./cmd/go-httpbin
+	go build -o dist/go-httpbin ./cmd/go_httpbin
+
+assets: $(GENERATED_ASSETS_PATH)
+
+clean:
+	rm -r dist
 
 $(GENERATED_ASSETS_PATH): $(GOBINDATA) static/*
 	$(GOBINDATA) -o $(GENERATED_ASSETS_PATH) -pkg=assets -prefix=static static
@@ -22,6 +33,10 @@ $(GENERATED_ASSETS_PATH): $(GOBINDATA) static/*
 	sed -i.bak 's/Xml/XML/g' $(GENERATED_ASSETS_PATH)
 	rm $(GENERATED_ASSETS_PATH).bak
 
+
+# =============================================================================
+# test & lint
+# =============================================================================
 test:
 	go test $(TEST_ARGS) ./...
 
@@ -35,24 +50,44 @@ lint: $(GOLINT)
 	$(GOLINT) -set_exit_status ./...
 	go vet ./...
 
+
+# =============================================================================
+# deploy & run locally
+# =============================================================================
+deploy: build
+	gcloud app deploy --quiet --project=$(GCLOUD_PROJECT) --version=$(VERSION) --promote
+
+stagedeploy: build
+	gcloud app deploy --quiet --project=$(GCLOUD_PROJECT) --version=$(VERSION) --no-promote
+
 run: build
 	./dist/go-httpbin
 
-clean:
-	rm -r dist
 
-image: $(GENERATED_ASSETS_PATH) cmd/go-httpbin/*.go httpbin/*.go
-	docker build -t mccutchen/go-httpbin:$(COMMIT) .
+# =============================================================================
+# docker images
+# =============================================================================
+image: assets cmd/go-httpbin/*.go httpbin/*.go
+	docker build -t mccutchen/go-httpbin:$(VERSION) .
 
 imagepush: image
-	docker push mccutchen/go-httpbin:$(COMMIT)
+	docker push mccutchen/go-httpbin:$(VERSION)
 
-assets: $(GENERATED_ASSETS_PATH)
 
+# =============================================================================
+# dependencies
+# =============================================================================
 deps: $(GOLINT) $(GOBINDATA)
 
-$(GOLINT):
-	go get -u golang.org/x/lint/golint
-
+# Can't install from working dir because of go mod issues:
+#
+#     go get -u github.com/kevinburke/go-bindata/...
+#     go: finding github.com/kevinburke/go-bindata/... latest
+#     go get github.com/kevinburke/go-bindata/...: no matching versions for query "latest"
+#
+# So we get out of the go modules path to install.
 $(GOBINDATA):
 	cd /tmp && go get -u github.com/kevinburke/go-bindata/...
+
+$(GOLINT):
+	go get -u golang.org/x/lint/golint

app.yaml

+---
+runtime: go112
+
+main: ./cmd/go_httpbin
+
+# redirect everything to https
+handlers:
+  - url: /.*
+    script: auto
+    secure: always
+    redirect_http_response_code: 301

go.mod

 module github.com/mccutchen/go-httpbin
+
+go 1.12

now.json

-{
-    "name": "go-httpbin",
-    "type": "docker",
-    "public": true,
-    "alias": [
-        "httpbingo.org"
-    ]
-}

static/index.html

@@ -6,7 +6,7 @@
   <title>go-httpbin(1): HTTP Client Testing Service</title>
   <style type='text/css' media='all'>
   /* style: man */
-  body#manpage {margin:0}
+  body#manpage {margin:0;background:#fff;}
   .mp {max-width:100ex;padding:0 9ex 1ex 4ex}
   .mp p,.mp pre,.mp ul,.mp ol,.mp dl {margin:0 0 20px 0}
   .mp h2 {margin:10px 0 0 0}
@@ -24,7 +24,6 @@
   .mp,.mp code,.mp pre,.mp tt,.mp kbd,.mp samp,.mp h3,.mp h4 {font-family:monospace;font-size:14px;line-height:1.42857142857143}
   .mp h2 {font-size:16px;line-height:1.25}
   .mp h1 {font-size:20px;line-height:2}
-  .mp {text-align:justify;background:#fff}
   .mp,.mp code,.mp pre,.mp pre code,.mp tt,.mp kbd,.mp samp {color:#131211}
   .mp h1,.mp h2,.mp h3,.mp h4 {color:#030201}
   .mp u {text-decoration:underline}

up.json

-{
-    "name": "go-httpbin",
-    "profile": "up",
-    "hooks": {
-        "build": "GOOS=linux GOARCH=amd64 make && mv dist/go-httpbin server",
-        "clean": "rm -f server"
-    }
-}