Merge ~morphis/snappy-hwe-snaps/+git/wifi-ap:no-external-go-deps into ~snappy-hwe-team/snappy-hwe-snaps/+git/wifi-ap:master

[Simon Fels]

Access go dependencies via existing debian packages

As our CI is building in an environment where access to external
services like github is not allowed we have to build with what we
get through the Ubuntu package archive. The packages we're using
here are used by the snapd debian package too so we're not basing
off something which isn't maintained.

This change will be also proposed upstream to have this available
as a general feature in snapcraft.

[Jim Hodapp (jhodapp)]

I'm curious for some more context. What exactly was being done to get the Go dependencies before this patch? I don't fully understand why this is required and why this is a big improvement.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:578acb5af0c89ca751f29a580dec536c928a10be
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/90/
Executed test runs:

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/90/rebuild

review: Approve (continuous-integration)

[Simon Fels (morphis)]

@Jim: With Go you normally fetch all dependencies in source code form from a git repository like on github.com. This is not possible in our CI builds or even .deb builds on launchpad. Therefor Ubuntu provides necessary Go dependencies packaged in the archive which install all source code to /usr/share/gocode which then can be use as part of your GOPATH environment and avoids fetching the source code from a remote git repository.

[System Enablement Bot (system-enablement-ci-bot)]

PASSED: Continuous integration, rev:4c17db7dc0251813de463c913e608d87269d729a
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/114/
Executed test runs:
    None: https://jenkins.canonical.com/system-enablement/job/generic-update-snap-mp/15/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-enablement/job/generic-build-snap/114/rebuild

review: Approve (continuous-integration)

[Alfonso Sanchez-Beato (alfonsosanchezbeato)]

LGTM

review: Approve

[Konrad Zapałowicz (kzapalowicz)]

Cool

review: Approve

diff --git a/parts/plugins/x-go.py b/parts/plugins/x-go.py
 new file mode 100644
index 0000000..2211de7
--- /dev/null
+++ b/parts/plugins/x-go.py
@@ -0,0 +1,44 @@
+# -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
+#
+# Copyright (C) 2015, 2016 Canonical Ltd
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 3 as
+# published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import os
+
+import snapcraft
+import snapcraft.plugins.go
+
+DEBIAN_GOCODE_SRC_PATH = "/usr/share/gocode/src"
+
+class GoPlugin(snapcraft.plugins.go.GoPlugin):
+    def pull(self):
+        # Skip the pull step from GoPlugin here as it would repeat 90% of what
+        # we're doing here and will only conflict.
+        snapcraft.BasePlugin.pull(self)
+        os.makedirs(self._gopath_src, exist_ok=True)
+
+        if self.options.source:
+            go_package = self._get_local_go_package()
+            go_package_path = os.path.join(self._gopath_src, go_package)
+            if os.path.islink(go_package_path):
+                os.unlink(go_package_path)
+            os.makedirs(os.path.dirname(go_package_path), exist_ok=True)
+            os.symlink(self.sourcedir, go_package_path)
+            # We can't just add the gocode directory to GOPATH as go
+            # doesn't like this. Instead we're symlinking the necessary
+            # subdirectories from the gocode directory into our already
+            # existing GOPATH.
+            for dir in os.listdir(DEBIAN_GOCODE_SRC_PATH):
+                os.symlink(os.path.join(DEBIAN_GOCODE_SRC_PATH, dir),
+                           os.path.join(self._gopath_src, dir))
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 479b348..955fdfb 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -62,12 +62,18 @@ parts:
     source: cmd/client
     snap:
       - bin
+    build-packages:
+      - golang-go-flags-dev
+      - golang-github-gorilla-mux-dev
 
   management-service:
     plugin: go
     source: cmd/service
     snap:
       - bin
+    build-packages:
+      - golang-go-flags-dev
+      - golang-github-gorilla-mux-dev
 
   dnsmasq:
     plugin: make