Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

examples: update xds examples for PSM security #4256

Merged
merged 2 commits into from Apr 8, 2021
Merged

examples: update xds examples for PSM security #4256

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f793fa
examples: update xds examples for PSM security
easwars Mar 10, 2021
fa9dac7
retain default value for target
easwars Apr 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
66 changes: 22 additions & 44 deletions examples/features/xds/client/main.go
View file
Open in desktop
Expand Up @@ -16,78 +16,56 @@
*
*/

// Package main implements a client for Greeter service.
// Binary main implements a client for Greeter service using gRPC's client-side
// support for xDS APIs.
package main

import (
"context"
"flag"
"fmt"
"log"
"strings"
"time"

"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
xdscreds "google.golang.org/grpc/credentials/xds"
pb "google.golang.org/grpc/examples/helloworld/helloworld"

_ "google.golang.org/grpc/xds" // To install the xds resolvers and balancers.
)

const (
defaultTarget = "localhost:50051"
defaultName = "world"
var (
target = flag.String("target", "", "uri of the Greeter Server, e.g. 'xds:///helloworld-service:8080'")
menghanl marked this conversation as resolved.
Show resolved Hide resolved
menghanl marked this conversation as resolved.
Show resolved Hide resolved
name = flag.String("name", "world", "name you wished to be greeted by the server")
xdsCreds = flag.Bool("xds_creds", false, "whether the server should use xDS APIs to receive security configuration")
menghanl marked this conversation as resolved.
Show resolved Hide resolved
)

var help = flag.Bool("help", false, "Print usage information")

func init() {
flag.Usage = func() {
fmt.Fprintf(flag.CommandLine.Output(), `
Usage: client [name [target]]

name
The name you wish to be greeted by. Defaults to %q
target
The URI of the server, e.g. "xds:///helloworld-service". Defaults to %q
`, defaultName, defaultTarget)

flag.PrintDefaults()
}
}

func main() {
flag.Parse()
if *help {
flag.Usage()
return
}
args := flag.Args()

if len(args) > 2 {
flag.Usage()
return
}

name := defaultName
if len(args) > 0 {
name = args[0]
if !strings.HasPrefix(*target, "xds:///") {
log.Fatalf("-target must use a URI with scheme set to 'xds'")
menghanl marked this conversation as resolved.
Show resolved Hide resolved
}

target := defaultTarget
if len(args) > 1 {
target = args[1]
creds := insecure.NewCredentials()
if *xdsCreds {
log.Println("Using xDS credentials...")
var err error
if creds, err = xdscreds.NewClientCredentials(xdscreds.ClientOptions{FallbackCreds: insecure.NewCredentials()}); err != nil {
log.Fatalf("failed to create client-side xDS credentials: %v", err)
}
}

// Set up a connection to the server.
conn, err := grpc.Dial(target, grpc.WithInsecure())
conn, err := grpc.Dial(*target, grpc.WithTransportCredentials(creds))
if err != nil {
log.Fatalf("did not connect: %v", err)
log.Fatalf("grpc.Dial(%s) failed: %v", *target, err)
}
defer conn.Close()
c := pb.NewGreeterClient(conn)

ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
defer cancel()
r, err := c.SayHello(ctx, &pb.HelloRequest{Name: name})
c := pb.NewGreeterClient(conn)
r, err := c.SayHello(ctx, &pb.HelloRequest{Name: *name})
if err != nil {
log.Fatalf("could not greet: %v", err)
}
Expand Down
93 changes: 31 additions & 62 deletions examples/features/xds/server/main.go
View file
Open in desktop
Expand Up @@ -16,7 +16,8 @@
*
*/

// Package main starts Greeter service that will response with the hostname.
// Binary server demonstrated gRPC's support for xDS APIs on the server-side. It
// exposes the Greeter service that will response with the hostname.
package main

import (
Expand All @@ -27,36 +28,29 @@ import (
"math/rand"
"net"
"os"
"strconv"
"time"

"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
xdscreds "google.golang.org/grpc/credentials/xds"
pb "google.golang.org/grpc/examples/helloworld/helloworld"
"google.golang.org/grpc/health"
healthpb "google.golang.org/grpc/health/grpc_health_v1"
"google.golang.org/grpc/reflection"
"google.golang.org/grpc/xds"
)

var help = flag.Bool("help", false, "Print usage information")

const (
defaultPort = 50051
var (
port = flag.Int("port", 50051, "the port to serve Greeter service requests on. Health service will be served on `port+1`")
xdsCreds = flag.Bool("xds_creds", false, "whether the server should use xDS APIs to receive security configuration")
)

// server is used to implement helloworld.GreeterServer.
// server implements helloworld.GreeterServer interface.
type server struct {
pb.UnimplementedGreeterServer

serverName string
}

func newServer(serverName string) *server {
return &server{
serverName: serverName,
}
}

// SayHello implements helloworld.GreeterServer
// SayHello implements helloworld.GreeterServer interface.
func (s *server) SayHello(ctx context.Context, in *pb.HelloRequest) (*pb.HelloReply, error) {
log.Printf("Received: %v", in.GetName())
return &pb.HelloReply{Message: "Hello " + in.GetName() + ", from " + s.serverName}, nil
Expand All @@ -72,65 +66,40 @@ func determineHostname() string {
return hostname
}

func init() {
flag.Usage = func() {
fmt.Fprintf(flag.CommandLine.Output(), `
Usage: server [port [hostname]]

port
The listen port. Defaults to %d
hostname
The name clients will see in greet responses. Defaults to the machine's hostname
`, defaultPort)

flag.PrintDefaults()
}
}

func main() {
flag.Parse()
if *help {
flag.Usage()
return
}
args := flag.Args()

if len(args) > 2 {
flag.Usage()
return
greeterPort := fmt.Sprintf(":%d", *port)
greeterLis, err := net.Listen("tcp4", greeterPort)
menghanl marked this conversation as resolved.
Show resolved Hide resolved
if err != nil {
log.Fatalf("net.Listen(tcp4, %q) failed: %v", greeterPort, err)
}

port := defaultPort
if len(args) > 0 {
creds := insecure.NewCredentials()
if *xdsCreds {
log.Println("Using xDS credentials...")
var err error
port, err = strconv.Atoi(args[0])
if err != nil {
log.Printf("Invalid port number: %v", err)
flag.Usage()
return
if creds, err = xdscreds.NewServerCredentials(xdscreds.ServerOptions{FallbackCreds: insecure.NewCredentials()}); err != nil {
log.Fatalf("failed to create server-side xDS credentials: %v", err)
}
}

var hostname string
if len(args) > 1 {
hostname = args[1]
}
if hostname == "" {
hostname = determineHostname()
}
greeterServer := xds.NewGRPCServer(grpc.Creds(creds))
pb.RegisterGreeterServer(greeterServer, &server{serverName: determineHostname()})

lis, err := net.Listen("tcp", fmt.Sprintf("localhost:%d", port))
healthPort := fmt.Sprintf(":%d", *port+1)
healthLis, err := net.Listen("tcp4", healthPort)
if err != nil {
log.Fatalf("failed to listen: %v", err)
log.Fatalf("net.Listen(tcp4, %q) failed: %v", healthPort, err)
}
s := grpc.NewServer()
pb.RegisterGreeterServer(s, newServer(hostname))

reflection.Register(s)
grpcServer := grpc.NewServer()
healthServer := health.NewServer()
healthServer.SetServingStatus("", healthpb.HealthCheckResponse_SERVING)
healthpb.RegisterHealthServer(s, healthServer)
healthpb.RegisterHealthServer(grpcServer, healthServer)
menghanl marked this conversation as resolved.
Show resolved Hide resolved

log.Printf("serving on %s, hostname %s", lis.Addr(), hostname)
s.Serve(lis)
log.Printf("Serving GreeterService on %s and HealthService on %s", greeterLis.Addr().String(), healthLis.Addr().String())
go func() {
greeterServer.Serve(greeterLis)
}()
grpcServer.Serve(healthLis)
}