Revert "Add a warning message about missing gcert at the end of the build"
This reverts commit b018b83664c33256b8fb1303c6db5b196d4331e5.
Reason for revert: Builds will start failing now since the gcert change is about to go in.
Change-Id: I81d36ce6bf4f7a9bc120b34d411f2cb4ec64e5eb
diff --git a/ui/build/config.go b/ui/build/config.go
index 6cac06f..01fe8fa 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -1205,21 +1205,6 @@
return "RBE_use_application_default_credentials", "true"
}
-func (c *configImpl) IsGooglerEnvironment() bool {
- cf := "ANDROID_BUILD_ENVIRONMENT_CONFIG"
- if v, ok := c.environ.Get(cf); ok {
- return v == "googler"
- }
- return false
-}
-
-func (c *configImpl) GoogleProdCredsExist() bool {
- if _, err := exec.Command("/usr/bin/prodcertstatus", "--simple_output", "--nocheck_loas").Output(); err != nil {
- return false
- }
- return true
-}
-
func (c *configImpl) UseRemoteBuild() bool {
return c.UseGoma() || c.UseRBE()
}
diff --git a/ui/build/rbe.go b/ui/build/rbe.go
index 78d37b4..8f9a699 100644
--- a/ui/build/rbe.go
+++ b/ui/build/rbe.go
@@ -119,7 +119,6 @@
}
func stopRBE(ctx Context, config Config) {
- defer checkProdCreds(ctx, config)
cmd := Command(ctx, config, "stopRBE bootstrap", rbeCommand(ctx, config, bootstrapCmd), "-shutdown")
output, err := cmd.CombinedOutput()
if err != nil {
@@ -132,15 +131,6 @@
}
}
-func checkProdCreds(ctx Context, config Config) {
- if !config.IsGooglerEnvironment() || config.GoogleProdCredsExist() {
- return
- }
- fmt.Fprintln(ctx.Writer, "")
- fmt.Fprintln(ctx.Writer, "\033[33mWARNING: Missing LOAS credentials, please run `gcert`. This will result in failing RBE builds in the future, see go/build-fast#authentication.\033[0m")
- fmt.Fprintln(ctx.Writer, "")
-}
-
// DumpRBEMetrics creates a metrics protobuf file containing RBE related metrics.
// The protobuf file is created if RBE is enabled and the proxy service has
// started. The proxy service is shutdown in order to dump the RBE metrics to the