commit 26757b2a3cdb41f5d0ca34c76fd2425c1e21dc4e
author Heschi Kreinick <heschi@google.com> Fri Jun 04 16:28:11 2021 -0400
committer Heschi Kreinick <heschi@google.com> Fri Jun 04 21:11:39 2021 +0000
tree 6bb49556f90a5ccbd2a8967d698f588ff4556f6d
parent c54211292be48b7eb56ec29f6e96a8a7f562cdbf

cmd/gitmirror: enable CSR mirroring

Flip the default flag to true. Install gcloud in the container image so
it can be used for authentication.

Also remove some stray debug logging.

Change-Id: I67011220661018fea057f3e9e7f18263bece0842
Reviewed-on: https://go-review.googlesource.com/c/build/+/325269
Trust: Heschi Kreinick <heschi@google.com>
Run-TryBot: Heschi Kreinick <heschi@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Dmitri Shuralyov <dmitshur@golang.org>

cmd/gitmirror/Dockerfile

diff --git a/cmd/gitmirror/Dockerfile b/cmd/gitmirror/Dockerfile
index 82cbefd..c85258a 100644
--- a/cmd/gitmirror/Dockerfile
+++ b/cmd/gitmirror/Dockerfile
@@ -42,8 +42,12 @@
 	git-core \
 	openssh-client \
 	gnupg dirmngr \
+	curl \
 	&& rm -rf /var/lib/apt/lists/*
 
+# Install gcloud for auth to CSR, see https://cloud.google.com/sdk/docs/install#deb
+RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg  add - && apt-get update -y && apt-get install google-cloud-sdk -y
+
 # See https://github.com/golang/go/issues/23705
 ENV TINI_VERSION v0.16.1
 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini

cmd/gitmirror/gitmirror.go

diff --git a/cmd/gitmirror/gitmirror.go b/cmd/gitmirror/gitmirror.go
index d279e65..d504e7f 100644
--- a/cmd/gitmirror/gitmirror.go
+++ b/cmd/gitmirror/gitmirror.go
@@ -46,7 +46,7 @@
 	flagPollInterval = flag.Duration("poll", 60*time.Second, "Remote repo poll interval")
 	flagMirror       = flag.Bool("mirror", false, "whether to mirror to mirror repos; if disabled, it only runs in HTTP archive server mode")
 	flagMirrorGitHub = flag.Bool("mirror-github", true, "whether to mirror to GitHub when mirroring is enabled")
-	flagMirrorCSR    = flag.Bool("mirror-csr", false, "whether to mirror to Cloud Source Repositories when mirroring is enabled")
+	flagMirrorCSR    = flag.Bool("mirror-csr", true, "whether to mirror to Cloud Source Repositories when mirroring is enabled")
 	flagSecretsDir   = flag.String("secretsdir", "", "directory to load secrets from instead of GCP")
 )
 
@@ -363,7 +363,7 @@
 	if err == nil {
 		r.logf("ran git %s in %v", args, time.Since(start))
 	} else {
-		r.logf("git %s failed after %v: %v\nstdout: %v\nstderr: %v\n", args, time.Since(start), err, string(stdout), string(stderr))
+		r.logf("git %s failed after %v: %v\nstderr: %v\n", args, time.Since(start), err, string(stderr))
 	}
 	return stdout, stderr, err
 }
@@ -537,7 +537,7 @@
 		return nil
 	}
 	r.logf("attempting to fetch missing revision %s from origin", rev)
-	_, _, err := r.runGitLogged("fetch", "-v", "origin", rev)
+	_, _, err := r.runGitLogged("fetch", "origin", rev)
 	return err
 }