diff --git a/Makefile b/Makefile index b2cce98d5b..0302708976 100644 --- a/Makefile +++ b/Makefile @@ -242,6 +242,8 @@ protobuild: @protoc-go-inject-tag -input=./internal/gen/testing/event/event.pb.go @buf generate --template buf.testing.gen.yaml --path internal/proto/testing/event/v1/ + @go run ./scripts/remove-gotags-comments/ -path ./internal/gen/controller.swagger.json + @rm -R ${TMP_DIR} .PHONY: protolint diff --git a/go.mod b/go.mod index a807abedcb..a788f65c4d 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/golang/protobuf v1.5.3 github.com/google/go-cmp v0.5.9 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 github.com/hashicorp/boundary/api v0.0.37-0.20230523195645-c8f37ca4dc39 github.com/hashicorp/boundary/sdk v0.0.33-0.20230523195645-c8f37ca4dc39 github.com/hashicorp/cap v0.3.0 @@ -76,8 +76,8 @@ require ( golang.org/x/sys v0.8.0 golang.org/x/term v0.8.0 golang.org/x/tools v0.6.0 - google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 - google.golang.org/grpc v1.53.0 + google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e + google.golang.org/grpc v1.55.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 google.golang.org/protobuf v1.30.0 gorm.io/driver/postgres v1.5.2 @@ -102,6 +102,7 @@ require ( github.com/mikesmitty/edkey v0.0.0-20170222072505-3356ea4e686a golang.org/x/exp v0.0.0-20230425010034-47ecfdc1ba53 golang.org/x/net v0.10.0 + google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc gopkg.in/square/go-jose.v2 v2.5.1 ) @@ -138,7 +139,7 @@ require ( github.com/go-jose/go-jose/v3 v3.0.0 // indirect github.com/go-ldap/ldap/v3 v3.4.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect - github.com/golang/glog v1.0.0 // indirect + github.com/golang/glog v1.1.0 // indirect github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/google/uuid v1.3.0 // indirect github.com/hashicorp/errwrap v1.1.0 // indirect @@ -194,10 +195,11 @@ require ( github.com/xo/dburl v0.14.2 // indirect go.uber.org/goleak v1.1.10 // indirect golang.org/x/mod v0.8.0 // indirect - golang.org/x/oauth2 v0.5.0 // indirect + golang.org/x/oauth2 v0.8.0 // indirect golang.org/x/text v0.9.0 // indirect golang.org/x/time v0.3.0 // indirect google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect gorm.io/driver/sqlite v1.5.1 // indirect diff --git a/go.sum b/go.sum index 10acbe07b8..1560027393 100644 --- a/go.sum +++ b/go.sum @@ -540,8 +540,8 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= -github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= -github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= +github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -654,8 +654,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2 h1:BqHID5W5qnMkug0Z8UmL8tN0gAy4jQ+B4WFt8cCgluU= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2/go.mod h1:ZbS3MZTZq/apAfAEHGoB5HbsQQstoqP92SjAqtQ9zeg= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 h1:YBftPWNWd4WwGqtY2yeZL2ef8rHAxPBD8KFhJpmcqms= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0/go.mod h1:YN5jB8ie0yfIUg6VvR9Kz84aCaG7AsGZnLjhHbUqwPg= github.com/hailocab/go-hostpool v0.0.0-20160125115350-e80d13ce29ed/go.mod h1:tMWxXQ9wFIaZeTI9F+hmhFiGpFmhOHzyShyFUhRm0H4= github.com/hashicorp/cap v0.3.0 h1:zFzVxuWy78lO6QRLHu/ONkjx/Jh0lpfvPgmpDGri43E= github.com/hashicorp/cap v0.3.0/go.mod h1:dHTmyMIVbzT981XxRoci5G//dfWmd/HhuNiCH6J5+IA= @@ -1545,8 +1545,8 @@ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210628180205-a41e5a781914/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.3.0/go.mod h1:rQrIauxkUhJ6CuwEXwymO2/eh4xz2ZWF1nBkcxS+tGk= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= +golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= 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= @@ -1894,8 +1894,12 @@ google.golang.org/genproto v0.0.0-20210716133855-ce7ef5c701ea/go.mod h1:AxrInvYm google.golang.org/genproto v0.0.0-20210721163202-f1cecdd8b78a/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= google.golang.org/genproto v0.0.0-20210726143408-b02e89920bf0/go.mod h1:ob2IJxKrgPT52GcgX759i1sleT07tiKowYBGbczaW48= google.golang.org/genproto v0.0.0-20211013025323-ce878158c4d4/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= -google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488 h1:QQF+HdiI4iocoxUjjpLgvTYDHKm99C/VtTBFnfiCJos= -google.golang.org/genproto v0.0.0-20230303212802-e74f57abe488/go.mod h1:TvhZT5f700eVlTNwND1xoEZQeWTB2RY/65kplwl/bFA= +google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e h1:Ao9GzfUMPH3zjVfzXG5rlWlk+Q8MXWKwWpwVQE1MXfw= +google.golang.org/genproto v0.0.0-20230526203410-71b5a4ffd15e/go.mod h1:zqTuNwFlFRsw5zIts5VnzLQxSRqh+CGOTVMlYbY0Eyk= +google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc h1:kVKPf/IiYSBWEWtkIn6wZXwWGCnLKcC8oWfZvXjsGnM= +google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc h1:XSJ8Vk1SWuNr8S18z1NZSziL0CPIXLCCMDOEFtHBOFc= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= @@ -1928,8 +1932,8 @@ google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQ google.golang.org/grpc v1.39.0/go.mod h1:PImNr+rS9TWYb2O4/emRugxiyHZ5JyHW5F+RPnDzfrE= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= -google.golang.org/grpc v1.53.0 h1:LAv2ds7cmFV/XTS3XG1NneeENYrXGmorPxsBbptIjNc= -google.golang.org/grpc v1.53.0/go.mod h1:OnIrk0ipVdj4N5d9IUoFUx72/VlD7+jUsHwZgwSMQpw= +google.golang.org/grpc v1.55.0 h1:3Oj82/tFSCeUrRTg/5E/7d/W5A1tj6Ky1ABAuZuv5ag= +google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 h1:M1YKkFIboKNieVO5DLUEVzQfGwJD30Nv2jfUgzb5UcE= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/internal/gen/controller.swagger.json b/internal/gen/controller.swagger.json index 3573a11c9d..ce3a8dfade 100644 --- a/internal/gen/controller.swagger.json +++ b/internal/gen/controller.swagger.json @@ -89,12 +89,14 @@ "parameters": [ { "name": "auth_method_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -145,6 +147,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -168,6 +171,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -191,6 +195,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -202,12 +207,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.accounts.v1.Account" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -230,6 +229,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -247,10 +247,12 @@ "description": "Version is used to ensure this resource has not changed.\nThe mutation will fail if the version does not match the latest known good version." }, "current_password": { - "type": "string" + "type": "string", + "title": "" }, "new_password": { - "type": "string" + "type": "string", + "title": "" } } } @@ -276,6 +278,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -293,7 +296,8 @@ "description": "Version is used to ensure this resource has not changed.\nThe mutation will fail if the version does not match the latest known good version." }, "password": { - "type": "string" + "type": "string", + "title": "" } } } @@ -319,18 +323,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -433,6 +440,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -456,6 +464,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -479,6 +488,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -490,12 +500,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.authmethods.v1.AuthMethod" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -518,6 +522,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -562,18 +567,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -599,6 +607,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -622,6 +631,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -647,12 +657,14 @@ "parameters": [ { "name": "credential_store_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -703,6 +715,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -726,6 +739,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -749,6 +763,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -760,12 +775,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.credentiallibraries.v1.CredentialLibrary" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -788,18 +797,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -850,6 +862,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -873,6 +886,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -896,6 +910,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -907,12 +922,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.credentialstores.v1.CredentialStore" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -935,12 +944,14 @@ "parameters": [ { "name": "credential_store_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -991,6 +1002,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1014,6 +1026,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1037,6 +1050,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1048,12 +1062,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.credentials.v1.Credential" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -1076,18 +1084,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -1138,6 +1149,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1161,6 +1173,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1184,6 +1197,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1195,12 +1209,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.groups.v1.Group" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -1223,6 +1231,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1243,7 +1252,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -1269,6 +1279,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1289,7 +1300,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -1315,6 +1327,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1335,7 +1348,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -1361,18 +1375,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -1430,6 +1447,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1453,6 +1471,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1476,6 +1495,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1487,12 +1507,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.hostcatalogs.v1.HostCatalog" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -1515,12 +1529,14 @@ "parameters": [ { "name": "host_catalog_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -1571,6 +1587,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1594,6 +1611,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1617,6 +1635,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1628,12 +1647,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.hostsets.v1.HostSet" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -1656,6 +1669,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1703,6 +1717,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1750,6 +1765,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1797,12 +1813,14 @@ "parameters": [ { "name": "host_catalog_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -1853,6 +1871,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1876,6 +1895,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1899,6 +1919,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -1910,12 +1931,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.hosts.v1.Host" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -1938,12 +1953,14 @@ "parameters": [ { "name": "auth_method_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -1994,6 +2011,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2017,6 +2035,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2040,6 +2059,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2051,12 +2071,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.managedgroups.v1.ManagedGroup" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -2079,18 +2093,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -2141,6 +2158,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2164,6 +2182,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2187,6 +2206,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2198,12 +2218,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.roles.v1.Role" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -2226,6 +2240,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2246,7 +2261,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -2272,6 +2288,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2292,7 +2309,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -2318,6 +2336,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2338,7 +2357,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -2364,6 +2384,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2384,7 +2405,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -2410,6 +2432,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2430,7 +2453,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -2456,6 +2480,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2476,7 +2501,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -2502,18 +2528,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -2545,12 +2574,14 @@ }, { "name": "skip_admin_role_creation", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "skip_default_role_creation", + "description": "", "in": "query", "required": false, "type": "boolean" @@ -2576,6 +2607,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2599,6 +2631,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2622,6 +2655,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2633,12 +2667,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.scopes.v1.Scope" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -2661,6 +2689,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2686,6 +2715,7 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2817,16 +2847,10 @@ "200": { "description": "A successful response.(streaming responses)", "schema": { - "type": "object", - "properties": { - "result": { - "$ref": "#/definitions/google.api.HttpBody" - }, - "error": { - "$ref": "#/definitions/google.rpc.Status" - } - }, - "title": "Stream result of google.api.HttpBody" + "type": "string", + "format": "binary", + "properties": {}, + "title": "Free form byte stream" } } }, @@ -2866,18 +2890,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -2910,6 +2937,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2935,6 +2963,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -2948,7 +2977,8 @@ "properties": { "version": { "type": "integer", - "format": "int64" + "format": "int64", + "title": "" } } } @@ -2974,18 +3004,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -3043,6 +3076,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3066,6 +3100,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3089,6 +3124,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3100,12 +3136,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.storagebuckets.v1.StorageBucket" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -3128,18 +3158,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -3190,6 +3223,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3213,6 +3247,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3236,6 +3271,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3247,12 +3283,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.targets.v1.Target" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -3275,6 +3305,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3296,6 +3327,7 @@ "items": { "type": "string" }, + "description": "", "title": "Deprecated use brokered_credential_source_ids instead" }, "brokered_credential_source_ids": { @@ -3336,6 +3368,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3356,7 +3389,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -3435,6 +3469,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3456,6 +3491,7 @@ "items": { "type": "string" }, + "description": "", "title": "Deprecated use brokered_credential_source_ids instead" }, "brokered_credential_source_ids": { @@ -3496,6 +3532,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3516,7 +3553,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -3542,6 +3580,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3563,6 +3602,7 @@ "items": { "type": "string" }, + "description": "", "title": "Deprecated use brokered_credential_source_ids instead" }, "brokered_credential_source_ids": { @@ -3604,6 +3644,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3624,7 +3665,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -3650,18 +3692,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -3712,6 +3757,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3735,6 +3781,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3758,6 +3805,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3769,12 +3817,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.users.v1.User" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -3797,6 +3839,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3817,7 +3860,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -3843,6 +3887,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3863,7 +3908,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -3889,6 +3935,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3909,7 +3956,8 @@ "type": "array", "items": { "type": "string" - } + }, + "title": "" } } } @@ -3935,18 +3983,21 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" }, { "name": "recursive", + "description": "", "in": "query", "required": false, "type": "boolean" }, { "name": "filter", + "description": "", "in": "query", "required": false, "type": "string" @@ -3972,6 +4023,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -3995,6 +4047,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -4018,6 +4071,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -4029,12 +4083,6 @@ "schema": { "$ref": "#/definitions/controller.api.resources.workers.v1.Worker" } - }, - { - "name": "update_mask", - "in": "query", - "required": false, - "type": "string" } ], "tags": [ @@ -4057,6 +4105,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -4080,7 +4129,8 @@ "items": { "type": "object" } - } + }, + "title": "" } } } @@ -4106,6 +4156,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -4129,7 +4180,8 @@ "items": { "type": "object" } - } + }, + "title": "" } } } @@ -4155,6 +4207,7 @@ "parameters": [ { "name": "id", + "description": "", "in": "path", "required": true, "type": "string" @@ -4178,7 +4231,8 @@ "items": { "type": "object" } - } + }, + "title": "" } } } @@ -4258,6 +4312,7 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" @@ -4283,6 +4338,7 @@ "parameters": [ { "name": "scope_id", + "description": "", "in": "query", "required": false, "type": "string" @@ -4350,6 +4406,7 @@ "items": { "type": "string" }, + "description": "", "title": "Output only. managed_group_ids indicates IDs of the managed groups that currently contain this account", "readOnly": true }, @@ -4573,6 +4630,7 @@ }, "credential_type": { "type": "string", + "description": "", "title": "The type of credential this library will issue, defaults to Unspecified" }, "credential_mapping_overrides": { @@ -4768,6 +4826,7 @@ "members": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.groups.v1.Member" }, "description": "Output only. The members of this Group.", @@ -5284,6 +5343,7 @@ "principals": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.roles.v1.Principal" }, "description": "Output only. The principals that are assigned to this role.", @@ -5300,6 +5360,7 @@ "grants": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.roles.v1.Grant" }, "description": "Output only. The parsed grant information.", @@ -5343,6 +5404,7 @@ "versions": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.scopes.v1.KeyVersion" }, "description": "The versions of the key." @@ -5451,6 +5513,7 @@ }, "primary_auth_method_id": { "type": "string", + "description": "", "title": "The ID of the primary auth method for this scope. A primary auth method\nis allowed to vivify users when new accounts are created and is the source for the users account info" }, "authorized_actions": { @@ -5611,6 +5674,7 @@ "channel_recordings": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.sessionrecordings.v1.ChannelRecording" }, "description": "Optionally, the channels used in this Connection,\nif it is using a multiplexed protocol, such as SSH." @@ -5623,10 +5687,12 @@ "properties": { "id": { "type": "string", + "description": "", "title": "The ID of the Host" }, "host_catalog": { "$ref": "#/definitions/controller.api.resources.sessionrecordings.v1.HostCatalog", + "description": "", "title": "The Host Catalog this Host is in" }, "name": { @@ -5639,6 +5705,7 @@ }, "type": { "type": "string", + "description": "", "title": "The type of the host. This will be either \"static\" or \"plugin\"" }, "attributes": { @@ -5657,10 +5724,12 @@ "properties": { "id": { "type": "string", + "description": "", "title": "The ID of the Host Catalog" }, "scope": { "$ref": "#/definitions/controller.api.resources.scopes.v1.ScopeInfo", + "description": "", "title": "The scope that the Host Catalog is in" }, "plugin_id": { @@ -5669,6 +5738,7 @@ }, "name": { "type": "string", + "description": "", "title": "The name of the Host Catalog, if set" }, "description": { @@ -5677,6 +5747,7 @@ }, "type": { "type": "string", + "description": "", "title": "The type of the Host Catalog. This will be either \"static\" or \"plugin\"" }, "attributes": { @@ -5765,6 +5836,7 @@ "connection_recordings": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.sessionrecordings.v1.ConnectionRecording" }, "description": "The recordings of the connections that were created in the Session.\nThis field may be unset when listing Session recordings." @@ -5880,34 +5952,41 @@ "properties": { "client_tcp_address": { "type": "string", + "description": "", "title": "client_tcp_address of the connection" }, "client_tcp_port": { "type": "integer", "format": "int64", + "description": "", "title": "client_tcp_port of the connection" }, "endpoint_tcp_address": { "type": "string", + "description": "", "title": "endpoint_tcp_address of the connection" }, "endpoint_tcp_port": { "type": "integer", "format": "int64", + "description": "", "title": "endpoint_tcp_port of the connection" }, "bytes_up": { "type": "string", "format": "int64", + "description": "", "title": "bytes_up of the connection" }, "bytes_down": { "type": "string", "format": "int64", + "description": "", "title": "bytes_down of the connection" }, "closed_reason": { "type": "string", + "description": "", "title": "closed_reason of the connection" } }, @@ -5992,6 +6071,7 @@ "states": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.sessions.v1.SessionState" }, "description": "Output only. The states of this Session in descending order from the current state to the first.", @@ -6024,6 +6104,7 @@ "connections": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.sessions.v1.Connection" }, "description": "Output only. The associated connections with this session.", @@ -6131,6 +6212,7 @@ }, "worker_filter": { "type": "string", + "description": "", "title": "Filters to the worker(s) that can handle requests for this storage bucket" }, "authorized_actions": { @@ -6250,6 +6332,7 @@ "credentials": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.targets.v1.SessionCredential" }, "description": "Output only. The credentials for this session.", @@ -6352,6 +6435,7 @@ "host_sources": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.targets.v1.HostSource" }, "description": "Output only. The Host Sources associated with this Target.", @@ -6390,6 +6474,7 @@ "application_credential_sources": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.targets.v1.CredentialSource" }, "description": "Output only. The application credential sources associated with this Target.\nDeprecated use \"brokered_credential_sources\" instead.", @@ -6406,6 +6491,7 @@ "brokered_credential_sources": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.targets.v1.CredentialSource" }, "description": "Output only. The brokered credential sources associated with this Target.", @@ -6422,6 +6508,7 @@ "injected_application_credential_sources": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.targets.v1.CredentialSource" }, "description": "Output only. The injected application credential sources associated with this Target.", @@ -6514,6 +6601,7 @@ "accounts": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.users.v1.Account" }, "description": "Output only. The Accounts linked to this User.", @@ -6529,21 +6617,25 @@ }, "login_name": { "type": "string", + "description": "", "title": "Output only. login_name is a string that maps to the user's account \"login\nname\" from the scope's primary auth method", "readOnly": true }, "full_name": { "type": "string", + "description": "", "title": "Output only. full_name is a string that maps to the user's account name\nfrom the scope's primary auth method", "readOnly": true }, "email": { "type": "string", + "description": "", "title": "Output only. email is a string that maps to the user's account email from\nthe scope's primary auth method", "readOnly": true }, "primary_account_id": { "type": "string", + "description": "", "title": "Output only. primary_account_id is a string that maps to the user's account\npublic_id from the scope's primary auth method", "readOnly": true } @@ -6555,23 +6647,27 @@ "properties": { "id": { "type": "string", + "description": "", "title": "Output only. The ID of the certificate", "readOnly": true }, "public_key_sha256": { "type": "string", + "description": "", "title": "Output only. The public key of the cert authority", "readOnly": true }, "not_before_time": { "type": "string", "format": "date-time", + "description": "", "title": "Output only. The time before which this CA is invalid", "readOnly": true }, "not_after_time": { "type": "string", "format": "date-time", + "description": "", "title": "Output only. The time after which this CA is invalid", "readOnly": true } @@ -6583,8 +6679,10 @@ "certs": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.workers.v1.Certificate" - } + }, + "title": "" } } }, @@ -6665,6 +6763,7 @@ }, "worker_generated_auth_token": { "type": "string", + "description": "", "title": "worker_generated_auth_token is input only. Supports the worker led node\nenrollment flow where this credentials token is produced by a worker. This\ntoken is a base58 encoded types.FetchNodeCredentialsRequest from\nhttps://github.com/hashicorp/nodeenrollment" }, "controller_generated_activation_token": { @@ -6835,7 +6934,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.accounts.v1.Account" @@ -6846,7 +6946,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.authmethods.v1.AuthMethod" @@ -6857,7 +6958,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.workers.v1.Worker" @@ -6868,7 +6970,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.credentiallibraries.v1.CredentialLibrary" @@ -6879,7 +6982,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.credentials.v1.Credential" @@ -6890,7 +6994,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.credentialstores.v1.CredentialStore" @@ -6901,7 +7006,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.groups.v1.Group" @@ -6912,7 +7018,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.hostcatalogs.v1.HostCatalog" @@ -6923,7 +7030,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.hosts.v1.Host" @@ -6934,7 +7042,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.hostsets.v1.HostSet" @@ -6945,7 +7054,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.managedgroups.v1.ManagedGroup" @@ -6967,7 +7077,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.scopes.v1.Scope" @@ -6978,7 +7089,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.storagebuckets.v1.StorageBucket" @@ -6989,7 +7101,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.targets.v1.Target" @@ -7000,7 +7113,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.users.v1.User" @@ -7011,7 +7125,8 @@ "type": "object", "properties": { "uri": { - "type": "string" + "type": "string", + "title": "" }, "item": { "$ref": "#/definitions/controller.api.resources.workers.v1.Worker" @@ -7073,10 +7188,12 @@ "type": "object", "properties": { "scope_id": { - "type": "string" + "type": "string", + "title": "" }, "key_version_id": { - "type": "string" + "type": "string", + "title": "" } } }, @@ -7248,6 +7365,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.accounts.v1.Account" } } @@ -7259,6 +7377,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.authmethods.v1.AuthMethod" } } @@ -7270,6 +7389,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.authtokens.v1.AuthToken" } } @@ -7281,6 +7401,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.credentiallibraries.v1.CredentialLibrary" } } @@ -7292,6 +7413,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.credentialstores.v1.CredentialStore" } } @@ -7303,6 +7425,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.credentials.v1.Credential" } } @@ -7314,6 +7437,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.groups.v1.Group" } } @@ -7325,6 +7449,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.hostcatalogs.v1.HostCatalog" } } @@ -7336,6 +7461,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.hostsets.v1.HostSet" } } @@ -7347,6 +7473,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.hosts.v1.Host" } } @@ -7358,6 +7485,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.scopes.v1.KeyVersionDestructionJob" } } @@ -7369,6 +7497,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.scopes.v1.Key" } } @@ -7380,6 +7509,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.managedgroups.v1.ManagedGroup" } } @@ -7391,6 +7521,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.roles.v1.Role" } } @@ -7402,6 +7533,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.scopes.v1.Scope" } } @@ -7413,6 +7545,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.sessionrecordings.v1.SessionRecording" }, "description": "All Session recordings, ordered by start_time descending (most recently started first)." @@ -7425,6 +7558,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.sessions.v1.Session" } } @@ -7436,6 +7570,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.storagebuckets.v1.StorageBucket" } } @@ -7447,6 +7582,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.targets.v1.Target" } } @@ -7458,6 +7594,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.users.v1.User" } } @@ -7469,6 +7606,7 @@ "items": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/controller.api.resources.workers.v1.Worker" } } @@ -7558,10 +7696,12 @@ "type": "object", "properties": { "scope_id": { - "type": "string" + "type": "string", + "title": "" }, "rewrap": { - "type": "boolean" + "type": "boolean", + "title": "" } } }, @@ -7783,6 +7923,7 @@ "extensions": { "type": "array", "items": { + "type": "object", "$ref": "#/definitions/google.protobuf.Any" }, "description": "Application specific response metadata. Must be set in the first response\nfor streaming APIs." diff --git a/internal/gen/controller/api/services/account_service.pb.gw.go b/internal/gen/controller/api/services/account_service.pb.gw.go index 690706571e..bbb7fe00a9 100644 --- a/internal/gen/controller/api/services/account_service.pb.gw.go +++ b/internal/gen/controller/api/services/account_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_AccountService_CreateAccount_0(ctx context.Context, marshaler } var ( - filter_AccountService_UpdateAccount_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_AccountService_UpdateAccount_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_AccountService_UpdateAccount_0(ctx context.Context, marshaler runtime.Marshaler, client AccountServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -628,7 +628,7 @@ func RegisterAccountServiceHandlerServer(ctx context.Context, mux *runtime.Serve // RegisterAccountServiceHandlerFromEndpoint is same as RegisterAccountServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterAccountServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/auth_method_service.pb.gw.go b/internal/gen/controller/api/services/auth_method_service.pb.gw.go index 933d8715a4..b62c4142af 100644 --- a/internal/gen/controller/api/services/auth_method_service.pb.gw.go +++ b/internal/gen/controller/api/services/auth_method_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_AuthMethodService_CreateAuthMethod_0(ctx context.Context, mar } var ( - filter_AuthMethodService_UpdateAuthMethod_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_AuthMethodService_UpdateAuthMethod_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_AuthMethodService_UpdateAuthMethod_0(ctx context.Context, marshaler runtime.Marshaler, client AuthMethodServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -628,7 +628,7 @@ func RegisterAuthMethodServiceHandlerServer(ctx context.Context, mux *runtime.Se // RegisterAuthMethodServiceHandlerFromEndpoint is same as RegisterAuthMethodServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterAuthMethodServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/authtokens_service.pb.gw.go b/internal/gen/controller/api/services/authtokens_service.pb.gw.go index c1102d9572..b633fc8fec 100644 --- a/internal/gen/controller/api/services/authtokens_service.pb.gw.go +++ b/internal/gen/controller/api/services/authtokens_service.pb.gw.go @@ -258,7 +258,7 @@ func RegisterAuthTokenServiceHandlerServer(ctx context.Context, mux *runtime.Ser // RegisterAuthTokenServiceHandlerFromEndpoint is same as RegisterAuthTokenServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterAuthTokenServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/credential_library_service.pb.gw.go b/internal/gen/controller/api/services/credential_library_service.pb.gw.go index 071235e7e8..18ee013883 100644 --- a/internal/gen/controller/api/services/credential_library_service.pb.gw.go +++ b/internal/gen/controller/api/services/credential_library_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_CredentialLibraryService_CreateCredentialLibrary_0(ctx contex } var ( - filter_CredentialLibraryService_UpdateCredentialLibrary_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_CredentialLibraryService_UpdateCredentialLibrary_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_CredentialLibraryService_UpdateCredentialLibrary_0(ctx context.Context, marshaler runtime.Marshaler, client CredentialLibraryServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -442,7 +442,7 @@ func RegisterCredentialLibraryServiceHandlerServer(ctx context.Context, mux *run // RegisterCredentialLibraryServiceHandlerFromEndpoint is same as RegisterCredentialLibraryServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterCredentialLibraryServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/credential_service.pb.gw.go b/internal/gen/controller/api/services/credential_service.pb.gw.go index 2d534c5ac0..05b870a4fe 100644 --- a/internal/gen/controller/api/services/credential_service.pb.gw.go +++ b/internal/gen/controller/api/services/credential_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_CredentialService_CreateCredential_0(ctx context.Context, mar } var ( - filter_CredentialService_UpdateCredential_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_CredentialService_UpdateCredential_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_CredentialService_UpdateCredential_0(ctx context.Context, marshaler runtime.Marshaler, client CredentialServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -442,7 +442,7 @@ func RegisterCredentialServiceHandlerServer(ctx context.Context, mux *runtime.Se // RegisterCredentialServiceHandlerFromEndpoint is same as RegisterCredentialServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterCredentialServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/credential_store_service.pb.gw.go b/internal/gen/controller/api/services/credential_store_service.pb.gw.go index 9280963112..0373ce6039 100644 --- a/internal/gen/controller/api/services/credential_store_service.pb.gw.go +++ b/internal/gen/controller/api/services/credential_store_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_CredentialStoreService_CreateCredentialStore_0(ctx context.Co } var ( - filter_CredentialStoreService_UpdateCredentialStore_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_CredentialStoreService_UpdateCredentialStore_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_CredentialStoreService_UpdateCredentialStore_0(ctx context.Context, marshaler runtime.Marshaler, client CredentialStoreServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -442,7 +442,7 @@ func RegisterCredentialStoreServiceHandlerServer(ctx context.Context, mux *runti // RegisterCredentialStoreServiceHandlerFromEndpoint is same as RegisterCredentialStoreServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterCredentialStoreServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/group_service.pb.gw.go b/internal/gen/controller/api/services/group_service.pb.gw.go index 2fba6a7d0e..51d7dce7ea 100644 --- a/internal/gen/controller/api/services/group_service.pb.gw.go +++ b/internal/gen/controller/api/services/group_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_GroupService_CreateGroup_0(ctx context.Context, marshaler run } var ( - filter_GroupService_UpdateGroup_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_GroupService_UpdateGroup_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_GroupService_UpdateGroup_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -721,7 +721,7 @@ func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu // RegisterGroupServiceHandlerFromEndpoint is same as RegisterGroupServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterGroupServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/host_catalog_service.pb.gw.go b/internal/gen/controller/api/services/host_catalog_service.pb.gw.go index b4d4538f28..177ab992c0 100644 --- a/internal/gen/controller/api/services/host_catalog_service.pb.gw.go +++ b/internal/gen/controller/api/services/host_catalog_service.pb.gw.go @@ -120,7 +120,7 @@ func local_request_HostCatalogService_ListHostCatalogs_0(ctx context.Context, ma } var ( - filter_HostCatalogService_CreateHostCatalog_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} + filter_HostCatalogService_CreateHostCatalog_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0}, Base: []int{1, 2, 0, 0}, Check: []int{0, 1, 2, 2}} ) func request_HostCatalogService_CreateHostCatalog_0(ctx context.Context, marshaler runtime.Marshaler, client HostCatalogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -172,7 +172,7 @@ func local_request_HostCatalogService_CreateHostCatalog_0(ctx context.Context, m } var ( - filter_HostCatalogService_UpdateHostCatalog_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_HostCatalogService_UpdateHostCatalog_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_HostCatalogService_UpdateHostCatalog_0(ctx context.Context, marshaler runtime.Marshaler, client HostCatalogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -460,7 +460,7 @@ func RegisterHostCatalogServiceHandlerServer(ctx context.Context, mux *runtime.S // RegisterHostCatalogServiceHandlerFromEndpoint is same as RegisterHostCatalogServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterHostCatalogServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/host_service.pb.gw.go b/internal/gen/controller/api/services/host_service.pb.gw.go index 70a9d9f231..61523bf3eb 100644 --- a/internal/gen/controller/api/services/host_service.pb.gw.go +++ b/internal/gen/controller/api/services/host_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_HostService_CreateHost_0(ctx context.Context, marshaler runti } var ( - filter_HostService_UpdateHost_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_HostService_UpdateHost_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_HostService_UpdateHost_0(ctx context.Context, marshaler runtime.Marshaler, client HostServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -442,7 +442,7 @@ func RegisterHostServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux // RegisterHostServiceHandlerFromEndpoint is same as RegisterHostServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterHostServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/host_set_service.pb.gw.go b/internal/gen/controller/api/services/host_set_service.pb.gw.go index e4cec9c088..4aa5ccb1d9 100644 --- a/internal/gen/controller/api/services/host_set_service.pb.gw.go +++ b/internal/gen/controller/api/services/host_set_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_HostSetService_CreateHostSet_0(ctx context.Context, marshaler } var ( - filter_HostSetService_UpdateHostSet_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_HostSetService_UpdateHostSet_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_HostSetService_UpdateHostSet_0(ctx context.Context, marshaler runtime.Marshaler, client HostSetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -721,7 +721,7 @@ func RegisterHostSetServiceHandlerServer(ctx context.Context, mux *runtime.Serve // RegisterHostSetServiceHandlerFromEndpoint is same as RegisterHostSetServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterHostSetServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/managed_group_service.pb.gw.go b/internal/gen/controller/api/services/managed_group_service.pb.gw.go index 73aa506b67..051ea9d043 100644 --- a/internal/gen/controller/api/services/managed_group_service.pb.gw.go +++ b/internal/gen/controller/api/services/managed_group_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_ManagedGroupService_CreateManagedGroup_0(ctx context.Context, } var ( - filter_ManagedGroupService_UpdateManagedGroup_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_ManagedGroupService_UpdateManagedGroup_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_ManagedGroupService_UpdateManagedGroup_0(ctx context.Context, marshaler runtime.Marshaler, client ManagedGroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -442,7 +442,7 @@ func RegisterManagedGroupServiceHandlerServer(ctx context.Context, mux *runtime. // RegisterManagedGroupServiceHandlerFromEndpoint is same as RegisterManagedGroupServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterManagedGroupServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/role_service.pb.gw.go b/internal/gen/controller/api/services/role_service.pb.gw.go index 7cfdbc83d2..dca4e8dc27 100644 --- a/internal/gen/controller/api/services/role_service.pb.gw.go +++ b/internal/gen/controller/api/services/role_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_RoleService_CreateRole_0(ctx context.Context, marshaler runti } var ( - filter_RoleService_UpdateRole_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_RoleService_UpdateRole_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_RoleService_UpdateRole_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -1000,7 +1000,7 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux // RegisterRoleServiceHandlerFromEndpoint is same as RegisterRoleServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterRoleServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/scope_service.pb.gw.go b/internal/gen/controller/api/services/scope_service.pb.gw.go index 05e49cca08..756ee671a4 100644 --- a/internal/gen/controller/api/services/scope_service.pb.gw.go +++ b/internal/gen/controller/api/services/scope_service.pb.gw.go @@ -120,7 +120,7 @@ func local_request_ScopeService_ListScopes_0(ctx context.Context, marshaler runt } var ( - filter_ScopeService_CreateScope_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} + filter_ScopeService_CreateScope_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0}, Base: []int{1, 2, 0, 0}, Check: []int{0, 1, 2, 2}} ) func request_ScopeService_CreateScope_0(ctx context.Context, marshaler runtime.Marshaler, client ScopeServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -172,7 +172,7 @@ func local_request_ScopeService_CreateScope_0(ctx context.Context, marshaler run } var ( - filter_ScopeService_UpdateScope_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_ScopeService_UpdateScope_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_ScopeService_UpdateScope_0(ctx context.Context, marshaler runtime.Marshaler, client ScopeServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -732,7 +732,7 @@ func RegisterScopeServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu // RegisterScopeServiceHandlerFromEndpoint is same as RegisterScopeServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterScopeServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/session_recording_service.pb.gw.go b/internal/gen/controller/api/services/session_recording_service.pb.gw.go index 22f6fb4f9c..53943f1a06 100644 --- a/internal/gen/controller/api/services/session_recording_service.pb.gw.go +++ b/internal/gen/controller/api/services/session_recording_service.pb.gw.go @@ -120,7 +120,7 @@ func local_request_SessionRecordingService_ListSessionRecordings_0(ctx context.C } var ( - filter_SessionRecordingService_Download_0 = &utilities.DoubleArray{Encoding: map[string]int{"id": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} + filter_SessionRecordingService_Download_0 = &utilities.DoubleArray{Encoding: map[string]int{"id": 0}, Base: []int{1, 2, 0, 0}, Check: []int{0, 1, 2, 2}} ) func request_SessionRecordingService_Download_0(ctx context.Context, marshaler runtime.Marshaler, client SessionRecordingServiceClient, req *http.Request, pathParams map[string]string) (SessionRecordingService_DownloadClient, runtime.ServerMetadata, error) { @@ -233,7 +233,7 @@ func RegisterSessionRecordingServiceHandlerServer(ctx context.Context, mux *runt // RegisterSessionRecordingServiceHandlerFromEndpoint is same as RegisterSessionRecordingServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterSessionRecordingServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/session_service.pb.gw.go b/internal/gen/controller/api/services/session_service.pb.gw.go index 1fe6524a58..71d66e1609 100644 --- a/internal/gen/controller/api/services/session_service.pb.gw.go +++ b/internal/gen/controller/api/services/session_service.pb.gw.go @@ -274,7 +274,7 @@ func RegisterSessionServiceHandlerServer(ctx context.Context, mux *runtime.Serve // RegisterSessionServiceHandlerFromEndpoint is same as RegisterSessionServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterSessionServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/storage_bucket_service.pb.gw.go b/internal/gen/controller/api/services/storage_bucket_service.pb.gw.go index 27b9fb9796..959881dc63 100644 --- a/internal/gen/controller/api/services/storage_bucket_service.pb.gw.go +++ b/internal/gen/controller/api/services/storage_bucket_service.pb.gw.go @@ -120,7 +120,7 @@ func local_request_StorageBucketService_ListStorageBuckets_0(ctx context.Context } var ( - filter_StorageBucketService_CreateStorageBucket_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} + filter_StorageBucketService_CreateStorageBucket_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0}, Base: []int{1, 2, 0, 0}, Check: []int{0, 1, 2, 2}} ) func request_StorageBucketService_CreateStorageBucket_0(ctx context.Context, marshaler runtime.Marshaler, client StorageBucketServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -172,7 +172,7 @@ func local_request_StorageBucketService_CreateStorageBucket_0(ctx context.Contex } var ( - filter_StorageBucketService_UpdateStorageBucket_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_StorageBucketService_UpdateStorageBucket_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_StorageBucketService_UpdateStorageBucket_0(ctx context.Context, marshaler runtime.Marshaler, client StorageBucketServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -460,7 +460,7 @@ func RegisterStorageBucketServiceHandlerServer(ctx context.Context, mux *runtime // RegisterStorageBucketServiceHandlerFromEndpoint is same as RegisterStorageBucketServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterStorageBucketServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/target_service.pb.gw.go b/internal/gen/controller/api/services/target_service.pb.gw.go index 9270d0f5fc..e5f271769a 100644 --- a/internal/gen/controller/api/services/target_service.pb.gw.go +++ b/internal/gen/controller/api/services/target_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_TargetService_CreateTarget_0(ctx context.Context, marshaler r } var ( - filter_TargetService_UpdateTarget_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_TargetService_UpdateTarget_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_TargetService_UpdateTarget_0(ctx context.Context, marshaler runtime.Marshaler, client TargetServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -1093,7 +1093,7 @@ func RegisterTargetServiceHandlerServer(ctx context.Context, mux *runtime.ServeM // RegisterTargetServiceHandlerFromEndpoint is same as RegisterTargetServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterTargetServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/user_service.pb.gw.go b/internal/gen/controller/api/services/user_service.pb.gw.go index 27d8a79f73..b390783c44 100644 --- a/internal/gen/controller/api/services/user_service.pb.gw.go +++ b/internal/gen/controller/api/services/user_service.pb.gw.go @@ -154,7 +154,7 @@ func local_request_UserService_CreateUser_0(ctx context.Context, marshaler runti } var ( - filter_UserService_UpdateUser_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_UserService_UpdateUser_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_UserService_UpdateUser_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -721,7 +721,7 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux // RegisterUserServiceHandlerFromEndpoint is same as RegisterUserServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterUserServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/controller/api/services/worker_service.pb.gw.go b/internal/gen/controller/api/services/worker_service.pb.gw.go index ac0f002f94..ddc883da6f 100644 --- a/internal/gen/controller/api/services/worker_service.pb.gw.go +++ b/internal/gen/controller/api/services/worker_service.pb.gw.go @@ -188,7 +188,7 @@ func local_request_WorkerService_CreateControllerLed_0(ctx context.Context, mars } var ( - filter_WorkerService_UpdateWorker_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_WorkerService_UpdateWorker_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_WorkerService_UpdateWorker_0(ctx context.Context, marshaler runtime.Marshaler, client WorkerServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -902,7 +902,7 @@ func RegisterWorkerServiceHandlerServer(ctx context.Context, mux *runtime.ServeM // RegisterWorkerServiceHandlerFromEndpoint is same as RegisterWorkerServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterWorkerServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/ops/services/health_service.pb.gw.go b/internal/gen/ops/services/health_service.pb.gw.go index f29e9522ac..2b9bfa34cb 100644 --- a/internal/gen/ops/services/health_service.pb.gw.go +++ b/internal/gen/ops/services/health_service.pb.gw.go @@ -104,7 +104,7 @@ func RegisterHealthServiceHandlerServer(ctx context.Context, mux *runtime.ServeM // RegisterHealthServiceHandlerFromEndpoint is same as RegisterHealthServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterHealthServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/testing/attribute/attribute.pb.gw.go b/internal/gen/testing/attribute/attribute.pb.gw.go index 9b96803f9f..9868d44cbb 100644 --- a/internal/gen/testing/attribute/attribute.pb.gw.go +++ b/internal/gen/testing/attribute/attribute.pb.gw.go @@ -84,7 +84,7 @@ func local_request_TestResourceService_TestCreateResource_0(ctx context.Context, } var ( - filter_TestResourceService_TestUpdateResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} + filter_TestResourceService_TestUpdateResource_0 = &utilities.DoubleArray{Encoding: map[string]int{"item": 0, "id": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} ) func request_TestResourceService_TestUpdateResource_0(ctx context.Context, marshaler runtime.Marshaler, client TestResourceServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -347,7 +347,7 @@ func RegisterTestResourceServiceHandlerServer(ctx context.Context, mux *runtime. // RegisterTestResourceServiceHandlerFromEndpoint is same as RegisterTestResourceServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterTestResourceServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/testing/event/event.pb.gw.go b/internal/gen/testing/event/event.pb.gw.go index 42ba4929cd..e76e0dfb65 100644 --- a/internal/gen/testing/event/event.pb.gw.go +++ b/internal/gen/testing/event/event.pb.gw.go @@ -136,7 +136,7 @@ func RegisterTestAuthMethodServiceHandlerServer(ctx context.Context, mux *runtim // RegisterTestAuthMethodServiceHandlerFromEndpoint is same as RegisterTestAuthMethodServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterTestAuthMethodServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/gen/testing/protooptions/service.pb.gw.go b/internal/gen/testing/protooptions/service.pb.gw.go index 363ada5f7c..cd78992a75 100644 --- a/internal/gen/testing/protooptions/service.pb.gw.go +++ b/internal/gen/testing/protooptions/service.pb.gw.go @@ -181,7 +181,7 @@ func RegisterTestServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux // RegisterTestServiceHandlerFromEndpoint is same as RegisterTestServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterTestServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.Dial(endpoint, opts...) + conn, err := grpc.DialContext(ctx, endpoint, opts...) if err != nil { return err } diff --git a/internal/proto/controller/api/resources/targets/v1/target.proto b/internal/proto/controller/api/resources/targets/v1/target.proto index 616258b421..62387ef61f 100644 --- a/internal/proto/controller/api/resources/targets/v1/target.proto +++ b/internal/proto/controller/api/resources/targets/v1/target.proto @@ -372,7 +372,7 @@ message SessionAuthorization { string type = 80; // @gotags: `class:"public"` // Output only. The marshaled SessionAuthorizationData message containing all information that the proxy needs. - string authorization_token = 90 [json_name = "authorization_token"]; // @gotags: `class:"private"` + string authorization_token = 90 [json_name = "authorization_token"]; // @gotags: `class:"secret"` // Output only. The endpoint address that the worker will connect to, useful for setting TLS parameters. string endpoint = 100; // @gotags: `class:"public"` diff --git a/scripts/remove-gotags-comments/main.go b/scripts/remove-gotags-comments/main.go new file mode 100644 index 0000000000..0739fad976 --- /dev/null +++ b/scripts/remove-gotags-comments/main.go @@ -0,0 +1,52 @@ +// Copyright (c) HashiCorp, Inc. +// SPDX-License-Identifier: MPL-2.0 + +package main + +import ( + "bytes" + "errors" + "flag" + "fmt" + "log" + "os" + + "github.com/hashicorp/boundary/internal/observability/event" +) + +var swaggerPath = flag.String("path", "", "The path to the swagger file to parse. Will also be written to") + +func main() { + flag.Parse() + + if err := run(*swaggerPath); err != nil { + log.Fatal(err) + } +} + +func run(swaggerPath string) error { + if swaggerPath == "" { + return errors.New("swagger file path is required") + } + swaggerBytes, err := os.ReadFile(swaggerPath) + if err != nil { + return fmt.Errorf("failed to read swagger file: %w", err) + } + for _, classification := range []event.DataClassification{event.PublicClassification, event.SensitiveClassification, event.SecretClassification} { + // Gotag comments appear both with and without the wrapping "`" + for _, wrapper := range []string{"", "`"} { + // The two cases we're covering are: + // - When gotags appears on its own. + // - When gotags appears at the end of another comment (preceded by \n\n). + for _, prefix := range []string{"\\n\\n", ""} { + swaggerBytes = bytes.ReplaceAll(swaggerBytes, []byte(fmt.Sprintf("%s@gotags: %sclass:\\\"%s\\\"%s", prefix, wrapper, classification, wrapper)), nil) + } + } + } + // Some fields have a comment explaining that their classification is manually managed + swaggerBytes = bytes.ReplaceAll(swaggerBytes, []byte("\\n\\nclassified as public via taggable implementation"), nil) + if err := os.WriteFile(swaggerPath, swaggerBytes, 0o644); err != nil { + return fmt.Errorf("failed to write new swagger file: %w", err) + } + return nil +} diff --git a/sdk/pbs/controller/api/resources/targets/target.pb.go b/sdk/pbs/controller/api/resources/targets/target.pb.go index 0e2c3abeb9..ce4ad818c9 100644 --- a/sdk/pbs/controller/api/resources/targets/target.pb.go +++ b/sdk/pbs/controller/api/resources/targets/target.pb.go @@ -988,7 +988,7 @@ type SessionAuthorization struct { // Output only. Type of the Session (e.g. tcp, ssh, etc.). Type string `protobuf:"bytes,80,opt,name=type,proto3" json:"type,omitempty" class:"public"` // @gotags: `class:"public"` // Output only. The marshaled SessionAuthorizationData message containing all information that the proxy needs. - AuthorizationToken string `protobuf:"bytes,90,opt,name=authorization_token,proto3" json:"authorization_token,omitempty" class:"private"` // @gotags: `class:"private"` + AuthorizationToken string `protobuf:"bytes,90,opt,name=authorization_token,proto3" json:"authorization_token,omitempty" class:"secret"` // @gotags: `class:"secret"` // Output only. The endpoint address that the worker will connect to, useful for setting TLS parameters. Endpoint string `protobuf:"bytes,100,opt,name=endpoint,proto3" json:"endpoint,omitempty" class:"public"` // @gotags: `class:"public"` // Output only. The credentials for this session.