From 48362262046b688a8388630788745941f1bfce5e Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Sun, 19 Jun 2022 16:34:31 -0700 Subject: [PATCH 1/9] [ir] Init Structure Relates to https://github.com/envoyproxy/gateway/issues/32 Signed-off-by: Arko Dasgupta --- go.mod | 5 +++ go.sum | 112 +++++++++++++++++++++++++++++++++++++++++++++++++++ pkg/ir/ir.go | 66 ++++++++++++++++++++++++++++++ 3 files changed, 183 insertions(+) create mode 100644 pkg/ir/ir.go diff --git a/go.mod b/go.mod index 0cc95052e9..6e6f11d60a 100644 --- a/go.mod +++ b/go.mod @@ -3,14 +3,19 @@ module github.com/envoyproxy/gateway go 1.18 require ( + github.com/envoyproxy/go-control-plane v0.10.1 github.com/spf13/cobra v1.4.0 github.com/stretchr/testify v1.7.1 ) require ( + github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe // indirect github.com/davecgh/go-spew v1.1.0 // indirect + github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect + github.com/golang/protobuf v1.5.0 // indirect github.com/inconshreveable/mousetrap v1.0.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + google.golang.org/protobuf v1.27.1 // indirect gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect ) diff --git a/go.sum b/go.sum index d05928a3d8..b50ef623b1 100644 --- a/go.sum +++ b/go.sum @@ -1,20 +1,132 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe h1:QJDJubh0OEcpeGjC7/8uF9tt4e39U/Ya1uyK+itnNPQ= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.10.1 h1:cgDRLG7bs59Zd+apAWuzLQL95obVYAymNJek76W3mgw= +github.com/envoyproxy/go-control-plane v0.10.1/go.mod h1:AY7fTTXNdv/aJ2O5jwpxAPOWUZ7hQAEvzN5Pf27BkQQ= +github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/spf13/cobra v1.4.0 h1:y+wJpx64xcgO1V+RcnwW0LEHxTKRi2ZDPSBjWnrg88Q= github.com/spf13/cobra v1.4.0/go.mod h1:Wo4iy3BUC+X2Fybo0PDqwJIv3dNRiZLHQymsfxlB84g= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/pkg/ir/ir.go b/pkg/ir/ir.go new file mode 100644 index 0000000000..e9909d5a1e --- /dev/null +++ b/pkg/ir/ir.go @@ -0,0 +1,66 @@ +package ir + +import ( + route "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" +) + +// Xds holds the intermediate representation of a Gateway and is +// used by the xDS Translator to convert it into xDS resources +type Xds struct { + Name string + // One or more HTTP or HTTPS listeners exposed by the gateway + Http []HttpListener +} + +type HttpListener struct { + // Port on which the service can be expected to be accessed by clients. + Port uint32 + + // Hostnames (Host/Authority header value) with which the service can be expected to be accessed by clients. + Hostnames []string + + // TLS certificate info. If omitted, the gateway will expose a plain text HTTP server. + Tls ServerTLSSettings + + // Routing rules associated with HTTP traffic to the service. + Routes []HttpRoute +} + +type HttpRoute struct { + // Match condition. + Matchers []route.HeaderMatcher + Destinations []RouteDestination +} + +type RouteDestination struct { + // FQDN or IP address of the backend service. + Host string + // The port on the service to forward the request to. + Port uint32 + // Weight associated with this destination. + Weight uint32 + // Priority of the destination. + Priority uint32 +} + +// TLSMode Describes how authentication is performed as part of establishing TLS connection. +type TLSMode int32 + +const ( + INVALID TLSMode = 0 + // Only the server is authenticated. + SIMPLE = 1 + // Both the peers in the communication must present their certificate for TLS authentication. + MUTUAL = 2 +) + +type ServerTLSSettings struct { + // Set this to SIMPLE, or MUTUAL for one-way TLS, mutual TLS respectively. + Mode TLSMode + // The server certificate. + ServerCertificate []byte + // The server private key. + PrivateKey []byte + // The CA certificates for authenticating clients when using TLS mode "MUTUAL". + CaCertificates []byte +} From 8b8abff35a0bcd55cf42a1802bb7a2181ff81f9f Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Tue, 21 Jun 2022 13:02:47 -0700 Subject: [PATCH 2/9] rename to xds.go Signed-off-by: Arko Dasgupta --- pkg/ir/{ir.go => xds.go} | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) rename pkg/ir/{ir.go => xds.go} (69%) diff --git a/pkg/ir/ir.go b/pkg/ir/xds.go similarity index 69% rename from pkg/ir/ir.go rename to pkg/ir/xds.go index e9909d5a1e..6860b02a25 100644 --- a/pkg/ir/ir.go +++ b/pkg/ir/xds.go @@ -5,13 +5,15 @@ import ( ) // Xds holds the intermediate representation of a Gateway and is -// used by the xDS Translator to convert it into xDS resources +// used by the xDS Translator to convert it into xDS resources. type Xds struct { + // Name of the Xds IR. Name string - // One or more HTTP or HTTPS listeners exposed by the gateway + // HTTP listeners exposed by the gateway. Http []HttpListener } +// HttpListener holds the listener configuration. type HttpListener struct { // Port on which the service can be expected to be accessed by clients. Port uint32 @@ -19,10 +21,10 @@ type HttpListener struct { // Hostnames (Host/Authority header value) with which the service can be expected to be accessed by clients. Hostnames []string - // TLS certificate info. If omitted, the gateway will expose a plain text HTTP server. + // Tls certificate info. If omitted, the gateway will expose a plain text HTTP server. Tls ServerTLSSettings - // Routing rules associated with HTTP traffic to the service. + // Routes associated with HTTP traffic to the service. Routes []HttpRoute } @@ -39,21 +41,21 @@ type RouteDestination struct { Port uint32 // Weight associated with this destination. Weight uint32 - // Priority of the destination. - Priority uint32 } -// TLSMode Describes how authentication is performed as part of establishing TLS connection. -type TLSMode int32 +// TLSMode describes how authentication is performed as part of establishing a TLS connection. +type TLSMode string const ( - INVALID TLSMode = 0 // Only the server is authenticated. - SIMPLE = 1 - // Both the peers in the communication must present their certificate for TLS authentication. - MUTUAL = 2 + SimpleTLS TLSMode = "simple-tls" ) +// String returns the string literal for the TLS Mode +func (m TLSMode) String() string { + return string(m) +} + type ServerTLSSettings struct { // Set this to SIMPLE, or MUTUAL for one-way TLS, mutual TLS respectively. Mode TLSMode From d479ce13ae42fd17ac51b0f65723badc009e7dd1 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Tue, 21 Jun 2022 17:27:46 -0700 Subject: [PATCH 3/9] api field names Signed-off-by: Arko Dasgupta --- pkg/ir/xds.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pkg/ir/xds.go b/pkg/ir/xds.go index 6860b02a25..bc65281225 100644 --- a/pkg/ir/xds.go +++ b/pkg/ir/xds.go @@ -15,6 +15,9 @@ type Xds struct { // HttpListener holds the listener configuration. type HttpListener struct { + // Address that the listener should listen on. + Address string + // Port on which the service can be expected to be accessed by clients. Port uint32 @@ -28,16 +31,19 @@ type HttpListener struct { Routes []HttpRoute } +// HttpRoute holds the route information associated with the HTTP Route type HttpRoute struct { - // Match condition. - Matchers []route.HeaderMatcher + // Matchers define the match conditions for this route. + Matchers []route.HeaderMatcher + // Destinations associated with this matched route. Destinations []RouteDestination } +// RouteDestination holds the destination details associated with the route type RouteDestination struct { - // FQDN or IP address of the backend service. + // Host refers to the FQDN or IP address of the backend service. Host string - // The port on the service to forward the request to. + // Port on the service to forward the request to. Port uint32 // Weight associated with this destination. Weight uint32 @@ -47,7 +53,7 @@ type RouteDestination struct { type TLSMode string const ( - // Only the server is authenticated. + // SimpleTLS denotes that only the server is authenticated. SimpleTLS TLSMode = "simple-tls" ) @@ -57,12 +63,12 @@ func (m TLSMode) String() string { } type ServerTLSSettings struct { - // Set this to SIMPLE, or MUTUAL for one-way TLS, mutual TLS respectively. + // Mode for TLS Authentication.Set this to SIMPLE, or MUTUAL for one-way TLS, mutual TLS respectively. Mode TLSMode - // The server certificate. + // ServerCertificate of the server. ServerCertificate []byte - // The server private key. + // PrivateKey for the server. PrivateKey []byte - // The CA certificates for authenticating clients when using TLS mode "MUTUAL". + // CaCertificates for authenticating clients when using TLS mode "MUTUAL". CaCertificates []byte } From 734d1db83418ebf30718baaa846ca23e761cf1c7 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Thu, 23 Jun 2022 18:39:11 -0700 Subject: [PATCH 4/9] address comments Signed-off-by: Arko Dasgupta --- docs/design/SYSTEM_DESIGN.md | 22 ++++++++++++++++++++++ pkg/ir/xds.go | 11 ++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/docs/design/SYSTEM_DESIGN.md b/docs/design/SYSTEM_DESIGN.md index dfc137f944..8851f90c70 100644 --- a/docs/design/SYSTEM_DESIGN.md +++ b/docs/design/SYSTEM_DESIGN.md @@ -79,6 +79,28 @@ used as input for the Infra Manager and an xDS IR used as input for the xDS Tran * Infra IR- Used as the internal definition of the managed data plane infrastructure. * xDS IR- Used as the internal definition of the managed data plane xDS configuration. +#### Config Manager +This component consumes the [Bootstrap Config](#bootstrap-config), and spawns the appropriate internal services in Envoy Gateway based on the config specification. +For e.g. if the platform field in the Bootstrap Config is set to `kubernetes`, the Config Manager will instantiate kubernetes controller services that implement the +[Config Source](#config-source), [Service Resolver](#service-resolver) and the [Envoy Provisioner](#provisioner) interfaces. + +#### Message Service +This component allows internal services to publish messages as well as subscribe to them. The message service's interface is used by the [Config Manager](#config-manager) to +allow communication between the services instantiated by it. +A message bus architecture allows components to be loosely coupled, work in an asynchronous manner and also scale out into multiple processes if needed. +For e.g. the [Config Source](#config-source) and the [Provisioner](#provisoner) could run as separate processes in different environments decoupling user configuration consumption +from the environment where the Envoy Proxy infrastructure is being provisioned. + +#### Service Resolver +This optional component preprocesses the IR resources and resolves the services into endpoints enabling precise load balancing and resilience policies. +For e.g. in Kubernetes, a controller service could watch for EndpointSlice resources, converting Services to Endpoints, allowing for Envoyproxy to skip kube-proxy’s +load balancing layer. This component is tied to the platform where it is running. When disabled, the services will be resolved by the underlying DNS resolver or +by explicitly specifying IPs. + +#### Gateway API Translator +This is a platform agnostic translator that translates Gateway API resources to an Intermediate Representation. +>>>>>>> 8928024... address comments + #### xDS Translator The xDS Translator translates the xDS IR into xDS Resources that are consumed by the xDS server. diff --git a/pkg/ir/xds.go b/pkg/ir/xds.go index bc65281225..542f34e204 100644 --- a/pkg/ir/xds.go +++ b/pkg/ir/xds.go @@ -15,24 +15,25 @@ type Xds struct { // HttpListener holds the listener configuration. type HttpListener struct { + // Name of the HttpListener + Name string // Address that the listener should listen on. Address string - // Port on which the service can be expected to be accessed by clients. Port uint32 - // Hostnames (Host/Authority header value) with which the service can be expected to be accessed by clients. + // This field is required. Hostnames []string - // Tls certificate info. If omitted, the gateway will expose a plain text HTTP server. - Tls ServerTLSSettings - + Tls ListenerTLSSettings // Routes associated with HTTP traffic to the service. Routes []HttpRoute } // HttpRoute holds the route information associated with the HTTP Route type HttpRoute struct { + // Name of the HttpRoute + Name string // Matchers define the match conditions for this route. Matchers []route.HeaderMatcher // Destinations associated with this matched route. From 68588e746f10d6cb521bbefc6f1c7e74aa50cb75 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Thu, 23 Jun 2022 19:07:23 -0700 Subject: [PATCH 5/9] fix lint ``` pkg/ir/xds.go:13:2: var-naming: struct field Http should be HTTP (revive) Http []HTTPListener ^ pkg/ir/xds.go:28:2: var-naming: struct field Tls should be TLS (revive) Tls TLSListenerSettings ``` Signed-off-by: Arko Dasgupta --- pkg/ir/xds.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/ir/xds.go b/pkg/ir/xds.go index 542f34e204..1a3a413f60 100644 --- a/pkg/ir/xds.go +++ b/pkg/ir/xds.go @@ -10,11 +10,11 @@ type Xds struct { // Name of the Xds IR. Name string // HTTP listeners exposed by the gateway. - Http []HttpListener + HTTP []HTTPListener } -// HttpListener holds the listener configuration. -type HttpListener struct { +// HTTPListener holds the listener configuration. +type HTTPListener struct { // Name of the HttpListener Name string // Address that the listener should listen on. @@ -25,13 +25,13 @@ type HttpListener struct { // This field is required. Hostnames []string // Tls certificate info. If omitted, the gateway will expose a plain text HTTP server. - Tls ListenerTLSSettings + TLS TLSListenerSettings // Routes associated with HTTP traffic to the service. - Routes []HttpRoute + Routes []HTTPRoute } -// HttpRoute holds the route information associated with the HTTP Route -type HttpRoute struct { +// HTTPRoute holds the route information associated with the HTTP Route +type HTTPRoute struct { // Name of the HttpRoute Name string // Matchers define the match conditions for this route. @@ -63,7 +63,7 @@ func (m TLSMode) String() string { return string(m) } -type ServerTLSSettings struct { +type TLSListenerSettings struct { // Mode for TLS Authentication.Set this to SIMPLE, or MUTUAL for one-way TLS, mutual TLS respectively. Mode TLSMode // ServerCertificate of the server. From 43670d535dddc36ae21f74a357455224998c6607 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Fri, 24 Jun 2022 15:40:37 -0700 Subject: [PATCH 6/9] address comments Signed-off-by: Arko Dasgupta --- pkg/ir/xds.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkg/ir/xds.go b/pkg/ir/xds.go index 1a3a413f60..90dc27b930 100644 --- a/pkg/ir/xds.go +++ b/pkg/ir/xds.go @@ -22,10 +22,12 @@ type HTTPListener struct { // Port on which the service can be expected to be accessed by clients. Port uint32 // Hostnames (Host/Authority header value) with which the service can be expected to be accessed by clients. - // This field is required. + // This field is required. Wildcard hosts are supported in the suffix or prefix form. + // Refer to https://www.envoyproxy.io/docs/envoy/latest/api-v3/config/route/v3/route_components.proto#config-route-v3-virtualhost + // for more info. Hostnames []string // Tls certificate info. If omitted, the gateway will expose a plain text HTTP server. - TLS TLSListenerSettings + TLS TLSListenerConfig // Routes associated with HTTP traffic to the service. Routes []HTTPRoute } @@ -34,8 +36,8 @@ type HTTPListener struct { type HTTPRoute struct { // Name of the HttpRoute Name string - // Matchers define the match conditions for this route. - Matchers []route.HeaderMatcher + // Matches define the match conditions for this route. + Matches []route.HeaderMatcher // Destinations associated with this matched route. Destinations []RouteDestination } @@ -55,7 +57,7 @@ type TLSMode string const ( // SimpleTLS denotes that only the server is authenticated. - SimpleTLS TLSMode = "simple-tls" + SimpleTLS TLSMode = "SimpleTLS" ) // String returns the string literal for the TLS Mode @@ -63,13 +65,12 @@ func (m TLSMode) String() string { return string(m) } -type TLSListenerSettings struct { - // Mode for TLS Authentication.Set this to SIMPLE, or MUTUAL for one-way TLS, mutual TLS respectively. +// TLSListenerConfig holds the configuration for downstream TLS context. +type TLSListenerConfig struct { + // Mode for TLS Authentication. Set this to SIMPLE for one-way TLS. Mode TLSMode // ServerCertificate of the server. ServerCertificate []byte // PrivateKey for the server. PrivateKey []byte - // CaCertificates for authenticating clients when using TLS mode "MUTUAL". - CaCertificates []byte } From 4c6583cc49eeb16b33e68d19cdf6e1154deed26b Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Fri, 24 Jun 2022 15:44:42 -0700 Subject: [PATCH 7/9] SimpleTLS Signed-off-by: Arko Dasgupta --- pkg/ir/xds.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/ir/xds.go b/pkg/ir/xds.go index 90dc27b930..a890327e51 100644 --- a/pkg/ir/xds.go +++ b/pkg/ir/xds.go @@ -67,7 +67,7 @@ func (m TLSMode) String() string { // TLSListenerConfig holds the configuration for downstream TLS context. type TLSListenerConfig struct { - // Mode for TLS Authentication. Set this to SIMPLE for one-way TLS. + // Mode for TLS Authentication. Set this to SimpleTLS for one-way TLS. Mode TLSMode // ServerCertificate of the server. ServerCertificate []byte From e09ddcecc731e765f581b52b6ee9ddbe4f730eab Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Mon, 27 Jun 2022 09:49:18 -0700 Subject: [PATCH 8/9] rm doc edits Signed-off-by: Arko Dasgupta --- docs/design/SYSTEM_DESIGN.md | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/docs/design/SYSTEM_DESIGN.md b/docs/design/SYSTEM_DESIGN.md index 8851f90c70..dfc137f944 100644 --- a/docs/design/SYSTEM_DESIGN.md +++ b/docs/design/SYSTEM_DESIGN.md @@ -79,28 +79,6 @@ used as input for the Infra Manager and an xDS IR used as input for the xDS Tran * Infra IR- Used as the internal definition of the managed data plane infrastructure. * xDS IR- Used as the internal definition of the managed data plane xDS configuration. -#### Config Manager -This component consumes the [Bootstrap Config](#bootstrap-config), and spawns the appropriate internal services in Envoy Gateway based on the config specification. -For e.g. if the platform field in the Bootstrap Config is set to `kubernetes`, the Config Manager will instantiate kubernetes controller services that implement the -[Config Source](#config-source), [Service Resolver](#service-resolver) and the [Envoy Provisioner](#provisioner) interfaces. - -#### Message Service -This component allows internal services to publish messages as well as subscribe to them. The message service's interface is used by the [Config Manager](#config-manager) to -allow communication between the services instantiated by it. -A message bus architecture allows components to be loosely coupled, work in an asynchronous manner and also scale out into multiple processes if needed. -For e.g. the [Config Source](#config-source) and the [Provisioner](#provisoner) could run as separate processes in different environments decoupling user configuration consumption -from the environment where the Envoy Proxy infrastructure is being provisioned. - -#### Service Resolver -This optional component preprocesses the IR resources and resolves the services into endpoints enabling precise load balancing and resilience policies. -For e.g. in Kubernetes, a controller service could watch for EndpointSlice resources, converting Services to Endpoints, allowing for Envoyproxy to skip kube-proxy’s -load balancing layer. This component is tied to the platform where it is running. When disabled, the services will be resolved by the underlying DNS resolver or -by explicitly specifying IPs. - -#### Gateway API Translator -This is a platform agnostic translator that translates Gateway API resources to an Intermediate Representation. ->>>>>>> 8928024... address comments - #### xDS Translator The xDS Translator translates the xDS IR into xDS Resources that are consumed by the xDS server. From 38decee1a3da0276750c778627d2168264a01e60 Mon Sep 17 00:00:00 2001 From: Arko Dasgupta Date: Tue, 28 Jun 2022 14:12:27 -0700 Subject: [PATCH 9/9] address steve's comments * rm TLSMode, bring it back when its needed * use internal match field * create more match fields for path and query params Signed-off-by: Arko Dasgupta --- pkg/ir/xds.go | 46 ++++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/pkg/ir/xds.go b/pkg/ir/xds.go index a890327e51..92f94a2b28 100644 --- a/pkg/ir/xds.go +++ b/pkg/ir/xds.go @@ -1,9 +1,5 @@ package ir -import ( - route "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" -) - // Xds holds the intermediate representation of a Gateway and is // used by the xDS Translator to convert it into xDS resources. type Xds struct { @@ -27,19 +23,23 @@ type HTTPListener struct { // for more info. Hostnames []string // Tls certificate info. If omitted, the gateway will expose a plain text HTTP server. - TLS TLSListenerConfig + TLS *TLSListenerConfig // Routes associated with HTTP traffic to the service. - Routes []HTTPRoute + Routes []*HTTPRoute } // HTTPRoute holds the route information associated with the HTTP Route type HTTPRoute struct { // Name of the HttpRoute Name string - // Matches define the match conditions for this route. - Matches []route.HeaderMatcher + // PathMatch defines the match conditions on the path. + PathMatch *StringMatch + // HeaderMatches define the match conditions on the request headers for this route. + HeaderMatches []*StringMatch + // QueryParamMatches define the match conditions on the query parameters. + QueryParamMatches []*StringMatch // Destinations associated with this matched route. - Destinations []RouteDestination + Destinations []*RouteDestination } // RouteDestination holds the destination details associated with the route @@ -52,25 +52,23 @@ type RouteDestination struct { Weight uint32 } -// TLSMode describes how authentication is performed as part of establishing a TLS connection. -type TLSMode string - -const ( - // SimpleTLS denotes that only the server is authenticated. - SimpleTLS TLSMode = "SimpleTLS" -) - -// String returns the string literal for the TLS Mode -func (m TLSMode) String() string { - return string(m) -} - // TLSListenerConfig holds the configuration for downstream TLS context. type TLSListenerConfig struct { - // Mode for TLS Authentication. Set this to SimpleTLS for one-way TLS. - Mode TLSMode // ServerCertificate of the server. ServerCertificate []byte // PrivateKey for the server. PrivateKey []byte } + +// StringMatch holds the various match conditions. +// Only one of Exact, Prefix or SafeRegex can be set. +type StringMatch struct { + // Name of the field to match on. + Name string + // Exact match condition. + Exact *string + // Prefix match condition. + Prefix *string + // SafeRegex match condition. + SafeRegex *string +}