diff --git a/channelz/service/func_nonlinux.go b/channelz/service/func_nonlinux.go index 64ecea947de..eb53334ed0d 100644 --- a/channelz/service/func_nonlinux.go +++ b/channelz/service/func_nonlinux.go @@ -1,4 +1,4 @@ -// +build !linux +// +build !linux appengine /* * diff --git a/internal/channelz/types_nonlinux.go b/internal/channelz/types_nonlinux.go index 50177079152..da7351e9709 100644 --- a/internal/channelz/types_nonlinux.go +++ b/internal/channelz/types_nonlinux.go @@ -1,4 +1,4 @@ -// +build !linux +// +build !linux appengine /* * diff --git a/internal/channelz/util_nonlinux.go b/internal/channelz/util_nonlinux.go index d600417fb8c..8864a081116 100644 --- a/internal/channelz/util_nonlinux.go +++ b/internal/channelz/util_nonlinux.go @@ -1,4 +1,4 @@ -// +build !linux +// +build !linux appengine /* * diff --git a/internal/credentials/spiffe_appengine.go b/internal/credentials/spiffe_appengine.go new file mode 100644 index 00000000000..af6f5771976 --- /dev/null +++ b/internal/credentials/spiffe_appengine.go @@ -0,0 +1,31 @@ +// +build appengine + +/* + * + * Copyright 2020 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package credentials + +import ( + "crypto/tls" + "net/url" +) + +// SPIFFEIDFromState is a no-op for appengine builds. +func SPIFFEIDFromState(state tls.ConnectionState) *url.URL { + return nil +} diff --git a/internal/syscall/syscall_linux.go b/internal/syscall/syscall_linux.go index 3743bd45afb..1fc1a4060e5 100644 --- a/internal/syscall/syscall_linux.go +++ b/internal/syscall/syscall_linux.go @@ -1,3 +1,5 @@ +// +build linux + /* * * Copyright 2018 gRPC authors. diff --git a/internal/syscall/syscall_nonlinux.go b/internal/syscall/syscall_nonlinux.go index 95b71343748..51159e638d7 100644 --- a/internal/syscall/syscall_nonlinux.go +++ b/internal/syscall/syscall_nonlinux.go @@ -1,4 +1,4 @@ -// +build !linux +// +build !linux appengine /* * diff --git a/security/advancedtls/sni_appengine.go b/security/advancedtls/sni_appengine.go new file mode 100644 index 00000000000..fffbb0107dd --- /dev/null +++ b/security/advancedtls/sni_appengine.go @@ -0,0 +1,30 @@ +// +build appengine + +/* + * + * Copyright 2020 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +package advancedtls + +import ( + "crypto/tls" +) + +// buildGetCertificates is a no-op for appengine builds. +func buildGetCertificates(clientHello *tls.ClientHelloInfo, o *ServerOptions) (*tls.Certificate, error) { + return nil, nil +} diff --git a/xds/internal/client/v2/client.go b/xds/internal/client/v2/client.go index 627b9e8e5a9..c5a79f54fc3 100644 --- a/xds/internal/client/v2/client.go +++ b/xds/internal/client/v2/client.go @@ -53,7 +53,7 @@ func (clientBuilder) Version() version.TransportAPI { func newClient(cc *grpc.ClientConn, opts xdsclient.BuildOptions) (xdsclient.APIClient, error) { nodeProto, ok := opts.NodeProto.(*v2corepb.Node) if !ok { - return nil, fmt.Errorf("xds: unsupported Node proto type: %T, want %T", opts.NodeProto, v2corepb.Node{}) + return nil, fmt.Errorf("xds: unsupported Node proto type: %T, want %T", opts.NodeProto, (*v2corepb.Node)(nil)) } v2c := &client{ cc: cc,