From 8bc4369596835ae7ee51f04ee1c40978d75b99ef Mon Sep 17 00:00:00 2001
From: Jason Hall <jasonhall@google.com>
Date: Thu, 16 May 2019 08:48:18 -0400
Subject: [PATCH] Don't use logging client

---
 cmd/api/main.go       |  4 ++--
 cmd/buildpack/main.go | 25 +++++++++----------------
 cmd/ko/main.go        | 18 ++----------------
 cmd/random/main.go    | 18 ++----------------
 4 files changed, 15 insertions(+), 50 deletions(-)

diff --git a/cmd/api/main.go b/cmd/api/main.go
index 7c1c513..3789886 100644
--- a/cmd/api/main.go
+++ b/cmd/api/main.go
@@ -46,8 +46,8 @@ func main() {
 	}
 
 	http.Handle("/", &server{
-		info:  log.New(os.Stdout, "INFO ", 0),
-		error: log.New(os.Stderr, "ERROR ", 0),
+		info:  log.New(os.Stdout, "I ", log.Ldate|log.Ltime|log.Lshortfile),
+		error: log.New(os.Stderr, "E ", log.Ldate|log.Ltime|log.Lshortfile),
 		ds:    ds,
 	})
 
diff --git a/cmd/buildpack/main.go b/cmd/buildpack/main.go
index 78b9eb7..6a5a88c 100644
--- a/cmd/buildpack/main.go
+++ b/cmd/buildpack/main.go
@@ -15,7 +15,6 @@ import (
 
 	"cloud.google.com/go/compute/metadata"
 	"cloud.google.com/go/datastore"
-	"cloud.google.com/go/logging"
 	"github.com/google/go-containerregistry/pkg/authn"
 	"github.com/google/go-containerregistry/pkg/name"
 	"github.com/google/go-containerregistry/pkg/v1"
@@ -28,32 +27,26 @@ import (
 var projectID = ""
 
 func init() {
-	p, err := metadata.ProjectID()
+	var err error
+	projectID, err = metadata.ProjectID()
 	if err != nil {
 		log.Fatalf("metadata.ProjectID: %v", err)
 	}
-	projectID = p
 }
 
 const base = "packs/run:v3alpha2"
 
 func main() {
 	ctx := context.Background()
-	client, err := logging.NewClient(ctx, projectID)
-	if err != nil {
-		log.Fatalf("logging.NewClient: %v", err)
-	}
-	lg := client.Logger("server")
-
-	dsClient, err := datastore.NewClient(ctx, projectID)
+	ds, err := datastore.NewClient(ctx, projectID)
 	if err != nil {
 		log.Fatalf("datastore.NewClient: %v", err)
 	}
 
 	http.Handle("/v2/", &server{
-		info:      lg.StandardLogger(logging.Info),
-		error:     lg.StandardLogger(logging.Error),
-		datastore: dsClient,
+		info:  log.New(os.Stdout, "I ", log.Ldate|log.Ltime|log.Lshortfile),
+		error: log.New(os.Stderr, "E ", log.Ldate|log.Ltime|log.Lshortfile),
+		ds:    ds,
 	})
 
 	log.Println("Starting...")
@@ -68,7 +61,7 @@ func main() {
 
 type server struct {
 	info, error *log.Logger
-	datastore   *datastore.Client
+	ds          *datastore.Client
 }
 
 func (s *server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
@@ -167,7 +160,7 @@ func (s *server) checkCachedManifest(revision string) []byte {
 	k := datastore.NameKey("Manifests", revision, nil)
 	var e cachedManifest
 	ctx := context.Background() // TODO
-	if err := s.datastore.Get(ctx, k, &e); err == datastore.ErrNoSuchEntity {
+	if err := s.ds.Get(ctx, k, &e); err == datastore.ErrNoSuchEntity {
 		s.info.Printf("No cached manifest digest for %q", revision)
 	} else if err != nil {
 		s.error.Printf("datastore.Get: %v", err)
@@ -179,7 +172,7 @@ func (s *server) putCachedManifest(revision string, manifest []byte) {
 	k := datastore.NameKey("Manifests", revision, nil)
 	e := cachedManifest{manifest}
 	ctx := context.Background() // TODO
-	if _, err := s.datastore.Put(ctx, k, &e); err != nil {
+	if _, err := s.ds.Put(ctx, k, &e); err != nil {
 		s.error.Printf("datastore.Put: %v", err)
 	}
 }
diff --git a/cmd/ko/main.go b/cmd/ko/main.go
index c2b1b3f..b307442 100644
--- a/cmd/ko/main.go
+++ b/cmd/ko/main.go
@@ -15,7 +15,6 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"net/http"
@@ -23,8 +22,6 @@ import (
 	"strings"
 	"time"
 
-	"cloud.google.com/go/compute/metadata"
-	"cloud.google.com/go/logging"
 	"github.com/google/go-containerregistry/pkg/name"
 	v1 "github.com/google/go-containerregistry/pkg/v1"
 	"github.com/google/go-containerregistry/pkg/v1/remote"
@@ -34,20 +31,9 @@ import (
 )
 
 func main() {
-	ctx := context.Background()
-	projectID, err := metadata.ProjectID()
-	if err != nil {
-		log.Fatalf("metadata.ProjectID: %v", err)
-	}
-	client, err := logging.NewClient(ctx, projectID)
-	if err != nil {
-		log.Fatalf("logging.NewClient: %v", err)
-	}
-	lg := client.Logger("server")
-
 	http.Handle("/v2/", &server{
-		info:  lg.StandardLogger(logging.Info),
-		error: lg.StandardLogger(logging.Error),
+		info:  log.New(os.Stdout, "I ", log.Ldate|log.Ltime|log.Lshortfile),
+		error: log.New(os.Stderr, "E ", log.Ldate|log.Ltime|log.Lshortfile),
 	})
 
 	log.Println("Starting...")
diff --git a/cmd/random/main.go b/cmd/random/main.go
index 5453b80..bd83b20 100644
--- a/cmd/random/main.go
+++ b/cmd/random/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"fmt"
 	"log"
 	"net/http"
@@ -10,27 +9,14 @@ import (
 	"strconv"
 	"strings"
 
-	"cloud.google.com/go/compute/metadata"
-	"cloud.google.com/go/logging"
 	"github.com/google/go-containerregistry/pkg/v1/random"
 	"github.com/imjasonh/kontain.me/pkg/serve"
 )
 
 func main() {
-	ctx := context.Background()
-	projectID, err := metadata.ProjectID()
-	if err != nil {
-		log.Fatalf("metadata.ProjectID: %v", err)
-	}
-	client, err := logging.NewClient(ctx, projectID)
-	if err != nil {
-		log.Fatalf("logging.NewClient: %v", err)
-	}
-	lg := client.Logger("server")
-
 	http.Handle("/v2/", &server{
-		info:  lg.StandardLogger(logging.Info),
-		error: lg.StandardLogger(logging.Error),
+		info:  log.New(os.Stdout, "I ", log.Ldate|log.Ltime|log.Lshortfile),
+		error: log.New(os.Stderr, "E ", log.Ldate|log.Ltime|log.Lshortfile),
 	})
 
 	log.Println("Starting...")