Skip to content

Commit

Permalink
Add some appengine build constraints.
Browse files Browse the repository at this point in the history
Support for Go1.9 and appengine was removed in
grpc#3767. But it looks like we still
need some way to do things differently for certain appengine builds.
  • Loading branch information
easwars committed Aug 4, 2020
1 parent 8bec2f5 commit 00d7f4b
Show file tree
Hide file tree
Showing 8 changed files with 68 additions and 5 deletions.
2 changes: 1 addition & 1 deletion channelz/service/func_nonlinux.go
@@ -1,4 +1,4 @@
// +build !linux
// +build !linux appengine

/*
*
Expand Down
2 changes: 1 addition & 1 deletion internal/channelz/types_nonlinux.go
@@ -1,4 +1,4 @@
// +build !linux
// +build !linux appengine

/*
*
Expand Down
2 changes: 1 addition & 1 deletion internal/channelz/util_nonlinux.go
@@ -1,4 +1,4 @@
// +build !linux
// +build !linux appengine

/*
*
Expand Down
31 changes: 31 additions & 0 deletions 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
}
2 changes: 2 additions & 0 deletions internal/syscall/syscall_linux.go
@@ -1,3 +1,5 @@
// +build linux

/*
*
* Copyright 2018 gRPC authors.
Expand Down
2 changes: 1 addition & 1 deletion internal/syscall/syscall_nonlinux.go
@@ -1,4 +1,4 @@
// +build !linux
// +build !linux appengine

/*
*
Expand Down
30 changes: 30 additions & 0 deletions 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
}
2 changes: 1 addition & 1 deletion xds/internal/client/v2/client.go
Expand Up @@ -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,
Expand Down

0 comments on commit 00d7f4b

Please sign in to comment.