From 3eca74879a0330df63a983b83f089d7892ccf378 Mon Sep 17 00:00:00 2001
From: Victor Vrantchan <groob@users.noreply.github.com>
Date: Sat, 12 May 2018 19:28:56 -0400
Subject: [PATCH] update circle-ci to go 1.10 (#419)

---
 .circleci/config.yml             | 7 +++----
 CONTRIBUTING.md                  | 2 +-
 Makefile                         | 3 ++-
 mdm/enroll/service.go            | 2 +-
 platform/apns/service.go         | 2 +-
 platform/blueprint/builtin/db.go | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 24b14ffe..dcba70c1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2
 jobs:
-  build-go1.9:
+  build-go1.10:
     docker:
-        - image: golang:1.9
+        - image: golang:1.10
     working_directory: /go/src/github.com/micromdm/micromdm
     steps: &steps
       - checkout
@@ -14,5 +14,4 @@ workflows:
   version: 2
   build:
     jobs:
-      - build-go1.9
-
+      - build-go1.10
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 972cef55..089cc302 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -15,7 +15,7 @@ Here's a few places to get started and find out what's outstanding.
 
 ## Building the project
 
-To build MicroMDM from source, you will need [Go 1.8](https://golang.org/dl/) or later installed.
+To build MicroMDM from source, you will need [Go 1.10](https://golang.org/dl/) or later installed.
 
 ```
 # if GOPATH is unset:
diff --git a/Makefile b/Makefile
index 91e07759..53835340 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,8 @@ ifneq ($(shell pwd), $(WORKSPACE))
 endif
 
 deps: check-deps
-	go get -u github.com/golang/dep/...
+	@which dep > /dev/null 2>&1 || \
+		echo "Installing dep" && go get -u github.com/golang/dep/cmd/dep
 	dep ensure -vendor-only
 
 test:
diff --git a/mdm/enroll/service.go b/mdm/enroll/service.go
index 76d7c07d..920fd221 100644
--- a/mdm/enroll/service.go
+++ b/mdm/enroll/service.go
@@ -97,7 +97,7 @@ func updateTopic(svc *service, sub pubsub.Subscriber) error {
 			case <-configEvents:
 				topic, err := svc.topicProvier.PushTopic()
 				if err != nil {
-					log.Println("enroll: get push topic %s", topic)
+					log.Printf("enroll: get push topic %s\n", topic)
 				}
 				svc.mu.Lock()
 				svc.Topic = topic
diff --git a/platform/apns/service.go b/platform/apns/service.go
index 67383048..afa95feb 100644
--- a/platform/apns/service.go
+++ b/platform/apns/service.go
@@ -108,7 +108,7 @@ func updateClient(svc *PushService, sub pubsub.Subscriber) error {
 			case <-configEvents:
 				pushsvc, err := NewPushService(svc.provider)
 				if err != nil {
-					log.Println("push: could not get push certificate %s", err)
+					log.Printf("push: could not get push certificate %s\n", err)
 					continue
 				}
 				svc.mu.Lock()
diff --git a/platform/blueprint/builtin/db.go b/platform/blueprint/builtin/db.go
index 2451eacf..16833282 100644
--- a/platform/blueprint/builtin/db.go
+++ b/platform/blueprint/builtin/db.go
@@ -112,7 +112,7 @@ func (db *DB) Save(bp *blueprint.Blueprint) error {
 	indexes := []string{bp.UUID, bp.Name}
 	idxBucket := tx.Bucket([]byte(blueprintIndexBucket))
 	if idxBucket == nil {
-		return fmt.Errorf("bucket %q not found!", idxBucket)
+		return fmt.Errorf("bucket %v not found!", idxBucket)
 	}
 	for _, idx := range indexes {
 		if idx == "" {