From 6accb180d8acd7513d8180e1d037b5328a3cf8ac Mon Sep 17 00:00:00 2001
From: Elliott Stoneham <elliott.stoneham@gmail.com>
Date: Thu, 12 Jan 2017 14:44:08 +0000
Subject: [PATCH 1/2] demonstrate go vendoring using app engine SDK

---
 go/vendortest/app.yaml                         |  8 ++++++++
 go/vendortest/vendortest/vendortest.go         |  7 +++++++
 .../vendor/my.vendor.test/foo/bar/bar.go       |  3 +++
 .../vendortestcode/vendortestcode.go           | 18 ++++++++++++++++++
 4 files changed, 36 insertions(+)
 create mode 100644 go/vendortest/app.yaml
 create mode 100644 go/vendortest/vendortest/vendortest.go
 create mode 100644 go/vendortestcode/vendor/my.vendor.test/foo/bar/bar.go
 create mode 100644 go/vendortestcode/vendortestcode/vendortestcode.go

diff --git a/go/vendortest/app.yaml b/go/vendortest/app.yaml
new file mode 100644
index 00000000..a28131b8
--- /dev/null
+++ b/go/vendortest/app.yaml
@@ -0,0 +1,8 @@
+application: vendortest
+version: 1
+runtime: go
+api_version: go1
+
+handlers:
+- url: /.*
+  script: _go_app
\ No newline at end of file
diff --git a/go/vendortest/vendortest/vendortest.go b/go/vendortest/vendortest/vendortest.go
new file mode 100644
index 00000000..92e4e7e4
--- /dev/null
+++ b/go/vendortest/vendortest/vendortest.go
@@ -0,0 +1,7 @@
+// for why this crazy arrangement is required, see http://stackoverflow.com/questions/39948027/how-do-i-make-vendoring-work-with-google-app-engine
+
+package vendortest
+
+import _ "github.com/appscale/sample-apps/go/vendortestcode/vendortestcode"
+
+func init() {}
diff --git a/go/vendortestcode/vendor/my.vendor.test/foo/bar/bar.go b/go/vendortestcode/vendor/my.vendor.test/foo/bar/bar.go
new file mode 100644
index 00000000..de93842e
--- /dev/null
+++ b/go/vendortestcode/vendor/my.vendor.test/foo/bar/bar.go
@@ -0,0 +1,3 @@
+package bar
+
+const Working = "working"
diff --git a/go/vendortestcode/vendortestcode/vendortestcode.go b/go/vendortestcode/vendortestcode/vendortestcode.go
new file mode 100644
index 00000000..e9f17664
--- /dev/null
+++ b/go/vendortestcode/vendortestcode/vendortestcode.go
@@ -0,0 +1,18 @@
+// test that go vendoring is working
+
+package vendortestcode
+
+import (
+	"fmt"
+	"net/http"
+
+	"my.vendor.test/foo/bar"
+)
+
+func init() {
+	http.HandleFunc("/", vendortest)
+}
+
+func vendortest(w http.ResponseWriter, r *http.Request) {
+	fmt.Fprintf(w, "Go vendoring is %s.", bar.Working)
+}

From 096298546a8123ebd41ea1d2c0c10e548ea146df Mon Sep 17 00:00:00 2001
From: Elliott Stoneham <elliott.stoneham@gmail.com>
Date: Thu, 12 Jan 2017 14:58:01 +0000
Subject: [PATCH 2/2] rename app package for clarity

---
 go/vendortest/vendortest/vendortest.go                          | 2 +-
 .../{vendortestcode/vendortestcode.go => app/app.go}            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename go/vendortestcode/{vendortestcode/vendortestcode.go => app/app.go} (91%)

diff --git a/go/vendortest/vendortest/vendortest.go b/go/vendortest/vendortest/vendortest.go
index 92e4e7e4..13258ee6 100644
--- a/go/vendortest/vendortest/vendortest.go
+++ b/go/vendortest/vendortest/vendortest.go
@@ -2,6 +2,6 @@
 
 package vendortest
 
-import _ "github.com/appscale/sample-apps/go/vendortestcode/vendortestcode"
+import _ "github.com/appscale/sample-apps/go/vendortestcode/app"
 
 func init() {}
diff --git a/go/vendortestcode/vendortestcode/vendortestcode.go b/go/vendortestcode/app/app.go
similarity index 91%
rename from go/vendortestcode/vendortestcode/vendortestcode.go
rename to go/vendortestcode/app/app.go
index e9f17664..20d04840 100644
--- a/go/vendortestcode/vendortestcode/vendortestcode.go
+++ b/go/vendortestcode/app/app.go
@@ -1,6 +1,6 @@
 // test that go vendoring is working
 
-package vendortestcode
+package app
 
 import (
 	"fmt"