Add a user agent to GCB calls.

GoogleContainerTools · May 23, 2018 · 996dd87 · 996dd87
1 parent b86a12b
commit 996dd87
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/pkg/skaffold/build/container_builder.go b/pkg/skaffold/build/container_builder.go
@@ -23,6 +23,8 @@ import (
 	"io"
 	"time"
 
+	"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
+
 	cstorage "cloud.google.com/go/storage"
 	"golang.org/x/oauth2/google"
 	cloudbuild "google.golang.org/api/cloudbuild/v1"
@@ -84,6 +86,7 @@ func (cb *GoogleCloudBuilder) Build(ctx context.Context, out io.Writer, tagger t
 	if err != nil {
 		return nil, errors.Wrap(err, "getting builder")
 	}
+	cbclient.UserAgent = version.UserAgent()
 	c, err := cstorage.NewClient(ctx)
 	if err != nil {
 		return nil, errors.Wrap(err, "getting cloud storage client")

diff --git a/pkg/skaffold/version/version.go b/pkg/skaffold/version/version.go
@@ -22,6 +22,7 @@ import (
 )
 
 var version, gitCommit, gitTreeState, buildDate string
+var platform = fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH)
 
 type Info struct {
 	Version      string
@@ -44,6 +45,10 @@ func Get() *Info {
 		BuildDate:    buildDate,
 		GoVersion:    runtime.Version(),
 		Compiler:     runtime.Compiler,
-		Platform:     fmt.Sprintf("%s/%s", runtime.GOOS, runtime.GOARCH),
+		Platform:     platform,
 	}
 }
+
+func UserAgent() string {
+	return fmt.Sprintf("skaffold/%s/%s", platform, version)
+}