diff --git a/Makefile b/Makefile index 464dd16..ca053db 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ protoc: api/*.proto \ --go_out=plugins=grpc:api \ --grpc-gateway_out=logtostderr=true,allow_delete_body=true:api \ - --swagger_out=allow_merge=true,fqn_for_swagger_name=true,allow_delete_body=true,logtostderr=true:api + --swagger_out=allow_merge=true,fqn_for_swagger_name=true,allow_delete_body=true,logtostderr=true,simple_operation_ids=true:api api: protoc jq diff --git a/api/api.pb.go b/api/api.pb.go index c8e66f1..5924f88 100644 --- a/api/api.pb.go +++ b/api/api.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: api.proto package api diff --git a/api/auth.pb.go b/api/auth.pb.go index 8bb79bc..0b3574b 100644 --- a/api/auth.pb.go +++ b/api/auth.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: auth.proto package api diff --git a/api/common.pb.go b/api/common.pb.go index 7da81f0..c66aa9a 100644 --- a/api/common.pb.go +++ b/api/common.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: common.proto package api diff --git a/api/cron_workflow.pb.go b/api/cron_workflow.pb.go index d3d55e1..ca53ef2 100644 --- a/api/cron_workflow.pb.go +++ b/api/cron_workflow.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: cron_workflow.proto package api diff --git a/api/label.pb.go b/api/label.pb.go index 1fbc8c0..a1a2481 100644 --- a/api/label.pb.go +++ b/api/label.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: label.proto package api diff --git a/api/metric.pb.go b/api/metric.pb.go index e703112..5bb88ad 100644 --- a/api/metric.pb.go +++ b/api/metric.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: metric.proto package api diff --git a/api/namespace.pb.go b/api/namespace.pb.go index 53d5712..fc140b2 100644 --- a/api/namespace.pb.go +++ b/api/namespace.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: namespace.proto package api diff --git a/api/secret.pb.go b/api/secret.pb.go index 8d2a255..7eb1343 100644 --- a/api/secret.pb.go +++ b/api/secret.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: secret.proto package api diff --git a/api/workflow.pb.go b/api/workflow.pb.go index 03568c0..3a8a031 100644 --- a/api/workflow.pb.go +++ b/api/workflow.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: workflow.proto package api diff --git a/api/workflow_template.pb.go b/api/workflow_template.pb.go index 5aa3dc9..2bf325a 100644 --- a/api/workflow_template.pb.go +++ b/api/workflow_template.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: workflow_template.proto package api diff --git a/api/workspace.pb.go b/api/workspace.pb.go index 455cf93..51a2035 100644 --- a/api/workspace.pb.go +++ b/api/workspace.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: workspace.proto package api diff --git a/api/workspace_template.pb.go b/api/workspace_template.pb.go index 2b573e8..20452a0 100644 --- a/api/workspace_template.pb.go +++ b/api/workspace_template.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.11.1 +// protoc-gen-go v1.22.0 +// protoc v3.11.4 // source: workspace_template.proto package api diff --git a/go.mod b/go.mod index e2fc149..5d0b2bc 100644 --- a/go.mod +++ b/go.mod @@ -13,11 +13,11 @@ require ( github.com/evanphx/json-patch v4.5.0+incompatible // indirect github.com/ghodss/yaml v1.0.0 github.com/go-sql-driver/mysql v1.5.0 // indirect - github.com/golang/protobuf v1.4.0 + github.com/golang/protobuf v1.4.1 github.com/google/uuid v1.1.1 github.com/gorilla/handlers v1.4.2 github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 - github.com/grpc-ecosystem/grpc-gateway v1.14.3 + github.com/grpc-ecosystem/grpc-gateway v1.14.4 github.com/hashicorp/go-uuid v1.0.2 github.com/hashicorp/golang-lru v0.5.4 // indirect github.com/jmoiron/sqlx v1.2.0 @@ -30,9 +30,9 @@ require ( github.com/spf13/cobra v0.0.5 // indirect github.com/stretchr/testify v1.4.0 github.com/tmc/grpc-websocket-proxy v0.0.0-20200122045848-3419fae592fc - google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36 + google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84 google.golang.org/grpc v1.28.0 - google.golang.org/protobuf v1.21.0 + google.golang.org/protobuf v1.22.0 gopkg.in/yaml.v2 v2.2.8 istio.io/api v0.0.0-20200107183329-ed4b507c54e1 k8s.io/api v0.16.4 diff --git a/go.sum b/go.sum index ea2226e..f55b1dc 100644 --- a/go.sum +++ b/go.sum @@ -191,6 +191,8 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0 h1:oOuy+ugB+P/kBdUnG5QaMXSIyJ1q38wWSojYCb3z5VQ= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/google/btree v0.0.0-20160524151835-7d79101e329e/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -237,6 +239,8 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.2.0/go.mod h1:mJzapYve32yjrKlk9G github.com/grpc-ecosystem/grpc-gateway v1.12.1/go.mod h1:8XEsbTttt/W+VvjtQhLACqCisSPWTxCZ7sBRjU6iH9c= github.com/grpc-ecosystem/grpc-gateway v1.14.3 h1:OCJlWkOUoTnl0neNGlf4fUm3TmbEtguw7vR+nGtnDjY= github.com/grpc-ecosystem/grpc-gateway v1.14.3/go.mod h1:6CwZWGDSPRJidgKAtJVvND6soZe6fT7iteq8wDPdhb0= +github.com/grpc-ecosystem/grpc-gateway v1.14.4 h1:IOPK2xMPP3aV6/NPt4jt//ELFo3Vv8sDVD8j3+tleDU= +github.com/grpc-ecosystem/grpc-gateway v1.14.4/go.mod h1:6CwZWGDSPRJidgKAtJVvND6soZe6fT7iteq8wDPdhb0= github.com/hashicorp/go-uuid v0.0.0-20180228145832-27454136f036/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE= @@ -646,6 +650,8 @@ google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfG google.golang.org/genproto v0.0.0-20200317114155-1f3552e48f24/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36 h1:j7CmVRD4Kec0+f8VuBAc2Ak2MFfXm5Q2/RxuJLL+76E= google.golang.org/genproto v0.0.0-20200413115906-b5235f65be36/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84 h1:pSLkPbrjnPyLDYUO2VM9mDLqo2V6CFBY84lFSZAfoi4= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -664,6 +670,8 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ 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 h1:qdOKuR/EIArgaWNjetjgTzgVTAZ+S/WXVrq9HW9zimw= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0 h1:cJv5/xdbk1NnMPR1VP9+HU6gupuG9MLBoH1r6RHZ2MY= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=