From fb576bdcd82091d1c9b42f362ce43f841a944c12 Mon Sep 17 00:00:00 2001 From: Andy Zhao Date: Mon, 23 Nov 2020 12:17:18 -0800 Subject: [PATCH 1/2] fix(google-api-go-generator): add temporary patch for compute mtls endpoint --- google-api-go-generator/gen.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/google-api-go-generator/gen.go b/google-api-go-generator/gen.go index 33aeaf42859..e934f836122 100644 --- a/google-api-go-generator/gen.go +++ b/google-api-go-generator/gen.go @@ -499,6 +499,11 @@ func (a *API) mtlsAPIBaseURL() string { if a.doc.MTLSRootURL != "" { return resolveRelative(a.doc.MTLSRootURL, a.doc.ServicePath) } + // TODO(andyrzhao): Remove the workaround below when MTLSRootURL becomes available in + // compute discovery doc, after compute migrates to OP discovery doc gen (ETA 2021). + if a.doc.MTLSRootURL == "" && a.doc.RootURL == "https://compute.googleapis.com/" { + return resolveRelative("https://compute.mtls.googleapis.com/", a.doc.ServicePath) + } return "" } From 502ec8b5c0b451f81e9d65c85ea94f8ce159ec7e Mon Sep 17 00:00:00 2001 From: Andy Zhao Date: Mon, 1 Feb 2021 14:34:52 -0800 Subject: [PATCH 2/2] fix(transport): expand OS environment variables in cert provider command --- transport/cert/default_cert.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/transport/cert/default_cert.go b/transport/cert/default_cert.go index 141ae457936..04aefec0afa 100644 --- a/transport/cert/default_cert.go +++ b/transport/cert/default_cert.go @@ -110,6 +110,10 @@ func (s *secureConnectSource) getClientCertificate(info *tls.CertificateRequestI if defaultCert.cachedCert != nil && !isCertificateExpired(defaultCert.cachedCert) { return defaultCert.cachedCert, nil } + // Expand OS environment variables in the cert provider command such as "$HOME". + for i := 0; i < len(s.metadata.Cmd); i++ { + s.metadata.Cmd[i] = os.ExpandEnv(s.metadata.Cmd[i]) + } command := s.metadata.Cmd data, err := exec.Command(command[0], command[1:]...).Output() if err != nil {